#include <XGUI_HistoryMenu.h>
#include <XGUI_QtEvents.h>
+#ifndef HAVE_SALOME
#include <AppElements_Button.h>
#include <AppElements_Command.h>
#include <AppElements_MainMenu.h>
#include <AppElements_MenuGroupPanel.h>
#include <AppElements_Viewer.h>
#include <AppElements_Workbench.h>
+#endif
#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_AttributeIntArray.h>
#include <QFileDialog>
#include <QMessageBox>
#include <QMdiSubWindow>
+#include <QMainWindow>
#include <QPushButton>
#include <QDockWidget>
#include <QLayout>
#include <dlfcn.h>
#endif
+
+QString XGUI_Workshop::MOVE_TO_END_COMMAND = QObject::tr("Move to the end");
+
//#define DEBUG_DELETE
+//#define DEBUG_FEATURE_NAME
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
: QObject(),
myObjectBrowser(0),
myDisplayer(0)
{
- myMainWindow = mySalomeConnector ? 0 : new AppElements_MainWindow();
+#ifndef HAVE_SALOME
+ myMainWindow = new AppElements_MainWindow();
- if (myMainWindow) {
- SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
- bool aCloc = aResMgr->booleanValue("language", "locale", true);
- if (aCloc)
- QLocale::setDefault( QLocale::c() );
- else
- QLocale::setDefault( QLocale::system() );
- }
+ SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
+ bool aCloc = aResMgr->booleanValue("language", "locale", true);
+ if (aCloc)
+ QLocale::setDefault( QLocale::c() );
+ else
+ QLocale::setDefault( QLocale::system() );
+#endif
myDisplayer = new XGUI_Displayer(this);
mySelector = new XGUI_SelectionMgr(this);
- //connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands()));
+ connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateCommandStatus()));
myOperationMgr = new XGUI_OperationMgr(this, 0);
myActionsMgr = new XGUI_ActionsMgr(this);
SLOT(onOperationCommitted(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
SLOT(onOperationAborted(ModuleBase_Operation*)));
- //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
- // myErrorMgr, SLOT(onValidationStateChanged()));
- if (myMainWindow)
- connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
+#ifndef HAVE_SALOME
+ connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
+ 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&)));
// by Config_PropManger to restore user-defined path to plugins
ModuleBase_Preferences::loadCustomProps();
createModule();
- if (myMainWindow) {
- myMainWindow->show();
- updateCommandStatus();
- }
+
+#ifndef HAVE_SALOME
+ myMainWindow->show();
+ updateCommandStatus();
+#endif
onNew();
+ myViewerProxy->connectViewProxy();
+ connect(myViewerProxy, SIGNAL(trihedronVisibilityChanged(bool)),
+ SLOT(onTrihedronVisibilityChanged(bool)));
+
emit applicationStarted();
}
connect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)),
myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr)));
- myActionsMgr->update();
+ updateCommandStatus();
// activate visualized objects in the viewer
XGUI_Displayer* aDisplayer = displayer();
QIntList aModes;
module()->activeSelectionModes(aModes);
aDisplayer->activateObjects(aModes, aDisplayed);
+ myOperationMgr->activate();
}
void XGUI_Workshop::deactivateModule()
XGUI_Displayer* aDisplayer = displayer();
QObjectPtrList aDisplayed = aDisplayer->displayedObjects();
aDisplayer->deactivateObjects(aDisplayed, true);
+
+ myOperationMgr->deactivate();
}
//******************************************************
{
myContextMenuMgr->createActions();
- if (isSalomeMode()) {
- // Create only Undo, Redo commands
- QAction* aAction = salomeConnector()->addDesktopCommand("UNDO_CMD", tr("Undo"),
- tr("Undo last command"),
- QIcon(":pictures/undo.png"),
- QKeySequence::Undo, false, "MEN_DESK_EDIT");
- QString aToolBarTitle = tr( "INF_DESK_TOOLBAR_STANDARD" );
- salomeConnector()->addActionInToolbar( aAction,aToolBarTitle );
-
- connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onUndo()));
-
addHistoryMenu(aAction, SIGNAL(updateUndoHistory(const QList<ActionInfo>&)), SLOT(onUndo(int)));
-
- aAction = salomeConnector()->addDesktopCommand("REDO_CMD", tr("Redo"), tr("Redo last command"),
- QIcon(":pictures/redo.png"), QKeySequence::Redo,
- false, "MEN_DESK_EDIT");
- salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
-
- connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRedo()));
-
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"),
- 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 NewGeom..."), tr("Export the current document into a NewGeom file"),
- QIcon(), QKeySequence(),
- false, "MEN_DESK_FILE");
- connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs()));
-
- aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import NewGeom..."), tr("Import a NewGeom file"),
- QIcon(), QKeySequence(),
- false, "MEN_DESK_FILE");
- connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen()));
- salomeConnector()->addDesktopMenuSeparator("MEN_DESK_FILE");
+#ifdef HAVE_SALOME
+ // Create only Undo, Redo commands
+ QAction* aAction = salomeConnector()->addDesktopCommand("UNDO_CMD", tr("Undo"),
+ tr("Undo last command"),
+ QIcon(":pictures/undo.png"),
+ QKeySequence::Undo, false, "MEN_DESK_EDIT");
+ QString aToolBarTitle = tr( "INF_DESK_TOOLBAR_STANDARD" );
+ salomeConnector()->addActionInToolbar( aAction,aToolBarTitle );
+
+ connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onUndo()));
+ addHistoryMenu(aAction, SIGNAL(updateUndoHistory(const QList<ActionInfo>&)), SLOT(onUndo(int)));
+
+ aAction = salomeConnector()->addDesktopCommand("REDO_CMD", tr("Redo"), tr("Redo last command"),
+ QIcon(":pictures/redo.png"), QKeySequence::Redo,
+ false, "MEN_DESK_EDIT");
+ salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
+
+ connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRedo()));
+ 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"),
+ // 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 NewGeom..."), tr("Export the current document into a NewGeom file"),
+ QIcon(), QKeySequence(),
+ false, "MEN_DESK_FILE");
+ connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs()));
+
+ aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import NewGeom..."), tr("Import a NewGeom file"),
+ QIcon(), QKeySequence(),
+ false, "MEN_DESK_FILE");
+ connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen()));
+ salomeConnector()->addDesktopMenuSeparator("MEN_DESK_FILE");
- return;
- }
+#else
// File commands group
AppElements_MenuGroupPanel* aGroup = myMainWindow->menuObject()->generalPage();
aCommand->connectTo(this, SLOT(onSave()));
//aCommand->disable();
+ aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"),
+ QIcon(":pictures/save.png"), QKeySequence());
+ aCommand->connectTo(this, SLOT(onSaveAs()));
+
QString aUndoId = "UNDO_CMD";
aCommand = aGroup->addFeature(aUndoId, tr("Undo"), tr("Undo last command"),
QIcon(":pictures/undo.png"), QKeySequence::Undo);
SIGNAL(updateRedoHistory(const QList<ActionInfo>&)),
SLOT(onRedo(int)));
- aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
- QIcon(":pictures/rebuild.png"), QKeySequence());
- aCommand->connectTo(this, SLOT(onRebuild()));
+ //aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
+ // QIcon(":pictures/rebuild.png"), QKeySequence());
+ //aCommand->connectTo(this, SLOT(onRebuild()));
- aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"),
- QIcon(":pictures/save.png"), QKeySequence());
- aCommand->connectTo(this, SLOT(onSaveAs()));
//aCommand->disable();
aCommand = aGroup->addFeature("OPEN_CMD", tr("Open..."), tr("Open a new document"),
QIcon(":pictures/open.png"), QKeySequence::Open);
aCommand->connectTo(this, SLOT(onOpen()));
- //aCommand = aGroup->addFeature("NEW_CMD", tr("New"), tr("Create a new document"),
- // QIcon(":pictures/new.png"), QKeySequence::New);
- //aCommand->connectTo(this, SLOT(onNew()));
-
aCommand = aGroup->addFeature("PREF_CMD", tr("Preferences"), tr("Edit preferences"),
QIcon(":pictures/preferences.png"), QKeySequence::Preferences);
aCommand->connectTo(this, SLOT(onPreferences()));
aCommand = aGroup->addFeature("EXIT_CMD", tr("Exit"), tr("Exit application"),
QIcon(":pictures/close.png"), QKeySequence::Close);
aCommand->connectTo(this, SLOT(onExit()));
- //FIXME: SBH's test action. Can be used for some GUI tests.
-// #ifdef _DEBUG
-// aCommand = aGroup->addFeature("TEST_CMD", "Test!", "Private debug button",
-// QIcon(":pictures/close.png"), QKeySequence(), true);
-// aCommand->connectTo(myMainWindow, SLOT(dockPythonConsole()));
-// #endif
+#endif
}
-//******************************************************
+#ifndef HAVE_SALOME
AppElements_Workbench* XGUI_Workshop::addWorkbench(const QString& theName)
{
AppElements_MainMenu* aMenuBar = myMainWindow->menuObject();
return aMenuBar->addWorkbench(theName);
}
+#endif
//******************************************************
QMainWindow* XGUI_Workshop::desktop() const
{
- return isSalomeMode() ? salomeConnector()->desktop() : myMainWindow;
+#ifdef HAVE_SALOME
+ return salomeConnector()->desktop();
+#else
+ return myMainWindow;
+#endif
}
//******************************************************
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(anOperationMgr->currentOperation());
if (aFOperation) {
- if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
- myOperationMgr->onCommitOperation();
+ //if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
+ myOperationMgr->onCommitOperation();
}
}
}
-//******************************************************
-/*void XGUI_Workshop::onValidationStateChanged(bool theEnabled)
-{
- XGUI_OperationMgr* anOperationMgr = operationMgr();
- if (anOperationMgr) {
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
- (anOperationMgr->currentOperation());
- if (aFOperation) {
- QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept);
- myErrorMgr->updateActionState(anAction, aFOperation->feature(), theEnabled);
- }
- }
-}*/
-
-
//******************************************************
void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer)
{
{
bool aHasNested = false;
std::string aFeatureKind = theFeature->getKind();
- if (isSalomeMode()) {
+#ifdef HAVE_SALOME
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())
aHasNested = true;
- }
+#endif
return aHasNested;
}
}
updateCommandStatus();
- myModule->onOperationStarted(aFOperation);
+ connectToPropertyPanel(true);
+ myModule->operationStarted(aFOperation);
// the objects of the current operation should be deactivated
QObjectPtrList anObjects;
if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
setPropertyPanel(theOperation);
+ connectToPropertyPanel(true);
}
updateCommandStatus();
- myModule->onOperationResumed(theOperation);
+ myModule->operationResumed(theOperation);
}
hidePropertyPanel();
myPropertyPanel->cleanContent();
- myModule->onOperationStopped(aFOperation);
+ connectToPropertyPanel(false);
+ myModule->operationStopped(aFOperation);
// the deactivated objects of the current operation should be activated back.
// They were deactivated on operation start or an object redisplay
void XGUI_Workshop::onOperationCommitted(ModuleBase_Operation* theOperation)
{
- myModule->onOperationCommitted(theOperation);
+ myModule->operationCommitted(theOperation);
}
void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation)
{
- myModule->onOperationAborted(theOperation);
+ myModule->operationAborted(theOperation);
}
void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
else
aGrantedIds = myActionsMgr->nestedCommands(theOperation->id());
+ ModuleBase_IModule* aModule = module();
+ if (aModule)
+ aModule->grantedOperationIds(theOperation, aGrantedIds);
+
aFOperation->setGrantedOperationIds(aGrantedIds);
}
return;
showPropertyPanel();
- QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
- ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector);
-
myPropertyPanel->cleanContent();
- aFactory.createWidget(myPropertyPanel->contentWidget());
- QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
+ QList<ModuleBase_ModelWidget*> aWidgets;
+ if (!module()->createWidgets(theOperation, aWidgets)) {
+ QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
+ ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector);
+ aFactory.createWidget(myPropertyPanel->contentWidget());
+ aWidgets = aFactory.getModelWidgets();
+ }
// check compatibility of feature and widgets
FeaturePtr aFeature = aFOperation->feature();
myModule->propertyPanelDefined(theOperation);
+#ifndef DEBUG_FEATURE_NAME
myPropertyPanel->setWindowTitle(theOperation->getDescription()->description());
+#else
+ std::string aFeatureName = aFeature->name();
+ myPropertyPanel->setWindowTitle(QString("%1: %2").arg(theOperation->getDescription()->description())
+ .arg(aFeatureName.c_str()));
+#endif
myErrorMgr->setPropertyPanel(myPropertyPanel);
}
+void XGUI_Workshop::connectToPropertyPanel(const bool isToConnect)
+{
+ XGUI_PropertyPanel* aPropertyPanel = propertyPanel();
+ if (aPropertyPanel) {
+ const QList<ModuleBase_ModelWidget*>& aWidgets = aPropertyPanel->modelWidgets();
+ foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
+ myModule->connectToPropertyPanel(aWidget, isToConnect);
+ if (isToConnect) {
+ connect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ }
+ else {
+ disconnect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ }
+ }
+ }
+}
+
/*
* Saves document with given name.
*/
}
//******************************************************
-void XGUI_Workshop::onExit()
+void XGUI_Workshop::onOpen()
{
- SessionPtr aMgr = ModelAPI_Session::get();
- if (aMgr->isModified()) {
+ if(!abortAllOperations())
+ return;
+ //save current file before close if modified
+ SessionPtr aSession = ModelAPI_Session::get();
+ if (aSession->isModified()) {
+ //TODO(sbh): re-launch the app?
int anAnswer = QMessageBox::question(
- myMainWindow, tr("Save current file"), tr("The document is modified, save before exit?"),
+ desktop(), tr("Save current file"),
+ tr("The document is modified, save before opening another?"),
QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
if (anAnswer == QMessageBox::Save) {
- bool saved = onSave();
- if (!saved) {
- return;
- }
+ onSave();
} else if (anAnswer == QMessageBox::Cancel) {
return;
}
+ myCurrentDir = "";
}
- qApp->exit();
+
+ //show file dialog, check if readable and open
+ myCurrentDir = QFileDialog::getExistingDirectory(desktop(), tr("Select directory"));
+ 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);
+ aSession->closeAll();
+ aSession->load(myCurrentDir.toLatin1().constData());
+ myObjectBrowser->rebuildDataTree();
+ updateCommandStatus();
+ QApplication::restoreOverrideCursor();
}
//******************************************************
}
myViewerProxy->connectToViewer();
showObjectBrowser();
- if (!isSalomeMode()) {
- myMainWindow->showPythonConsole();
- QMdiSubWindow* aWnd = myMainWindow->viewer()->createView();
- aWnd->showMaximized();
- updateCommandStatus();
- }
+#ifndef HAVE_SALOME
+ myMainWindow->showPythonConsole();
+ QMdiSubWindow* aWnd = myMainWindow->viewer()->createView();
+ aWnd->showMaximized();
+ updateCommandStatus();
+#endif
myContextMenuMgr->connectViewer();
QApplication::restoreOverrideCursor();
}
+#ifndef HAVE_SALOME
//******************************************************
-void XGUI_Workshop::onOpen()
+void XGUI_Workshop::onExit()
{
- if(!abortAllOperations())
- return;
- //save current file before close if modified
- SessionPtr aSession = ModelAPI_Session::get();
- if (aSession->isModified()) {
- //TODO(sbh): re-launch the app?
+ SessionPtr aMgr = ModelAPI_Session::get();
+ if (aMgr->isModified()) {
int anAnswer = QMessageBox::question(
- myMainWindow, tr("Save current file"),
- tr("The document is modified, save before opening another?"),
+ myMainWindow, tr("Save current file"), tr("The document is modified, save before exit?"),
QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
if (anAnswer == QMessageBox::Save) {
- onSave();
+ bool saved = onSave();
+ if (!saved) {
+ return;
+ }
} else if (anAnswer == QMessageBox::Cancel) {
return;
}
- myCurrentDir = "";
}
+ qApp->exit();
+}
- //show file dialog, check if readable and open
- myCurrentDir = QFileDialog::getExistingDirectory(mainWindow(), tr("Select directory"));
- if (myCurrentDir.isEmpty())
- return;
- QFileInfo aFileInfo(myCurrentDir);
- if (!aFileInfo.exists() || !aFileInfo.isReadable()) {
- QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to open the file."));
- myCurrentDir = "";
- return;
+//******************************************************
+void XGUI_Workshop::onPreferences()
+{
+ ModuleBase_Prefs aModif;
+ ModuleBase_Preferences::editPreferences(aModif);
+ if (aModif.size() > 0) {
+ QString aSection;
+ foreach (ModuleBase_Pref aPref, aModif)
+ {
+ aSection = aPref.first;
+ if (aSection == ModuleBase_Preferences::VIEWER_SECTION) {
+ myMainWindow->viewer()->updateFromResources();
+ } else if (aSection == ModuleBase_Preferences::MENU_SECTION) {
+ myMainWindow->menuObject()->updateFromResources();
+ }
+ }
+ displayer()->redisplayObjects();
}
- QApplication::setOverrideCursor(Qt::WaitCursor);
- aSession->closeAll();
- aSession->load(myCurrentDir.toLatin1().constData());
- myObjectBrowser->rebuildDataTree();
- updateCommandStatus();
- QApplication::restoreOverrideCursor();
+}
+#endif
+
+//******************************************************
+void XGUI_Workshop::onTrihedronVisibilityChanged(bool theState)
+{
+ XGUI_Displayer* aDisplayer = displayer();
+ if (aDisplayer)
+ aDisplayer->displayTrihedron(theState);
}
//******************************************************
std::list<std::string> aFiles;
saveDocument(myCurrentDir, aFiles);
updateCommandStatus();
- if (!isSalomeMode())
+#ifndef HAVE_SALOME
myMainWindow->setModifiedState(false);
+#endif
return true;
}
{
if(!abortAllOperations())
return false;
- QFileDialog dialog(mainWindow());
+ QFileDialog dialog(desktop());
dialog.setWindowTitle(tr("Select directory to save files..."));
dialog.setFileMode(QFileDialog::Directory);
dialog.setFilter(tr("Directories (*)"));
QDir aDir(aTempDir);
if (aDir.exists() && !aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) {
int answer = QMessageBox::question(
- myMainWindow,
+ desktop(),
//: 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?"),
}
}
myCurrentDir = aTempDir;
- if (!isSalomeMode()) {
+#ifndef HAVE_SALOME
myMainWindow->setCurrentDir(myCurrentDir, false);
myMainWindow->setModifiedState(false);
- }
+#endif
return onSave();
}
{
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
+ std::list<std::string> aUndoList = aMgr->undoList();
if (aMgr->isOperation()) {
- /// this is important for nested operrations
- /// when sketch opeation is active, this condition is false and
+ /// this is important for nested operations
+ /// when sketch operation is active, this condition is false and
/// the sketch operation is not aborted
operationMgr()->onAbortOperation();
}
- for (int i = 0; i < theTimes; ++i) {
+ std::list<std::string>::const_iterator aIt = aUndoList.cbegin();
+ for (int i = 0; (i < theTimes) && (aIt != aUndoList.cend()); ++i, ++aIt) {
aMgr->undo();
+ if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND)
+ myObjectBrowser->rebuildDataTree();
}
operationMgr()->updateApplyOfOperations();
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
+ std::list<std::string> aRedoList = aMgr->redoList();
if (aMgr->isOperation()) {
- /// this is important for nested operrations
- /// when sketch opeation is active, this condition is false and
+ /// this is important for nested operations
+ /// when sketch operation is active, this condition is false and
/// the sketch operation is not aborted
operationMgr()->onAbortOperation();
}
- for (int i = 0; i < theTimes; ++i) {
+ std::list<std::string>::const_iterator aIt = aRedoList.cbegin();
+ for (int i = 0; (i < theTimes) && (aIt != aRedoList.cend()); ++i, ++aIt) {
aMgr->redo();
+ if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND)
+ myObjectBrowser->rebuildDataTree();
}
operationMgr()->updateApplyOfOperations();
updateCommandStatus();
}
//******************************************************
-void XGUI_Workshop::onRebuild()
-{
- SessionPtr aMgr = ModelAPI_Session::get();
- bool aWasOperation = aMgr->isOperation(); // keep this value
- if (!aWasOperation) {
- aMgr->startOperation("Rebuild");
- }
- static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild");
- Events_Loop::loop()->send(std::shared_ptr<Events_Message>(
- new Events_Message(aRebuildEvent, this)));
- if (!aWasOperation) {
- aMgr->finishOperation();
- }
- updateCommandStatus();
-}
+//void XGUI_Workshop::onRebuild()
+//{
+// SessionPtr aMgr = ModelAPI_Session::get();
+// bool aWasOperation = aMgr->isOperation(); // keep this value
+// if (!aWasOperation) {
+// aMgr->startOperation("Rebuild");
+// }
+// static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild");
+// Events_Loop::loop()->send(std::shared_ptr<Events_Message>(
+// new Events_Message(aRebuildEvent, this)));
+// if (!aWasOperation) {
+// aMgr->finishOperation();
+// }
+// updateCommandStatus();
+//}
//******************************************************
-void XGUI_Workshop::onPreferences()
+void XGUI_Workshop::onWidgetStateChanged(int thePreviousState)
{
- ModuleBase_Prefs aModif;
- ModuleBase_Preferences::editPreferences(aModif);
- if (aModif.size() > 0) {
- QString aSection;
- foreach (ModuleBase_Pref aPref, aModif)
- {
- aSection = aPref.first;
- if (aSection == ModuleBase_Preferences::VIEWER_SECTION) {
- if (!isSalomeMode())
- myMainWindow->viewer()->updateFromResources();
- } else if (aSection == ModuleBase_Preferences::MENU_SECTION) {
- if (!isSalomeMode())
- myMainWindow->menuObject()->updateFromResources();
- }
- }
- displayer()->redisplayObjects();
+ ModuleBase_ModelWidget* anActiveWidget = 0;
+ ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ if (anOperation) {
+ ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
+ if (aPanel)
+ anActiveWidget = aPanel->activeWidget();
}
+ if (anActiveWidget)
+ operationMgr()->onValidateOperation();
+
+ myModule->widgetStateChanged(thePreviousState);
}
-//******************************************************
ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
{
QString libName = QString::fromStdString(library(theModule.toStdString()));
ModuleBase_IModule* aModule = crtInst ? crtInst(myModuleConnector) : 0;
if (!err.isEmpty()) {
- if (mainWindow()) {
+ if (desktop()) {
Events_Error::send(err.toStdString());
} else {
qWarning(qPrintable(err));
void XGUI_Workshop::updateCommandStatus()
{
QList<QAction*> aCommands;
- if (isSalomeMode()) { // update commands in SALOME mode
+#ifdef HAVE_SALOME
aCommands = salomeConnector()->commandList();
- } else {
+#else
AppElements_MainMenu* aMenuBar = myMainWindow->menuObject();
foreach (AppElements_Command* aCmd, aMenuBar->features())
aCommands.append(aCmd);
- }
+#endif
SessionPtr aMgr = ModelAPI_Session::get();
if (aMgr->hasModuleDocument()) {
foreach(QAction* aCmd, aCommands) {
aCmd->setEnabled(false);
}
}
- myActionsMgr->update();
+ myActionsMgr->updateCommandsStatus();
emit commandStatusUpdated();
}
aObjDock->setStyleSheet(
"::title { position: relative; padding-left: 5px; text-align: left center }");
myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
-#ifdef ModuleDataModel
- myObjectBrowser->setDataModel(myModule->dataModel());
-#endif
myModule->customizeObjectBrowser(myObjectBrowser);
aObjDock->setWidget(myObjectBrowser);
*/
void XGUI_Workshop::createDockWidgets()
{
- QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow;
+ QMainWindow* aDesktop = desktop();
QDockWidget* aObjDock = createObjectBrowser(aDesktop);
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
- myPropertyPanel = new XGUI_PropertyPanel(aDesktop);
+ myPropertyPanel = new XGUI_PropertyPanel(aDesktop, myOperationMgr);
myPropertyPanel->setupActions(myActionsMgr);
myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
QAction* aCancelAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Abort);
connect(aCancelAct, SIGNAL(triggered()), myOperationMgr, SLOT(onAbortOperation()));
- connect(myPropertyPanel, SIGNAL(noMoreWidgets()), myModule, SLOT(onNoMoreWidgets()));
- connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)),
- myOperationMgr, SLOT(onKeyReleased(QKeyEvent*)));
- //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
- // this, SLOT(onValidationStateChanged(bool)));
+ connect(myPropertyPanel, SIGNAL(keyReleased(QObject*, QKeyEvent*)),
+ myOperationMgr, SLOT(onKeyReleased(QObject*, QKeyEvent*)));
+
+ connect(myPropertyPanel, SIGNAL(enterClicked(QObject*)),
+ myOperationMgr, SLOT(onProcessEnter(QObject*)));
}
//******************************************************
// The next code is necessary to made the property panel the active window
// 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 happend by property panel activation(e.g. resume operaion of Sketch)
- myPropertyPanel->activateWindow();
- myPropertyPanel->setFocus();
+ // 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()");
}
//******************************************************
// set the focus on it. As a result, shortcuts of the application, like
// are processed by this console. For example Undo actions.
// It is possible that this code is to be moved to NewGeom package
- QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow;
- aDesktop->activateWindow();
- aDesktop->setFocus();
+ QMainWindow* aDesktop = desktop();
+ ModuleBase_Tools::activateWindow(aDesktop, "XGUI_Workshop::hidePropertyPanel()");
+ ModuleBase_Tools::setFocus(aDesktop, "XGUI_Workshop::showPropertyPanel()");
}
//******************************************************
void XGUI_Workshop::showObjectBrowser()
{
- myObjectBrowser->parentWidget()->show();
+ if (!isSalomeMode())
+ myObjectBrowser->parentWidget()->show();
}
//******************************************************
void XGUI_Workshop::hideObjectBrowser()
{
- myObjectBrowser->parentWidget()->hide();
+ if (!isSalomeMode())
+ myObjectBrowser->parentWidget()->hide();
}
//******************************************************
QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
if (theId == "DELETE_CMD")
deleteObjects();
+ else if (theId == "CLEAN_HISTORY_CMD")
+ cleanHistory();
else if (theId == "MOVE_CMD")
moveObjects();
else if (theId == "COLOR_CMD")
changeColor(aObjects);
- else if (theId == "SHOW_CMD")
+ else if (theId == "SHOW_CMD") {
showObjects(aObjects, true);
+ mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ }
else if (theId == "HIDE_CMD")
showObjects(aObjects, false);
- else if (theId == "SHOW_ONLY_CMD")
+ else if (theId == "SHOW_ONLY_CMD") {
showOnlyObjects(aObjects);
+ mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ }
else if (theId == "SHADING_CMD")
setDisplayMode(aObjects, XGUI_Displayer::Shading);
else if (theId == "WIREFRAME_CMD")
return;
}
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
if (!abortAllOperations())
return;
- QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
- // It is necessary to clear selection in order to avoid selection changed event during
- // deleteion and negative consequences connected with processing of already deleted items
- mySelector->clearSelection();
// check whether the object can be deleted. There should not be parts which are not loaded
- if (!XGUI_Tools::canRemoveOrRename(myMainWindow, anObjects))
+ if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
return;
bool hasResult = false;
// 1. start operation
QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text();
- aDescription += tr(" %1");
- QStringList aObjectNames;
- foreach (ObjectPtr aObj, anObjects) {
- if (!aObj->data()->isValid())
- continue;
- aObjectNames << QString::fromStdString(aObj->data()->name());
- }
- aDescription = aDescription.arg(aObjectNames.join(", "));
+ aDescription += " " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
-
operationMgr()->startOperation(anOpAction);
+
// 3. delete objects
- QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow;
std::set<FeaturePtr> anIgnoredFeatures;
- if (deleteFeatures(anObjects, anIgnoredFeatures, aDesktop, true)) {
- operationMgr()->commitOperation();
+ std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
+ findReferences(anObjects, aDirectRefFeatures, aIndirectRefFeatures);
+
+ bool doDeleteReferences = true;
+ if (isDeleteFeatureWithReferences(anObjects, aDirectRefFeatures, aIndirectRefFeatures,
+ desktop(), doDeleteReferences)) {
+ // It is necessary to clear selection in order to avoid selection changed event during
+ // deletion and negative consequences connected with processing of already deleted items
+ mySelector->clearSelection();
+ if (deleteFeaturesInternal(anObjects, aDirectRefFeatures, aIndirectRefFeatures,
+ anIgnoredFeatures, doDeleteReferences))
+ operationMgr()->commitOperation();
+ else
+ operationMgr()->abortOperation(operationMgr()->currentOperation());
+ }
+}
+
+//**************************************************************
+void XGUI_Workshop::cleanHistory()
+{
+ if (!abortAllOperations())
+ return;
+
+ QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
+ QObjectPtrList aFeatures;
+ foreach (ObjectPtr anObject, anObjects) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+ // for parameter result, use the corresponded reature to be removed
+ if (!aFeature.get() && anObject->groupName() == ModelAPI_ResultParameter::group()) {
+ aFeature = ModelAPI_Feature::feature(anObject);
+ }
+ aFeatures.append(aFeature);
+ }
+
+ // 1. find all referenced features
+ QList<ObjectPtr> anUnusedObjects;
+ std::set<FeaturePtr> aDirectRefFeatures;
+ //foreach (ObjectPtr anObject, anObjects) {
+ foreach (ObjectPtr anObject, aFeatures) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+ // for parameter result, use the corresponded reature to be removed
+ //if (!aFeature.get() && anObject->groupName() == ModelAPI_ResultParameter::group()) {
+ // aFeature = ModelAPI_Feature::feature(anObject);
+ //}
+ if (aFeature.get()) {
+ std::set<FeaturePtr> alreadyProcessed;
+ aDirectRefFeatures.clear();
+ XGUI_Tools::refsDirectToFeatureInAllDocuments(aFeature, aFeature, aFeatures,
+ aDirectRefFeatures, alreadyProcessed);
+ if (aDirectRefFeatures.empty() && !anUnusedObjects.contains(aFeature))
+ anUnusedObjects.append(aFeature);
+ }
}
- else {
- operationMgr()->abortOperation(operationMgr()->currentOperation());
+
+ // 2. warn about the references remove, break the delete operation if the user chose it
+ if (!anUnusedObjects.empty()) {
+ QStringList aNames;
+ foreach (const ObjectPtr& anObject, anUnusedObjects) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+ aNames.append(aFeature->name().c_str());
+ }
+ QString anUnusedNames = aNames.join(", ");
+
+ QString anActionId = "CLEAN_HISTORY_CMD";
+ QString aDescription = contextMenuMgr()->action(anActionId)->text();
+
+ QMessageBox aMessageBox(desktop());
+ aMessageBox.setWindowTitle(aDescription);
+ aMessageBox.setIcon(QMessageBox::Warning);
+ 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));
+ aMessageBox.setText(aText);
+ if (aMessageBox.exec() == QMessageBox::No)
+ return;
+
+ // 1. start operation
+ aDescription += "by deleting of " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
+ ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
+ operationMgr()->startOperation(anOpAction);
+
+ std::set<FeaturePtr> anIgnoredFeatures;
+ if (removeFeatures(anUnusedObjects, anIgnoredFeatures, anActionId)) {
+ operationMgr()->commitOperation();
+ }
+ else {
+ operationMgr()->abortOperation(operationMgr()->currentOperation());
+ }
}
}
// 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(myMainWindow, anObjects))
+ if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects))
return;
DocumentPtr anActiveDocument = aMgr->activeDocument();
}
//**************************************************************
-bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theList,
- const std::set<FeaturePtr>& theIgnoredFeatures,
- QWidget* theParent,
- const bool theAskAboutDeleteReferences)
+void XGUI_Workshop::findReferences(const QObjectPtrList& theList,
+ std::set<FeaturePtr>& aDirectRefFeatures,
+ std::set<FeaturePtr>& aIndirectRefFeatures)
{
-#ifdef DEBUG_DELETE
- QStringList aDInfo;
- QObjectPtrList::const_iterator aDIt = theList.begin(), aDLast = theList.end();
- for (; aDIt != aDLast; ++aDIt) {
- aDInfo.append(ModuleBase_Tools::objectInfo((*aDIt)));
- }
- QString anInfoStr = aDInfo.join(", ");
- qDebug(QString("deleteFeatures: %1, %2").arg(theList.size()).arg(anInfoStr).toStdString().c_str());
-#endif
-
- // 1. find all referenced features
- std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
foreach (ObjectPtr aDeletedObj, theList) {
- XGUI_Tools::refsToFeatureInAllDocuments(aDeletedObj, aDeletedObj, aDirectRefFeatures, aIndirectRefFeatures);
+ std::set<FeaturePtr> alreadyProcessed;
+ XGUI_Tools::refsToFeatureInAllDocuments(aDeletedObj, aDeletedObj, theList, aDirectRefFeatures,
+ aIndirectRefFeatures, alreadyProcessed);
std::set<FeaturePtr> aDifference;
std::set_difference(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end(),
aDirectRefFeatures.begin(), aDirectRefFeatures.end(),
std::inserter(aDifference, aDifference.begin()));
aIndirectRefFeatures = aDifference;
}
+}
- bool doDeleteReferences = true;
+bool XGUI_Workshop::isDeleteFeatureWithReferences(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& aDirectRefFeatures,
+ const std::set<FeaturePtr>& aIndirectRefFeatures,
+ QWidget* theParent,
+ bool& doDeleteReferences)
+{
+ doDeleteReferences = true;
- // 2. warn about the references remove, break the delete operation if the user chose it
- if (theAskAboutDeleteReferences && !aDirectRefFeatures.empty()) {
+ if (!aDirectRefFeatures.empty()) {
QStringList aDirectRefNames;
foreach (const FeaturePtr& aFeature, aDirectRefFeatures)
aDirectRefNames.append(aFeature->name().c_str());
bool canReplaceParameters = true;
foreach (ObjectPtr aObj, theList) {
FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
- if (aFeature->getKind() != "Parameter") {
+ if (!std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aFeature->firstResult()).get()) { // the feature is not a parameter
canReplaceParameters = false;
break;
}
QString aText;
if (canReplaceParameters) {
- aText = QString(tr("Selected parameters are used in the following features: %1.\nThese features will be deleted.\n%2Or parameters could be replaced with its values.\nWould you like to continue?"))
+ aText = QString(tr("Selected parameters are used in the following features: %1.\nThese features will be deleted.\n%2Or parameters could be replaced by their values.\nWould you like to continue?"))
.arg(aDirectNames).arg(aIndirectNames.isEmpty() ? QString() : QString(tr("(Also these features will be deleted: %1)\n")).arg(aIndirectNames));
QPushButton *aReplaceButton = aMessageBox.addButton(tr("Replace"), QMessageBox::ActionRole);
} else {
doDeleteReferences = false;
}
}
+ return true;
+}
- // 3. remove referenced features
+bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theFeatures,
+ const std::set<FeaturePtr>& theIgnoredFeatures)
+{
+ std::set<FeaturePtr> aDirectRefFeatures, aIndirectRefFeatures;
+ findReferences(theFeatures, aDirectRefFeatures, aIndirectRefFeatures);
+ return deleteFeaturesInternal(theFeatures, aDirectRefFeatures, aIndirectRefFeatures,
+ theIgnoredFeatures);
+}
+
+bool XGUI_Workshop::deleteFeaturesInternal(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& aDirectRefFeatures,
+ const std::set<FeaturePtr>& aIndirectRefFeatures,
+ const std::set<FeaturePtr>& theIgnoredFeatures,
+ const bool doDeleteReferences)
+{
if (doDeleteReferences) {
std::set<FeaturePtr> aFeaturesToDelete = aDirectRefFeatures;
aFeaturesToDelete.insert(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end());
}
QString anActionId = "DELETE_CMD";
- QString anId = QString::fromStdString(anActionId.toStdString().c_str());
+ return removeFeatures(theList, theIgnoredFeatures, anActionId);
+}
+
+//**************************************************************
+bool XGUI_Workshop::removeFeatures(const QObjectPtrList& theList,
+ const std::set<FeaturePtr>& theIgnoredFeatures,
+ const QString& theActionId)
+{
+ bool isDone = false;
+
+ QString anId = QString::fromStdString(theActionId.toStdString().c_str());
QStringList anObjectGroups = contextMenuMgr()->actionObjectGroups(anId);
// 4. remove the parameter features
foreach (ObjectPtr aObj, theList) {
if (!anObjectGroups.contains(aGroupName.c_str()))
continue;
- if (!myModule->canApplyAction(aObj, anActionId))
- continue;
-
FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
if (aFeature) {
/*// TODO: to learn the workshop to delegate the Part object deletion to the PartSet module
qDebug(QString("remove feature :%1").arg(anInfoStr).toStdString().c_str());
#endif
aDoc->removeFeature(aFeature);
+ isDone = true;
}
}
}
return hasResults(aObjects, aTypes);
}
-void setColor(ResultPtr theResult, std::vector<int>& theColor)
+void setColor(ResultPtr theResult, const std::vector<int>& theColor)
{
if (!theResult.get())
return;
//**************************************************************
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
if (aColor.size() != 3)
return;
+ if (!abortAllOperations())
+ return;
// 2. show the dialog to change the value
- XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(mainWindow());
+ XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(desktop());
aDlg->setColor(aColor);
aDlg->move(QCursor::pos());
bool isDone = aDlg->exec() == QDialog::Accepted;
// 3. abort the previous operation and start a new one
SessionPtr aMgr = ModelAPI_Session::get();
- bool aWasOperation = aMgr->isOperation(); // keep this value
- if (!aWasOperation) {
- QString aDescription = contextMenuMgr()->action("COLOR_CMD")->text();
- aMgr->startOperation(aDescription.toStdString());
- }
+ QString aDescription = contextMenuMgr()->action("COLOR_CMD")->text();
+ aMgr->startOperation(aDescription.toStdString());
// 4. set the value to all results
std::vector<int> aColorResult = aDlg->getColor();
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++)
- setColor(aCompsolidResult->subResult(i), aColorResult);
+ for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
+ setColor(aCompsolidResult->subResult(i), !isRandomColor ? aColorResult : aDlg->getRandomColor());
+ }
}
- setColor(aResult, aColorResult);
+ setColor(aResult, !isRandomColor ? aColorResult : aDlg->getRandomColor());
}
}
- if (!aWasOperation)
- aMgr->finishOperation();
+ aMgr->finishOperation();
updateCommandStatus();
}
