#include "XGUI_ViewerProxy.h"
#include "XGUI_PropertyPanel.h"
#include "XGUI_ContextMenuMgr.h"
+#include "XGUI_ModuleConnector.h"
#include <Model_Events.h>
#include <ModelAPI_PluginManager.h>
#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_Object.h>
+#include <PartSetPlugin_Part.h>
+
#include <Events_Loop.h>
#include <Events_Error.h>
#include <ModuleBase_Operation.h>
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
: QObject(),
- myCurrentFile(QString()),
+ myCurrentDir(QString()),
myPartSetModule(NULL),
mySalomeConnector(theConnector),
myPropertyPanel(0),
this, SLOT(onContextMenuCommand(const QString&, bool)));
myViewerProxy = new XGUI_ViewerProxy(this);
-
- connect(myOperationMgr, SIGNAL(operationStarted()), this, SLOT(onOperationStarted()));
- connect(myOperationMgr, SIGNAL(operationResumed()), this, SLOT(onOperationStarted()));
- connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
- this, SLOT(onOperationStopped(ModuleBase_Operation*)));
+
+ 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(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&)));
}
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_Loop::eventByName(EVENT_FEATURE_DELETED));
activateModule();
if (myMainWindow) {
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
}
//******************************************************
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);
- addFeature(aFeatureMsg);
+ 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);
- FeaturePtr aFeature = aUpdMsg->feature();
- if (aFeature->getKind() == "Part") {
+ std::set<FeaturePtr> aFeatures = aUpdMsg->features();
+
+ std::set<FeaturePtr>::const_iterator aIt;
+ bool aHasPart = false;
+ for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
+ FeaturePtr aFeature = (*aIt);
+ if (aFeature->getKind() == PARTSET_PART_KIND) {
+ aHasPart = true;
+ break;
+ }
+ }
+ 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()));
}
}
- // Process deletion of a part
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_DELETED)) {
- PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
- if (aMgr->currentDocument() == aMgr->rootDocument())
- activatePart(FeaturePtr()); // Activate PartSet
- }
-
//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);
{
const Model_FeatureUpdatedMessage* anUpdateMsg =
dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
- FeaturePtr aNewFeature = anUpdateMsg->feature();
+ std::set<FeaturePtr> aFeatures = anUpdateMsg->features();
+
FeaturePtr aCurrentFeature = myOperationMgr->currentOperation()->feature();
- if(aNewFeature == aCurrentFeature) {
- myPropertyPanel->updateContentWidget(aCurrentFeature);
+ std::set<FeaturePtr>::const_iterator aIt;
+ for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
+ FeaturePtr 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) {
+ // Clear previous content
+ myPropertyPanel->cleanContent();
ModuleBase_Operation* anOperation =
(ModuleBase_Operation*)(aPartSetMsg->pointer());
const Events_Error* anAppError = dynamic_cast<const Events_Error*>(theMessage);
if (anAppError) {
emit errorOccurred(QString::fromLatin1(anAppError->description()));
- myErrorDlg->show();
- myErrorDlg->raise();
- myErrorDlg->activateWindow();
}
}
showPropertyPanel();
- ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation);
+ ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation, myModuleConnector);
QWidget* aContent = myPropertyPanel->contentWidget();
qDeleteAll(aContent->children());
aFactory.createWidget(aContent);
myPropertyPanel->setModelWidgets(aFactory.getModelWidgets());
myPropertyPanel->setWindowTitle(aOperation->getDescription()->description());
}
+ updateCommandStatus();
}
//******************************************************
void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
{
- ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
-
//!< No need for property panel
updateCommandStatus();
hidePropertyPanel();
- if(myOperationMgr->operationsCount() > 1) {
- myActionsMgr->updateAction(theOperation->getDescription()->operationId());
- return;
- }
- if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) {
- myActionsMgr->restoreCommandState();
- }
}
/*
QString::fromStdString(theMessage->tooltip()),
QIcon(theMessage->icon().c_str()),
QKeySequence(), isUsePropPanel);
- myActionsMgr->addCommand(aAction);
salomeConnector()->setNestedActions(aId, aNestedFeatures.split(" "));
+ myActionsMgr->addCommand(aAction);
myPartSetModule->featureCreated(aAction);
} else {
QString::fromStdString(theMessage->tooltip()),
QIcon(theMessage->icon().c_str()),
QKeySequence(), isUsePropPanel);
- aCommand->setUnblockableCommands(aNestedFeatures.split(" "));
+ aCommand->setNestedCommands(aNestedFeatures.split(" ", QString::SkipEmptyParts));
myActionsMgr->addCommand(aCommand);
myPartSetModule->featureCreated(aCommand);
}
tr("The document is modified, save before exit?"),
QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel);
if(anAnswer == QMessageBox::Save) {
- onSave();
+ bool saved = onSave();
+ if(!saved) {
+ return;
+ }
} else if (anAnswer == QMessageBox::Cancel) {
return;
}
return;
}
aDoc->close();
- myCurrentFile = "";
+ myCurrentDir = "";
}
//show file dialog, check if readable and open
- myCurrentFile = QFileDialog::getExistingDirectory(mainWindow());
- if(myCurrentFile.isEmpty())
+ myCurrentDir = QFileDialog::getExistingDirectory(mainWindow());
+ if(myCurrentDir.isEmpty())
return;
- QFileInfo aFileInfo(myCurrentFile);
+ QFileInfo aFileInfo(myCurrentDir);
if(!aFileInfo.exists() || !aFileInfo.isReadable()) {
QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to open the file."));
- myCurrentFile = "";
+ myCurrentDir = "";
return;
}
QApplication::setOverrideCursor(Qt::WaitCursor);
- aDoc->load(myCurrentFile.toLatin1().constData());
+ aDoc->load(myCurrentDir.toLatin1().constData());
QApplication::restoreOverrideCursor();
updateCommandStatus();
}
//******************************************************
-void XGUI_Workshop::onSave()
+bool XGUI_Workshop::onSave()
{
- if(myCurrentFile.isEmpty()) {
- onSaveAs();
- return;
+ if(myCurrentDir.isEmpty()) {
+ return onSaveAs();
}
- saveDocument(myCurrentFile);
+ saveDocument(myCurrentDir);
updateCommandStatus();
+ return true;
}
//******************************************************
-void XGUI_Workshop::onSaveAs()
+bool XGUI_Workshop::onSaveAs()
{
- QString aTemp = myCurrentFile;
- myCurrentFile = QFileDialog::getSaveFileName(mainWindow());
- if(myCurrentFile.isEmpty()) {
- myCurrentFile = aTemp;
- return;
+ QFileDialog dialog(mainWindow());
+ dialog.setWindowTitle(tr("Select directory to save files..."));
+ dialog.setFileMode(QFileDialog::Directory);
+ dialog.setFilter(tr("Folders (*)"));
+ dialog.setOptions(QFileDialog::HideNameFilterDetails | QFileDialog::ShowDirsOnly);
+ dialog.setViewMode(QFileDialog::Detail);
+
+ if(!dialog.exec()) {
+ return false;
}
- QFileInfo aFileInfo(myCurrentFile);
- if(aFileInfo.exists() && !aFileInfo.isWritable()) {
- QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to save the file."));
- return;
+ 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) {
+ return false;
+ }
}
- onSave();
+ myCurrentDir = aTempDir;
+ return onSave();
}
//******************************************************
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
DocumentPtr aDoc = aMgr->rootDocument();
+ if (aDoc->isOperation())
+ operationMgr()->abortOperation();
aDoc->redo();
updateCommandStatus();
}
if (!myPartSetModule)
return false;
myPartSetModule->createFeatures();
+ myActionsMgr->update();
return true;
}
aCmd->setEnabled(false);
}
}
+ myActionsMgr->update();
}
//******************************************************
QDockWidget* aObjDock = new QDockWidget(theParent);
aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
aObjDock->setWindowTitle(tr("Object browser"));
+ 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)));
aObjDock->setWidget(myObjectBrowser);
connect(aOkBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onCommitOperation()));
QPushButton* aCancelBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
connect(aCancelBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onAbortOperation()));
+
+ connect(myPropertyPanel, SIGNAL(keyReleased(const std::string&, QKeyEvent*)),
+ myOperationMgr, SLOT(onKeyReleased(const std::string&, QKeyEvent*)));
}
//******************************************************
{
PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
if (thePart) {
- boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = thePart->data()->docRef("PartDocument");
- if (aDocRef)
- aMgr->setCurrentDocument(aDocRef->value());
+ 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();
+ }
+ if (aFeaDoc)
+ aMgr->setCurrentDocument(aFeaDoc);
} else {
aMgr->setCurrentDocument(aMgr->rootDocument());
}
activatePart(FeaturePtr());
else if (theId == "DELETE_CMD")
deleteFeatures(aFeatures);
+ else if (theId == "SHOW_CMD")
+ showFeatures(aFeatures, true);
+ else if (theId == "HIDE_CMD")
+ showFeatures(aFeatures, false);
}
//**************************************************************
PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
aMgr->rootDocument()->startOperation();
foreach (FeaturePtr aFeature, theList) {
- if (aFeature->getKind() == "Part") {
- DocumentPtr aDoc = aFeature->data()->docRef("PartDocument")->value();
+ 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();
+ }
if (aDoc == aMgr->currentDocument()) {
aDoc->close();
}
- } //else
- //aDoc = aFeature->document();
- aMgr->rootDocument()->removeFeature(aFeature);
+ } else {
+ if (XGUI_Tools::isModelObject(aFeature)) {
+ ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(aFeature);
+ aFeature = aObject->featureRef();
+ }
+ }
+ aFeature->document()->removeFeature(aFeature);
}
aMgr->rootDocument()->finishOperation();
}
}
+
+//**************************************************************
+void XGUI_Workshop::showFeatures(QFeatureList theList, bool isVisible)
+{
+// foreach (FeaturePtr aFeature, theList) {
+// }
+}
