-#include "XGUI_Module.h"
-#include "XGUI_Constants.h"
-#include "XGUI_Command.h"
-#include "XGUI_MainMenu.h"
-#include "XGUI_MainWindow.h"
-#include "XGUI_MenuGroupPanel.h"
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
+//#include "XGUI_Constants.h"
#include "XGUI_Tools.h"
-#include "XGUI_Workbench.h"
#include "XGUI_Workshop.h"
-#include "XGUI_Viewer.h"
-#include "ModuleBase_WidgetFactory.h"
#include "XGUI_SelectionMgr.h"
+#include "XGUI_Selection.h"
#include "XGUI_ObjectsBrowser.h"
#include "XGUI_Displayer.h"
#include "XGUI_OperationMgr.h"
#include "XGUI_SalomeConnector.h"
-#include "XGUI_SalomeViewer.h"
#include "XGUI_ActionsMgr.h"
#include "XGUI_ErrorDialog.h"
#include "XGUI_ViewerProxy.h"
#include "XGUI_PropertyPanel.h"
#include "XGUI_ContextMenuMgr.h"
+#include "XGUI_ModuleConnector.h"
+#include <XGUI_QtEvents.h>
+
+#include <AppElements_Workbench.h>
+#include <AppElements_Viewer.h>
+#include <AppElements_Command.h>
+#include <AppElements_MainMenu.h>
+#include <AppElements_MainWindow.h>
+#include <AppElements_MenuGroupPanel.h>
-#include <Model_Events.h>
-#include <ModelAPI_PluginManager.h>
+#include <ModuleBase_IModule.h>
+#include <ModuleBase_Preferences.h>
+
+#include <ModelAPI_Events.h>
+#include <ModelAPI_Session.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_Object.h>
+#include <ModelAPI_Validator.h>
+#include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultBody.h>
+
+//#include <PartSetPlugin_Part.h>
#include <Events_Loop.h>
#include <Events_Error.h>
+#include <Events_LongOp.h>
+
#include <ModuleBase_Operation.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_SelectionValidator.h>
+#include <ModuleBase_WidgetFactory.h>
+#include <ModuleBase_Tools.h>
+#include <ModuleBase_IViewer.h>
+#include<ModuleBase_FilterFactory.h>
+
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
#include <Config_PointerMessage.h>
#include <Config_ModuleReader.h>
+#include <Config_PropManager.h>
+#include <Config_SelectionFilterMessage.h>
#include <QApplication>
#include <QFileDialog>
#include <QPushButton>
#include <QDockWidget>
#include <QLayout>
-#include <QTimer>
+#include <QThread>
+#include <QObject>
#ifdef _DEBUG
#include <QDebug>
+#include <iostream>
#endif
#ifdef WIN32
#include <dlfcn.h>
#endif
-
QMap<QString, QString> XGUI_Workshop::myIcons;
-QString XGUI_Workshop::featureIcon(const std::string& theId)
+
+QIcon XGUI_Workshop::featureIcon(const FeaturePtr& theFeature)
{
- QString aId(theId.c_str());
- if (myIcons.contains(aId))
- return myIcons[aId];
- return QString();
+ QIcon anIcon;
+
+ std::string aKind = theFeature->getKind();
+ QString aId(aKind.c_str());
+ if (!myIcons.contains(aId))
+ return anIcon;
+
+ QString anIconString = myIcons[aId];
+
+ ModelAPI_ExecState aState = theFeature->data()->execState();
+ switch(aState) {
+ case ModelAPI_StateDone:
+ case ModelAPI_StateNothing: {
+ anIcon = QIcon(anIconString);
+ }
+ break;
+ case ModelAPI_StateMustBeUpdated: {
+ anIcon = ModuleBase_Tools::lighter(anIconString);
+ }
+ break;
+ case ModelAPI_StateExecFailed: {
+ anIcon = ModuleBase_Tools::composite(":pictures/exec_state_failed.png", anIconString);
+ }
+ break;
+ case ModelAPI_StateInvalidArgument: {
+ anIcon = ModuleBase_Tools::composite(":pictures/exec_state_invalid_parameters.png",
+ anIconString);
+ }
+ break;
+ default: break;
+ }
+ return anIcon;
}
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
- : QObject(),
- myCurrentDir(QString()),
- myPartSetModule(NULL),
- mySalomeConnector(theConnector),
- myPropertyPanel(0),
- myObjectBrowser(0),
- myDisplayer(0)
+ : QObject(),
+ myCurrentDir(QString()),
+ myModule(NULL),
+ mySalomeConnector(theConnector),
+ myPropertyPanel(0),
+ myObjectBrowser(0),
+ myDisplayer(0),
+ myUpdatePrefs(false),
+ myPartActivating(false)
{
- myMainWindow = mySalomeConnector? 0 : new XGUI_MainWindow();
+ myMainWindow = mySalomeConnector ? 0 : new AppElements_MainWindow();
myDisplayer = new XGUI_Displayer(this);
mySelector = new XGUI_SelectionMgr(this);
+ //connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands()));
myOperationMgr = new XGUI_OperationMgr(this);
myActionsMgr = new XGUI_ActionsMgr(this);
myErrorDlg = new XGUI_ErrorDialog(myMainWindow);
myContextMenuMgr = new XGUI_ContextMenuMgr(this);
- connect(myContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)),
- this, SLOT(onContextMenuCommand(const QString&, bool)));
+ connect(myContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)), this,
+ SLOT(onContextMenuCommand(const QString&, bool)));
myViewerProxy = new XGUI_ViewerProxy(this);
-
- connect(myOperationMgr, SIGNAL(operationStarted()), SLOT(onOperationStarted()));
- connect(myOperationMgr, SIGNAL(operationResumed()), SLOT(onOperationStarted()));
- connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), SLOT(onOperationStopped(ModuleBase_Operation*)));
+ connect(myViewerProxy, SIGNAL(selectionChanged()),
+ myActionsMgr, SLOT(updateOnViewSelection()));
+
+ myModuleConnector = new XGUI_ModuleConnector(this);
+
+ 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*)),
+ SLOT(onOperationCommitted(ModuleBase_Operation*)));
+ connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
+ SLOT(onOperationAborted(ModuleBase_Operation*)));
connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
- connect(myOperationMgr, SIGNAL(operationStarted()), myActionsMgr, SLOT(update()));
- connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), myActionsMgr, SLOT(update()));
connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
}
//******************************************************
XGUI_Workshop::~XGUI_Workshop(void)
{
+ delete myDisplayer;
}
//******************************************************
void XGUI_Workshop::startApplication()
{
initMenu();
+
+ Config_PropManager::registerProp("Plugins", "default_path", "Default Path",
+ Config_Prop::Directory, "");
+
//Initialize event listening
Events_Loop* aLoop = Events_Loop::loop();
- aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors.
- //TODO(sbh): Implement static method to extract event id [SEID]
- Events_ID aFeatureId = aLoop->eventByName(EVENT_FEATURE_LOADED);
- aLoop->registerListener(this, aFeatureId);
- Events_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent");
- aLoop->registerListener(this, aPartSetId);
- Events_ID aFeatureUpdatedId = aLoop->eventByName(EVENT_FEATURE_UPDATED);
- aLoop->registerListener(this, aFeatureUpdatedId);
- aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_CREATED));
-
+ aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors.
+ aLoop->registerListener(this, Events_Loop::eventByName(Config_FeatureMessage::GUI_EVENT()));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED));
+ aLoop->registerListener(this, Events_Loop::eventByName("LongOperation"));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_PLUGIN_LOADED));
+ aLoop->registerListener(this, Events_Loop::eventByName("CurrentDocumentChanged"));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOSHOW));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOHIDE));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SELFILTER_LOADED));
+
+ registerValidators();
+
+ // Calling of loadCustomProps before activating module is required
+ // by Config_PropManger to restore user-defined path to plugins
+ ModuleBase_Preferences::loadCustomProps();
activateModule();
if (myMainWindow) {
myMainWindow->show();
updateCommandStatus();
}
+
onNew();
}
if (isSalomeMode()) {
// Create only Undo, Redo commands
- QAction* aAction = salomeConnector()->addEditCommand("UNDO_CMD",
- tr("Undo"), tr("Undo last command"),
- QIcon(":pictures/undo.png"),
- QKeySequence::Undo, false);
+ QAction* aAction = salomeConnector()->addDesktopCommand("UNDO_CMD", tr("Undo"),
+ tr("Undo last command"),
+ QIcon(":pictures/undo.png"),
+ QKeySequence::Undo, false, "MEN_DESK_EDIT");
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onUndo()));
- aAction = salomeConnector()->addEditCommand("REDO_CMD",
- tr("Redo"), tr("Redo last command"),
- QIcon(":pictures/redo.png"),
- QKeySequence::Redo, false);
+ aAction = salomeConnector()->addDesktopCommand("REDO_CMD", tr("Redo"), tr("Redo last command"),
+ QIcon(":pictures/redo.png"), QKeySequence::Redo,
+ false, "MEN_DESK_EDIT");
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRedo()));
- salomeConnector()->addEditMenuSeparator();
+ 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");
+ 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;
}
- XGUI_Workbench* aPage = myMainWindow->menuObject()->generalPage();
-
// File commands group
- XGUI_MenuGroupPanel* aGroup = aPage->addGroup("Default");
+ AppElements_MenuGroupPanel* aGroup = myMainWindow->menuObject()->generalPage();
- XGUI_Command* aCommand;
+ AppElements_Command* aCommand;
aCommand = aGroup->addFeature("SAVE_CMD", tr("Save..."), tr("Save the document"),
QIcon(":pictures/save.png"), QKeySequence::Save);
aCommand->connectTo(this, SLOT(onRedo()));
aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
- QIcon(":pictures/rebuild.png"));
+ 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"));
+ QIcon(":pictures/save.png"), QKeySequence());
aCommand->connectTo(this, SLOT(onSaveAs()));
//aCommand->disable();
// 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"));
- // aCommand->connectTo(myActionsMgr, SLOT(update()));
- //#endif
+// #ifdef _DEBUG
+// aCommand = aGroup->addFeature("TEST_CMD", "Test!", "Private debug button",
+// QIcon(":pictures/close.png"), QKeySequence(), true);
+// aCommand->connectTo(myMainWindow, SLOT(dockPythonConsole()));
+// #endif
}
//******************************************************
-XGUI_Workbench* XGUI_Workshop::addWorkbench(const QString& theName)
+AppElements_Workbench* XGUI_Workshop::addWorkbench(const QString& theName)
{
- XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
+ AppElements_MainMenu* aMenuBar = myMainWindow->menuObject();
return aMenuBar->addWorkbench(theName);
}
//******************************************************
-void XGUI_Workshop::processEvent(const Events_Message* theMessage)
+void XGUI_Workshop::processEvent(const std::shared_ptr<Events_Message>& theMessage)
{
+ if (QApplication::instance()->thread() != QThread::currentThread()) {
+ #ifdef _DEBUG
+ std::cout << "XGUI_Workshop::processEvent: " << "Working in another thread." << std::endl;
+ #endif
+ SessionPtr aMgr = ModelAPI_Session::get();
+ PostponeMessageQtEvent* aPostponeEvent = new PostponeMessageQtEvent(theMessage);
+ QApplication::postEvent(this, aPostponeEvent);
+ return;
+ }
+
//A message to start feature creation received.
- static Events_ID aFeatureLoadedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_LOADED);
- if (theMessage->eventID() == aFeatureLoadedId) {
- const Config_FeatureMessage* aFeatureMsg = dynamic_cast<const Config_FeatureMessage*>(theMessage);
- if(!aFeatureMsg->isInternal()) {
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(Config_FeatureMessage::GUI_EVENT())) {
+ std::shared_ptr<Config_FeatureMessage> aFeatureMsg =
+ std::dynamic_pointer_cast<Config_FeatureMessage>(theMessage);
+ if (!aFeatureMsg->isInternal()) {
addFeature(aFeatureMsg);
}
- return;
}
+
// Process creation of Part
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_CREATED)) {
- const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
- std::set<FeaturePtr> aFeatures = aUpdMsg->features();
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
+ std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+ onFeatureCreatedMsg(aUpdMsg);
+ if (myUpdatePrefs) {
+ if (mySalomeConnector)
+ mySalomeConnector->createPreferences();
+ myUpdatePrefs = false;
+ }
+ }
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_PLUGIN_LOADED)) {
+ myUpdatePrefs = true;
+ }
- std::set<FeaturePtr>::const_iterator aIt;
- bool aHasPart = false;
- for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
- FeaturePtr aFeature = (*aIt);
- if (aFeature->getKind() == "Part") {
- aHasPart = true;
- break;
+ // Redisplay feature
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)) {
+ std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+ onFeatureRedisplayMsg(aUpdMsg);
+ }
+
+ //Update property panel on corresponding message. If there is no current operation (no
+ //property panel), or received message has different feature to the current - do nothing.
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
+ std::shared_ptr<ModelAPI_ObjectUpdatedMessage> anUpdateMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+ onFeatureUpdatedMsg(anUpdateMsg);
+ }
+
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) {
+ std::shared_ptr<ModelAPI_ObjectDeletedMessage> aDelMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectDeletedMessage>(theMessage);
+ onObjectDeletedMsg(aDelMsg);
+ }
+
+ else if (theMessage->eventID() == Events_LongOp::eventID()) {
+ if (Events_LongOp::isPerformed())
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ else
+ QApplication::restoreOverrideCursor();
+ }
+
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOSHOW)) {
+ std::shared_ptr<ModelAPI_ObjectUpdatedMessage> anUpdateMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+ const std::set<ObjectPtr>& aObjList = anUpdateMsg->objects();
+ QObjectPtrList aList;
+ std::set<ObjectPtr>::const_iterator aIt;
+ for (aIt = aObjList.cbegin(); aIt != aObjList.cend(); ++aIt)
+ aList.append(*aIt);
+ showObjects(aList, true);
+ }
+
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOHIDE)) {
+ std::shared_ptr<ModelAPI_ObjectUpdatedMessage> anUpdateMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+ const std::set<ObjectPtr>& aObjList = anUpdateMsg->objects();
+ QObjectPtrList aList;
+ std::set<ObjectPtr>::const_iterator aIt;
+ for (aIt = aObjList.cbegin(); aIt != aObjList.cend(); ++aIt)
+ aList.append(*aIt);
+ showObjects(aList, false);
+ }
+
+ //An operation passed by message. Start it, process and commit.
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) {
+ std::shared_ptr<Config_PointerMessage> aPartSetMsg =
+ std::dynamic_pointer_cast<Config_PointerMessage>(theMessage);
+ //myPropertyPanel->cleanContent();
+ ModuleBase_Operation* anOperation = (ModuleBase_Operation*) aPartSetMsg->pointer();
+
+ if (myOperationMgr->startOperation(anOperation)) {
+ myPropertyPanel->updateContentWidget(anOperation->feature());
+ if (!anOperation->getDescription()->hasXmlRepresentation()) {
+ if (anOperation->commit())
+ updateCommandStatus();
+ }
+ }
+ }
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName("CurrentDocumentChanged")) {
+ myActionsMgr->update();
+ // Find and Activate active part
+ if (myPartActivating)
+ return;
+ SessionPtr aMgr = ModelAPI_Session::get();
+ DocumentPtr aActiveDoc = aMgr->activeDocument();
+ DocumentPtr aDoc = aMgr->moduleDocument();
+ if (aActiveDoc == aDoc) {
+ activatePart(ResultPartPtr());
+ return;
+ }
+ std::string aGrpName = ModelAPI_ResultPart::group();
+ for (int i = 0; i < aDoc->size(aGrpName); i++) {
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aDoc->object(aGrpName, i));
+ if (aPart->partDoc() == aActiveDoc) {
+ activatePart(aPart); // Activate a part which corresponds to active Doc
+ return;
}
}
- if (aHasPart) {
- //The created part will be created in Object Browser later and we have to activate it
- // only when it is created everywere
- QTimer::singleShot(50, this, SLOT(activateLastPart()));
+ // If not found then activate global document
+ activatePart(ResultPartPtr());
+
+ }
+ else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_SELFILTER_LOADED)) {
+ std::shared_ptr<Config_SelectionFilterMessage> aMsg =
+ std::dynamic_pointer_cast<Config_SelectionFilterMessage>(theMessage);
+ if (aMsg) {
+ ModuleBase_FilterFactory* aFactory = moduleConnector()->selectionFilters();
+ if (!aMsg->attributeId().empty()) {
+ aFactory->assignFilter(aMsg->selectionFilterId(), aMsg->featureId(), aMsg->attributeId(),
+ aMsg->parameters());
+ }
}
}
- //Update property panel on corresponding message. If there is no current operation (no
- //property panel), or received message has different feature to the current - do nothing.
- static Events_ID aFeatureUpdatedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_UPDATED);
- if (theMessage->eventID() == aFeatureUpdatedId && myOperationMgr->hasOperation())
- {
- const Model_FeatureUpdatedMessage* anUpdateMsg =
- dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
- std::set<FeaturePtr> aFeatures = anUpdateMsg->features();
+
+ else {
+ //Show error dialog if error message received.
+ std::shared_ptr<Events_Error> anAppError = std::dynamic_pointer_cast<Events_Error>(theMessage);
+ if (anAppError) {
+ emit errorOccurred(QString::fromLatin1(anAppError->description()));
+ }
+ }
+ if (!isSalomeMode()) {
+ SessionPtr aMgr = ModelAPI_Session::get();
+ if (aMgr->isModified() != myMainWindow->isModifiedState())
+ myMainWindow->setModifiedState(aMgr->isModified());
+ }
+}
+
+//******************************************************
+void XGUI_Workshop::onStartWaiting()
+{
+ if (Events_LongOp::isPerformed()) {
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ }
+}
+
+//******************************************************
+void XGUI_Workshop::onFeatureUpdatedMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
+{
+ std::set<ObjectPtr> aFeatures = theMsg->objects();
+ if (myOperationMgr->hasOperation()) {
FeaturePtr aCurrentFeature = myOperationMgr->currentOperation()->feature();
- std::set<FeaturePtr>::const_iterator aIt;
+ std::set<ObjectPtr>::const_iterator aIt;
for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
- FeaturePtr aNewFeature = (*aIt);
- if(aNewFeature == aCurrentFeature) {
+ ObjectPtr aNewFeature = (*aIt);
+ if (aNewFeature == aCurrentFeature) {
myPropertyPanel->updateContentWidget(aCurrentFeature);
break;
- }
+ }
}
}
- //An operation passed by message. Start it, process and commit.
- const Config_PointerMessage* aPartSetMsg = dynamic_cast<const Config_PointerMessage*>(theMessage);
- if (aPartSetMsg) {
- ModuleBase_Operation* anOperation =
- (ModuleBase_Operation*)(aPartSetMsg->pointer());
+ myOperationMgr->onValidateOperation();
+ if (myObjectBrowser)
+ myObjectBrowser->processEvent(theMsg);
+}
- if (myOperationMgr->startOperation(anOperation)) {
- myPropertyPanel->updateContentWidget(anOperation->feature());
- if (anOperation->getDescription()->xmlRepresentation().isEmpty()) {
- anOperation->commit();
- updateCommandStatus();
+//******************************************************
+void XGUI_Workshop::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
+{
+ std::set<ObjectPtr> aObjects = theMsg->objects();
+ std::set<ObjectPtr>::const_iterator aIt;
+ for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ ObjectPtr aObj = (*aIt);
+ bool aHide = !aObj->data() || !aObj->data()->isValid();
+ if (!aHide) { // check that this is not hidden result
+ ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+ aHide = aRes && aRes->isConcealed();
+ }
+ if (aHide)
+ myDisplayer->erase(aObj, false);
+ else {
+ if (myDisplayer->isVisible(aObj)) {
+ myDisplayer->display(aObj, false); // In order to update presentation
+ if (myOperationMgr->hasOperation()) {
+ ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+ if (aOperation->hasObject(aObj) && myDisplayer->isActive(aObj))
+ myDisplayer->deactivate(aObj);
+ }
+ } else {
+ if (myOperationMgr->hasOperation()) {
+ ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+ // Display only current operation results if operation has preview
+ if (aOperation->hasObject(aObj)/* && aOperation->hasPreview()*/) {
+ myDisplayer->display(aObj, false);
+ // Deactivate object of current operation from selection
+ if (myDisplayer->isActive(aObj))
+ myDisplayer->deactivate(aObj);
+ }
+ }
}
}
- return;
}
- //Show error dialog if error message received.
- const Events_Error* anAppError = dynamic_cast<const Events_Error*>(theMessage);
- if (anAppError) {
- emit errorOccurred(QString::fromLatin1(anAppError->description()));
+ myDisplayer->updateViewer();
+}
+
+//******************************************************
+void XGUI_Workshop::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
+{
+ std::set<ObjectPtr> aObjects = theMsg->objects();
+
+ std::set<ObjectPtr>::const_iterator aIt;
+ bool aHasPart = false;
+ bool isDisplayed = false;
+ for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aIt);
+ if (aPart) {
+ aHasPart = true;
+ // If a feature is created from the aplication's python console
+ // it doesn't stored in the operation mgr and doesn't displayed
+ } else if (myOperationMgr->hasOperation()) {
+ ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+ if (aOperation->hasObject(*aIt)) { // Display only current operation results
+ myDisplayer->display(*aIt, false);
+ isDisplayed = true;
+ }
+ }
}
+ if (myObjectBrowser)
+ myObjectBrowser->processEvent(theMsg);
+ if (isDisplayed)
+ myDisplayer->updateViewer();
+ //if (aHasPart) { // TODO: Avoid activate last part on loading of document
+ // activateLastPart();
+ //}
+}
+//******************************************************
+void XGUI_Workshop::onObjectDeletedMsg(const std::shared_ptr<ModelAPI_ObjectDeletedMessage>& theMsg)
+{
+ if (myObjectBrowser)
+ myObjectBrowser->processEvent(theMsg);
+ //std::set<ObjectPtr> aFeatures = theMsg->objects();
}
//******************************************************
-void XGUI_Workshop::onOperationStarted()
+void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation)
{
- ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+ setNestedFeatures(theOperation);
- if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) { //!< No need for property panel
- connectWithOperation(aOperation);
+ if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ connectWithOperation(theOperation);
+ setPropertyPanel(theOperation);
+ }
+ updateCommandStatus();
- showPropertyPanel();
+ myModule->operationStarted(theOperation);
+}
+
+//******************************************************
+void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation)
+{
+ setNestedFeatures(theOperation);
- ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation);
- QWidget* aContent = myPropertyPanel->contentWidget();
- qDeleteAll(aContent->children());
- aFactory.createWidget(aContent);
- myPropertyPanel->setModelWidgets(aFactory.getModelWidgets());
- myPropertyPanel->setWindowTitle(aOperation->getDescription()->description());
+ if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ connectWithOperation(theOperation);
+ setPropertyPanel(theOperation);
}
updateCommandStatus();
+
+ myModule->operationResumed(theOperation);
}
+
//******************************************************
void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
{
//!< No need for property panel
updateCommandStatus();
hidePropertyPanel();
+ myPropertyPanel->cleanContent();
+
+ // Activate objects created by current operation
+ FeaturePtr aFeature = theOperation->feature();
+ myDisplayer->activate(aFeature);
+ const std::list<ResultPtr>& aResults = aFeature->results();
+ std::list<ResultPtr>::const_iterator aIt;
+ for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
+ myDisplayer->activate(*aIt);
+ }
+ myModule->operationStopped(theOperation);
+}
+
+
+void XGUI_Workshop::onOperationCommitted(ModuleBase_Operation* theOperation)
+{
+ myModule->operationCommitted(theOperation);
+}
+
+void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation)
+{
+ myModule->operationAborted(theOperation);
+}
+
+void XGUI_Workshop::setNestedFeatures(ModuleBase_Operation* theOperation)
+{
+ if (this->isSalomeMode())
+ theOperation->setNestedFeatures(mySalomeConnector->nestedActions(theOperation->id()));
+ else
+ theOperation->setNestedFeatures(myActionsMgr->nestedCommands(theOperation->id()));
+}
+
+void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation)
+{
+ showPropertyPanel();
+ QString aXmlRepr = theOperation->getDescription()->xmlRepresentation();
+ ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(),
+ myModuleConnector);
+
+ myPropertyPanel->cleanContent();
+ aFactory.createWidget(myPropertyPanel->contentWidget());
+ ModuleBase_Tools::zeroMargins(myPropertyPanel->contentWidget());
+
+ QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
+ foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
+ aWidget->setFeature(theOperation->feature());
+ aWidget->enableFocusProcessing();
+ QObject::connect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onWidgetValuesChanged()));
+ // Init default values
+ if (!theOperation->isEditOperation() && !aWidget->isComputedDefault()) {
+ aWidget->storeValue();
+ }
+ }
+
+ myPropertyPanel->setModelWidgets(aWidgets);
+ theOperation->setPropertyPanel(myPropertyPanel);
+
+ myModule->propertyPanelDefined(theOperation);
+
+ myPropertyPanel->setWindowTitle(theOperation->getDescription()->description());
+}
+
+bool XGUI_Workshop::event(QEvent * theEvent)
+{
+ PostponeMessageQtEvent* aPostponedEv = dynamic_cast<PostponeMessageQtEvent*>(theEvent);
+ if (aPostponedEv) {
+ std::shared_ptr<Events_Message> aEventPtr = aPostponedEv->postponedMessage();
+ processEvent(aEventPtr);
+ return true;
+ }
+ return false;
}
/*
*
*/
-void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage)
+void XGUI_Workshop::addFeature(const std::shared_ptr<Config_FeatureMessage>& theMessage)
{
if (!theMessage) {
#ifdef _DEBUG
QString aWchName = QString::fromStdString(theMessage->workbenchId());
QString aNestedFeatures = QString::fromStdString(theMessage->nestedFeatures());
bool isUsePropPanel = theMessage->isUseInput();
- QString aId = QString::fromStdString(theMessage->id());
+ QString aFeatureId = QString::fromStdString(theMessage->id());
if (isSalomeMode()) {
- QAction* aAction = salomeConnector()->addFeature(aWchName,
- aId,
- QString::fromStdString(theMessage->text()),
- QString::fromStdString(theMessage->tooltip()),
- QIcon(theMessage->icon().c_str()),
- QKeySequence(), isUsePropPanel);
- salomeConnector()->setNestedActions(aId, aNestedFeatures.split(" "));
+ QAction* aAction = salomeConnector()->addFeature(aWchName, aFeatureId,
+ QString::fromStdString(theMessage->text()),
+ QString::fromStdString(theMessage->tooltip()),
+ QIcon(theMessage->icon().c_str()),
+ QKeySequence(),
+ isUsePropPanel);
+ salomeConnector()->setNestedActions(aFeatureId, aNestedFeatures.split(" ", QString::SkipEmptyParts));
+ salomeConnector()->setDocumentKind(aFeatureId, QString::fromStdString(theMessage->documentKind()));
+
myActionsMgr->addCommand(aAction);
- myPartSetModule->featureCreated(aAction);
+ myModule->actionCreated(aAction);
} else {
- XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
- XGUI_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
+ AppElements_MainMenu* aMenuBar = myMainWindow->menuObject();
+ AppElements_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
if (!aPage) {
aPage = addWorkbench(aWchName);
}
//Find or create Group
QString aGroupName = QString::fromStdString(theMessage->groupId());
- XGUI_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
+ AppElements_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
if (!aGroup) {
aGroup = aPage->addGroup(aGroupName);
}
- //Create feature...
- XGUI_Command* aCommand = aGroup->addFeature(aId,
+ QString aDocKind = QString::fromStdString(theMessage->documentKind());
+ // Check if hotkey sequence is already defined:
+ QKeySequence aHotKey = myActionsMgr->registerShortcut(
+ QString::fromStdString(theMessage->keysequence()));
+ // Create feature...
+ AppElements_Command* aCommand = aGroup->addFeature(aFeatureId,
QString::fromStdString(theMessage->text()),
QString::fromStdString(theMessage->tooltip()),
QIcon(theMessage->icon().c_str()),
- QKeySequence(), isUsePropPanel);
+ aDocKind,
+ aHotKey,
+ isUsePropPanel);
aCommand->setNestedCommands(aNestedFeatures.split(" ", QString::SkipEmptyParts));
myActionsMgr->addCommand(aCommand);
- myPartSetModule->featureCreated(aCommand);
+ myModule->actionCreated(aCommand);
}
}
if (isSalomeMode()) {
aCommand = salomeConnector()->command(theOperation->getDescription()->operationId());
} else {
- XGUI_MainMenu* aMenu = myMainWindow->menuObject();
- aCommand = aMenu->feature(theOperation->getDescription()->operationId());
+ AppElements_MainMenu* aMenu = myMainWindow->menuObject();
+ FeaturePtr aFeature = theOperation->feature();
+ if(aFeature)
+ aCommand = aMenu->feature(QString::fromStdString(aFeature->getKind()));
}
//Abort operation on uncheck the command
- connect(aCommand, SIGNAL(triggered(bool)), theOperation, SLOT(setRunning(bool)));
+ if (aCommand) {
+ connect(aCommand, SIGNAL(triggered(bool)), theOperation, SLOT(setRunning(bool)));
+ }
}
/*
* Saves document with given name.
*/
-void XGUI_Workshop::saveDocument(QString theName)
+void XGUI_Workshop::saveDocument(const QString& theName, std::list<std::string>& theFileNames)
{
QApplication::restoreOverrideCursor();
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- DocumentPtr aDoc = aMgr->rootDocument();
- aDoc->save(theName.toLatin1().constData());
+ SessionPtr aMgr = ModelAPI_Session::get();
+ aMgr->save(theName.toLatin1().constData(), theFileNames);
QApplication::restoreOverrideCursor();
}
+bool XGUI_Workshop::isActiveOperationAborted()
+{
+ return myOperationMgr->abortAllOperations();
+}
+
//******************************************************
void XGUI_Workshop::onExit()
{
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- DocumentPtr aDoc = aMgr->rootDocument();
- if(aDoc->isModified()) {
+ SessionPtr aMgr = ModelAPI_Session::get();
+ if (aMgr->isModified()) {
int anAnswer = QMessageBox::question(
- myMainWindow, tr("Save current file"),
- tr("The document is modified, save before exit?"),
+ 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) {
+ if (anAnswer == QMessageBox::Save) {
bool saved = onSave();
- if(!saved) {
+ if (!saved) {
return;
}
} else if (anAnswer == QMessageBox::Cancel) {
aWnd->showMaximized();
updateCommandStatus();
}
+ myContextMenuMgr->connectViewer();
QApplication::restoreOverrideCursor();
}
//******************************************************
void XGUI_Workshop::onOpen()
{
+ if(!isActiveOperationAborted())
+ return;
//save current file before close if modified
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- DocumentPtr aDoc = aMgr->rootDocument();
- if(aDoc->isModified()) {
+ 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 opening another?"),
QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
- if(anAnswer == QMessageBox::Save) {
+ if (anAnswer == QMessageBox::Save) {
onSave();
} else if (anAnswer == QMessageBox::Cancel) {
return;
}
- aDoc->close();
+ aSession->closeAll();
myCurrentDir = "";
}
//show file dialog, check if readable and open
myCurrentDir = QFileDialog::getExistingDirectory(mainWindow());
- if(myCurrentDir.isEmpty())
+ if (myCurrentDir.isEmpty())
return;
QFileInfo aFileInfo(myCurrentDir);
- if(!aFileInfo.exists() || !aFileInfo.isReadable()) {
+ if (!aFileInfo.exists() || !aFileInfo.isReadable()) {
QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to open the file."));
myCurrentDir = "";
return;
}
QApplication::setOverrideCursor(Qt::WaitCursor);
- aDoc->load(myCurrentDir.toLatin1().constData());
- QApplication::restoreOverrideCursor();
+ aSession->load(myCurrentDir.toLatin1().constData());
+ myObjectBrowser->rebuildDataTree();
+ displayAllResults();
updateCommandStatus();
+ QApplication::restoreOverrideCursor();
}
//******************************************************
bool XGUI_Workshop::onSave()
{
- if(myCurrentDir.isEmpty()) {
+ if(!isActiveOperationAborted())
+ return false;
+ if (myCurrentDir.isEmpty()) {
return onSaveAs();
}
- saveDocument(myCurrentDir);
+ std::list<std::string> aFiles;
+ saveDocument(myCurrentDir, aFiles);
updateCommandStatus();
+ if (!isSalomeMode())
+ myMainWindow->setModifiedState(false);
return true;
}
//******************************************************
bool XGUI_Workshop::onSaveAs()
{
+ if(!isActiveOperationAborted())
+ return false;
QFileDialog dialog(mainWindow());
dialog.setWindowTitle(tr("Select directory to save files..."));
dialog.setFileMode(QFileDialog::Directory);
dialog.setOptions(QFileDialog::HideNameFilterDetails | QFileDialog::ShowDirsOnly);
dialog.setViewMode(QFileDialog::Detail);
- if(!dialog.exec()) {
+ if (!dialog.exec()) {
return false;
}
QString aTempDir = dialog.selectedFiles().first();
QDir aDir(aTempDir);
- if(aDir.exists() && !aDir.entryInfoList(QDir::NoDotAndDotDot|QDir::AllEntries).isEmpty()) {
- int answer = QMessageBox::question(myMainWindow,
- //: Title of the dialog which asks user if he wants to save study in existing non-empty folder
- tr("Save"),
- tr("The folder already contains some files, save anyway?"),
- QMessageBox::Save|QMessageBox::Cancel);
- if(answer == QMessageBox::Cancel) {
+ if (aDir.exists() && !aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) {
+ int answer = QMessageBox::question(
+ myMainWindow,
+ //: Title of the dialog which asks user if he wants to save study in existing non-empty folder
+ tr("Save"),
+ tr("The folder already contains some files, save anyway?"),
+ QMessageBox::Save | QMessageBox::Cancel);
+ if (answer == QMessageBox::Cancel) {
return false;
}
}
myCurrentDir = aTempDir;
+ if (!isSalomeMode()) {
+ myMainWindow->setCurrentDir(myCurrentDir, false);
+ myMainWindow->setModifiedState(false);
+ }
return onSave();
}
void XGUI_Workshop::onUndo()
{
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- DocumentPtr aDoc = aMgr->rootDocument();
- if (aDoc->isOperation())
- operationMgr()->abortOperation();
- aDoc->undo();
+ SessionPtr aMgr = ModelAPI_Session::get();
+ if (aMgr->isOperation())
+ operationMgr()->onAbortOperation();
+ aMgr->undo();
updateCommandStatus();
}
void XGUI_Workshop::onRedo()
{
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- DocumentPtr aDoc = aMgr->rootDocument();
- if (aDoc->isOperation())
- operationMgr()->abortOperation();
- aDoc->redo();
+ SessionPtr aMgr = ModelAPI_Session::get();
+ if (aMgr->isOperation())
+ operationMgr()->onAbortOperation();
+ aMgr->redo();
updateCommandStatus();
}
//******************************************************
-XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
+void XGUI_Workshop::onRebuild()
+{
+ SessionPtr aMgr = ModelAPI_Session::get();
+ bool aWasOperation = aMgr->isOperation(); // keep this value
+ if (!aWasOperation) {
+ aMgr->startOperation();
+ }
+ 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();
+ }
+}
+
+//******************************************************
+void XGUI_Workshop::onPreferences()
{
- QString libName =
- QString::fromStdString(library(theModule.toStdString()));
+ 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();
+ }
+ }
+ }
+}
+
+//******************************************************
+ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
+{
+ QString libName = QString::fromStdString(library(theModule.toStdString()));
if (libName.isEmpty()) {
- qWarning(
- qPrintable( tr( "Information about module \"%1\" doesn't exist." ).arg( theModule ) ));
+ qWarning(qPrintable(tr("Information about module \"%1\" doesn't exist.").arg(theModule)));
return 0;
}
}
#endif
- XGUI_Module* aModule = crtInst ? crtInst(this) : 0;
+ ModuleBase_IModule* aModule = crtInst ? crtInst(myModuleConnector) : 0;
if (!err.isEmpty()) {
if (mainWindow()) {
- QMessageBox::warning(mainWindow(), tr("Error"), err);
+ Events_Error::send(err.toStdString());
} else {
- qWarning( qPrintable( err ));
+ qWarning(qPrintable(err));
}
}
return aModule;
{
Config_ModuleReader aModuleReader;
QString moduleName = QString::fromStdString(aModuleReader.getModuleName());
- myPartSetModule = loadModule(moduleName);
- if (!myPartSetModule)
+ myModule = loadModule(moduleName);
+ if (!myModule)
return false;
- myPartSetModule->createFeatures();
+ myModule->createFeatures();
myActionsMgr->update();
return true;
}
void XGUI_Workshop::updateCommandStatus()
{
QList<QAction*> aCommands;
- if (isSalomeMode()) { // update commands in SALOME mode
+ if (isSalomeMode()) { // update commands in SALOME mode
aCommands = salomeConnector()->commandList();
} else {
- XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
- foreach (XGUI_Command* aCmd, aMenuBar->features())
+ AppElements_MainMenu* aMenuBar = myMainWindow->menuObject();
+ foreach (AppElements_Command* aCmd, aMenuBar->features())
aCommands.append(aCmd);
}
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- if (aMgr->hasRootDocument()) {
- QAction* aUndoCmd;
- QAction* aRedoCmd;
+ SessionPtr aMgr = ModelAPI_Session::get();
+ if (aMgr->hasModuleDocument()) {
+ QAction *aUndoCmd, *aRedoCmd;
foreach(QAction* aCmd, aCommands) {
QString aId = aCmd->data().toString();
if (aId == "UNDO_CMD")
aUndoCmd = aCmd;
else if (aId == "REDO_CMD")
aRedoCmd = aCmd;
- else // Enable all commands
+ else
+ // Enable all commands
aCmd->setEnabled(true);
}
- DocumentPtr aDoc = aMgr->rootDocument();
- aUndoCmd->setEnabled(aDoc->canUndo());
- aRedoCmd->setEnabled(aDoc->canRedo());
+ aUndoCmd->setEnabled(aMgr->canUndo() && !aMgr->isOperation());
+ aRedoCmd->setEnabled(aMgr->canRedo() && !aMgr->isOperation());
} else {
foreach(QAction* aCmd, aCommands) {
QString aId = aCmd->data().toString();
aCmd->setEnabled(true);
else if (aId == "EXIT_CMD")
aCmd->setEnabled(true);
- else
+ else
aCmd->setEnabled(false);
}
}
myActionsMgr->update();
+ emit commandStatusUpdated();
}
//******************************************************
QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
{
QDockWidget* aObjDock = new QDockWidget(theParent);
- aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ 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 }");
+ aObjDock->setStyleSheet(
+ "::title { position: relative; padding-left: 5px; text-align: left center }");
myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
- connect(myObjectBrowser, SIGNAL(activePartChanged(FeaturePtr)), this, SLOT(changeCurrentDocument(FeaturePtr)));
+ connect(myObjectBrowser, SIGNAL(activePartChanged(ObjectPtr)), this,
+ SLOT(changeCurrentDocument(ObjectPtr)));
aObjDock->setWidget(myObjectBrowser);
myContextMenuMgr->connectObjectBrowser();
*/
void XGUI_Workshop::createDockWidgets()
{
- QMainWindow* aDesktop = isSalomeMode()? salomeConnector()->desktop() :
- myMainWindow;
+ QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow;
QDockWidget* aObjDock = createObjectBrowser(aDesktop);
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
myPropertyPanel = new XGUI_PropertyPanel(aDesktop);
+ myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
+
+ connect(myPropertyPanel, SIGNAL(noMoreWidgets()), myModule, SLOT(onNoMoreWidgets()));
+
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
- hidePropertyPanel(); //<! Invisible by default
+ hidePropertyPanel(); //<! Invisible by default
hideObjectBrowser();
aDesktop->tabifyDockWidget(aObjDock, myPropertyPanel);
+ myPropertyPanel->installEventFilter(myOperationMgr);
- QPushButton* aOkBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+ QPushButton* aOkBtn = myPropertyPanel->findChild<QPushButton*>(PROP_PANEL_OK);
connect(aOkBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onCommitOperation()));
- QPushButton* aCancelBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
+ QPushButton* aCancelBtn = myPropertyPanel->findChild<QPushButton*>(PROP_PANEL_CANCEL);
connect(aCancelBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onAbortOperation()));
+ connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)), myOperationMgr,
+ SLOT(onKeyReleased(QKeyEvent*)));
+ connect(myOperationMgr, SIGNAL(operationValidated(bool)), myPropertyPanel,
+ SLOT(setAcceptEnabled(bool)));
- connect(myPropertyPanel, SIGNAL(keyReleased(const std::string&, QKeyEvent*)),
- myOperationMgr, SLOT(onKeyReleased(const std::string&, QKeyEvent*)));
}
//******************************************************
if (aCmd) {
QString aId = salomeConnector()->commandId(aCmd);
if (!aId.isNull())
- myPartSetModule->launchOperation(aId);
+ myModule->launchOperation(aId);
}
}
//******************************************************
-void XGUI_Workshop::changeCurrentDocument(FeaturePtr thePart)
+void XGUI_Workshop::changeCurrentDocument(ObjectPtr theObj)
{
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- if (thePart) {
- DocumentPtr aFeaDoc;
- if (!XGUI_Tools::isModelObject(thePart)) {
- aFeaDoc = thePart->data()->docRef("PartDocument")->value();
- } else {
- ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(thePart);
- aFeaDoc = aObject->featureRef()->data()->docRef("PartDocument")->value();
+ SessionPtr aMgr = ModelAPI_Session::get();
+ if (theObj) {
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(theObj);
+ if (aPart) {
+ DocumentPtr aPartDoc = aPart->partDoc();
+ if (aPartDoc) {
+ aMgr->setActiveDocument(aPartDoc);
+ return;
+ }
}
- if (aFeaDoc)
- aMgr->setCurrentDocument(aFeaDoc);
- } else {
- aMgr->setCurrentDocument(aMgr->rootDocument());
}
+ aMgr->setActiveDocument(aMgr->moduleDocument());
}
//******************************************************
emit salomeViewerSelection();
}
-
//**************************************************************
-XGUI_SalomeViewer* XGUI_Workshop::salomeViewer() const
-{
- return mySalomeConnector->viewer();
+ModuleBase_IViewer* XGUI_Workshop::salomeViewer() const
+{
+ return mySalomeConnector->viewer();
}
//**************************************************************
void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked)
{
- QFeatureList aFeatures = mySelector->selectedFeatures();
- if ((theId == "ACTIVATE_PART_CMD") && (aFeatures.size() > 0))
- activatePart(aFeatures.first());
- else if (theId == "DEACTIVATE_PART_CMD")
- activatePart(FeaturePtr());
+ QObjectPtrList aObjects = mySelector->selection()->selectedObjects();
+ if ((theId == "ACTIVATE_PART_CMD") && (aObjects.size() > 0)) {
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObjects.first());
+ activatePart(aPart);
+ } else if (theId == "DEACTIVATE_PART_CMD")
+ activatePart(ResultPartPtr());
else if (theId == "DELETE_CMD")
- deleteFeatures(aFeatures);
+ deleteObjects(aObjects);
else if (theId == "SHOW_CMD")
- showFeatures(aFeatures, true);
+ showObjects(aObjects, true);
else if (theId == "HIDE_CMD")
- showFeatures(aFeatures, false);
+ showObjects(aObjects, false);
+ else if (theId == "SHOW_ONLY_CMD")
+ showOnlyObjects(aObjects);
+ else if (theId == "SHADING_CMD")
+ setDisplayMode(aObjects, XGUI_Displayer::Shading);
+ else if (theId == "WIREFRAME_CMD")
+ setDisplayMode(aObjects, XGUI_Displayer::Wireframe);
+ else if (theId == "HIDEALL_CMD")
+ myDisplayer->eraseAll();
+ else if (theId == "EDIT_CMD") {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObjects.first());
+ if (aFeature)
+ myModule->editFeature(aFeature);
+ }
+}
+
+//**************************************************************
+void XGUI_Workshop::onWidgetValuesChanged()
+{
+ ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ FeaturePtr aFeature = anOperation->feature();
+
+ ModuleBase_ModelWidget* aSenderWidget = dynamic_cast<ModuleBase_ModelWidget*>(sender());
+
+ const QList<ModuleBase_ModelWidget*>& aWidgets = myPropertyPanel->modelWidgets();
+ QList<ModuleBase_ModelWidget*>::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end();
+ for (; anIt != aLast; anIt++) {
+ ModuleBase_ModelWidget* aCustom = *anIt;
+ if (aCustom && (aCustom == aSenderWidget)) {
+ aCustom->storeValue();
+ }
+ }
}
//**************************************************************
-void XGUI_Workshop::activatePart(FeaturePtr theFeature)
+void XGUI_Workshop::activatePart(ResultPartPtr theFeature)
{
- changeCurrentDocument(theFeature);
- myObjectBrowser->activatePart(theFeature);
+ if (!myPartActivating) {
+ myPartActivating = true;
+ if (theFeature)
+ theFeature->activate();
+ changeCurrentDocument(theFeature);
+ myObjectBrowser->activatePart(theFeature);
+ myPartActivating = false;
+ }
}
//**************************************************************
void XGUI_Workshop::activateLastPart()
{
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- DocumentPtr aDoc = aMgr->rootDocument();
- FeaturePtr aLastPart = aDoc->feature(PARTS_GROUP, aDoc->size(PARTS_GROUP) - 1, true);
- activatePart(aLastPart);
+ SessionPtr aMgr = ModelAPI_Session::get();
+ DocumentPtr aDoc = aMgr->moduleDocument();
+ std::string aGrpName = ModelAPI_ResultPart::group();
+ ObjectPtr aLastPart = aDoc->object(aGrpName, aDoc->size(aGrpName) - 1);
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aLastPart);
+ if (aPart) {
+ activatePart(aPart);
+ }
}
//**************************************************************
-void XGUI_Workshop::deleteFeatures(QFeatureList theList)
+void XGUI_Workshop::deleteObjects(const QObjectPtrList& theList)
{
- QMainWindow* aDesktop = isSalomeMode()? salomeConnector()->desktop() : myMainWindow;
- QMessageBox::StandardButton aRes = QMessageBox::warning(aDesktop, tr("Delete features"),
- tr("Seleted features will be deleted. Continue?"),
- QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
+ QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow;
+ QMessageBox::StandardButton aRes = QMessageBox::warning(
+ aDesktop, tr("Delete features"), tr("Seleted features will be deleted. Continue?"),
+ QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
+ // ToDo: definbe deleting method
if (aRes == QMessageBox::Yes) {
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- aMgr->rootDocument()->startOperation();
- foreach (FeaturePtr aFeature, theList) {
- if (aFeature->getKind() == "Part") {
- DocumentPtr aDoc;
- if (!XGUI_Tools::isModelObject(aFeature)) {
- aDoc = aFeature->data()->docRef("PartDocument")->value();
- } else {
- ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(aFeature);
- aDoc = aObject->featureRef()->data()->docRef("PartDocument")->value();
- aFeature = aObject->featureRef();
- }
- if (aDoc == aMgr->currentDocument()) {
+ SessionPtr aMgr = ModelAPI_Session::get();
+ aMgr->startOperation();
+ foreach (ObjectPtr aObj, theList)
+ {
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
+ if (aPart) {
+ DocumentPtr aDoc = aPart->document();
+ if (aDoc == aMgr->activeDocument()) {
aDoc->close();
}
+ //aMgr->moduleDocument()->removeFeature(aPart->owner());
} else {
- if (XGUI_Tools::isModelObject(aFeature)) {
- ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(aFeature);
- aFeature = aObject->featureRef();
- }
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+ if (aFeature)
+ aObj->document()->removeFeature(aFeature);
}
- aFeature->document()->removeFeature(aFeature);
}
- aMgr->rootDocument()->finishOperation();
+ myDisplayer->updateViewer();
+ aMgr->finishOperation();
}
}
//**************************************************************
-void XGUI_Workshop::showFeatures(QFeatureList theList, bool isVisible)
+void XGUI_Workshop::showObjects(const QObjectPtrList& theList, bool isVisible)
{
-// foreach (FeaturePtr aFeature, theList) {
-// }
+ foreach (ObjectPtr aObj, theList)
+ {
+ if (isVisible) {
+ myDisplayer->display(aObj, false);
+ } else {
+ myDisplayer->erase(aObj, false);
+ }
+ }
+ myDisplayer->updateViewer();
+}
+
+//**************************************************************
+void XGUI_Workshop::showOnlyObjects(const QObjectPtrList& theList)
+{
+ myDisplayer->showOnly(theList);
+}
+
+
+//**************************************************************
+void XGUI_Workshop::registerValidators() const
+{
+ SessionPtr aMgr = ModelAPI_Session::get();
+ ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
+}
+
+//**************************************************************
+void XGUI_Workshop::displayAllResults()
+{
+ SessionPtr aMgr = ModelAPI_Session::get();
+ DocumentPtr aRootDoc = aMgr->moduleDocument();
+ displayDocumentResults(aRootDoc);
+ for (int i = 0; i < aRootDoc->size(ModelAPI_ResultPart::group()); i++) {
+ ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), i);
+ ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
+ displayDocumentResults(aPart->partDoc());
+ }
+ myDisplayer->updateViewer();
+}
+
+//**************************************************************
+void XGUI_Workshop::displayDocumentResults(DocumentPtr theDoc)
+{
+ if (!theDoc)
+ return;
+ displayGroupResults(theDoc, ModelAPI_ResultConstruction::group());
+ displayGroupResults(theDoc, ModelAPI_ResultBody::group());
+}
+
+//**************************************************************
+void XGUI_Workshop::displayGroupResults(DocumentPtr theDoc, std::string theGroup)
+{
+ for (int i = 0; i < theDoc->size(theGroup); i++)
+ myDisplayer->display(theDoc->object(theGroup, i), false);
+}
+
+//**************************************************************
+void XGUI_Workshop::setDisplayMode(const QObjectPtrList& theList, int theMode)
+{
+ foreach(ObjectPtr aObj, theList) {
+ myDisplayer->setDisplayMode(aObj, (XGUI_Displayer::DisplayMode)theMode, false);
+ }
+ if (theList.size() > 0)
+ myDisplayer->updateViewer();
+}
+
+//**************************************************************
+void XGUI_Workshop::closeDocument()
+{
+ myDisplayer->closeLocalContexts();
+ myDisplayer->eraseAll();
+ objectBrowser()->clearContent();
+
+ SessionPtr aMgr = ModelAPI_Session::get();
+ aMgr->closeAll();
+ objectBrowser()->clearContent();
}