-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2017 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
-//#include "XGUI_Constants.h"
#include "XGUI_Workshop.h"
#include "XGUI_ActionsMgr.h"
#include "XGUI_MenuMgr.h"
#include "XGUI_ColorDialog.h"
+#include "XGUI_DeflectionDialog.h"
#include "XGUI_ContextMenuMgr.h"
#include "XGUI_Displayer.h"
#include "XGUI_ErrorDialog.h"
#include <XGUI_CustomPrs.h>
#include <XGUI_HistoryMenu.h>
#include <XGUI_QtEvents.h>
+#include <XGUI_DataModel.h>
#ifndef HAVE_SALOME
#include <AppElements_Button.h>
#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_ResultGroup.h>
#include <ModelAPI_ResultParameter.h>
+#include <ModelAPI_ResultField.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
#include <ModelAPI_ResultCompSolid.h>
//#include <PartSetPlugin_Part.h>
#include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
#include <Events_LongOp.h>
-#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_IModule.h>
#include <ModuleBase_IViewer.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_PagedContainer.h>
#include <ModuleBase_WidgetValidated.h>
#include <ModuleBase_ModelWidget.h>
+#include <ModuleBase_ResultPrs.h>
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
#include <Config_ModuleReader.h>
#include <Config_PointerMessage.h>
#include <Config_PropManager.h>
-#include <Config_SelectionFilterMessage.h>
#include <Config_DataModelReader.h>
+#include <Config_Translator.h>
+#include <Config_WidgetAPI.h>
+#include <Config_Keywords.h>
#include <SUIT_ResourceMgr.h>
+#include <AIS_Trihedron.hxx>
+#ifdef BEFORE_TRIHEDRON_PATCH
+#include <AIS_Point.hxx>
+#include <AIS_Axis.hxx>
+#endif
+
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
#include <iterator>
+#ifdef TINSPECTOR
+#include <CDF_Session.hxx>
+#include <CDF_Application.hxx>
+#include <TInspector_Communicator.hxx>
+#include <VInspector_CallBack.hxx>
+static TInspector_Communicator* MyTCommunicator;
+static Handle(VInspector_CallBack) MyVCallBack;
+
+#endif
+
#ifdef _DEBUG
#include <QDebug>
#include <iostream>
myDisplayer(0)
//myViewerSelMode(TopAbs_FACE)
{
+ mySelector = new XGUI_SelectionMgr(this);
+ myModuleConnector = new XGUI_ModuleConnector(this);
+ myOperationMgr = new XGUI_OperationMgr(this, 0);
+ ModuleBase_IWorkshop* aWorkshop = moduleConnector();
+ // Has to be defined first in order to get errors and messages from other components
+ myEventsListener = new XGUI_WorkshopListener(aWorkshop);
+
+ SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
#ifndef HAVE_SALOME
myMainWindow = new AppElements_MainWindow();
- SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
bool aCloc = aResMgr->booleanValue("language", "locale", true);
if (aCloc)
QLocale::setDefault( QLocale::c() );
- else
+ else
QLocale::setDefault( QLocale::system() );
#endif
+ QString aPath = Config_XMLReader::pluginConfigFile().c_str();
+ QDir aDir(aPath);
+
+ // Load translations
+ QStringList aLangs;
+ aLangs << "*_en.ts"; // load by default eng translations
+ QString aCurrLang = aResMgr->stringValue("language", "language", "en");
+ if(aCurrLang != "en") {
+ aLangs << "*_" + aCurrLang + ".ts"; // then replace with translated files
+ }
+
+ foreach(QString aLang, aLangs) {
+ QStringList aFilters;
+ aFilters << aLang;
+ QStringList aTsFiles = aDir.entryList(aFilters, QDir::Files);
+ foreach(QString aFileName, aTsFiles) {
+ Config_Translator::load(aFileName.toStdString());
+ }
+ }
myDataModelXMLReader = new Config_DataModelReader();
- myDataModelXMLReader->readAll();
+ //myDataModelXMLReader->readAll();
myDisplayer = new XGUI_Displayer(this);
- mySelector = new XGUI_SelectionMgr(this);
connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateCommandStatus()));
- myOperationMgr = new XGUI_OperationMgr(this, 0);
myActionsMgr = new XGUI_ActionsMgr(this);
myMenuMgr = new XGUI_MenuMgr(this);
myErrorDlg = new XGUI_ErrorDialog(QApplication::desktop());
//connect(myViewerProxy, SIGNAL(selectionChanged()),
// myActionsMgr, SLOT(updateOnViewSelection()));
- myModuleConnector = new XGUI_ModuleConnector(this);
-
- ModuleBase_IWorkshop* aWorkshop = moduleConnector();
myOperationMgr->setWorkshop(aWorkshop);
myErrorMgr = new XGUI_ErrorMgr(this, aWorkshop);
- myEventsListener = new XGUI_WorkshopListener(aWorkshop);
- connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)),
- SLOT(onOperationStarted(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationResumed(ModuleBase_Operation*)),
SLOT(onOperationResumed(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
SLOT(onOperationStopped(ModuleBase_Operation*)));
- connect(myOperationMgr, SIGNAL(operationCommitted(ModuleBase_Operation*)),
+ connect(myOperationMgr, SIGNAL(operationCommitted(ModuleBase_Operation*)),
SLOT(onOperationCommitted(ModuleBase_Operation*)));
- connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
+ connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
SLOT(onOperationAborted(ModuleBase_Operation*)));
#ifndef HAVE_SALOME
onTrihedronVisibilityChanged(true);
#endif
- connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
- connect(myEventsListener, SIGNAL(errorOccurred(const QString&)),
- myErrorDlg, SLOT(addError(const QString&)));
+ connect(myEventsListener, SIGNAL(errorOccurred(std::shared_ptr<Events_InfoMessage>)),
+ myErrorDlg, SLOT(addError(std::shared_ptr<Events_InfoMessage>)));
//Config_PropManager::registerProp("Visualization", "object_default_color", "Object color",
// Config_Prop::Color, "225,225,225");
- Config_PropManager::registerProp("Visualization", "result_body_color", "Body color",
+ Config_PropManager::registerProp("Visualization", "result_body_color", "Result color",
Config_Prop::Color, ModelAPI_ResultBody::DEFAULT_COLOR());
Config_PropManager::registerProp("Visualization", "result_group_color", "Group color",
Config_Prop::Color, ModelAPI_ResultGroup::DEFAULT_COLOR());
- Config_PropManager::registerProp("Visualization", "result_construction_color", "Construction color",
- Config_Prop::Color, ModelAPI_ResultConstruction::DEFAULT_COLOR());
+ Config_PropManager::registerProp("Visualization", "result_construction_color",
+ "Construction color",
+ Config_Prop::Color,
+ ModelAPI_ResultConstruction::DEFAULT_COLOR());
Config_PropManager::registerProp("Visualization", "result_part_color", "Part color",
Config_Prop::Color, ModelAPI_ResultPart::DEFAULT_COLOR());
-
+ Config_PropManager::registerProp("Visualization", "result_field_color", "Field color",
+ Config_Prop::Color, ModelAPI_ResultField::DEFAULT_COLOR());
+
if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "face-selection", true))
myViewerSelMode.append(TopAbs_FACE);
if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "edge-selection", true))
myViewerSelMode.append(TopAbs_EDGE);
if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "vertex-selection", true))
myViewerSelMode.append(TopAbs_VERTEX);
+ //IMP: an attempt to use result selection with other selection modes
+ myViewerSelMode.append(ModuleBase_ResultPrs::Sel_Result);//TopAbs_VERTEX);
+ myViewerSelMode.append(TopAbs_COMPSOLID);
}
//******************************************************
XGUI_Workshop::~XGUI_Workshop(void)
{
+#ifdef _DEBUG
+#ifdef MISSED_TRANSLATION
+ // Save Missed translations
+ Config_Translator::saveMissedTranslations();
+#endif
+#endif
+
delete myDisplayer;
delete myDataModelXMLReader;
}
//******************************************************
void XGUI_Workshop::startApplication()
{
+ //Initialize event listening
+ myEventsListener->initializeEventListening();
+
+ myDataModelXMLReader->readAll();
initMenu();
Config_PropManager::registerProp("Plugins", "default_path", "Default Path",
Config_Prop::Directory, "");
- //Initialize event listening
- myEventsListener->initializeEventListening();
registerValidators();
myMainWindow->show();
updateCommandStatus();
#endif
-
+
onNew();
myViewerProxy->connectViewProxy();
XGUI_Displayer* aDisplayer = displayer();
QObjectPtrList aDisplayed = aDisplayer->displayedObjects();
aDisplayer->deactivateObjects(aDisplayed, true);
+ Handle(AIS_InteractiveContext) aContext = viewer()->AISContext();
+ Handle(AIS_Trihedron) aTrihedron = Handle(AIS_Trihedron)::DownCast(aDisplayer->getTrihedron());
+ /// deactivate trihedron in selection modes
+ TColStd_ListOfInteger aTColModes;
+ aContext->ActivatedModes(aTrihedron, aTColModes);
+ TColStd_ListIteratorOfListOfInteger itr( aTColModes );
+ for (; itr.More(); itr.Next() ) {
+ Standard_Integer aMode = itr.Value();
+ aContext->Deactivate(aTrihedron, aMode);
+ }
+#ifdef BEFORE_TRIHEDRON_PATCH
+ /// Trihedron problem: objects stayed in the viewer, should be removed manually
+ /// otherwise in SALOME happens crash by HideAll in the viewer
+ aContext->Remove(aTrihedron->Position(), true);
+ aContext->Remove(aTrihedron->Axis(), true);
+ aContext->Remove(aTrihedron->XAxis(), true);
+ aContext->Remove(aTrihedron->YAxis(), true);
+#endif
myOperationMgr->deactivate();
}
QAction* aAction = salomeConnector()->addDesktopCommand("UNDO_CMD", tr("Undo"),
tr("Undo last command"),
QIcon(":pictures/undo.png"),
- QKeySequence::Undo, false, "MEN_DESK_EDIT");
+ QKeySequence::Undo, false,
+ "MEN_DESK_EDIT");
QString aToolBarTitle = tr( "INF_DESK_TOOLBAR_STANDARD" );
salomeConnector()->addActionInToolbar( aAction,aToolBarTitle );
addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList<ActionInfo>&)), SLOT(onRedo(int)));
salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
- //aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
+ //aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"),
+ // tr("Rebuild data objects"),
// QIcon(":pictures/rebuild.png"), QKeySequence(),
// false, "MEN_DESK_EDIT");
//salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
//connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild()));
//salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
- aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export native..."), tr("Export the current document into a native file"),
+ aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export native..."),
+ tr("Export the current document into a native file"),
QIcon(), QKeySequence(),
false, "MEN_DESK_FILE");
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs()));
- aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import native..."), tr("Import native file"),
+ aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import native..."),
+ tr("Import native file"),
QIcon(), QKeySequence(),
false, "MEN_DESK_FILE");
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen()));
(anOperationMgr->currentOperation());
if (aFOperation) {
//if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
- myOperationMgr->onCommitOperation();
+ myOperationMgr->commitOperation();
}
}
}
XGUI_SalomeConnector* aSalomeConnector = salomeConnector();
if (aSalomeConnector->isFeatureOfNested(actionsMgr()->action(aFeatureKind.c_str())))
aHasNested = true;
-#else
+#else
AppElements_MainMenu* aMenuBar = mainWindow()->menuObject();
AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str());
if (aCommand && aCommand->button()->additionalButtonWidget())
return aHasNested;
}
-void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation)
+void XGUI_Workshop::fillPropertyPanel(ModuleBase_Operation* theOperation)
{
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (!aFOperation)
return;
std::string aFeatureKind = aFeature->getKind();
foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
if (!aWidget->attributeID().empty() && !aFeature->attribute(aWidget->attributeID()).get()) {
- std::string anErrorMsg = "The feature '" + aFeatureKind + "' has no attribute '"
- + aWidget->attributeID() + "' used by widget '"
- + aWidget->metaObject()->className() + "'.";
- Events_Error::send(anErrorMsg);
+ std::string anErrorMsg = "The feature '%1' has no attribute '%2' used by widget '%3'.";
+ Events_InfoMessage("XGUI_Workshop", anErrorMsg)
+ .arg(aFeatureKind).arg(aWidget->attributeID())
+ .arg(aWidget->metaObject()->className()).send();
myPropertyPanel->cleanContent();
return;
}
ModuleBase_Tools::flushUpdated(aFeature);
// update visible state of Preview button
+ std::shared_ptr<Config_FeatureMessage> aFeatureInfo;
#ifdef HAVE_SALOME
- bool anIsAutoPreview = mySalomeConnector->featureInfo(aFeatureKind.c_str())->isAutoPreview();
+ aFeatureInfo = mySalomeConnector->featureInfo(aFeatureKind.c_str());
#else
AppElements_MainMenu* aMenuBar = mainWindow()->menuObject();
AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str());
- bool anIsAutoPreview = aCommand && aCommand->featureMessage()->isAutoPreview();
+ if (aCommand)
+ aFeatureInfo = aCommand->featureMessage();
#endif
+ bool anIsAutoPreview = true;
+ if (aFeatureInfo.get())
+ anIsAutoPreview = aFeatureInfo->isAutoPreview();
+ else {
+ std::string aXmlCfg, aDescription;
+ module()->getXMLRepresentation(aFeatureKind, aXmlCfg, aDescription);
+ ModuleBase_WidgetFactory aFactory(aXmlCfg, moduleConnector());
+ anIsAutoPreview = aFactory.widgetAPI()->getBooleanAttribute(FEATURE_AUTO_PREVIEW, true);
+ }
+
if (!anIsAutoPreview) {
myPropertyPanel->findButton(PROP_PANEL_PREVIEW)->setVisible(true);
// send signal about preview should not be computed automatically, click on preview
myPropertyPanel->setWindowTitle(theOperation->getDescription()->description());
#else
std::string aFeatureName = aFeature->name();
- myPropertyPanel->setWindowTitle(QString("%1: %2").arg(theOperation->getDescription()->description())
- .arg(aFeatureName.c_str()));
+ myPropertyPanel->setWindowTitle(QString("%1: %2")
+ .arg(theOperation->getDescription()->description())
+ .arg(aFeatureName.c_str()));
#endif
myErrorMgr->setPropertyPanel(myPropertyPanel);
}
}
-//******************************************************
-void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation)
-{
- setGrantedFeatures(theOperation);
- myModule->operationStarted(theOperation);
-}
-
//******************************************************
void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation)
{
setGrantedFeatures(theOperation);
if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
- setPropertyPanel(theOperation);
+ fillPropertyPanel(theOperation);
connectToPropertyPanel(true);
}
updateCommandStatus();
if (aFeature.get()) { // feature may be not created (plugin load fail)
if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature))
anObjects.append(aFeature);
- std::list<ResultPtr> aResults = aFeature->results();
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
std::list<ResultPtr>::const_iterator aIt;
for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
ResultPtr anObject = *aIt;
void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
{
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (!aFOperation)
return;
aFOperation->setGrantedOperationIds(aGrantedIds);
}
-
-/*
- * Saves document with given name.
- */
+//******************************************************
void XGUI_Workshop::saveDocument(const QString& theName, std::list<std::string>& theFileNames)
{
QApplication::restoreOverrideCursor();
SessionPtr aMgr = ModelAPI_Session::get();
+
+ std::list<DocumentPtr> aDocList = aMgr->allOpenedDocuments();
+ std::list<DocumentPtr>::const_iterator aIt;
+ for (aIt = aDocList.cbegin(); aIt != aDocList.cend(); aIt++) {
+ std::list<bool> aState = myObjectBrowser->getStateForDoc(*aIt);
+ (*aIt)->storeNodesState(aState);
+ }
+
aMgr->save(theName.toLatin1().constData(), theFileNames);
+
QApplication::restoreOverrideCursor();
}
-bool XGUI_Workshop::abortAllOperations()
+//******************************************************
+void XGUI_Workshop::operationStarted(ModuleBase_Operation* theOperation)
{
- return myOperationMgr->abortAllOperations();
+ setGrantedFeatures(theOperation);
+ if (!theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ updateCommandStatus();
+ }
+ else {
+ myModule->operationStarted(theOperation);
+ }
}
//******************************************************
void XGUI_Workshop::onOpen()
{
- if(!abortAllOperations())
+ if(!myOperationMgr->abortAllOperations())
return;
//save current file before close if modified
SessionPtr aSession = ModelAPI_Session::get();
}
//show file dialog, check if readable and open
- myCurrentDir = QFileDialog::getExistingDirectory(desktop(), tr("Select directory"));
+ QString aDirectory = QFileDialog::getExistingDirectory(desktop(), tr("Select directory"));
+ openDirectory(aDirectory);
+}
+
+//******************************************************
+void XGUI_Workshop::openDirectory(const QString& theDirectory)
+{
+ myCurrentDir = theDirectory;
if (myCurrentDir.isEmpty())
return;
+
QFileInfo aFileInfo(myCurrentDir);
if (!aFileInfo.exists() || !aFileInfo.isReadable()) {
QMessageBox::critical(desktop(), tr("Warning"), tr("Unable to open the file."));
myCurrentDir = "";
return;
}
+
QApplication::setOverrideCursor(Qt::WaitCursor);
+ module()->closeDocument();
+ SessionPtr aSession = ModelAPI_Session::get();
aSession->closeAll();
aSession->load(myCurrentDir.toLatin1().constData());
myObjectBrowser->rebuildDataTree();
+
+ // Open first level of data tree
+ DocumentPtr aRootDoc = aSession->moduleDocument();
+ std::list<bool> aStates;
+ aRootDoc->restoreNodesState(aStates);
+ myObjectBrowser->setStateForDoc(aRootDoc, aStates);
+
updateCommandStatus();
+#ifndef HAVE_SALOME
+ myMainWindow->setCurrentDir(myCurrentDir, true);
+#endif
QApplication::restoreOverrideCursor();
}
//******************************************************
bool XGUI_Workshop::onSave()
{
- if(!abortAllOperations())
+ if(!myOperationMgr->abortAllOperations(XGUI_OperationMgr::XGUI_InformationMessage))
return false;
if (myCurrentDir.isEmpty()) {
return onSaveAs();
//******************************************************
bool XGUI_Workshop::onSaveAs()
{
- if(!abortAllOperations())
+ if(!myOperationMgr->abortAllOperations(XGUI_OperationMgr::XGUI_InformationMessage))
return false;
QFileDialog dialog(desktop());
dialog.setWindowTitle(tr("Select directory to save files..."));
dialog.setFileMode(QFileDialog::Directory);
- dialog.setFilter(tr("Directories (*)"));
+ dialog.setFilter(QDir::AllDirs);
dialog.setOptions(QFileDialog::HideNameFilterDetails | QFileDialog::ShowDirsOnly);
dialog.setViewMode(QFileDialog::Detail);
if (aDir.exists() && !aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) {
int answer = QMessageBox::question(
desktop(),
- //: Title of the dialog which asks user if he wants to save study in existing non-empty folder
+ // Title of the dialog which asks user if he wants to save study
+ // in existing non-empty folder
tr("Save"),
tr("The directory already contains some files, save anyway?"),
QMessageBox::Save | QMessageBox::Cancel);
{
// 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 until
- // redo of all possible objects happens
+ // each created result. After a redisplay signal is flushed. So, the viewer update is blocked
+ // until redo of all possible objects happens
bool isUpdateEnabled = myDisplayer->enableUpdateViewer(false);
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
if (!err.isEmpty()) {
if (desktop()) {
- Events_Error::send(err.toStdString());
+ Events_InfoMessage("XGUI_Workshop", err.toStdString()).send();
} else {
qWarning(qPrintable(err));
}
QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
{
QDockWidget* aObjDock = new QDockWidget(theParent);
- aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
+ aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea |
+ Qt::RightDockWidgetArea |
+ Qt::BottomDockWidgetArea);
aObjDock->setWindowTitle(tr("Object browser"));
aObjDock->setStyleSheet(
"::title { position: relative; padding-left: 5px; text-align: left center }");
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
myPropertyPanel = new XGUI_PropertyPanel(aDesktop, myOperationMgr);
myPropertyPanel->setupActions(myActionsMgr);
- myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
+ myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea |
+ Qt::RightDockWidgetArea |
+ Qt::BottomDockWidgetArea);
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
hidePropertyPanel(); ///<! Invisible by default
hideObjectBrowser();
// in order to operation manager could process key events of the panel.
// otherwise they are ignored. It happens only if the same(activateWindow) is
// not happened by property panel activation(e.g. resume operation of Sketch)
- ModuleBase_Tools::activateWindow(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()");
ModuleBase_Tools::setFocus(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()");
}
// are processed by this console. For example Undo actions.
// It is possible that this code is to be moved to SHAPER package
QMainWindow* aDesktop = desktop();
- ModuleBase_Tools::activateWindow(aDesktop, "XGUI_Workshop::hidePropertyPanel()");
ModuleBase_Tools::setFocus(aDesktop, "XGUI_Workshop::showPropertyPanel()");
}
moveObjects();
else if (theId == "COLOR_CMD")
changeColor(aObjects);
+ else if (theId == "DEFLECTION_CMD")
+ changeDeflection(aObjects);
else if (theId == "SHOW_CMD") {
showObjects(aObjects, true);
mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ updateCommandStatus();
}
- else if (theId == "HIDE_CMD")
+ else if (theId == "HIDE_CMD") {
showObjects(aObjects, false);
+ updateCommandStatus();
+ }
else if (theId == "SHOW_ONLY_CMD") {
showOnlyObjects(aObjects);
mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ updateCommandStatus();
}
else if (theId == "SHADING_CMD")
setDisplayMode(aObjects, XGUI_Displayer::Shading);
aObj->setDisplayed(false);
}
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
+#ifdef HAVE_SALOME
+ //issue #2159 Hide all incomplete behavior
+ viewer()->eraseAll();
+#endif
+ updateCommandStatus();
} else if (theId == "SELECT_VERTEX_CMD") {
setViewerSelectionMode(TopAbs_VERTEX);
} else if (theId == "SELECT_EDGE_CMD") {
} else if (theId == "SELECT_FACE_CMD") {
setViewerSelectionMode(TopAbs_FACE);
} else if (theId == "SELECT_RESULT_CMD") {
- setViewerSelectionMode(-1);
+ //setViewerSelectionMode(-1);
+ //IMP: an attempt to use result selection with other selection modes
+ setViewerSelectionMode(ModuleBase_ResultPrs::Sel_Result);
+ setViewerSelectionMode(TopAbs_COMPSOLID);
} else if (theId == "SHOW_RESULTS_CMD") {
highlightResults(aObjects);
} else if (theId == "SHOW_FEATURE_CMD") {
highlightFeature(aObjects);
}
+#ifdef TINSPECTOR
+ else if (theId == "TINSPECTOR_VIEW") {
+ Handle(CDF_Application) anApplication = CDF_Session::CurrentSession()->CurrentApplication();
+ if (!anApplication.IsNull())
+ {
+ if (!MyTCommunicator)
+ {
+ MyTCommunicator = new TInspector_Communicator();
+
+ NCollection_List<Handle(Standard_Transient)> aParameters;
+ aParameters.Append(anApplication);
+ Handle(AIS_InteractiveContext) aContext = viewer()->AISContext();
+ if (!aContext.IsNull())
+ aParameters.Append(aContext);
+
+ MyVCallBack = new VInspector_CallBack();
+ myDisplayer->setCallBack(MyVCallBack);
+ #ifndef HAVE_SALOME
+ AppElements_Viewer* aViewer = mainWindow()->viewer();
+ if (aViewer)
+ aViewer->setCallBack(MyVCallBack);
+ #endif
+ aParameters.Append(MyVCallBack);
+
+ MyTCommunicator->registerPlugin("SMBrowser"); // custom plugin to view ModelAPI
+
+ MyTCommunicator->init(aParameters);
+ MyTCommunicator->Activate("SMBrowser"); // to have button in TInspector
+ MyTCommunicator->Activate("TKVInspector"); // to have filled callback by model
+ MyTCommunicator->Activate("TKDFBrowser");
+ }
+ MyTCommunicator->setVisible(true);
+ }
+ }
+#endif
}
//**************************************************************
}
QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
- if (!abortAllOperations())
- return;
- // check whether the object can be deleted. There should not be parts which are not loaded
- if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
+ if (!myOperationMgr->abortAllOperations())
return;
bool hasResult = false;
bool hasFeature = false;
bool hasParameter = false;
bool hasCompositeOwner = false;
- ModuleBase_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter, hasCompositeOwner);
+ bool hasResultInHistory = false;
+ ModuleBase_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter, hasCompositeOwner,
+ hasResultInHistory);
if (!(hasFeature || hasParameter))
return;
//**************************************************************
void XGUI_Workshop::cleanHistory()
{
- if (!abortAllOperations())
+ if (!myOperationMgr->abortAllOperations())
return;
QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
anInfo.append(aFeature->name().c_str());
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("cleanHistory for: [%1] - %2").arg(aFeatures.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("cleanHistory for: [%1] - %2").
+ arg(aFeatures.size()).arg(anInfoStr).toStdString().c_str());
#endif
std::map<FeaturePtr, std::set<FeaturePtr> > aReferences;
ModelAPI_Tools::findAllReferences(aFeatures, aReferences, true, false);
- // find for each object whether all reference values are in the map as key, that means that there is
- // no other reference in the model to this object, so it might be removed by cleaning history
+ // find for each object whether all reference values are in the map as key, that means that there
+ // is no other reference in the model to this object, so it might be removed by cleaning history
// sk_1(ext_1, vertex_1) + (sk_3, bool_1) - cann't be deleted, dependency to bool_1
// ext_1(bool_1, sk_3) - cann't be deleted, dependency to bool_1
// vertex_1()
for (; aMainIt != aMainLast; aMainIt++) {
FeaturePtr aMainListFeature = aMainIt->first;
std::set<FeaturePtr> aMainRefList = aMainIt->second;
- std::set<FeaturePtr>::const_iterator aRefIt = aMainRefList.begin(), aRefLast = aMainRefList.end();
+ std::set<FeaturePtr>::const_iterator aRefIt = aMainRefList.begin(),
+ aRefLast = aMainRefList.end();
bool aFeatureOutOfTheList = false;
for (; aRefIt != aRefLast && !aFeatureOutOfTheList; aRefIt++) {
FeaturePtr aRefFeature = *aRefIt;
FeaturePtr aFeature = *aFIt;
anInfo.append(aFeature->name().c_str());
}
- qDebug(QString("unused objects: [%1] - %2").arg(anInfo.size()).arg(anInfo.join(";\t")).toStdString().c_str());
+ qDebug(QString("unused objects: [%1] - %2").
+ arg(anInfo.size()).arg(anInfo.join(";\t")).toStdString().c_str());
#endif
// warn about the references remove, break the delete operation if the user chose it
aMessageBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
aMessageBox.setDefaultButton(QMessageBox::No);
- QString aText = QString(tr("Unused features are the following: %1.\nThese features will be deleted.\nWould you like to continue?")
- .arg(anUnusedNames));
+ const char* aKeyStr = "Unused features are the following: "
+ "%1.\nThese features will be deleted.\nWould you like to continue?";
+ QString aText = QString(tr(aKeyStr).arg(anUnusedNames));
aMessageBox.setText(aText);
if (aMessageBox.exec() == QMessageBox::No)
return;
// 1. start operation
- aDescription += "by deleting of " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
+ aDescription += "by deleting of " +
+ aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
operationMgr()->startOperation(anOpAction);
//**************************************************************
void XGUI_Workshop::moveObjects()
{
- if (!abortAllOperations())
+ if (!myOperationMgr->abortAllOperations())
return;
SessionPtr aMgr = ModelAPI_Session::get();
// moving and negative consequences connected with processing of already moved items
mySelector->clearSelection();
// check whether the object can be moved. There should not be parts which are not loaded
- if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
+ std::set<FeaturePtr> aFeatures;
+ ModuleBase_Tools::convertToFeatures(anObjects, aFeatures);
+ if (!XGUI_Tools::canRemoveOrRename(desktop(), aFeatures))
return;
DocumentPtr anActiveDocument = aMgr->activeDocument();
FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true);
- foreach (ObjectPtr aObject, anObjects) {
- if (!myModule->canApplyAction(aObject, anActionId))
+ std::set<FeaturePtr>::const_iterator anIt = aFeatures.begin(), aLast = aFeatures.end();
+ for (; anIt != aLast; anIt++) {
+ FeaturePtr aFeature = *anIt;
+ if (!aFeature.get() || !myModule->canApplyAction(aFeature, anActionId))
continue;
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
- if (aFeature.get()) {
- anActiveDocument->moveFeature(aFeature, aCurrentFeature);
- aCurrentFeature = anActiveDocument->currentFeature(true);
- }
+ anActiveDocument->moveFeature(aFeature, aCurrentFeature);
+ aCurrentFeature = anActiveDocument->currentFeature(true);
}
aMgr->finishOperation();
}
// The order of appending features of the part and the part itself is important
// Append features from a part feature
- foreach (const ResultPtr& aResult, aFeature->results()) {
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
+ foreach (const ResultPtr& aResult, aResults) {
ResultPartPtr aResultPart =
std::dynamic_pointer_cast<ModelAPI_ResultPart>(aResult);
if (aResultPart.get() && aResultPart->partDoc().get()) {
DocumentPtr aDocument = theObject->document();
std::list<FeaturePtr> anAllFeatures = allFeatures(aDocument);
// find the object iterator
- std::list<FeaturePtr>::iterator aObjectIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject);
+ std::list<FeaturePtr>::iterator aObjectIt =
+ std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject);
if (aObjectIt == anAllFeatures.end())
return aResult;
// find the current feature iterator
- std::list<FeaturePtr>::iterator aCurrentIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), aDocument->currentFeature(true));
+ std::list<FeaturePtr>::iterator aCurrentIt =
+ std::find(anAllFeatures.begin(), anAllFeatures.end(), aDocument->currentFeature(true));
if (aCurrentIt == anAllFeatures.end())
return aResult;
// check the right order
- if (std::distance(aObjectIt, anAllFeatures.end()) <= std::distance(aCurrentIt, anAllFeatures.end()))
+ if (std::distance(aObjectIt, anAllFeatures.end()) <=
+ std::distance(aCurrentIt, anAllFeatures.end()))
return aResult;
// exclude the object
std::advance(aObjectIt, 1);
QObjectPtrList::const_iterator anIt = aObjects.begin(), aLast = aObjects.end();
for (; anIt != aLast && aCanMove; anIt++) {
ObjectPtr aObject = *anIt;
- // 1. Get features placed between selected and current in the document
+ // 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
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
+ // 2. Get all reference features to the selected object in the document
std::set<FeaturePtr> aRefFeatures;
ModuleBase_Tools::refsToFeatureInFeatureDocument(aObject, aRefFeatures);
AttributeIntArrayPtr aColorAttr;
// 1. find the current color of the object. This is a color of AIS presentation
- // The objects are iterated until a first valid color is found
+ // The objects are iterated until a first valid color is found
std::vector<int> aColor;
foreach(ObjectPtr anObject, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
if (aColor.size() != 3)
return;
- if (!abortAllOperations())
- return;
+ if (!myOperationMgr->abortAllOperations())
+ return;
// 2. show the dialog to change the value
XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(desktop());
aDlg->setColor(aColor);
foreach(ObjectPtr anObj, theObjects) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
if (aResult.get() != NULL) {
- ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
- setColor(aCompsolidResult->subResult(i), !isRandomColor ? aColorResult : aDlg->getRandomColor());
+ setColor(aCompsolidResult->subResult(i), !isRandomColor ? aColorResult :
+ aDlg->getRandomColor());
}
}
setColor(aResult, !isRandomColor ? aColorResult : aDlg->getRandomColor());
updateCommandStatus();
}
+//**************************************************************
+bool XGUI_Workshop::canChangeDeflection() const
+{
+ QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
+
+ std::set<std::string> aTypes;
+ aTypes.insert(ModelAPI_ResultGroup::group());
+ aTypes.insert(ModelAPI_ResultConstruction::group());
+ aTypes.insert(ModelAPI_ResultBody::group());
+ aTypes.insert(ModelAPI_ResultPart::group());
+
+ return hasResults(aObjects, aTypes);
+}
+
+void setDeflection(ResultPtr theResult, const double theDeflection)
+{
+ if (!theResult.get())
+ return;
+
+ AttributeDoublePtr aDeflectionAttr = theResult->data()->real(ModelAPI_Result::DEFLECTION_ID());
+ if (aDeflectionAttr.get() != NULL)
+ aDeflectionAttr->setValue(theDeflection);
+}
+
+
+//**************************************************************
+void XGUI_Workshop::changeDeflection(const QObjectPtrList& theObjects)
+{
+ AttributeDoublePtr aDoubleAttr;
+ // 1. find the current color of the object. This is a color of AIS presentation
+ // The objects are iterated until a first valid color is found
+ double aDeflection = -1;
+ foreach(ObjectPtr anObject, theObjects) {
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
+ if (aResult.get()) {
+ aDeflection = XGUI_CustomPrs::getResultDeflection(aResult);
+ }
+ 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()) {
+ aDeflection = anAISObj->getDeflection();
+ }
+ }
+ if (aDeflection > 0)
+ break;
+ }
+ if (aDeflection < 0)
+ return;
+
+ if (!myOperationMgr->abortAllOperations())
+ return;
+ // 2. show the dialog to change the value
+ XGUI_DeflectionDialog* aDlg = new XGUI_DeflectionDialog(desktop());
+ aDlg->setDeflection(aDeflection);
+ aDlg->move(QCursor::pos());
+ bool isDone = aDlg->exec() == QDialog::Accepted;
+ if (!isDone)
+ return;
+
+ // 3. abort the previous operation and start a new one
+ SessionPtr aMgr = ModelAPI_Session::get();
+ QString aDescription = contextMenuMgr()->action("DEFLECTION_CMD")->text();
+ aMgr->startOperation(aDescription.toStdString());
+
+ // 4. set the value to all results
+ aDeflection = aDlg->getDeflection();
+ foreach(ObjectPtr anObj, theObjects) {
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
+ if (aResult.get() != NULL) {
+ ResultCompSolidPtr aCompsolidResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(aResult);
+ if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids
+ for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
+ setDeflection(aCompsolidResult->subResult(i), aDeflection);
+ }
+ }
+ setDeflection(aResult, aDeflection);
+ }
+ }
+ aMgr->finishOperation();
+ updateCommandStatus();
+}
+
//**************************************************************
#define SET_DISPLAY_GROUP(aGroupName, aDisplay) \
for (int i = 0; i < aDoc->size(aGroupName); i++) { \
void XGUI_Workshop::showObjects(const QObjectPtrList& theList, bool isVisible)
{
foreach (ObjectPtr aObj, theList) {
- /*
- ResultPartPtr aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
- if (aPartRes) {
- DocumentPtr aDoc = aPartRes->partDoc();
- SET_DISPLAY_GROUP(ModelAPI_ResultBody::group(), isVisible)
- SET_DISPLAY_GROUP(ModelAPI_ResultConstruction::group(), isVisible)
- SET_DISPLAY_GROUP(ModelAPI_ResultGroup::group(), isVisible)
- } else {
- */
- aObj->setDisplayed(isVisible);
- //}
+ aObj->setDisplayed(isVisible);
}
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
}
if (module()->canEraseObject(aObj))
aObj->setDisplayed(false);
}
+ Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
+#ifdef HAVE_SALOME
+ //issue #2159 Hide all incomplete behavior
+ viewer()->eraseAll();
+#endif
// Show only objects from the list
foreach (ObjectPtr aObj, theList) {
- /*
- ResultPartPtr aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
- if (aPartRes) {
- DocumentPtr aDoc = aPartRes->partDoc();
- SET_DISPLAY_GROUP(ModelAPI_ResultBody::group(), true)
- SET_DISPLAY_GROUP(ModelAPI_ResultConstruction::group(), true)
- SET_DISPLAY_GROUP(ModelAPI_ResultGroup::group(), true)
- } else {
- */
- aObj->setDisplayed(true);
- //}
+ aObj->setDisplayed(true);
}
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
-
}
//**************************************************************
void XGUI_Workshop::displayGroupResults(DocumentPtr theDoc, std::string theGroup)
{
- for (int i = 0; i < theDoc->size(theGroup); i++)
+ for (int i = 0; i < theDoc->size(theGroup); i++)
theDoc->object(theGroup, i)->setDisplayed(true);
//displayObject(theDoc->object(theGroup, i));
Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
anOperation->abort();
anOperation = operationMgr()->currentOperation();
}
- myDisplayer->closeLocalContexts();
+ //myDisplayer->closeLocalContexts();
myDisplayer->eraseAll();
objectBrowser()->clearContent();
module()->closeDocument();
+ // data model need not process the document's signals about objects modifications as
+ // the document is closed
+ //bool isBlocked = objectBrowser()->dataModel()->blockEventsProcessing(true);
+
SessionPtr aMgr = ModelAPI_Session::get();
aMgr->closeAll();
+
+ //objectBrowser()->dataModel()->blockEventsProcessing(isBlocked);
}
void XGUI_Workshop::addHistoryMenu(QObject* theObject, const char* theSignal, const char* theSlot)
void XGUI_Workshop::synchronizeViewer()
{
SessionPtr aMgr = ModelAPI_Session::get();
- DocumentPtr aDoc = aMgr->activeDocument();
+ QList<DocumentPtr> aDocs;
+ aDocs.append(aMgr->activeDocument());
+ aDocs.append(aMgr->moduleDocument());
- synchronizeGroupInViewer(aDoc, ModelAPI_ResultConstruction::group(), false);
- synchronizeGroupInViewer(aDoc, ModelAPI_ResultBody::group(), false);
- synchronizeGroupInViewer(aDoc, ModelAPI_ResultPart::group(), false);
- synchronizeGroupInViewer(aDoc, ModelAPI_ResultGroup::group(), false);
+ foreach(DocumentPtr aDoc, aDocs) {
+ synchronizeGroupInViewer(aDoc, ModelAPI_ResultConstruction::group(), false);
+ synchronizeGroupInViewer(aDoc, ModelAPI_ResultBody::group(), false);
+ synchronizeGroupInViewer(aDoc, ModelAPI_ResultPart::group(), false);
+ synchronizeGroupInViewer(aDoc, ModelAPI_ResultGroup::group(), false);
+ }
}
-void XGUI_Workshop::synchronizeGroupInViewer(const DocumentPtr& theDoc,
- const std::string& theGroup,
+void XGUI_Workshop::synchronizeGroupInViewer(const DocumentPtr& theDoc,
+ const std::string& theGroup,
bool theUpdateViewer)
{
ObjectPtr aObj;
{
FeaturePtr aFeature;
QObjectPtrList aSelList = theObjects;
- std::list<ResultPtr> aResList;
bool aHasHidden = false;
foreach(ObjectPtr aObj, theObjects) {
aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
if (aFeature.get()) {
- aResList = aFeature->results();
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
- for(aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) {
+ for(aIt = aResults.cbegin(); aIt != aResults.cend(); aIt++) {
aHasHidden |= (*aIt)->isConcealed();
aSelList.append(*aIt);
}
objectBrowser()->setObjectsSelected(aSelList);
objectBrowser()->blockSignals(aBlocked);
}
- if (aHasHidden)
- QMessageBox::information(desktop(), tr("Find results"),
+ if (aHasHidden)
+ QMessageBox::information(desktop(), tr("Find results"),
tr("Results not found"), QMessageBox::Ok);
}
