#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>
//#define DEBUG_FEATURE_UPDATED
//#define DEBUG_RESULT_COMPSOLID
+#ifdef DEBUG_FEATURE_REDISPLAY
+const std::string DebugFeatureKind = "Extrusion";
+#endif
+
XGUI_WorkshopListener::XGUI_WorkshopListener(ModuleBase_IWorkshop* theWorkshop)
: myWorkshop(theWorkshop),
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);
}
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
}
//******************************************************
XGUI_Workshop* aWorkshop = workshop();
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
+ bool aFirstVisualizedBody = false;
+
bool aRedisplayed = false;
for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
ObjectPtr aObj = (*aIt);
qDebug("COMPSOLID sub-object");
}
#endif
+ #ifdef DEBUG_FEATURE_REDISPLAY
+ QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
+ FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
+ if (aFeature.get()) {
+ std::string aKind = aFeature->getKind();
+ if (aKind == DebugFeatureKind) {
+ qDebug(QString("visible=%1, hide=%2 : display= %2").arg(aDisplayer->isVisible(aObj))
+ .arg(aHide).arg(anObjInfo).toStdString().c_str());
+ }
+ }
+ #endif
if (aHide) {
aRedisplayed = aDisplayer->erase(aObj, false) || aRedisplayed;
#ifdef DEBUG_FEATURE_REDISPLAY
#ifdef DEBUG_FEATURE_REDISPLAY
QString anObjInfo = ModuleBase_Tools::objectInfo((aObj));
//qDebug(QString("visible=%1 : display= %2").arg(isVisibleObject).arg(anObjInfo).toStdString().c_str());
- /*FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
- if (aFeature.get()) {
- std::string aKind = aFeature->getKind();
- if (aKind == "SketchMultiRotation")
- bool aValue = true;
- }*/
#endif
if (isVisibleObject) { // redisplay visible object
aWorkshop->deactivateActiveObject(aObj, false);
}
} else { // display object if the current operation has it
- if (displayObject(aObj)) {
+ if (displayObject(aObj, aFirstVisualizedBody)) {
aRedisplayed = true;
// Deactivate object of current operation from selection
aWorkshop->deactivateActiveObject(aObj, false);
}
if (aRedisplayed) {
customizeCurrentObject();
- aDisplayer->updateViewer();
+ //VSV FitAll updated viewer by it self
+ if (aFirstVisualizedBody)
+ myWorkshop->viewer()->fitAll();
+ else
+ aDisplayer->updateViewer();
}
}
//******************************************************
qDebug(QString("onFeatureCreatedMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str());
#endif
+ bool aFirstVisualizedBody = false;
+
//bool aHasPart = false;
bool aDisplayed = false;
for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
// with list of displayed objects
if (myWorkshop->module()->canDisplayObject(anObject)) {
anObject->setDisplayed(true);
- aDisplayed = displayObject(*aIt);
+ aDisplayed = displayObject(*aIt, aFirstVisualizedBody);
} else
anObject->setDisplayed(false);
}
// myObjectBrowser->processEvent(theMsg);
if (aDisplayed) {
customizeCurrentObject();
- workshop()->displayer()->updateViewer();
+ //VSV FitAll updated viewer by it self
+ if (aFirstVisualizedBody)
+ myWorkshop->viewer()->fitAll();
+ else
+ workshop()->displayer()->updateViewer();
}
//if (aHasPart) { // TODO: Avoid activate last part on loading of document
// activateLastPart();
//}
}
-/*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
}
//**************************************************************
-bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj)
+bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj, bool& theFirstVisualizedBody)
{
#ifdef DEBUG_RESULT_COMPSOLID
ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(theObj);
int aNb = aDisplayer->objectsCount();
aDisplayed = aDisplayer->display(theObj, false);
if (aNb == 0)
- myWorkshop->viewer()->fitAll();
+ theFirstVisualizedBody = true;
} else
aDisplayed = aDisplayer->display(theObj, false);
