-// Copyright (C) 2014-2020 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <XGUI_InspectionPanel.h>
#include <XGUI_CompressFiles.h>
-#ifndef HAVE_SALOME
+#ifdef HAVE_SALOME
+#include <SUIT_Application.h>
+#include <SUIT_Session.h>
+#else
#include <AppElements_Button.h>
#include <AppElements_Command.h>
#include <AppElements_MainMenu.h>
#include <QSpinBox>
#include <QDialogButtonBox>
+#include <sstream>
#include <iterator>
#ifdef TINSPECTOR
-#include <CDF_Session.hxx>
-#include <CDF_Application.hxx>
+#include <TDocStd_Application.hxx>
#include <inspector/TInspector_Communicator.hxx>
#include <inspector/VInspector_CallBack.hxx>
static TInspector_Communicator* MyTCommunicator;
static Handle(VInspector_CallBack) MyVCallBack;
-
#endif
#ifdef _DEBUG
#ifdef WIN32
#include <windows.h>
+#pragma warning(disable : 4456) // for nested foreach
+#pragma warning(disable : 4189) // for declaration of unused variables (MAYBE_UNUSED)
#else
#include <dlfcn.h>
#endif
QKeySequence(), false, "MEN_DESK_FILE", tr("Import"), 10, 10);
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onImportShape()));
+ aAction = salomeConnector()->addDesktopCommand("IMPORT_IMAGE_CMD", tr("Picture..."),
+ tr("Import a picture from an image file"),
+ QIcon(),
+ QKeySequence(), false, "MEN_DESK_FILE", tr("Import"), 10, 10);
+ connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onImportImage()));
+
// Export sub-menu
aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Part set..."),
tr("Export the current document into a native file"),
#endif
QString aFileName = aDocDir + aSep + thePage;
if (QFile::exists(aFileName)) {
+#ifdef HAVE_SALOME
+ SUIT_Application* app = SUIT_Session::session()->activeApplication();
+ if (app)
+ app->onHelpContextModule("SHAPER", aFileName);
+ else {
+ QUrl aUrl = QUrl::fromLocalFile(aFileName);
+ QDesktopServices::openUrl(aUrl);
+ }
+#else
QUrl aUrl = QUrl::fromLocalFile(aFileName);
QDesktopServices::openUrl(aUrl);
+#endif
}
}
}
if (aNewPart) {
int aSize = aRootDoc->size(ModelAPI_ResultPart::group());
if (aSize > 0 ) {
- ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), 0);
- ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
+ ObjectPtr anObject = aRootDoc->object(ModelAPI_ResultPart::group(), 0);
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(anObject);
if (aPart.get())
aPart->activate();
}
}
#endif
+ int anActivationId =
+ ModuleBase_Preferences::resourceMgr()->integerValue("General", "part_activation_study", -1);
+ int aSize = aRootDoc->size(ModelAPI_ResultPart::group());
+
+ if (anActivationId == 0 && aSize > 0) {
+ ObjectPtr anObject = aRootDoc->object(ModelAPI_ResultPart::group(), aSize - 1);
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(anObject);
+ if (aPart.get()) {
+ aPart->activate();
+ ModuleBase_Tools::setDisplaying(aPart);
+ }
+ }
+ else if (anActivationId == 1) {
+ for (int anIndex = 0; anIndex < aSize; ++anIndex) {
+ ObjectPtr anObject = aRootDoc->object(ModelAPI_ResultPart::group(), anIndex);
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(anObject);
+ if (aPart.get()) {
+ aPart->activate();
+ ModuleBase_Tools::setDisplaying(aPart);
+
+ if (anIndex < aSize - 1) {
+ SessionPtr aMgr = ModelAPI_Session::get();
+ aMgr->startOperation("Activation");
+ aMgr->setActiveDocument(aMgr->moduleDocument());
+ aMgr->finishOperation();
+ updateCommandStatus();
+ viewer()->update();
+ }
+ }
+ }
+ }
QApplication::restoreOverrideCursor();
}
if (anActiveWidget->processAction(theActionType, aParam))
return;
}
+ else
+ {
+ XGUI_FacesPanel * anFacePannel = facesPanel();
+ if(ActionUndo == theActionType && anFacePannel->isActivePanel())
+ {
+ anFacePannel->processUndo();
+ return;
+ }
+ }
// the viewer update should be blocked in order to avoid the features blinking. For the created
// feature a results are created, the flush of the created signal caused the viewer redisplay for
// each created result. After a redisplay signal is flushed. So, the viewer update is blocked
}
}
+//******************************************************
+void XGUI_Workshop::onImportImage()
+{
+ if (abortAllOperations()) {
+ ModuleBase_OperationFeature* anImportOp = dynamic_cast<ModuleBase_OperationFeature*>(
+ module()->createOperation(ExchangePlugin_Import_Image::ID()));
+ anImportOp->setHelpFileName(QString("ExchangePlugin") + QDir::separator() +
+ "importFeature.html");
+ myPropertyPanel->updateApplyPlusButton(anImportOp->feature());
+ operationMgr()->startOperation(anImportOp);
+ }
+}
+
//******************************************************
void XGUI_Workshop::onExportShape()
{
//**************************************************************
void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked)
{
- QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
if (theId == "DELETE_CMD")
deleteObjects();
else if (theId == "CLEAN_HISTORY_CMD")
else if (theId == "MOVE_CMD" || theId == "MOVE_SPLIT_CMD")
moveObjects(theId == "MOVE_SPLIT_CMD");
else if (theId == "COLOR_CMD")
- changeColor(aObjects);
+ changeColor(anObjects);
+ else if (theId == "AUTOCOLOR_CMD")
+ changeAutoColor(anObjects);
else if (theId == "ISOLINES_CMD")
- changeIsoLines(aObjects);
+ changeIsoLines(anObjects);
else if (theId == "SHOW_ISOLINES_CMD") {
- foreach(ObjectPtr aObj, aObjects) {
+ foreach(ObjectPtr aObj, anObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
if (aResult.get())
ModelAPI_Tools::showIsoLines(aResult, !ModelAPI_Tools::isShownIsoLines(aResult));
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
}
else if (theId == "DEFLECTION_CMD")
- changeDeflection(aObjects);
+ changeDeflection(anObjects);
else if (theId == "TRANSPARENCY_CMD")
- changeTransparency(aObjects);
+ changeTransparency(anObjects);
else if (theId == "SHOW_CMD") {
- showObjects(aObjects, true);
+ showObjects(anObjects, true);
mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
updateCommandStatus();
}
else if (theId == "HIDE_CMD") {
- showObjects(aObjects, false);
+ showObjects(anObjects, false);
updateCommandStatus();
}
else if (theId == "SHOW_ONLY_CMD") {
- showOnlyObjects(aObjects);
+ showOnlyObjects(anObjects);
mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
updateCommandStatus();
}
else if (theId == "SHADING_CMD")
- setDisplayMode(aObjects, XGUI_Displayer::Shading);
+ setDisplayMode(anObjects, XGUI_Displayer::Shading);
else if (theId == "WIREFRAME_CMD")
- setDisplayMode(aObjects, XGUI_Displayer::Wireframe);
+ setDisplayMode(anObjects, XGUI_Displayer::Wireframe);
else if (theId == "HIDEALL_CMD") {
QObjectPtrList aList = myDisplayer->displayedObjects();
foreach (ObjectPtr aObj, aList) {
setViewerSelectionMode(ModuleBase_ResultPrs::Sel_Result);
setViewerSelectionMode(TopAbs_COMPSOLID);
} else if (theId == "SHOW_RESULTS_CMD") {
- highlightResults(aObjects);
+ highlightResults(anObjects);
} else if (theId == "SHOW_FEATURE_CMD") {
- highlightFeature(aObjects);
+ highlightFeature(anObjects);
} else if (theId == "SET_VIEW_NORMAL_CMD") {
setNormalView();
} else if (theId == "SET_VIEW_INVERTEDNORMAL_CMD") {
}
#ifdef TINSPECTOR
else if (theId == "TINSPECTOR_VIEW") {
- Handle(CDF_Application) anApplication = CDF_Session::CurrentSession()->CurrentApplication();
+ Handle(TDocStd_Application) anApplication = ModelAPI_Session::get()->application();
if (!anApplication.IsNull())
{
if (!MyTCommunicator)
if (!facesPanel()->isObjectHiddenByPanel(*anObjectsIt))
continue;
aHiddenObjects.insert(*anObjectsIt);
- aHiddenObjectNames.append((*anObjectsIt)->data()->name().c_str());
+ aHiddenObjectNames.append(QString::fromStdWString((*anObjectsIt)->data()->name()));
}
if (aHiddenObjects.empty()) // in parameter objects there are no hidden objects in hide face
return true;
ResultConstructionPtr aConstr = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aObj);
FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
if (aFeature) {
- notDelete = (!aFeature->isInHistory()) && aConstr->isInfinite();
+ notDelete = (!aFeature->isInHistory()) && (aConstr && aConstr->isInfinite());
if (notDelete) {
anObjects.removeAll(aObj);
aIt--;
if (!anUnusedObjects.empty()) {
QStringList aNames;
foreach (const FeaturePtr& aFeature, anUnusedObjects) {
- aNames.append(aFeature->name().c_str());
+ aNames.append(QString::fromStdWString(aFeature->name()));
}
aNames.sort();
QString anUnusedNames = aNames.join(", ");
DocumentPtr aDocument = theObject->document();
std::list<FeaturePtr> anAllFeatures = allFeatures(aDocument);
// find the object iterator
- std::list<FeaturePtr>::iterator aObjectIt =
+ std::list<FeaturePtr>::iterator anObjectIt =
std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject);
- if (aObjectIt == anAllFeatures.end())
+ if (anObjectIt == anAllFeatures.end())
return aResult;
// find the current feature iterator
std::list<FeaturePtr>::iterator aCurrentIt =
if (aCurrentIt == anAllFeatures.end())
return aResult;
// check the right order
- if (std::distance(aObjectIt, anAllFeatures.end()) <=
+ if (std::distance(anObjectIt, anAllFeatures.end()) <=
std::distance(aCurrentIt, anAllFeatures.end()))
return aResult;
// exclude the object
- std::advance(aObjectIt, 1);
+ std::advance(anObjectIt, 1);
// include the current feature
std::advance(aCurrentIt, 1);
- return std::list<FeaturePtr>(aObjectIt, aCurrentIt);
+ return std::list<FeaturePtr>(anObjectIt, aCurrentIt);
}
//******************************************************
{
QString anActionId = "MOVE_CMD";
- QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
QObjectPtrList aValidatedObjects;
- foreach (ObjectPtr aObject, aObjects) {
- if (!myModule->canApplyAction(aObject, anActionId))
+ foreach (ObjectPtr anObject, anObjects) {
+ if (!myModule->canApplyAction(anObject, anActionId))
continue;
// To be moved feature should be in active document
- if (aObject->document() != ModelAPI_Session::get()->activeDocument())
+ if (anObject->document() != ModelAPI_Session::get()->activeDocument())
continue;
- aValidatedObjects.append(aObject);
+ aValidatedObjects.append(anObject);
}
- if (aValidatedObjects.size() != aObjects.size())
- aObjects = aValidatedObjects;
+ if (aValidatedObjects.size() != anObjects.size())
+ anObjects = aValidatedObjects;
- bool aCanMove = !aObjects.empty();
+ bool aCanMove = !anObjects.empty();
- QObjectPtrList::const_iterator anIt = aObjects.begin(), aLast = aObjects.end();
+ QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end();
for (; anIt != aLast && aCanMove; anIt++) {
- ObjectPtr aObject = *anIt;
- if (!aObject.get() || !aObject->data().get() || !aObject->data()->isValid()) {
+ ObjectPtr anObject = *anIt;
+ if (!anObject.get() || !anObject->data().get() || !anObject->data()->isValid()) {
aCanMove = false;
break;
}
- FeaturePtr aFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
+ FeaturePtr aFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
// only groups can be moved to the end for now (#2451)
if (aFeat.get() && aFeat->getKind() != "Group") {
aCanMove = false;
}
// 1. Get features placed between selected and current in the document
- std::list<FeaturePtr> aFeaturesBetween = toCurrentFeatures(aObject);
- // if aFeaturesBetween is empty it means wrong order or aObject is the current feature
+ std::list<FeaturePtr> aFeaturesBetween = toCurrentFeatures(anObject);
+ // if aFeaturesBetween is empty it means wrong order or anObject is the current feature
if (aFeaturesBetween.empty())
aCanMove = false;
else {
std::set<FeaturePtr> aPlacedFeatures(aFeaturesBetween.begin(), aFeaturesBetween.end());
// 2. Get all reference features to the selected object in the document
std::set<FeaturePtr> aRefFeatures;
- ModuleBase_Tools::refsToFeatureInFeatureDocument(aObject, aRefFeatures);
+ ModuleBase_Tools::refsToFeatureInFeatureDocument(anObject, aRefFeatures);
if (aRefFeatures.empty())
continue;
if (theActionName == "COLOR_CMD" ||
theActionName == "DEFLECTION_CMD" ||
theActionName == "TRANSPARENCY_CMD") {
- QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
std::set<std::string> aTypes;
aTypes.insert(ModelAPI_ResultGroup::group());
aTypes.insert(ModelAPI_ResultBody::group());
aTypes.insert(ModelAPI_ResultPart::group());
- return hasResults(aObjects, aTypes);
+ return hasResults(anObjects, aTypes);
+ }
+ if (theActionName == "AUTOCOLOR_CMD") {
+
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
+
+ std::set<std::string> aTypes;
+ aTypes.insert(ModelAPI_ResultGroup::group());
+
+ return hasResults(anObjects, aTypes);
}
return false;
}
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
if (aResult.get()) {
ModelAPI_Tools::getColor(aResult, aColor);
- if (aColor.empty())
+ if (aColor.empty()) {
+ AISObjectPtr anAISObj = myDisplayer->getAISObject(anObject);
+ if (anAISObj.get()) {
+ aColor.resize(3);
+ anAISObj->getColor(aColor[0], aColor[1], aColor[2]);
+ }
+ }
+ if (aColor.empty()) {
getDefaultColor(aResult, false, aColor);
- }
- else {
- // TODO: remove the obtaining a color from the AIS object
- // this does not happen never because:
- // 1. The color can be changed only on results
- // 2. The result can be not visualized in the viewer(e.g. Origin Construction)
- AISObjectPtr anAISObj = myDisplayer->getAISObject(anObject);
- if (anAISObj.get()) {
- aColor.resize(3);
- anAISObj->getColor(aColor[0], aColor[1], aColor[2]);
}
}
- if (!aColor.empty())
- break;
}
if (aColor.size() != 3)
return;
// 3. abort the previous operation and start a new one
SessionPtr aMgr = ModelAPI_Session::get();
QString aDescription = contextMenuMgr()->action("COLOR_CMD")->text();
+
aMgr->startOperation(aDescription.toStdString());
// 4. set the value to all results
myViewerProxy->update();
}
+//**************************************************************
+void XGUI_Workshop::changeAutoColor(const QObjectPtrList& theObjects)
+{
+ if (!abortAllOperations())
+ return;
+
+ std::vector<int> aColor;
+
+ // abort the previous operation and start a new one
+ SessionPtr aMgr = ModelAPI_Session::get();
+ QString aDescription = contextMenuMgr()->action("AUTOCOLOR_CMD")->text();
+ aMgr->startOperation(aDescription.toStdString());
+
+ if (Config_PropManager::getAutoColorStatus()) {
+ contextMenuMgr()->action("AUTOCOLOR_CMD")->setText(tr("Auto color"));
+ Config_PropManager::setAutoColorStatus(false);
+ ModelAPI_Tools::findRandomColor(aColor, true);
+ } else {
+ // set the value to all results
+ foreach (ObjectPtr anObj, theObjects) {
+ DocumentPtr aDocument = anObj->document();
+ std::list<FeaturePtr> anAllFeatures = allFeatures(aDocument);
+ // find the object iterator
+ std::list<FeaturePtr>::iterator anObjectIt = anAllFeatures.begin();
+ for (; anObjectIt != anAllFeatures.end(); ++ anObjectIt) {
+ FeaturePtr aFeature = *anObjectIt;
+ if (aFeature.get()) {
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
+ std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
+ for (aIt = aResults.cbegin(); aIt != aResults.cend(); aIt++) {
+ ResultPtr aGroupResult = *aIt;
+ if (aGroupResult.get() &&
+ aGroupResult->groupName() == ModelAPI_ResultGroup::group()) {
+ ModelAPI_Tools::findRandomColor(aColor);
+ ModelAPI_Tools::setColor(aGroupResult, aColor);
+ }
+ }
+ }
+ }
+ }
+ Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
+ aMgr->finishOperation();
+ updateCommandStatus();
+ myViewerProxy->update();
+ contextMenuMgr()->action("AUTOCOLOR_CMD")->setText(tr("Disable auto color"));
+ Config_PropManager::setAutoColorStatus(true);
+ }
+}
+
//**************************************************************
void setTransparency(double theTransparency, const QObjectPtrList& theObjects)
{
//**************************************************************
void XGUI_Workshop::updateColorScaleVisibility()
{
- QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
viewer()->setColorScaleShown(false);
- if (aObjects.size() == 1) {
+ if (anObjects.size() == 1) {
FieldStepPtr aStep =
- std::dynamic_pointer_cast<ModelAPI_ResultField::ModelAPI_FieldStep>(aObjects.first());
+ std::dynamic_pointer_cast<ModelAPI_ResultField::ModelAPI_FieldStep>(anObjects.first());
if (aStep.get() && myDisplayer->isVisible(aStep)) {
AISObjectPtr aAisPtr = myDisplayer->getAISObject(aStep);
Handle(AIS_InteractiveObject) aIO = aAisPtr->impl<Handle(AIS_InteractiveObject)>();
aPrs->dataRange(aMin, aMax);
myViewerProxy->setColorScaleRange(aMin, aMax);
}
- myViewerProxy->setColorScaleTitle(aStep->name().c_str());
+ myViewerProxy->setColorScaleTitle(QString::fromStdWString(aStep->name()));
myViewerProxy->setColorScaleShown(true);
}
}
GeomShapePtr aPlanarFace;
foreach(ModuleBase_ViewerPrsPtr aPrs, aPrsList) {
GeomShapePtr aShape = aPrs->shape();
- if (aShape.get() && aShape->isPlanar()) {
+ if (aShape.get() && aShape->isFace() && aShape->isPlanar()) {
aPlanarFace = aShape;
break;
}
void XGUI_Workshop::insertFeatureFolder()
{
- QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
- if (aObjects.isEmpty())
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
+ if (anObjects.isEmpty())
return;
- ObjectPtr aObj = aObjects.first();
+ ObjectPtr aObj = anObjects.first();
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
if (aFeature.get() == NULL)
return;
aMgr->finishOperation();
updateCommandStatus();
}
-}
\ No newline at end of file
+}
