#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 "XGUI_ContextMenuMgr.h"
#include "XGUI_ModuleConnector.h"
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
#include <ModelAPI_PluginManager.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_AttributeDocRef.h>
#include <ModelAPI_Object.h>
+#include <ModelAPI_Validator.h>
+#include <ModelAPI_ResultPart.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()));
+ //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]
- aLoop->registerListener(this, aLoop->eventByName(EVENT_FEATURE_LOADED));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_LOADED));
// TODO Is it good to use non standard event within workshop?
- aLoop->registerListener(this, aLoop->eventByName("PartSetModuleEvent"));
- aLoop->registerListener(this, aLoop->eventByName(EVENT_FEATURE_UPDATED));
- aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_CREATED));
- aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_TO_REDISPLAY));
+ 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_OBJECT_TO_REDISPLAY));
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED));
activateModule();
if (myMainWindow) {
}
// Process creation of Part
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_CREATED)) {
- const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
+ const ModelAPI_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
onFeatureCreatedMsg(aUpdMsg);
+ return;
}
// Redisplay feature
- if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_TO_REDISPLAY)) {
- const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)) {
+ const ModelAPI_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
onFeatureRedisplayMsg(aUpdMsg);
+ 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) {
- const Model_FeatureUpdatedMessage* anUpdateMsg =
- dynamic_cast<const Model_FeatureUpdatedMessage*>(theMessage);
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
+ const ModelAPI_ObjectUpdatedMessage* anUpdateMsg =
+ dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
onFeatureUpdatedMsg(anUpdateMsg);
+ return;
+ }
+
+ if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) {
+ const ModelAPI_ObjectDeletedMessage* aDelMsg =
+ dynamic_cast<const ModelAPI_ObjectDeletedMessage*>(theMessage);
+ onObjectDeletedMsg(aDelMsg);
+ return;
}
//An operation passed by message. Start it, process and commit.
- const Config_PointerMessage* aPartSetMsg = dynamic_cast<const Config_PointerMessage*>(theMessage);
- if (aPartSetMsg) {
- myPropertyPanel->cleanContent();
+ 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)) {
}
//******************************************************
-void XGUI_Workshop::onFeatureUpdatedMsg(const Model_FeatureUpdatedMessage* theMsg)
+void XGUI_Workshop::onFeatureUpdatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
{
- std::set<FeaturePtr> aFeatures = theMsg->features();
+ 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);
+ ObjectPtr 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;
- for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) {
- FeaturePtr aFeature = (*aIt);
- if (aFeature->getKind() != PARTSET_PART_KIND) {
- if (myDisplayer->isVisible(aFeature))
- myDisplayer->redisplay(aFeature, false);
- else
- myDisplayer->display(aFeature, false);
+void XGUI_Workshop::onFeatureRedisplayMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
+{
+ std::set<ObjectPtr> aObjects = theMsg->objects();
+ std::set<ObjectPtr>::const_iterator aIt;
+ bool isDisplayed = false;
+ for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ ObjectPtr aObj = (*aIt);
+ ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+ if (aRes) {
+ if (aRes->data())
+ isDisplayed = myDisplayer->redisplay(aRes, false);
+ else {
+ myDisplayer->erase(aRes, false);
+ isDisplayed = true;
+ }
}
}
- myDisplayer->updateViewer();
+ if (isDisplayed)
+ 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> aFeatures = 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) {
+ ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(*aIt);
+ if (aPart) {
aHasPart = true;
//break;
} else {
- myDisplayer->display(aFeature, false);
+ ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(*aIt);
+ if (aRes)
+ isDisplayed = myDisplayer->display(aRes, false);
}
}
- myDisplayer->updateViewer();
+ 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::onObjectDeletedMsg(const ModelAPI_ObjectDeletedMessage* theMsg)
+{
+ //std::set<ObjectPtr> aFeatures = theMsg->objects();
+}
//******************************************************
void XGUI_Workshop::onOperationStarted()
showPropertyPanel();
QString aXmlRepr = aOperation->getDescription()->xmlRepresentation();
ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(), myModuleConnector);
- QWidget* aContent = myPropertyPanel->contentWidget();
- qDeleteAll(aContent->children());
- aFactory.createWidget(aContent);
+
+ myPropertyPanel->cleanContent();
+ aFactory.createWidget(myPropertyPanel->contentWidget());
QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
QList<ModuleBase_ModelWidget*>::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end();
//!< No need for property panel
updateCommandStatus();
hidePropertyPanel();
- //myPropertyPanel->cleanContent();
+ 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);
}
}
{
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;
}
}
//******************************************************
-void XGUI_Workshop::updateModuleCommands()
+QList<QAction*> XGUI_Workshop::getModuleCommands() const
{
QList<QAction*> aCommands;
if (isSalomeMode()) { // update commands in SALOME mode
}
}
}
- foreach(QAction* aCmd, aCommands) {
- aCmd->setEnabled(myPartSetModule->isFeatureEnabled(aCmd->data().toString()));
- }
+ return aCommands;
}
//******************************************************
if (aCmd) {
QString aId = salomeConnector()->commandId(aCmd);
if (!aId.isNull())
- myPartSetModule->launchOperation(aId);
+ myModule->launchOperation(aId);
}
}
//******************************************************
-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();
+ 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());
}
//******************************************************
//**************************************************************
void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked)
{
- QFeatureList aFeatures = mySelector->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);
}
//**************************************************************
}
//**************************************************************
-void XGUI_Workshop::activatePart(FeaturePtr theFeature)
+void XGUI_Workshop::activatePart(ResultPartPtr theFeature)
{
changeCurrentDocument(theFeature);
myObjectBrowser->activatePart(theFeature);
{
PluginManagerPtr aMgr = ModelAPI_PluginManager::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);
+ // ToDo: definbe deleting method
if (aRes == QMessageBox::Yes) {
PluginManagerPtr aMgr = ModelAPI_PluginManager::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::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));
+ }
+ }
+ }
+}
