XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
: QObject(),
- myCurrentFile(QString()),
+ myCurrentDir(QString()),
myPartSetModule(NULL),
mySalomeConnector(theConnector),
myPropertyPanel(0),
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*)));
+ 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()), 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") {
- //The created part will be created in Object Browser later and we have to activate that
- // only when it created everywere
+ 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() == "Part") {
+ 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.
//******************************************************
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 aWchName = QString::fromStdString(theMessage->workbenchId());
QString aNestedFeatures = QString::fromStdString(theMessage->nestedFeatures());
bool isUsePropPanel = theMessage->isUseInput();
+ QString aId = QString::fromStdString(theMessage->id());
if (isSalomeMode()) {
- QString aId = QString::fromStdString(theMessage->id());
QAction* aAction = salomeConnector()->addFeature(aWchName,
aId,
QString::fromStdString(theMessage->text()),
aGroup = aPage->addGroup(aGroupName);
}
//Create feature...
- XGUI_Command* aCommand = aGroup->addFeature(QString::fromStdString(theMessage->id()),
+ XGUI_Command* aCommand = aGroup->addFeature(aId,
QString::fromStdString(theMessage->text()),
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,
+ QString(),
+ tr("The folder already contains some files, save anyway?"),
+ QMessageBox::Save|QMessageBox::Cancel);
+ if(answer == QMessageBox::Cancel) {
+ return false;
+ }
}
- onSave();
+ myCurrentDir = aTempDir;
+ return onSave();
}
//******************************************************
}
}
#else
- void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY );
+ void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY | RTLD_GLOBAL );
if ( !modLib ) {
err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
} else {
if (!myPartSetModule)
return false;
myPartSetModule->createFeatures();
+ myActionsMgr->update();
return true;
}
aCmd->setEnabled(false);
}
}
+ myActionsMgr->update();
}
//******************************************************
activatePart(aFeatures.first());
else if (theId == "DEACTIVATE_PART_CMD")
activatePart(FeaturePtr());
-
+ else if (theId == "DELETE_CMD")
+ deleteFeatures(aFeatures);
}
//**************************************************************
FeaturePtr aLastPart = aDoc->feature(PARTS_GROUP, aDoc->size(PARTS_GROUP) - 1, true);
activatePart(aLastPart);
}
+
+//**************************************************************
+void XGUI_Workshop::deleteFeatures(QFeatureList 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);
+ if (aRes == QMessageBox::Yes) {
+ PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ aMgr->rootDocument()->startOperation();
+ foreach (FeaturePtr aFeature, theList) {
+ if (aFeature->getKind() == "Part") {
+ DocumentPtr aDoc = aFeature->data()->docRef("PartDocument")->value();
+ if (aDoc == aMgr->currentDocument()) {
+ aDoc->close();
+ }
+ } //else
+ //aDoc = aFeature->document();
+ aMgr->rootDocument()->removeFeature(aFeature);
+ }
+ aMgr->rootDocument()->finishOperation();
+ }
+}
