#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_PropertyPanel.h"
#include "XGUI_ContextMenuMgr.h"
#include "XGUI_ModuleConnector.h"
+#include "XGUI_Preferences.h"
-#include <Model_Events.h>
-#include <ModelAPI_PluginManager.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 <Config_Common.h>
#include <Config_FeatureMessage.h>
#include <dlfcn.h>
#endif
-
QMap<QString, QString> XGUI_Workshop::myIcons;
QString XGUI_Workshop::featureIcon(const std::string& theId)
}
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
- : QObject(),
- myCurrentDir(QString()),
- myModule(NULL),
- mySalomeConnector(theConnector),
- myPropertyPanel(0),
- myObjectBrowser(0),
- myDisplayer(0)
+ : QObject(),
+ myCurrentDir(QString()),
+ myModule(NULL),
+ mySalomeConnector(theConnector),
+ myPropertyPanel(0),
+ myObjectBrowser(0),
+ myDisplayer(0),
+ myUpdatePrefs(false)
{
- myMainWindow = mySalomeConnector? 0 : new XGUI_MainWindow();
+ myMainWindow = mySalomeConnector ? 0 : new XGUI_MainWindow();
myDisplayer = new XGUI_Displayer(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(myViewerProxy, SIGNAL(selectionChanged()), this, SLOT(updateCommandsOnViewSelection()));
-
+
myModuleConnector = new XGUI_ModuleConnector(this);
connect(myOperationMgr, SIGNAL(operationStarted()), SLOT(onOperationStarted()));
connect(myOperationMgr, SIGNAL(operationResumed()), SLOT(onOperationStarted()));
- connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), SLOT(onOperationStopped(ModuleBase_Operation*)));
+ connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
+ SLOT(onOperationStopped(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(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), myActionsMgr,
+ SLOT(update()));
connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
}
initMenu();
//Initialize event listening
Events_Loop* aLoop = Events_Loop::loop();
- aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors.
+ aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors.
//TODO(sbh): Implement static method to extract event id [SEID]
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_LOADED));
// TODO Is it good to use non standard event within workshop?
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_FEATURE_TO_REDISPLAY));
+ 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));
+ registerValidators();
activateModule();
if (myMainWindow) {
myMainWindow->show();
updateCommandStatus();
}
+ XGUI_Preferences::loadCustomProps();
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()->addEditCommand("UNDO_CMD", tr("Undo"),
+ tr("Undo last command"),
+ QIcon(":pictures/undo.png"),
+ QKeySequence::Undo, false);
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()->addEditCommand("REDO_CMD", tr("Redo"), tr("Redo last command"),
+ QIcon(":pictures/redo.png"), QKeySequence::Redo,
+ false);
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRedo()));
salomeConnector()->addEditMenuSeparator();
return;
}
- XGUI_Workbench* aPage = myMainWindow->menuObject()->generalPage();
-
// File commands group
- XGUI_MenuGroupPanel* aGroup = aPage->addGroup("Default");
+ XGUI_MenuGroupPanel* aGroup = myMainWindow->menuObject()->generalPage();
XGUI_Command* aCommand;
// 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
}
//******************************************************
void XGUI_Workshop::processEvent(const Events_Message* theMessage)
{
//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(EVENT_FEATURE_LOADED)) {
+ const Config_FeatureMessage* aFeatureMsg =
+ dynamic_cast<const Config_FeatureMessage*>(theMessage);
+ if (!aFeatureMsg->isInternal()) {
addFeature(aFeatureMsg);
}
- return;
}
// Process creation of Part
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
- const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
+ const ModelAPI_ObjectUpdatedMessage* aUpdMsg =
+ dynamic_cast<const 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;
}
// Redisplay feature
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_TO_REDISPLAY)) {
- const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)) {
+ const ModelAPI_ObjectUpdatedMessage* aUpdMsg =
+ dynamic_cast<const 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.
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
- const Model_FeatureUpdatedMessage* anUpdateMsg =
- dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
+ const ModelAPI_ObjectUpdatedMessage* anUpdateMsg =
+ dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
onFeatureUpdatedMsg(anUpdateMsg);
}
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) {
+ const ModelAPI_ObjectDeletedMessage* aDelMsg =
+ dynamic_cast<const ModelAPI_ObjectDeletedMessage*>(theMessage);
+ onObjectDeletedMsg(aDelMsg);
+ }
+
+ else if (theMessage->eventID() == Events_LongOp::eventID()) {
+ if (Events_LongOp::isPerformed())
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ //QTimer::singleShot(10, this, SLOT(onStartWaiting()));
+ else
+ QApplication::restoreOverrideCursor();
+ }
+
//An operation passed by message. Start it, process and commit.
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) {
- const Config_PointerMessage* aPartSetMsg = dynamic_cast<const Config_PointerMessage*>(theMessage);
+ else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) {
+ const Config_PointerMessage* aPartSetMsg =
+ dynamic_cast<const Config_PointerMessage*>(theMessage);
//myPropertyPanel->cleanContent();
- ModuleBase_Operation* anOperation = (ModuleBase_Operation*)aPartSetMsg->pointer();
+ ModuleBase_Operation* anOperation = (ModuleBase_Operation*) aPartSetMsg->pointer();
if (myOperationMgr->startOperation(anOperation)) {
myPropertyPanel->updateContentWidget(anOperation->feature());
if (!anOperation->getDescription()->hasXmlRepresentation()) {
- anOperation->commit();
- updateCommandStatus();
+ if (anOperation->commit())
+ updateCommandStatus();
}
}
- return;
+ } else {
+ //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()));
+ }
}
- //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()));
+ if (!isSalomeMode()) {
+ PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ DocumentPtr aDoc = aMgr->rootDocument();
+ if (aDoc->isModified() != myMainWindow->isModifiedState())
+ myMainWindow->setModifiedState(aDoc->isModified());
}
}
+
//******************************************************
-void XGUI_Workshop::onFeatureUpdatedMsg(const Model_FeatureUpdatedMessage* theMsg)
+void XGUI_Workshop::onStartWaiting()
{
- std::set<FeaturePtr> aFeatures = theMsg->features();
- if (myOperationMgr->hasOperation())
- {
+ if (Events_LongOp::isPerformed()) {
+ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ }
+}
+
+//******************************************************
+void XGUI_Workshop::onFeatureUpdatedMsg(const 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;
- }
+ }
}
}
+ myOperationMgr->validateCurrentOperation();
}
//******************************************************
-void XGUI_Workshop::onFeatureRedisplayMsg(const Model_FeatureUpdatedMessage* theMsg)
+void XGUI_Workshop::onFeatureRedisplayMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
{
- std::set<FeaturePtr> aFeatures = theMsg->features();
- std::set<FeaturePtr>::const_iterator aIt;
- bool isDisplayed = false;
- for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
- FeaturePtr aFeature = (*aIt);
- if (aFeature->getKind() != PARTSET_PART_KIND) {
- isDisplayed = myDisplayer->redisplay(aFeature, false);
+ std::set<ObjectPtr> aObjects = theMsg->objects();
+ std::set<ObjectPtr>::const_iterator aIt;
+ for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ ObjectPtr aObj = (*aIt);
+ if (!aObj->data() || !aObj->data()->isValid())
+ myDisplayer->erase(aObj, false);
+ else {
+ if (myDisplayer->isVisible(aObj)) // TODO VSV: Correction sketch drawing
+ myDisplayer->display(aObj, false); // In order to update presentation
+ else {
+ if (myOperationMgr->hasOperation()) {
+ ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
+ if (aOperation->hasObject(aObj)) { // Display only current operation results
+ myDisplayer->display(aObj, false);
+ }
+ }
+ }
}
}
- if (isDisplayed)
- myDisplayer->updateViewer();
+ myDisplayer->updateViewer();
}
//******************************************************
-void XGUI_Workshop::onFeatureCreatedMsg(const Model_FeatureUpdatedMessage* theMsg)
+void XGUI_Workshop::onFeatureCreatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
{
- std::set<FeaturePtr> aFeatures = theMsg->features();
+ std::set<ObjectPtr> aObjects = theMsg->objects();
- std::set<FeaturePtr>::const_iterator aIt;
+ std::set<ObjectPtr>::const_iterator aIt;
bool aHasPart = false;
bool isDisplayed = false;
- for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
- FeaturePtr aFeature = (*aIt);
- if (aFeature->getKind() == PARTSET_PART_KIND) {
+ for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(*aIt);
+ if (aPart) {
aHasPart = true;
- //break;
- } else {
- isDisplayed = myDisplayer->display(aFeature, false);
+ // 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 (isDisplayed)
QTimer::singleShot(50, this, SLOT(activateLastPart()));
}
}
-
+
+//******************************************************
+void XGUI_Workshop::onObjectDeletedMsg(const ModelAPI_ObjectDeletedMessage* theMsg)
+{
+ //std::set<ObjectPtr> aFeatures = theMsg->objects();
+}
+
//******************************************************
void XGUI_Workshop::onOperationStarted()
{
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
-
- if(aOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ if (this->isSalomeMode())
+ aOperation->setNestedFeatures(mySalomeConnector->nestedActions(aOperation->id()));
+ else
+ aOperation->setNestedFeatures(myActionsMgr->nestedCommands(aOperation->id()));
+
+ if (aOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
connectWithOperation(aOperation);
showPropertyPanel();
QString aXmlRepr = aOperation->getDescription()->xmlRepresentation();
- ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(), myModuleConnector);
+ ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(),
+ myModuleConnector);
myPropertyPanel->cleanContent();
aFactory.createWidget(myPropertyPanel->contentWidget());
-
+
QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
QList<ModuleBase_ModelWidget*>::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end();
ModuleBase_ModelWidget* aWidget;
for (; anIt != aLast; anIt++) {
aWidget = *anIt;
- //QObject::connect(aWidget, SIGNAL(valuesChanged()), aOperation, SLOT(storeCustomValue()));
- QObject::connect(aWidget, SIGNAL(valuesChanged()),
- this, SLOT(onWidgetValuesChanged()));
+ aWidget->setFeature(aOperation->feature());
+ QObject::connect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onWidgetValuesChanged()));
// Init default values
- if (!aOperation->isEditOperation() && aWidget->hasDefaultValue()) {
- aWidget->storeValue(aOperation->feature());
+ if (!aOperation->isEditOperation() && !aWidget->isComputedDefault()) {
+ aWidget->storeValue();
}
}
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));
myActionsMgr->addCommand(aAction);
myModule->featureCreated(aAction);
} else {
if (!aGroup) {
aGroup = aPage->addGroup(aGroupName);
}
- //Create feature...
- XGUI_Command* aCommand = aGroup->addFeature(aId,
+ // Check if hotkey sequence is already defined:
+ QKeySequence aHotKey = myActionsMgr->registerShortcut(
+ QString::fromStdString(theMessage->keysequence()));
+ // Create feature...
+ XGUI_Command* aCommand = aGroup->addFeature(aFeatureId,
QString::fromStdString(theMessage->text()),
QString::fromStdString(theMessage->tooltip()),
- QIcon(theMessage->icon().c_str()),
- QKeySequence(), isUsePropPanel);
+ QIcon(theMessage->icon().c_str()), aHotKey,
+ isUsePropPanel);
aCommand->setNestedCommands(aNestedFeatures.split(" ", QString::SkipEmptyParts));
myActionsMgr->addCommand(aCommand);
myModule->featureCreated(aCommand);
aCommand = aMenu->feature(theOperation->getDescription()->operationId());
}
//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();
+ SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aDoc = aMgr->rootDocument();
- aDoc->save(theName.toLatin1().constData());
+ aDoc->save(theName.toLatin1().constData(), theFileNames);
QApplication::restoreOverrideCursor();
}
//******************************************************
void XGUI_Workshop::onExit()
{
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aDoc = aMgr->rootDocument();
- if(aDoc->isModified()) {
+ if (aDoc->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) {
void XGUI_Workshop::onOpen()
{
//save current file before close if modified
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aDoc = aMgr->rootDocument();
- if(aDoc->isModified()) {
+ if (aDoc->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;
//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());
- updateCommandStatus();
myObjectBrowser->rebuildDataTree();
+ displayAllResults();
+ updateCommandStatus();
QApplication::restoreOverrideCursor();
}
//******************************************************
bool XGUI_Workshop::onSave()
{
- if(myCurrentDir.isEmpty()) {
+ if (myCurrentDir.isEmpty()) {
return onSaveAs();
}
- saveDocument(myCurrentDir);
+ std::list<std::string> aFiles;
+ saveDocument(myCurrentDir, aFiles);
updateCommandStatus();
+ myMainWindow->setModifiedState(false);
return true;
}
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();
+ SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aDoc = aMgr->rootDocument();
if (aDoc->isOperation())
operationMgr()->abortOperation();
void XGUI_Workshop::onRedo()
{
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aDoc = aMgr->rootDocument();
if (aDoc->isOperation())
operationMgr()->abortOperation();
updateCommandStatus();
}
+//******************************************************
+void XGUI_Workshop::onPreferences()
+{
+ XGUI_Prefs aModif;
+ XGUI_Preferences::editPreferences(aModif);
+ if (aModif.size() > 0) {
+ QString aSection;
+ foreach (XGUI_Pref aPref, aModif)
+ {
+ aSection = aPref.first;
+ if (aSection == XGUI_Preferences::VIEWER_SECTION) {
+ if (!isSalomeMode())
+ myMainWindow->viewer()->updateFromResources();
+ } else if (aSection == XGUI_Preferences::MENU_SECTION) {
+ if (!isSalomeMode())
+ myMainWindow->menuObject()->updateFromResources();
+ }
+ }
+ }
+}
+
//******************************************************
ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
{
- QString libName =
- QString::fromStdString(library(theModule.toStdString()));
+ 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;
}
if (mainWindow()) {
QMessageBox::warning(mainWindow(), tr("Error"), err);
} else {
- qWarning( qPrintable( err ));
+ qWarning(qPrintable(err));
}
}
return aModule;
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())
aCommands.append(aCmd);
}
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ SessionPtr aMgr = ModelAPI_Session::get();
if (aMgr->hasRootDocument()) {
QAction* aUndoCmd;
QAction* aRedoCmd;
- foreach(QAction* aCmd, aCommands) {
+ 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());
} else {
- foreach(QAction* aCmd, aCommands) {
+ foreach(QAction* aCmd, aCommands)
+ {
QString aId = aCmd->data().toString();
if (aId == "NEW_CMD")
aCmd->setEnabled(true);
else if (aId == "EXIT_CMD")
aCmd->setEnabled(true);
- else
+ else
aCmd->setEnabled(false);
}
}
QList<QAction*> XGUI_Workshop::getModuleCommands() const
{
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_Workbench* aWb, aMenuBar->workbenches()) {
- if (aWb != aMenuBar->generalPage()) {
- foreach(XGUI_Command* aCmd, aWb->features())
- aCommands.append(aCmd);
- }
+ foreach(XGUI_Command* aCmd, aMenuBar->features())
+ {
+ aCommands.append(aCmd);
}
}
return aCommands;
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);
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
- hidePropertyPanel(); //<! Invisible by default
+ hidePropertyPanel(); //<! Invisible by default
hideObjectBrowser();
aDesktop->tabifyDockWidget(aObjDock, myPropertyPanel);
connect(aOkBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onCommitOperation()));
QPushButton* aCancelBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
connect(aCancelBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onAbortOperation()));
+//TODO(sbh): KeyReleasedProblem
+ connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)), myOperationMgr,
+ SLOT(onKeyReleased(QKeyEvent*)));
- connect(myPropertyPanel, SIGNAL(keyReleased(const std::string&, QKeyEvent*)),
- myOperationMgr, SLOT(onKeyReleased(const std::string&, QKeyEvent*)));
+ connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)), myOperationMgr,
+ SLOT(onWidgetActivated(ModuleBase_ModelWidget*)));
+ connect(myOperationMgr, SIGNAL(activateNextWidget(ModuleBase_ModelWidget*)), myPropertyPanel,
+ SLOT(onActivateNextWidget(ModuleBase_ModelWidget*)));
+ connect(myOperationMgr, SIGNAL(operationValidated(bool)), myPropertyPanel,
+ SLOT(setAcceptEnabled(bool)));
- connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)),
- myOperationMgr, SLOT(onWidgetActivated(ModuleBase_ModelWidget*)));
- connect(myOperationMgr, SIGNAL(activateNextWidget(ModuleBase_ModelWidget*)),
- myPropertyPanel, SLOT(onActivateNextWidget(ModuleBase_ModelWidget*)));
}
//******************************************************
}
//******************************************************
-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 = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(theObj);
+ if (aPart) {
+ DocumentPtr aPartDoc = aPart->partDoc();
+ if (aPartDoc) {
+ aMgr->setCurrentDocument(aPartDoc);
+ return;
+ }
}
- if (aFeaDoc)
- aMgr->setCurrentDocument(aFeaDoc);
- } else {
- aMgr->setCurrentDocument(aMgr->rootDocument());
}
+ aMgr->setCurrentDocument(aMgr->rootDocument());
}
//******************************************************
emit salomeViewerSelection();
}
-
//**************************************************************
-XGUI_SalomeViewer* XGUI_Workshop::salomeViewer() const
-{
- return mySalomeConnector->viewer();
+XGUI_SalomeViewer* XGUI_Workshop::salomeViewer() const
+{
+ return mySalomeConnector->viewer();
}
//**************************************************************
void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked)
{
- QFeatureList aFeatures = mySelector->selection()->selectedFeatures();
- if ((theId == "ACTIVATE_PART_CMD") && (aFeatures.size() > 0))
- activatePart(aFeatures.first());
- else if (theId == "DEACTIVATE_PART_CMD")
- activatePart(FeaturePtr());
+ QList<ObjectPtr> aObjects = mySelector->selection()->selectedObjects();
+ if ((theId == "ACTIVATE_PART_CMD") && (aObjects.size() > 0)) {
+ ResultPartPtr aPart = boost::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);
}
//**************************************************************
QList<ModuleBase_ModelWidget*>::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end();
for (; anIt != aLast; anIt++) {
ModuleBase_ModelWidget* aCustom = *anIt;
- if (aCustom && (/*!aCustom->isInitialized(aFeature) ||*/ aCustom == aSenderWidget)) {
- aCustom->storeValue(aFeature);
+ if (aCustom && (/*!aCustom->isInitialized(aFeature) ||*/aCustom == aSenderWidget)) {
+ //aCustom->storeValue(aFeature);
+ aCustom->storeValue();
}
}
}
//**************************************************************
-void XGUI_Workshop::activatePart(FeaturePtr theFeature)
+void XGUI_Workshop::activatePart(ResultPartPtr theFeature)
{
+ if (theFeature)
+ theFeature->activate();
changeCurrentDocument(theFeature);
myObjectBrowser->activatePart(theFeature);
}
//**************************************************************
void XGUI_Workshop::activateLastPart()
{
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aDoc = aMgr->rootDocument();
- FeaturePtr aLastPart = aDoc->feature(PARTS_GROUP, aDoc->size(PARTS_GROUP) - 1, true);
- activatePart(aLastPart);
+ std::string aGrpName = ModelAPI_ResultPart::group();
+ ObjectPtr aLastPart = aDoc->object(aGrpName, aDoc->size(aGrpName) - 1);
+ ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(aLastPart);
+ if (aPart)
+ activatePart(aPart);
}
//**************************************************************
-void XGUI_Workshop::deleteFeatures(QFeatureList theList)
+void XGUI_Workshop::deleteObjects(const QList<ObjectPtr>& 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();
+ SessionPtr aMgr = ModelAPI_Session::get();
aMgr->rootDocument()->startOperation();
- foreach (FeaturePtr aFeature, theList) {
- if (aFeature->getKind() == PARTSET_PART_KIND) {
- 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();
- }
+ foreach (ObjectPtr aObj, theList)
+ {
+ ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
+ if (aPart) {
+ DocumentPtr aDoc = aPart->document();
if (aDoc == aMgr->currentDocument()) {
aDoc->close();
}
+ //aMgr->rootDocument()->removeFeature(aPart->owner());
} else {
- if (XGUI_Tools::isModelObject(aFeature)) {
- ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(aFeature);
- aFeature = aObject->featureRef();
- }
+ FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+ if (aFeature)
+ aObj->document()->removeFeature(aFeature);
}
- if (myDisplayer->isVisible(aFeature))
- myDisplayer->erase(aFeature, false);
- aFeature->document()->removeFeature(aFeature);
}
myDisplayer->updateViewer();
aMgr->rootDocument()->finishOperation();
}
//**************************************************************
-void XGUI_Workshop::showFeatures(QFeatureList theList, bool isVisible)
+void XGUI_Workshop::showObjects(const QList<ObjectPtr>& theList, bool isVisible)
{
- if (isVisible) {
- foreach (FeaturePtr aFeature, theList) {
- myDisplayer->display(aFeature, false);
- }
- } else {
- foreach (FeaturePtr aFeature, theList) {
- myDisplayer->erase(aFeature, false);
+ foreach (ObjectPtr aObj, theList)
+ {
+ ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+ if (aRes) {
+ if (isVisible) {
+ myDisplayer->display(aRes, false);
+ } else {
+ myDisplayer->erase(aRes, false);
+ }
}
}
myDisplayer->updateViewer();
}
+//**************************************************************
+void XGUI_Workshop::showOnlyObjects(const QList<ObjectPtr>& theList)
+{
+ myDisplayer->eraseAll(false);
+ showObjects(theList, true);
+}
+
+
//**************************************************************
void XGUI_Workshop::updateCommandsOnViewSelection()
{
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ SessionPtr aMgr = ModelAPI_Session::get();
ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
XGUI_Selection* aSelection = mySelector->selection();
+ if (aSelection->getSelected().size() == 0)
+ return;
QList<QAction*> aActions = getModuleCommands();
- foreach(QAction* aAction, aActions) {
+ foreach(QAction* aAction, aActions)
+ {
QString aId = aAction->data().toString();
- const ModelAPI_Validator* aValidator = aFactory->validator(aId.toStdString());
- if (aValidator) {
- const ModuleBase_SelectionValidator* aSelValidator =
- dynamic_cast<const ModuleBase_SelectionValidator*>(aValidator);
- if (aSelValidator) {
- aAction->setEnabled(aSelValidator->isValid(aSelection));
+ std::list<ModelAPI_Validator*> aValidators;
+ std::list<std::list<std::string> > anArguments;
+ aFactory->validators(aId.toStdString(), aValidators, anArguments);
+ std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
+ for (; aValidator != aValidators.end(); aValidator++) {
+ if (*aValidator) {
+ const ModuleBase_SelectionValidator* aSelValidator =
+ dynamic_cast<const ModuleBase_SelectionValidator*>(*aValidator);
+ if (aSelValidator) {
+ aAction->setEnabled(aSelValidator->isValid(aSelection));
+ }
}
}
}
}
+
+//**************************************************************
+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->rootDocument();
+ displayDocumentResults(aRootDoc);
+ for (int i = 0; i < aRootDoc->size(ModelAPI_ResultPart::group()); i++) {
+ ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), i);
+ ResultPartPtr aPart = boost::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);
+}
