-#include "XGUI_Module.h"
+#include "ModuleBase_IModule.h"
#include "XGUI_Constants.h"
#include "XGUI_Command.h"
#include "XGUI_MainMenu.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 <ModelAPI_Data.h>
#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_Object.h>
+#include <ModelAPI_Validator.h>
#include <PartSetPlugin_Part.h>
#include <Events_Loop.h>
#include <Events_Error.h>
+
#include <ModuleBase_Operation.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_SelectionValidator.h>
+
#include <Config_Common.h>
#include <Config_FeatureMessage.h>
#include <Config_PointerMessage.h>
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
: QObject(),
myCurrentDir(QString()),
- myPartSetModule(NULL),
+ myModule(NULL),
mySalomeConnector(theConnector),
myPropertyPanel(0),
myObjectBrowser(0),
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);
this, SLOT(onContextMenuCommand(const QString&, bool)));
myViewerProxy = new XGUI_ViewerProxy(this);
+ connect(myViewerProxy, SIGNAL(selectionChanged()), this, SLOT(updateCommandsOnViewSelection()));
myModuleConnector = new XGUI_ModuleConnector(this);
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_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_FEATURE_UPDATED));
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_CREATED));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_TO_REDISPLAY));
activateModule();
if (myMainWindow) {
}
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();
+ onFeatureCreatedMsg(aUpdMsg);
+ }
- 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()));
- }
+ // Redisplay feature
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_TO_REDISPLAY)) {
+ const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast<const Model_FeatureUpdatedMessage*>(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.
- static Events_ID aFeatureUpdatedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_UPDATED);
- if (theMessage->eventID() == aFeatureUpdatedId && myOperationMgr->hasOperation())
- {
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_UPDATED)) {
const Model_FeatureUpdatedMessage* anUpdateMsg =
dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
- std::set<FeaturePtr> aFeatures = anUpdateMsg->features();
-
- FeaturePtr aCurrentFeature = myOperationMgr->currentOperation()->feature();
- std::set<FeaturePtr>::const_iterator aIt;
- for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
- FeaturePtr aNewFeature = (*aIt);
- if(aNewFeature == aCurrentFeature) {
- myPropertyPanel->updateContentWidget(aCurrentFeature);
- break;
- }
- }
+ onFeatureUpdatedMsg(anUpdateMsg);
}
+
//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());
+ 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();
if (myOperationMgr->startOperation(anOperation)) {
myPropertyPanel->updateContentWidget(anOperation->feature());
- if (anOperation->getDescription()->xmlRepresentation().isEmpty()) {
+ if (!anOperation->getDescription()->hasXmlRepresentation()) {
anOperation->commit();
updateCommandStatus();
}
if (anAppError) {
emit errorOccurred(QString::fromLatin1(anAppError->description()));
}
+}
+
+//******************************************************
+void XGUI_Workshop::onFeatureUpdatedMsg(const Model_FeatureUpdatedMessage* theMsg)
+{
+ std::set<FeaturePtr> aFeatures = theMsg->features();
+ if (myOperationMgr->hasOperation())
+ {
+ FeaturePtr aCurrentFeature = myOperationMgr->currentOperation()->feature();
+ std::set<FeaturePtr>::const_iterator aIt;
+ for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
+ FeaturePtr aNewFeature = (*aIt);
+ if(aNewFeature == aCurrentFeature) {
+ myPropertyPanel->updateContentWidget(aCurrentFeature);
+ break;
+ }
+ }
+ }
+}
+//******************************************************
+void XGUI_Workshop::onFeatureRedisplayMsg(const Model_FeatureUpdatedMessage* 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() != PartSetPlugin_Part::ID()) {
+ isDisplayed = myDisplayer->redisplay(aFeature, false);
+ }
+ }
+ if (isDisplayed)
+ myDisplayer->updateViewer();
}
+//******************************************************
+void XGUI_Workshop::onFeatureCreatedMsg(const Model_FeatureUpdatedMessage* theMsg)
+{
+ std::set<FeaturePtr> aFeatures = theMsg->features();
+
+ std::set<FeaturePtr>::const_iterator aIt;
+ bool aHasPart = false;
+ bool isDisplayed = false;
+ for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
+ FeaturePtr aFeature = (*aIt);
+ if (aFeature->getKind() == PartSetPlugin_Part::ID()) {
+ aHasPart = true;
+ //break;
+ } else {
+ isDisplayed = myDisplayer->display(aFeature, false);
+ }
+ }
+ if (isDisplayed)
+ myDisplayer->updateViewer();
+ 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()));
+ }
+}
+
//******************************************************
void XGUI_Workshop::onOperationStarted()
{
ModuleBase_Operation* aOperation = myOperationMgr->currentOperation();
- if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) { //!< No need for property panel
+ 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);
+
+ 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()));
+ // Init default values
+ if (!aOperation->isEditOperation() && aWidget->hasDefaultValue()) {
+ aWidget->storeValue(aOperation->feature());
+ }
+ }
- ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation, myModuleConnector);
- QWidget* aContent = myPropertyPanel->contentWidget();
- qDeleteAll(aContent->children());
- aFactory.createWidget(aContent);
- myPropertyPanel->setModelWidgets(aFactory.getModelWidgets());
+ myPropertyPanel->setModelWidgets(aWidgets);
myPropertyPanel->setWindowTitle(aOperation->getDescription()->description());
}
updateCommandStatus();
//!< No need for property panel
updateCommandStatus();
hidePropertyPanel();
+ myPropertyPanel->cleanContent();
}
/*
QKeySequence(), isUsePropPanel);
salomeConnector()->setNestedActions(aId, aNestedFeatures.split(" "));
myActionsMgr->addCommand(aAction);
- myPartSetModule->featureCreated(aAction);
+ myModule->featureCreated(aAction);
} else {
XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
QKeySequence(), isUsePropPanel);
aCommand->setNestedCommands(aNestedFeatures.split(" ", QString::SkipEmptyParts));
myActionsMgr->addCommand(aCommand);
- myPartSetModule->featureCreated(aCommand);
+ myModule->featureCreated(aCommand);
}
}
aWnd->showMaximized();
updateCommandStatus();
}
+ myContextMenuMgr->connectViewer();
QApplication::restoreOverrideCursor();
}
}
QApplication::setOverrideCursor(Qt::WaitCursor);
aDoc->load(myCurrentDir.toLatin1().constData());
- QApplication::restoreOverrideCursor();
updateCommandStatus();
+ myObjectBrowser->rebuildDataTree();
+ QApplication::restoreOverrideCursor();
}
//******************************************************
}
//******************************************************
-XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
+ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
{
QString libName =
QString::fromStdString(library(theModule.toStdString()));
}
#endif
- XGUI_Module* aModule = crtInst ? crtInst(this) : 0;
+ ModuleBase_IModule* aModule = crtInst ? crtInst(this) : 0;
if (!err.isEmpty()) {
if (mainWindow()) {
{
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;
}
myActionsMgr->update();
}
+//******************************************************
+QList<QAction*> XGUI_Workshop::getModuleCommands() const
+{
+ QList<QAction*> aCommands;
+ 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);
+ }
+ }
+ }
+ return aCommands;
+}
+
//******************************************************
QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
{
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*)));
}
//******************************************************
if (aCmd) {
QString aId = salomeConnector()->commandId(aCmd);
if (!aId.isNull())
- myPartSetModule->launchOperation(aId);
+ myModule->launchOperation(aId);
}
}
//**************************************************************
void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked)
{
- QFeatureList aFeatures = mySelector->selectedFeatures();
+ QFeatureList aFeatures = mySelector->selection()->selectedFeatures();
if ((theId == "ACTIVATE_PART_CMD") && (aFeatures.size() > 0))
activatePart(aFeatures.first());
else if (theId == "DEACTIVATE_PART_CMD")
showFeatures(aFeatures, false);
}
+//**************************************************************
+void XGUI_Workshop::onWidgetValuesChanged()
+{
+ ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ FeaturePtr aFeature = anOperation->feature();
+
+ ModuleBase_ModelWidget* aSenderWidget = dynamic_cast<ModuleBase_ModelWidget*>(sender());
+ //if (aCustom)
+ // aCustom->storeValue(aFeature);
+
+ 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->isInitialized(aFeature) ||*/ aCustom == aSenderWidget)) {
+ aCustom->storeValue(aFeature);
+ }
+ }
+}
+
//**************************************************************
void XGUI_Workshop::activatePart(FeaturePtr theFeature)
{
{
PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
DocumentPtr aDoc = aMgr->rootDocument();
- FeaturePtr aLastPart = aDoc->feature(PARTS_GROUP, aDoc->size(PARTS_GROUP) - 1, true);
+ FeaturePtr aLastPart = aDoc->feature(ModelAPI_Document::PARTS_GROUP(),
+ aDoc->size(ModelAPI_Document::PARTS_GROUP()) - 1, true);
activatePart(aLastPart);
}
PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
aMgr->rootDocument()->startOperation();
foreach (FeaturePtr aFeature, theList) {
- if (aFeature->getKind() == PARTSET_PART_KIND) {
+ if (aFeature->getKind() == PartSetPlugin_Part::ID()) {
DocumentPtr aDoc;
if (!XGUI_Tools::isModelObject(aFeature)) {
aDoc = aFeature->data()->docRef("PartDocument")->value();
aFeature = aObject->featureRef();
}
}
+ 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)
{
-// foreach (FeaturePtr aFeature, theList) {
-// }
+ if (isVisible) {
+ foreach (FeaturePtr aFeature, theList) {
+ myDisplayer->display(aFeature, false);
+ }
+ } else {
+ foreach (FeaturePtr aFeature, theList) {
+ myDisplayer->erase(aFeature, false);
+ }
+ }
+ myDisplayer->updateViewer();
+}
+
+//**************************************************************
+void XGUI_Workshop::updateCommandsOnViewSelection()
+{
+ PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
+ XGUI_Selection* aSelection = mySelector->selection();
+
+ QList<QAction*> aActions = getModuleCommands();
+ 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));
+ }
+ }
+ }
}
