#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 <Model_Events.h>
#include <ModelAPI_PluginManager.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
#include <Events_Loop.h>
#include <Events_Error.h>
-#include <ModuleBase_PropPanelOperation.h>
#include <ModuleBase_Operation.h>
+#include <ModuleBase_Operation.h>
+#include <ModuleBase_OperationDescription.h>
+#include <Config_Common.h>
#include <Config_FeatureMessage.h>
#include <Config_PointerMessage.h>
+#include <Config_ModuleReader.h>
#include <QApplication>
#include <QFileDialog>
#include <dlfcn.h>
#endif
+
+QMap<QString, QString> XGUI_Workshop::myIcons;
+
+QString XGUI_Workshop::featureIcon(const std::string& theId)
+{
+ QString aId(theId.c_str());
+ if (myIcons.contains(aId))
+ return myIcons[aId];
+ return QString();
+}
+
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
: QObject(),
myCurrentFile(QString()),
myPartSetModule(NULL),
mySalomeConnector(theConnector),
- myPropertyPanelDock(0),
+ myPropertyPanel(0),
myObjectBrowser(0),
myDisplayer(0)
{
myMainWindow = mySalomeConnector? 0 : new XGUI_MainWindow();
- // In SALOME viewer is accessible only when module is initialized
- // and in SALOME mode myDisplayer object has to be created later
- // So, displayer will be created on demand.
+ myDisplayer = new XGUI_Displayer(this);
mySelector = new XGUI_SelectionMgr(this);
- connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(changeCurrentDocument()));
+
myOperationMgr = new XGUI_OperationMgr(this);
myActionsMgr = new XGUI_ActionsMgr(this);
myErrorDlg = new XGUI_ErrorDialog(myMainWindow);
+ myContextMenuMgr = new XGUI_ContextMenuMgr(this);
+
+ myViewerProxy = new XGUI_ViewerProxy(this);
connect(myOperationMgr, SIGNAL(operationStarted()), this, SLOT(onOperationStarted()));
connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
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("FeatureEvent");
+ 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);
activateModule();
if (myMainWindow) {
myMainWindow->show();
updateCommandStatus();
}
onNew();
- // Testing of document creation
- //boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
- //boost::shared_ptr<ModelAPI_Feature> aPoint1 = aMgr->rootDocument()->addFeature("Point");
- //boost::shared_ptr<ModelAPI_Feature> aPart = aMgr->rootDocument()->addFeature("Part");
- //aPart->execute();
- //aMgr->setCurrentDocument(aPart->data()->docRef("PartDocument")->value());
- //boost::shared_ptr<ModelAPI_Feature> aPoint2 = aMgr->rootDocument()->addFeature("Point");
- //aPoint2 = aMgr->rootDocument()->addFeature("Point");
-
- //aPart = aMgr->rootDocument()->addFeature("Part");
- //aPart->execute();
}
//******************************************************
QIcon(":pictures/close.png"), QKeySequence::Close);
aCommand->connectTo(this, SLOT(onExit()));
+ myContextMenuMgr->createActions();
}
//******************************************************
//******************************************************
void XGUI_Workshop::processEvent(const Events_Message* theMessage)
{
- static Events_ID aFeatureId = Events_Loop::loop()->eventByName("FeatureEvent");
- if (theMessage->eventID() == aFeatureId) {
+ //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);
addFeature(aFeatureMsg);
return;
}
+ //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);
+ boost::shared_ptr<ModelAPI_Feature> aNewFeature = anUpdateMsg->feature();
+ boost::shared_ptr<ModelAPI_Feature> aCurrentFeature = myOperationMgr->currentOperation()->feature();
+ if(aNewFeature == aCurrentFeature) {
+ myPropertyPanel->updateContentWidget(aCurrentFeature);
+ }
+ }
+ //An operation passed by message. Start it, process and commit.
const Config_PointerMessage* aPartSetMsg = dynamic_cast<const Config_PointerMessage*>(theMessage);
if (aPartSetMsg) {
- ModuleBase_PropPanelOperation* anOperation =
- (ModuleBase_PropPanelOperation*)(aPartSetMsg->pointer());
+ ModuleBase_Operation* anOperation =
+ (ModuleBase_Operation*)(aPartSetMsg->pointer());
if (myOperationMgr->startOperation(anOperation)) {
- if (anOperation->xmlRepresentation().isEmpty()) {
+ myPropertyPanel->updateContentWidget(anOperation->feature());
+ if (anOperation->getDescription()->xmlRepresentation().isEmpty()) {
anOperation->commit();
updateCommandStatus();
}
}
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()));
- myErrorDlg->show();
- myErrorDlg->raise();
- myErrorDlg->activateWindow();
+ emit errorOccurred(QString::fromLatin1(anAppError->description()));
+ myErrorDlg->show();
+ myErrorDlg->raise();
+ myErrorDlg->activateWindow();
}
-#ifdef _DEBUG
- qDebug() << "XGUI_Workshop::ProcessEvent: "
- << "Catch message, but it can not be processed.";
-#endif
-
}
//******************************************************
void XGUI_Workshop::onOperationStarted()
{
- ModuleBase_PropPanelOperation* aOperation =
- (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
+ ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
- if(!aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
+ if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) { //!< No need for property panel
connectWithOperation(aOperation);
- QWidget* aPropWidget = myPropertyPanelDock->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
- qDeleteAll(aPropWidget->children());
showPropertyPanel();
ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation);
- aFactory.createWidget(aPropWidget);
- setPropertyPannelTitle(aOperation->description());
+ QWidget* aContent = myPropertyPanel->contentWidget();
+ qDeleteAll(aContent->children());
+ aFactory.createWidget(aContent);
+ myPropertyPanel->setModelWidgets(aFactory.getModelWidgets());
+ myPropertyPanel->setWindowTitle(aOperation->getDescription()->description());
}
}
//******************************************************
void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
{
- ModuleBase_PropPanelOperation* aOperation =
- (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
+ ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
- if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
- updateCommandStatus();
- } else {
- hidePropertyPanel();
- updateCommandStatus();
+ //!< No need for property panel
+ updateCommandStatus();
+ hidePropertyPanel();
+ if(myOperationMgr->operationsCount() > 1) {
+ myActionsMgr->updateAction(theOperation->getDescription()->operationId());
+ return;
+ }
+ if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) {
myActionsMgr->restoreCommandState();
}
}
#endif
return;
}
+ // Remember features icons
+ myIcons[QString::fromStdString(theMessage->id())] = QString::fromStdString(theMessage->icon());
+
//Find or create Workbench
QString aWchName = QString::fromStdString(theMessage->workbenchId());
QString aNestedFeatures = QString::fromStdString(theMessage->nestedFeatures());
*/
void XGUI_Workshop::connectWithOperation(ModuleBase_Operation* theOperation)
{
- QPushButton* aOkBtn = myPropertyPanelDock->findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+ QPushButton* aOkBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
connect(aOkBtn, SIGNAL(clicked()), theOperation, SLOT(commit()));
- QPushButton* aCancelBtn = myPropertyPanelDock->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
+ QPushButton* aCancelBtn = myPropertyPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
connect(aCancelBtn, SIGNAL(clicked()), theOperation, SLOT(abort()));
QAction* aCommand = 0;
if (isSalomeMode()) {
- aCommand = salomeConnector()->command(theOperation->operationId());
+ aCommand = salomeConnector()->command(theOperation->getDescription()->operationId());
} else {
XGUI_MainMenu* aMenu = myMainWindow->menuObject();
- aCommand = aMenu->feature(theOperation->operationId());
+ aCommand = aMenu->feature(theOperation->getDescription()->operationId());
}
//Abort operation on uncheck the command
connect(aCommand, SIGNAL(triggered(bool)), theOperation, SLOT(setRunning(bool)));
createDockWidgets();
mySelector->connectViewers();
}
+ myViewerProxy->connectToViewer();
showObjectBrowser();
if (!isSalomeMode()) {
myMainWindow->showPythonConsole();
}
//show file dialog, check if readable and open
- myCurrentFile = QFileDialog::getOpenFileName(mainWindow());
+ myCurrentFile = QFileDialog::getExistingDirectory(mainWindow());
if(myCurrentFile.isEmpty())
return;
QFileInfo aFileInfo(myCurrentFile);
objectBrowser()->setCurrentIndex(QModelIndex());
boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+ if (!operationMgr()->abortOperation())
+ return;
aDoc->undo();
updateCommandStatus();
}
//******************************************************
XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
{
- QString libName = library(theModule);
+ QString libName =
+ QString::fromStdString(library(theModule.toStdString()));
if (libName.isEmpty()) {
qWarning(
qPrintable( tr( "Information about module \"%1\" doesn't exist." ).arg( theModule ) ));
CREATE_FUNC crtInst = 0;
#ifdef WIN32
-
HINSTANCE modLib = ::LoadLibrary((LPTSTR) qPrintable(libName));
if (!modLib) {
LPVOID lpMsgBuf;
}
#else
void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY );
- if ( !modLib )
- err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
- else
- {
+ if ( !modLib ) {
+ err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
+ } else {
crtInst = (CREATE_FUNC)dlsym( modLib, CREATE_MODULE );
- if ( !crtInst )
- err = QString( "Failed to find function %1. %2" ).arg( CREATE_MODULE ).arg( dlerror() );
+ if ( !crtInst ) {
+ err = QString( "Failed to find function %1. %2" ).arg( CREATE_MODULE ).arg( dlerror() );
+ }
}
#endif
XGUI_Module* aModule = crtInst ? crtInst(this) : 0;
if (!err.isEmpty()) {
- if (mainWindow() && mainWindow()->isVisible())
+ if (mainWindow()) {
QMessageBox::warning(mainWindow(), tr("Error"), err);
- else
+ } else {
qWarning( qPrintable( err ));
+ }
}
return aModule;
}
//******************************************************
bool XGUI_Workshop::activateModule()
{
- myPartSetModule = loadModule("PartSet");
+ Config_ModuleReader aModuleReader;
+ QString moduleName = QString::fromStdString(aModuleReader.getModuleName());
+ myPartSetModule = loadModule(moduleName);
if (!myPartSetModule)
return false;
myPartSetModule->createFeatures();
if (aMgr->hasRootDocument()) {
XGUI_Command* aUndoCmd;
XGUI_Command* aRedoCmd;
- for (aIt = aCommands.constBegin(); aIt != aCommands.constEnd(); ++aIt) {
- if ((*aIt)->id() == "UNDO_CMD")
- aUndoCmd = (*aIt);
- else if ((*aIt)->id() == "REDO_CMD")
- aRedoCmd = (*aIt);
+ foreach(XGUI_Command* aCmd, aCommands) {
+ if (aCmd->id() == "UNDO_CMD")
+ aUndoCmd = aCmd;
+ else if (aCmd->id() == "REDO_CMD")
+ aRedoCmd = aCmd;
else // Enable all commands
- (*aIt)->enable();
+ aCmd->enable();
}
boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
aUndoCmd->setEnabled(aDoc->canUndo());
aRedoCmd->setEnabled(aDoc->canRedo());
} else {
- for (aIt = aCommands.constBegin(); aIt != aCommands.constEnd(); ++aIt) {
- if ((*aIt)->id() == "NEW_CMD")
- (*aIt)->enable();
- else if ((*aIt)->id() == "EXIT_CMD")
- (*aIt)->enable();
+ foreach(XGUI_Command* aCmd, aCommands) {
+ if (aCmd->id() == "NEW_CMD")
+ aCmd->enable();
+ else if (aCmd->id() == "EXIT_CMD")
+ aCmd->enable();
else
- (*aIt)->disable();
+ aCmd->disable();
}
}
}
aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
aObjDock->setWindowTitle(tr("Object browser"));
myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
+ connect(myObjectBrowser, SIGNAL(activePartChanged(FeaturePtr)), this, SLOT(changeCurrentDocument(FeaturePtr)));
aObjDock->setWidget(myObjectBrowser);
- return aObjDock;
-}
-
-//******************************************************
-QDockWidget* XGUI_Workshop::createPropertyPanel(QWidget* theParent)
-{
- QDockWidget* aPropPanel = new QDockWidget(theParent);
- aPropPanel->setWindowTitle(tr("Property Panel"));
- QAction* aViewAct = aPropPanel->toggleViewAction();
- aPropPanel->setObjectName(XGUI::PROP_PANEL);
-
- QWidget* aContent = new QWidget(aPropPanel);
- QVBoxLayout* aMainLay = new QVBoxLayout(aContent);
- aMainLay->setContentsMargins(3, 3, 3, 3);
- aPropPanel->setWidget(aContent);
-
- QFrame* aFrm = new QFrame(aContent);
- aFrm->setFrameStyle(QFrame::Sunken);
- aFrm->setFrameShape(QFrame::Panel);
- QHBoxLayout* aBtnLay = new QHBoxLayout(aFrm);
- aBtnLay->setContentsMargins(0, 0, 0, 0);
- aMainLay->addWidget(aFrm);
-
- QPushButton* aBtn = new QPushButton(QIcon(":pictures/button_help.png"), "", aFrm);
- aBtn->setFlat(true);
- aBtnLay->addWidget(aBtn);
- aBtnLay->addStretch(1);
- aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm);
- aBtn->setObjectName(XGUI::PROP_PANEL_OK);
- aBtn->setFlat(true);
- aBtnLay->addWidget(aBtn);
- aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
- aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL);
- aBtn->setFlat(true);
- aBtnLay->addWidget(aBtn);
-
- QWidget* aCustomWidget = new QWidget(aContent);
- aCustomWidget->setObjectName(XGUI::PROP_PANEL_WDG);
- aMainLay->addWidget(aCustomWidget);
- aMainLay->addStretch(1);
-
- return aPropPanel;
-}
-//******************************************************
-void XGUI_Workshop::setPropertyPannelTitle(const QString& theTitle)
-{
- myPropertyPanelDock->setWindowTitle(theTitle);
+ myContextMenuMgr->connectObjectBrowser();
+ return aObjDock;
}
//******************************************************
myMainWindow;
QDockWidget* aObjDock = createObjectBrowser(aDesktop);
aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
- myPropertyPanelDock = createPropertyPanel(aDesktop);
- aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanelDock);
+ myPropertyPanel = new XGUI_PropertyPanel(aDesktop);
+ aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
hidePropertyPanel(); //<! Invisible by default
hideObjectBrowser();
- aDesktop->tabifyDockWidget(aObjDock, myPropertyPanelDock);
+ aDesktop->tabifyDockWidget(aObjDock, myPropertyPanel);
}
//******************************************************
void XGUI_Workshop::showPropertyPanel()
{
- QAction* aViewAct = myPropertyPanelDock->toggleViewAction();
+ QAction* aViewAct = myPropertyPanel->toggleViewAction();
//<! Restore ability to close panel from the window's menu
aViewAct->setEnabled(true);
- myPropertyPanelDock->show();
- myPropertyPanelDock->raise();
+ myPropertyPanel->show();
+ myPropertyPanel->raise();
}
//******************************************************
void XGUI_Workshop::hidePropertyPanel()
{
- QAction* aViewAct = myPropertyPanelDock->toggleViewAction();
+ QAction* aViewAct = myPropertyPanel->toggleViewAction();
//<! Do not allow to show empty property panel
aViewAct->setEnabled(false);
- myPropertyPanelDock->hide();
+ myPropertyPanel->hide();
}
//******************************************************
}
//******************************************************
-XGUI_Displayer* XGUI_Workshop::displayer() const
+void XGUI_Workshop::changeCurrentDocument(FeaturePtr thePart)
{
- // In SALOME viewer is accessible only when module is initialized
- // and in SALOME mode myDisplayer object has to be created later (on demand)
- if (!myDisplayer) {
- XGUI_Workshop* that = (XGUI_Workshop*)this;
- that->myDisplayer = isSalomeMode() ?
- new XGUI_Displayer(salomeViewer()->AISContext()):
- new XGUI_Displayer(myMainWindow->viewer()->AISContext());
- }
- return myDisplayer;
-}
-
-//******************************************************
-void XGUI_Workshop::changeCurrentDocument()
-{
- QFeatureList aFeatures = objectBrowser()->selectedFeatures();
-
- // Set current document
- if (aFeatures.size() > 0) {
- FeaturePtr aFeature = aFeatures.first();
-
- boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
- boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = aFeature->data()->docRef("PartDocument");
+ boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+ if (thePart) {
+ boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = thePart->data()->docRef("PartDocument");
if (aDocRef)
aMgr->setCurrentDocument(aDocRef->value());
+ } else {
+ aMgr->setCurrentDocument(aMgr->rootDocument());
}
}
