#include "XGUI_ModuleConnector.h"
#include "XGUI_QtEvents.h"
+#ifndef HAVE_SALOME
#include <AppElements_Workbench.h>
#include <AppElements_Command.h>
#include <AppElements_MainMenu.h>
#include <AppElements_MainWindow.h>
#include <AppElements_MenuGroupPanel.h>
#include <AppElements_Button.h>
+#endif
#include <ModuleBase_IModule.h>
myUpdatePrefs(false)
{
XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
- //connect(anOperationMgr, SIGNAL(nestedStateChanged(const std::string&, const bool)),
- // this, SLOT(onNestedStateChanged(const std::string&, const bool)));
}
//******************************************************
// the viewer's update context is unblocked, the viewer's update works
XGUI_Displayer* aDisplayer = workshop()->displayer();
aDisplayer->enableUpdateViewer(true);
- aDisplayer->updateViewer();
} else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_OBJECT_ERROR_CHANGED)) {
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
- std::set<ObjectPtr> aObjects = aUpdMsg->objects();
+ std::set<ObjectPtr> anObjects = aUpdMsg->objects();
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(workshop()->operationMgr()->currentOperation());
FeaturePtr aFeature = aFOperation->feature();
if (aFeature.get()) {
std::set<ObjectPtr>::const_iterator aIt;
- for (aIt = aObjects.begin(); aIt != aObjects.end() && !aFeatureChanged; ++aIt) {
+ for (aIt = anObjects.begin(); aIt != anObjects.end() && !aFeatureChanged; ++aIt) {
aFeatureChanged = ModelAPI_Feature::feature(*aIt) == aFeature;
}
}
}
return;
}
- if (!workshop()->isSalomeMode()) {
+#ifndef HAVE_SALOME
SessionPtr aMgr = ModelAPI_Session::get();
AppElements_MainWindow* aMainWindow = workshop()->mainWindow();
if (aMgr->isModified() != aMainWindow->isModifiedState())
aMainWindow->setModifiedState(aMgr->isModified());
- }
+#endif
}
//******************************************************
const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
{
#ifdef DEBUG_FEATURE_UPDATED
- std::set<ObjectPtr> aObjects = theMsg->objects();
+ std::set<ObjectPtr> anObjects = theMsg->objects();
std::set<ObjectPtr>::const_iterator aIt;
QStringList anInfo;
- for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ for (aIt = anObjects.begin(); aIt != anObjects.end(); ++aIt) {
anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("onFeatureUpdatedMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("onFeatureUpdatedMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
std::set<ObjectPtr> aFeatures = theMsg->objects();
XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
//******************************************************
void XGUI_WorkshopListener::onFeatureRedisplayMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
{
- std::set<ObjectPtr> aObjects = theMsg->objects();
+ std::set<ObjectPtr> anObjects = theMsg->objects();
std::set<ObjectPtr>::const_iterator aIt;
#ifdef DEBUG_FEATURE_REDISPLAY
QStringList anInfo;
- for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ for (aIt = anObjects.begin(); aIt != anObjects.end(); ++aIt) {
anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("onFeatureRedisplayMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("onFeatureRedisplayMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
XGUI_Workshop* aWorkshop = workshop();
bool aFirstVisualizedBody = false;
bool aRedisplayed = false;
- for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ //std::list<ObjectPtr> aHiddenObjects;
+ for (aIt = anObjects.begin(); aIt != anObjects.end(); ++aIt) {
ObjectPtr aObj = (*aIt);
// Hide the object if it is invalid or concealed one
ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
aHide = aRes && aRes->isConcealed();
}
+
#ifdef DEBUG_RESULT_COMPSOLID
ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
if (aRes.get()) {
}
#endif
if (aHide) {
+ //we should provide objects which are hidden in the viewer, e.g. sketch always should visualizes
+ // all sub-features, if some features are to be hidden, sould be proposed may be to removed #1223
+ //aHiddenObjects.push_back(aObj);
aRedisplayed = aDisplayer->erase(aObj, false) || aRedisplayed;
#ifdef DEBUG_FEATURE_REDISPLAY
// Redisplay the visible object or the object of the current operation
}
}
}
- if (aRedisplayed) {
- customizeCurrentObject();
+ // this processing should be moved in another place in order to do not cause problems in
+ // flush messages chain
+ //if (aHiddenObjects.size() > 0)
+ // myWorkshop->module()->processHiddenObject(aHiddenObjects);
+
+ bool isCustomized = customizeCurrentObject(anObjects, aRedisplayed);
+ if (aRedisplayed || isCustomized) {
//VSV FitAll updated viewer by it self
if (aFirstVisualizedBody)
myWorkshop->viewer()->fitAll();
//******************************************************
void XGUI_WorkshopListener::onFeatureCreatedMsg(const std::shared_ptr<ModelAPI_ObjectUpdatedMessage>& theMsg)
{
- std::set<ObjectPtr> aObjects = theMsg->objects();
+ std::set<ObjectPtr> anObjects = theMsg->objects();
std::set<ObjectPtr>::const_iterator aIt;
#ifdef DEBUG_FEATURE_CREATED
QStringList anInfo;
- for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ for (aIt = anObjects.begin(); aIt != anObjects.end(); ++aIt) {
anInfo.append(ModuleBase_Tools::objectInfo((*aIt)));
}
QString anInfoStr = anInfo.join(";\t");
- qDebug(QString("onFeatureCreatedMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str());
+ qDebug(QString("onFeatureCreatedMsg: %1, %2").arg(anObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
bool aFirstVisualizedBody = false;
//bool aHasPart = false;
bool aDisplayed = false;
- for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ for (aIt = anObjects.begin(); aIt != anObjects.end(); ++aIt) {
ObjectPtr anObject = *aIt;
#ifdef DEBUG_RESULT_COMPSOLID
bool aHide = !anObject->data()->isValid() ||
anObject->isDisabled() ||
!anObject->isDisplayed();
+ if (!aHide) { // check that this is not hidden result
+ ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
+ bool isConcealed = aRes && aRes->isConcealed();
+ aHide = aRes && aRes->isConcealed();
+ }
if (!aHide) {
// setDisplayed has to be called in order to synchronize internal state of the object
// with list of displayed objects
}
}
+ bool isCustomized = customizeCurrentObject(anObjects, aDisplayed);
+
//if (myObjectBrowser)
// myObjectBrowser->processEvent(theMsg);
if (aDisplayed) {
- customizeCurrentObject();
//VSV FitAll updated viewer by it self
if (aFirstVisualizedBody)
myWorkshop->viewer()->fitAll();
//}
}
-/*void XGUI_WorkshopListener::onNestedStateChanged(const std::string& theFeatureId, const bool theState)
-{
- XGUI_Workshop* aWorkshop = workshop();
-
- //one button is used for all features, which can have nested actions, so it is obtained from
- // the action manager
- //bool aActionToBeUpdated = aWorkshop->isFeatureOfNested(theFeatureId);
- if (aWorkshop->isSalomeMode()) {
- XGUI_SalomeConnector* aSalomeConnector = aWorkshop->salomeConnector();
- XGUI_ActionsMgr* anActionsMgr = aWorkshop->actionsMgr();
- if (aSalomeConnector->isFeatureOfNested(anActionsMgr->action(theFeatureId.c_str())))
- aActionToBeUpdated = true;
- } else {
- AppElements_MainMenu* aMenuBar = aWorkshop->mainWindow()->menuObject();
- AppElements_Command* aCommand = aMenuBar->feature(theFeatureId.c_str());
- if (aCommand && aCommand->button()->additionalButtonWidget())
- aActionToBeUpdated = true;
- }
- if (aActionToBeUpdated) {
- QAction* anAcceptAllAction = aWorkshop->actionsMgr()->operationStateAction(XGUI_ActionsMgr::AcceptAll, NULL);
- anAcceptAllAction->setEnabled(theState);
- }
-}*/
-
bool XGUI_WorkshopListener::event(QEvent * theEvent)
{
PostponeMessageQtEvent* aPostponedEv = dynamic_cast<PostponeMessageQtEvent*>(theEvent);
}
}
- if (aWorkshop->isSalomeMode()) {
- XGUI_SalomeConnector* aSalomeConnector = aWorkshop->salomeConnector();
- QAction* aAction;
- if (isColumnButton) {
- aAction = aSalomeConnector->addFeatureOfNested(aWchName, aFeatureInfo, aNestedActList);
- } else {
- //Issue #650: in the SALOME mode the tooltip should be same as text
- aFeatureInfo.toolTip = aFeatureInfo.text;
- aAction = aSalomeConnector->addFeature(aWchName, aFeatureInfo);
- }
- aSalomeConnector->setNestedActions(aFeatureInfo.id, aNestedFeatures);
- aSalomeConnector->setDocumentKind(aFeatureInfo.id, aDocKind);
-
- aWorkshop->actionsMgr()->addCommand(aAction);
- aWorkshop->module()->actionCreated(aAction);
+#ifdef HAVE_SALOME
+ XGUI_SalomeConnector* aSalomeConnector = aWorkshop->salomeConnector();
+ QAction* aAction;
+ if (isColumnButton) {
+ aAction = aSalomeConnector->addFeatureOfNested(aWchName, aFeatureInfo, aNestedActList);
} else {
- //Find or create Workbench
- AppElements_MainMenu* aMenuBar = aWorkshop->mainWindow()->menuObject();
- AppElements_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
- if (!aPage) {
- aPage = aWorkshop->addWorkbench(aWchName);
- }
- //Find or create Group
- QString aGroupName = QString::fromStdString(theMessage->groupId());
- AppElements_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
- if (!aGroup) {
- aGroup = aPage->addGroup(aGroupName);
- }
- // Check if hotkey sequence is already defined:
- XGUI_ActionsMgr* anActionsMgr = aWorkshop->actionsMgr();
- QKeySequence aHotKey = anActionsMgr->registerShortcut(aFeatureInfo.shortcut);
- if(aHotKey != aFeatureInfo.shortcut) {
- aFeatureInfo.shortcut = aHotKey;
- }
- // Create feature...
- AppElements_Command* aCommand = aGroup->addFeature(aFeatureInfo,
- aDocKind,
- aNestedFeatures);
- // Enrich created button with accept/abort buttons if necessary
- AppElements_Button* aButton = aCommand->button();
- if (aButton->isColumnButton()) {
- aButton->setAdditionalButtons(aNestedActList);
- }
- aWorkshop->actionsMgr()->addCommand(aCommand);
- aWorkshop->module()->actionCreated(aCommand);
+ //Issue #650: in the SALOME mode the tooltip should be same as text
+ aFeatureInfo.toolTip = aFeatureInfo.text;
+ aAction = aSalomeConnector->addFeature(aWchName, aFeatureInfo);
+ }
+ aSalomeConnector->setNestedActions(aFeatureInfo.id, aNestedFeatures);
+ aSalomeConnector->setDocumentKind(aFeatureInfo.id, aDocKind);
+
+ aWorkshop->actionsMgr()->addCommand(aAction);
+ aWorkshop->module()->actionCreated(aAction);
+#else
+ //Find or create Workbench
+ AppElements_MainMenu* aMenuBar = aWorkshop->mainWindow()->menuObject();
+ AppElements_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
+ if (!aPage) {
+ aPage = aWorkshop->addWorkbench(aWchName);
+ }
+ //Find or create Group
+ QString aGroupName = QString::fromStdString(theMessage->groupId());
+ AppElements_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
+ if (!aGroup) {
+ aGroup = aPage->addGroup(aGroupName);
}
+ // Check if hotkey sequence is already defined:
+ XGUI_ActionsMgr* anActionsMgr = aWorkshop->actionsMgr();
+ QKeySequence aHotKey = anActionsMgr->registerShortcut(aFeatureInfo.shortcut);
+ if(aHotKey != aFeatureInfo.shortcut) {
+ aFeatureInfo.shortcut = aHotKey;
+ }
+ // Create feature...
+ AppElements_Command* aCommand = aGroup->addFeature(aFeatureInfo,
+ aDocKind,
+ aNestedFeatures);
+ // Enrich created button with accept/abort buttons if necessary
+ AppElements_Button* aButton = aCommand->button();
+ if (aButton->isColumnButton()) {
+ aButton->setAdditionalButtons(aNestedActList);
+ }
+ aWorkshop->actionsMgr()->addCommand(aCommand);
+ aWorkshop->module()->actionCreated(aCommand);
+#endif
}
return aDisplayed;
}
-bool XGUI_WorkshopListener::customizeCurrentObject()
+bool XGUI_WorkshopListener::customizeCurrentObject(const std::set<ObjectPtr>& theObjects,
+ bool theForceRedisplay)
{
- bool aCustomized = false;
XGUI_OperationMgr* anOperationMgr = workshop()->operationMgr();
+ FeaturePtr aCurrentFeature;
if (anOperationMgr->hasOperation()) {
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(anOperationMgr->currentOperation());
if (aFOperation) {
- FeaturePtr aCurrentFeature = aFOperation->feature();
- if (aCurrentFeature.get())
- aCustomized = myWorkshop->module()->customizeObject(aCurrentFeature, false);
+ aCurrentFeature = aFOperation->feature();
+ }
+ }
+
+ bool aCustomized = false;
+ if (aCurrentFeature.get()) {
+ // the customize presentation should be redisplayed if force redislayed is true or
+ // if a list of message objects contains the operation feature for case when
+ // the feature is hidden, but arguments of the feature are modified
+ // e.g. extrusion is hidden(h=0) but sketch is chosen
+ if (theForceRedisplay || theObjects.find(aCurrentFeature) != theObjects.end()) {
+ aCustomized = myWorkshop->module()->customizeObject(aCurrentFeature,
+ ModuleBase_IModule::CustomizeArguments, false);
+ aCustomized = myWorkshop->module()->customizeObject(aCurrentFeature,
+ ModuleBase_IModule::CustomizeResults, false);
+ aCustomized = myWorkshop->module()->customizeObject(aCurrentFeature,
+ ModuleBase_IModule::CustomizeHighlightedObjects, false);
}
}
return aCustomized;
