X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=17be4e5309218cd94261291618e6ae54b8dc33ff;hb=08a596f683652d0694b58dbb14eadfe11163c803;hp=88102925242baa5a61eff80d15f1280194679912;hpb=1caca4db4cda17236f7a9f50fc9c620f6a426372;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 881029252..17be4e530 100755 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -1,11 +1,30 @@ -// 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 +// -//#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_TransparencyWidget.h" #include "XGUI_ContextMenuMgr.h" #include "XGUI_Displayer.h" #include "XGUI_ErrorDialog.h" @@ -14,6 +33,7 @@ #include "XGUI_ObjectsBrowser.h" #include "XGUI_OperationMgr.h" #include "XGUI_PropertyPanel.h" +#include "XGUI_PropertyDialog.h" #include "XGUI_SalomeConnector.h" #include "XGUI_Selection.h" #include "XGUI_SelectionMgr.h" @@ -23,6 +43,7 @@ #include #include #include +#include #ifndef HAVE_SALOME #include @@ -34,8 +55,11 @@ #include #endif +#include + #include #include +#include #include #include #include @@ -44,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -55,7 +80,6 @@ #include #include -#include #include #include #include @@ -70,18 +94,26 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include +#include +#include #include +#include +#ifdef BEFORE_TRIHEDRON_PATCH +#include +#include +#endif + #include #include #include @@ -99,6 +131,16 @@ #include +#ifdef TINSPECTOR +#include +#include +#include +#include +static TInspector_Communicator* MyTCommunicator; +static Handle(VInspector_CallBack) MyVCallBack; + +#endif + #ifdef _DEBUG #include #include @@ -133,25 +175,34 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) // 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 aFilters; - aFilters << "*_en.ts"; - QStringList aTsFiles = aDir.entryList(aFilters, QDir::Files); - foreach(QString aFileName, aTsFiles) { - Config_Translator::load(aFileName.toStdString()); + 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(); @@ -176,15 +227,13 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) myErrorMgr = new XGUI_ErrorMgr(this, 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 @@ -198,21 +247,28 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) //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); } //****************************************************** @@ -241,7 +297,14 @@ void XGUI_Workshop::startApplication() Config_PropManager::registerProp("Plugins", "default_path", "Default Path", Config_Prop::Directory, ""); + std::string aDir = Config_XMLReader::resourcesConfigFile(); + Config_PropManager::registerProp("Plugins", "import_initial_path", "Import initial directory", + Config_Prop::Directory, aDir); +#ifdef _DEBUG + Config_PropManager::registerProp("Plugins", "create_part_by_start", "Create Part by Start", + Config_Prop::Boolean, "false"); +#endif registerValidators(); // Calling of loadCustomProps before activating module is required @@ -253,7 +316,7 @@ void XGUI_Workshop::startApplication() myMainWindow->show(); updateCommandStatus(); #endif - + onNew(); myViewerProxy->connectViewProxy(); @@ -261,6 +324,13 @@ void XGUI_Workshop::startApplication() SLOT(onTrihedronVisibilityChanged(bool))); emit applicationStarted(); + +#ifdef _DEBUG + bool aNewPart = Config_PropManager::boolean("Plugins", "create_part_by_start"); + if (aNewPart) { + module()->launchOperation("Part", false); // PartSetPlugin_Part::ID() + } +#endif } void XGUI_Workshop::activateModule() @@ -296,6 +366,24 @@ void XGUI_Workshop::deactivateModule() 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(); } @@ -310,7 +398,8 @@ void XGUI_Workshop::initMenu() 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 ); @@ -326,7 +415,8 @@ void XGUI_Workshop::initMenu() addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList&)), 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 ); @@ -334,12 +424,14 @@ void XGUI_Workshop::initMenu() //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())); @@ -434,7 +526,7 @@ void XGUI_Workshop::onAcceptActionClicked() (anOperationMgr->currentOperation()); if (aFOperation) { //if (errorMgr()->canProcessClick(anAction, aFOperation->feature())) - myOperationMgr->onCommitOperation(); + myOperationMgr->commitOperation(); } } } @@ -475,7 +567,7 @@ bool XGUI_Workshop::isFeatureOfNested(const FeaturePtr& theFeature) 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()) @@ -484,9 +576,10 @@ bool XGUI_Workshop::isFeatureOfNested(const FeaturePtr& theFeature) return aHasNested; } -void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) +void XGUI_Workshop::fillPropertyPanel(ModuleBase_Operation* theOperation) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (!aFOperation) return; @@ -508,7 +601,8 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) if (!aWidget->attributeID().empty() && !aFeature->attribute(aWidget->attributeID()).get()) { 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(); + .arg(aFeatureKind).arg(aWidget->attributeID()) + .arg(aWidget->metaObject()->className()).send(); myPropertyPanel->cleanContent(); return; } @@ -524,16 +618,26 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) aWidget->restoreValue(); aWidget->enableFocusProcessing(); } - ModuleBase_Tools::flushUpdated(aFeature); - // update visible state of Preview button + std::shared_ptr 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 @@ -542,6 +646,10 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) new Events_Message(Events_Loop::eventByName(EVENT_PREVIEW_BLOCKED))); Events_Loop::loop()->send(aMsg); } + // if update happens after preview is blocked, it does nothing when blocked + // it improves performance for valid objects on feature start + ModuleBase_Tools::flushUpdated(aFeature); + myPropertyPanel->setModelWidgets(aWidgets); aFOperation->setPropertyPanel(myPropertyPanel); @@ -551,8 +659,9 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) 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); @@ -579,20 +688,13 @@ void XGUI_Workshop::connectToPropertyPanel(const bool isToConnect) } } -//****************************************************** -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(); @@ -627,7 +729,8 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) if (aFeature.get()) { // feature may be not created (plugin load fail) if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature)) anObjects.append(aFeature); - std::list aResults = aFeature->results(); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); std::list::const_iterator aIt; for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { ResultPtr anObject = *aIt; @@ -652,7 +755,8 @@ void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation) void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (!aFOperation) return; @@ -674,23 +778,42 @@ void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation) aFOperation->setGrantedOperationIds(aGrantedIds); } - -/* - * Saves document with given name. - */ +//****************************************************** void XGUI_Workshop::saveDocument(const QString& theName, std::list& theFileNames) { QApplication::restoreOverrideCursor(); SessionPtr aMgr = ModelAPI_Session::get(); + + std::list aDocList = aMgr->allOpenedDocuments(); + std::list::const_iterator aIt; + for (aIt = aDocList.cbegin(); aIt != aDocList.cend(); aIt++) { + std::list aState = myObjectBrowser->getStateForDoc(*aIt); + (*aIt)->storeNodesState(aState); + } + aMgr->save(theName.toLatin1().constData(), theFileNames); + QApplication::restoreOverrideCursor(); } +//****************************************************** bool XGUI_Workshop::abortAllOperations() { return myOperationMgr->abortAllOperations(); } +//****************************************************** +void XGUI_Workshop::operationStarted(ModuleBase_Operation* theOperation) +{ + setGrantedFeatures(theOperation); + if (!theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel + updateCommandStatus(); + } + else { + myModule->operationStarted(theOperation); + } +} + //****************************************************** void XGUI_Workshop::onOpen() { @@ -713,20 +836,57 @@ void XGUI_Workshop::onOpen() } //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 aStates; + aRootDoc->restoreNodesState(aStates); + myObjectBrowser->setStateForDoc(aRootDoc, aStates); + updateCommandStatus(); +#ifndef HAVE_SALOME + myMainWindow->setCurrentDir(myCurrentDir, true); +#endif + +#ifdef _DEBUG + bool aNewPart = Config_PropManager::boolean("Plugins", "create_part_by_start"); + if (aNewPart) { + + DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument(); + int aSize = aRootDoc->size(ModelAPI_ResultPart::group()); + if (aSize > 0 ) { + ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), 0); + ResultPartPtr aPart = std::dynamic_pointer_cast(aObject); + if (aPart.get()) + aPart->activate(); + } + } +#endif + QApplication::restoreOverrideCursor(); } @@ -803,7 +963,7 @@ void XGUI_Workshop::onTrihedronVisibilityChanged(bool theState) //****************************************************** bool XGUI_Workshop::onSave() { - if(!abortAllOperations()) + if(!myOperationMgr->abortAllOperations(XGUI_OperationMgr::XGUI_InformationMessage)) return false; if (myCurrentDir.isEmpty()) { return onSaveAs(); @@ -820,12 +980,12 @@ bool XGUI_Workshop::onSave() //****************************************************** 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); @@ -838,7 +998,8 @@ bool XGUI_Workshop::onSaveAs() 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); @@ -857,6 +1018,10 @@ bool XGUI_Workshop::onSaveAs() //****************************************************** void XGUI_Workshop::onUndo(int theTimes) { + ModuleBase_ModelWidget* anActiveWidget = myOperationMgr->activeWidget(); + if (anActiveWidget && anActiveWidget->processAction(ActionUndo)) + return; + objectBrowser()->treeView()->setCurrentIndex(QModelIndex()); SessionPtr aMgr = ModelAPI_Session::get(); std::list aUndoList = aMgr->undoList(); @@ -880,10 +1045,14 @@ void XGUI_Workshop::onUndo(int theTimes) //****************************************************** void XGUI_Workshop::onRedo(int theTimes) { + ModuleBase_ModelWidget* anActiveWidget = myOperationMgr->activeWidget(); + if (anActiveWidget && anActiveWidget->processAction(ActionRedo)) + 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 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()); @@ -929,13 +1098,13 @@ void XGUI_Workshop::onRedo(int theTimes) //****************************************************** void XGUI_Workshop::onWidgetStateChanged(int thePreviousState) { - ModuleBase_ModelWidget* anActiveWidget = 0; - ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); - if (anOperation) { - ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel(); - if (aPanel) - anActiveWidget = aPanel->activeWidget(); - } + ModuleBase_ModelWidget* anActiveWidget = myOperationMgr->activeWidget(); + //ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); + //if (anOperation) { + // ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel(); + // if (aPanel) + // anActiveWidget = aPanel->activeWidget(); + //} if (anActiveWidget) operationMgr()->onValidateOperation(); @@ -1064,10 +1233,24 @@ void XGUI_Workshop::updateCommandStatus() if (aMgr->hasModuleDocument()) { foreach(QAction* aCmd, aCommands) { QString aId = aCmd->data().toString(); - if (aId == "UNDO_CMD") - aCmd->setEnabled(myModule->canUndo()); - else if (aId == "REDO_CMD") - aCmd->setEnabled(myModule->canRedo()); + if (aId == "UNDO_CMD") { + bool isActionEnabled = false; + // if ultimate is true -> using result of operation only, or using OR combination + ModuleBase_ModelWidget* anActiveWidget = myOperationMgr->activeWidget(); + if (anActiveWidget && anActiveWidget->canProcessAction(ActionUndo, isActionEnabled)) + aCmd->setEnabled(isActionEnabled); + else + aCmd->setEnabled(myModule->canUndo()); + } + else if (aId == "REDO_CMD") { + bool isActionEnabled = false; + // if ultimate is true -> using result of operation only, or using OR combination + ModuleBase_ModelWidget* anActiveWidget = myOperationMgr->activeWidget(); + if (anActiveWidget && anActiveWidget->canProcessAction(ActionRedo, isActionEnabled)) + aCmd->setEnabled(isActionEnabled); + else + aCmd->setEnabled(myModule->canRedo()); + } else // Enable all commands aCmd->setEnabled(true); @@ -1103,11 +1286,13 @@ void XGUI_Workshop::updateHistory() 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 }"); - myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock); + myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock, this); myObjectBrowser->setXMLReader(myDataModelXMLReader); myModule->customizeObjectBrowser(myObjectBrowser); aObjDock->setWidget(myObjectBrowser); @@ -1128,7 +1313,9 @@ void XGUI_Workshop::createDockWidgets() 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(); ///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); @@ -1246,6 +1441,11 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) 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") { @@ -1253,12 +1453,54 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) } 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 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("TKDFBrowser"); + MyTCommunicator->RegisterPlugin("TKShapeView"); + MyTCommunicator->RegisterPlugin("TKVInspector"); + MyTCommunicator->RegisterPlugin("SMBrowser"); // custom plugin to view ModelAPI + //MyTCommunicator->RegisterPlugin("TKSMBrowser"); // custom plugin to view ModelAPI + + MyTCommunicator->Init(aParameters); + MyTCommunicator->Activate("TKSMBrowser"); // to have button in TInspector + MyTCommunicator->Activate("TKVInspector"); // to have filled callback by model + MyTCommunicator->Activate("TKDFBrowser"); + } + MyTCommunicator->SetVisible(true); + } + } +#endif } //************************************************************** @@ -1298,15 +1540,14 @@ void XGUI_Workshop::deleteObjects() 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)) - 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; @@ -1379,13 +1620,14 @@ void XGUI_Workshop::cleanHistory() 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 > 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() @@ -1399,7 +1641,8 @@ void XGUI_Workshop::cleanHistory() for (; aMainIt != aMainLast; aMainIt++) { FeaturePtr aMainListFeature = aMainIt->first; std::set aMainRefList = aMainIt->second; - std::set::const_iterator aRefIt = aMainRefList.begin(), aRefLast = aMainRefList.end(); + std::set::const_iterator aRefIt = aMainRefList.begin(), + aRefLast = aMainRefList.end(); bool aFeatureOutOfTheList = false; for (; aRefIt != aRefLast && !aFeatureOutOfTheList; aRefIt++) { FeaturePtr aRefFeature = *aRefIt; @@ -1415,7 +1658,8 @@ void XGUI_Workshop::cleanHistory() 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 @@ -1436,14 +1680,16 @@ void XGUI_Workshop::cleanHistory() 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); @@ -1499,20 +1745,21 @@ void XGUI_Workshop::moveObjects() // 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 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::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(aObject); - if (aFeature.get()) { - anActiveDocument->moveFeature(aFeature, aCurrentFeature); - aCurrentFeature = anActiveDocument->currentFeature(true); - } + anActiveDocument->moveFeature(aFeature, aCurrentFeature); + aCurrentFeature = anActiveDocument->currentFeature(true); } aMgr->finishOperation(); } @@ -1554,7 +1801,9 @@ std::list allFeatures(const DocumentPtr& theDocument) // 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 aResults; + ModelAPI_Tools::allResults(aFeature, aResults); + foreach (const ResultPtr& aResult, aResults) { ResultPartPtr aResultPart = std::dynamic_pointer_cast(aResult); if (aResultPart.get() && aResultPart->partDoc().get()) { @@ -1578,15 +1827,18 @@ std::list toCurrentFeatures(const ObjectPtr& theObject) DocumentPtr aDocument = theObject->document(); std::list anAllFeatures = allFeatures(aDocument); // find the object iterator - std::list::iterator aObjectIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject); + std::list::iterator aObjectIt = + std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject); if (aObjectIt == anAllFeatures.end()) return aResult; // find the current feature iterator - std::list::iterator aCurrentIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), aDocument->currentFeature(true)); + std::list::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); @@ -1617,14 +1869,14 @@ bool XGUI_Workshop::canMoveFeature() 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 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 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 aRefFeatures; ModuleBase_Tools::refsToFeatureInFeatureDocument(aObject, aRefFeatures); @@ -1661,17 +1913,25 @@ bool XGUI_Workshop::canBeShaded(const ObjectPtr& theObject) const } //************************************************************** -bool XGUI_Workshop::canChangeColor() const +bool XGUI_Workshop::canChangeProperty(const QString& theActionName) const { - QObjectPtrList aObjects = mySelector->selection()->selectedObjects(); + if (theActionName == "COLOR_CMD" || + theActionName == "DEFLECTION_CMD" +#ifdef USE_TRANSPARENCY + || theActionName == "TRANSPARENCY_CMD" +#endif + ) { + QObjectPtrList aObjects = mySelector->selection()->selectedObjects(); - std::set aTypes; - aTypes.insert(ModelAPI_ResultGroup::group()); - aTypes.insert(ModelAPI_ResultConstruction::group()); - aTypes.insert(ModelAPI_ResultBody::group()); - aTypes.insert(ModelAPI_ResultPart::group()); + std::set 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); + return hasResults(aObjects, aTypes); + } + return false; } void setColor(ResultPtr theResult, const std::vector& theColor) @@ -1696,7 +1956,7 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) 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 aColor; foreach(ObjectPtr anObject, theObjects) { ResultPtr aResult = std::dynamic_pointer_cast(anObject); @@ -1721,7 +1981,7 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) return; if (!abortAllOperations()) - return; + return; // 2. show the dialog to change the value XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(desktop()); aDlg->setColor(aColor); @@ -1742,10 +2002,12 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) foreach(ObjectPtr anObj, theObjects) { ResultPtr aResult = std::dynamic_pointer_cast(anObj); if (aResult.get() != NULL) { - ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast(aResult); + ResultCompSolidPtr aCompsolidResult = + std::dynamic_pointer_cast(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()); @@ -1755,6 +2017,192 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) updateCommandStatus(); } +//************************************************************** +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 setTransparency(ResultPtr theResult, double theTransparency) +{ + if (!theResult.get()) + return; + + AttributeDoublePtr anAttribute = theResult->data()->real(ModelAPI_Result::TRANSPARENCY_ID()); + if (anAttribute.get() != NULL) + anAttribute->setValue(theTransparency); +} + +//************************************************************** +void setTransparency(double theTransparency, const QObjectPtrList& theObjects) +{ + foreach(ObjectPtr anObj, theObjects) { + ResultPtr aResult = std::dynamic_pointer_cast(anObj); + if (aResult.get() != NULL) { + ResultCompSolidPtr aCompsolidResult = + std::dynamic_pointer_cast(aResult); + if (aCompsolidResult.get() != NULL) { // change property for all sub-solids + for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { + setTransparency(aCompsolidResult->subResult(i), theTransparency); + } + } + setTransparency(aResult, theTransparency); + } + } +} + +//************************************************************** +void XGUI_Workshop::changeDeflection(const QObjectPtrList& theObjects) +{ + AttributeDoublePtr aDoubleAttr; + // 1. find the current property of the object. This is a property of AIS presentation + // The objects are iterated until a first valid property is found + double aDeflection = -1; + foreach(ObjectPtr anObject, theObjects) { + ResultPtr aResult = std::dynamic_pointer_cast(anObject); + if (aResult.get()) { + aDeflection = XGUI_CustomPrs::getResultDeflection(aResult); + } + else { + // TODO: remove the obtaining a property from the AIS object + // this does not happen never because: + // 1. The property 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 (!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(anObj); + if (aResult.get() != NULL) { + ResultCompSolidPtr aCompsolidResult = + std::dynamic_pointer_cast(aResult); + if (aCompsolidResult.get() != NULL) { // change property for all sub-solids + for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { + setDeflection(aCompsolidResult->subResult(i), aDeflection); + } + } + setDeflection(aResult, aDeflection); + } + } + aMgr->finishOperation(); + updateCommandStatus(); +} + +//************************************************************** +void XGUI_Workshop::changeTransparency(const QObjectPtrList& theObjects) +{ + AttributeDoublePtr aDoubleAttr; + // 1. find the current property of the object. This is a property of AIS presentation + // The objects are iterated until a first valid property is found + double aCurrentValue = -1; + foreach(ObjectPtr anObject, theObjects) { + ResultPtr aResult = std::dynamic_pointer_cast(anObject); + if (aResult.get()) { + aCurrentValue = XGUI_CustomPrs::getResultTransparency(aResult); + } + else { + // TODO: remove the obtaining a property from the AIS object + // this does not happen never because: + // 1. The property 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()) { + aCurrentValue = anAISObj->getDeflection(); + } + } + if (aCurrentValue > 0) + break; + } + if (aCurrentValue < 0) + return; + + if (!abortAllOperations()) + return; + + // 2. show the dialog to change the value + XGUI_PropertyDialog* aDlg = new XGUI_PropertyDialog(desktop()); + aDlg->setWindowTitle("Transparency"); + XGUI_TransparencyWidget* aTransparencyWidget = new XGUI_TransparencyWidget(aDlg); + connect(aTransparencyWidget, SIGNAL(transparencyValueChanged()), + this, SLOT(onTransparencyValueChanged())); + connect(aTransparencyWidget, SIGNAL(previewStateChanged()), + this, SLOT(onPreviewStateChanged())); + aDlg->setContent(aTransparencyWidget); + aTransparencyWidget->setValue(aCurrentValue); + + // 3. abort the previous operation and start a new one + SessionPtr aMgr = ModelAPI_Session::get(); + QString aDescription = contextMenuMgr()->action("TRANSPARENCY_CMD")->text(); + aMgr->startOperation(aDescription.toStdString()); + + aDlg->move(QCursor::pos()); + bool isDone = aDlg->exec() == QDialog::Accepted; + if (!isDone) + return; + + // 4. set the value to all results + aCurrentValue = aTransparencyWidget->getValue(); + setTransparency(aCurrentValue, theObjects); + + aMgr->finishOperation(); + updateCommandStatus(); +} + +//************************************************************** +void XGUI_Workshop::onTransparencyValueChanged() +{ + XGUI_TransparencyWidget* aTransparencyWidget = (XGUI_TransparencyWidget*)sender(); + if (!aTransparencyWidget || !aTransparencyWidget->isPreviewNeeded()) + return; + + QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); + setTransparency(aTransparencyWidget->getValue(), anObjects); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); +} + +//************************************************************** +void XGUI_Workshop::onPreviewStateChanged() +{ + XGUI_TransparencyWidget* aTransparencyWidget = (XGUI_TransparencyWidget*)sender(); + if (!aTransparencyWidget || !aTransparencyWidget->isPreviewNeeded()) + return; + + QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); + setTransparency(aTransparencyWidget->getValue(), anObjects); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); +} + //************************************************************** #define SET_DISPLAY_GROUP(aGroupName, aDisplay) \ for (int i = 0; i < aDoc->size(aGroupName); i++) { \ @@ -1763,19 +2211,18 @@ 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(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)); +#ifndef WIN32 + // Necessary for update icons in ObjectBrowser on Linux + QModelIndexList aIndexes = mySelector->selection()->selectedIndexes(); + foreach (QModelIndex aIdx, aIndexes) { + if (aIdx.column() == 0) { + myObjectBrowser->treeView()->update(aIdx); + } + } +#endif } //************************************************************** @@ -1787,23 +2234,29 @@ void XGUI_Workshop::showOnlyObjects(const QObjectPtrList& theList) if (module()->canEraseObject(aObj)) aObj->setDisplayed(false); } + //Do not use eraseAll if you didn't send Redisplay event: + //all objects are erased from viewer, but considered as displayed in displayer + // Problem in bug 2218 + 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(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)); - +#ifndef WIN32 + // Necessary for update icons in ObjectBrowser on Linux + QModelIndexList aIndexes = mySelector->selection()->selectedIndexes(); + foreach (QModelIndex aIdx, aIndexes) { + if (aIdx.column() == 0) { + myObjectBrowser->treeView()->update(aIdx); + } + } +#endif } @@ -1826,7 +2279,7 @@ void XGUI_Workshop::displayDocumentResults(DocumentPtr theDoc) //************************************************************** 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)); @@ -1858,14 +2311,23 @@ void XGUI_Workshop::closeDocument() anOperation->abort(); anOperation = operationMgr()->currentOperation(); } - myDisplayer->closeLocalContexts(); + //myDisplayer->closeLocalContexts(); myDisplayer->eraseAll(); objectBrowser()->clearContent(); module()->closeDocument(); + // we need to clear viewer (with created filters) to do not have problems in 2nd SALOME study + module()->clearViewer(); + + + // 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) @@ -1921,16 +2383,20 @@ void XGUI_Workshop::setStatusBarMessage(const QString& theMessage) void XGUI_Workshop::synchronizeViewer() { SessionPtr aMgr = ModelAPI_Session::get(); - DocumentPtr aDoc = aMgr->activeDocument(); + QList 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; @@ -1954,14 +2420,14 @@ void XGUI_Workshop::highlightResults(const QObjectPtrList& theObjects) { FeaturePtr aFeature; QObjectPtrList aSelList = theObjects; - std::list aResList; bool aHasHidden = false; foreach(ObjectPtr aObj, theObjects) { aFeature = std::dynamic_pointer_cast(aObj); if (aFeature.get()) { - aResList = aFeature->results(); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); std::list >::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); } @@ -1973,8 +2439,8 @@ void XGUI_Workshop::highlightResults(const QObjectPtrList& theObjects) 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); }