X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FNewGeom%2FNewGeom_Module.cpp;h=cb422b659c850801ca655f136328d0d9118a3013;hb=0c64a21a042cfdd26920de8b2fbb11604547d4d0;hp=412407827058d8722fc4227bd3670c60c29b8743;hpb=0ae9b65878cc8fef5e30a35d9917faee46c4257d;p=modules%2Fshaper.git diff --git a/src/NewGeom/NewGeom_Module.cpp b/src/NewGeom/NewGeom_Module.cpp index 412407827..cb422b659 100644 --- a/src/NewGeom/NewGeom_Module.cpp +++ b/src/NewGeom/NewGeom_Module.cpp @@ -1,17 +1,26 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + #include "NewGeom_Module.h" #include "NewGeom_DataModel.h" #include "NewGeom_OCCSelector.h" +#include #include #include #include -#include #include +#include +#include + +#include +#include +#include #include #include #include +#include #include #include @@ -21,13 +30,19 @@ #include #include +#include #include #include +#include + +#include +#include #include #include #include +#include extern "C" { @@ -42,9 +57,15 @@ NewGeom_EXPORT char* getModuleVersion() } } -class NewGeom_PrefMgr: public XGUI_IPrefMgr +/** +* Class for preferences management +*/ +class NewGeom_PrefMgr: public ModuleBase_IPrefMgr { public: + /// Constructor + /// \param theMgr preferences manager of SALOME + /// \param theModName name of the module NewGeom_PrefMgr(LightApp_Preferences* theMgr, const QString& theModName):myMgr(theMgr), myModName(theModName) {} virtual int addPreference(const QString& theLbl, int pId, @@ -54,6 +75,14 @@ public: return myMgr->addPreference(myModName, theLbl, pId, theType, theSection, theName); } + virtual void setItemProperty(const QString& thePropName, + const QVariant& theValue, + const int theId = -1) + { + myMgr->setItemProperty(thePropName, theValue, theId); + } + + virtual SUIT_PreferenceMgr* prefMgr() const { return myMgr; } private: @@ -67,13 +96,16 @@ private: //****************************************************** NewGeom_Module::NewGeom_Module() : LightApp_Module("NewGeom"), - mySelector(0), myIsOpened(0) + mySelector(0), myIsOpened(0), myPopupMgr(0) { myWorkshop = new XGUI_Workshop(this); + connect(myWorkshop, SIGNAL(commandStatusUpdated()), + this, SLOT(onUpdateCommandStatus())); + myProxyViewer = new NewGeom_SalomeViewer(this); - XGUI_Preferences::setResourceMgr(application()->resourceMgr()); - XGUI_Preferences::loadCustomProps(); + ModuleBase_Preferences::setResourceMgr(application()->resourceMgr()); + ModuleBase_Preferences::loadCustomProps(); } //****************************************************** @@ -85,8 +117,12 @@ NewGeom_Module::~NewGeom_Module() void NewGeom_Module::initialize(CAM_Application* theApp) { LightApp_Module::initialize(theApp); + inspectSalomeModules(); myWorkshop->startApplication(); + LightApp_Application* anApp = dynamic_cast(theApp); + if (anApp) + connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences())); } //****************************************************** @@ -116,6 +152,7 @@ bool NewGeom_Module::activateModule(SUIT_Study* theStudy) aViewAct->setEnabled(true); myWorkshop->objectBrowser()->setVisible(true); aObjDoc->setVisible(true); + desktop()->tabifyDockWidget(aObjDoc, myWorkshop->propertyPanel()); } if (!mySelector) { @@ -125,28 +162,74 @@ bool NewGeom_Module::activateModule(SUIT_Study* theStudy) mySelector = createSelector(OCCViewManagers.first()); } } - myWorkshop->propertyPanel()->hide(); - QtxPopupMgr* aMgr = popupMgr(); // Create popup manager - action(myEraseAll)->setEnabled(false); + // it should be pefromed after the selector creation in order to have AISContext + myWorkshop->activateModule(); + //action(myEraseAll)->setEnabled(false); if (myIsOpened) { myWorkshop->objectBrowser()->rebuildDataTree(); myWorkshop->updateCommandStatus(); myIsOpened = false; - QTimer::singleShot(1000, myWorkshop, SLOT(displayAllResults())); + // the display all results is not necessary anymore, it was commented in XGUI_Workshop, + // so it should be commented here + //QTimer::singleShot(1000, myWorkshop, SLOT(displayAllResults())); } + else + myWorkshop->updateCommandStatus(); } + SUIT_ResourceMgr* aResMgr = application()->resourceMgr(); + myIsStorePositions = aResMgr->booleanValue("Study", "store_positions", true); + myIsEditEnabled = getApp()->isEditEnabled(); + getApp()->setEditEnabled(false); + + // this following row is caused by #187 bug. + // SALOME saves the dock widget positions before deactivateModule() and + // load it after the module activation. So, if the panel is visible before + // deactivate, it becomes visible after activate. + // In order to avoid the visible property panel, the widget position save is + // switch off in this module + aResMgr->setValue("Study", "store_positions", false); + + // Synchronize displayed objects + if (mySelector && mySelector->viewer()) { + Handle(AIS_InteractiveContext) aContext = mySelector->viewer()->getAISContext(); + XGUI_Displayer* aDisp = myWorkshop->displayer(); + QObjectPtrList aObjList = aDisp->displayedObjects(); + + AIS_ListOfInteractive aList; + aContext->DisplayedObjects(aList); + AIS_ListIteratorOfListOfInteractive aLIt; + Handle(AIS_InteractiveObject) anAISIO; + foreach (ObjectPtr aObj, aObjList) { + AISObjectPtr aPrs = aDisp->getAISObject(aObj); + Handle(AIS_InteractiveObject) aAIS = aPrs->impl(); + bool aFound = false; + for (aLIt.Initialize(aList); aLIt.More(); aLIt.Next()) { + anAISIO = aLIt.Value(); + if (anAISIO.Access() == aAIS.Access()) { + aFound = true; + break; + } + } + if (!aFound) { + aObj->setDisplayed(false); + //aDisp->erase(aObj, false); + } + } + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + } + myProxyViewer->activateViewer(true); return isDone; } //****************************************************** bool NewGeom_Module::deactivateModule(SUIT_Study* theStudy) { + myProxyViewer->activateViewer(false); setMenuShown(false); setToolShown(false); - myWorkshop->propertyPanel()->setVisible(false); - desktop()->removeDockWidget(myWorkshop->propertyPanel()); + myWorkshop->deactivateModule(); QObject* aObj = myWorkshop->objectBrowser()->parent(); QDockWidget* aObjDoc = dynamic_cast(aObj); @@ -157,18 +240,85 @@ bool NewGeom_Module::deactivateModule(SUIT_Study* theStudy) aViewAct->setEnabled(false); } + // the active operation should be stopped for the next activation. + // There should not be active operation and visualized preview. + // Abort operation should be performed before the selection's remove + // because the displayed objects should be removed from the viewer, but + // the AIS context is obtained from the selector. + ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation(); + while (anOperation) { + anOperation->abort(); + anOperation = myWorkshop->operationMgr()->currentOperation(); + } + // Delete selector because it has to be redefined on next activation + if (mySelector) { + myProxyViewer->setSelector(0); + delete mySelector; + mySelector = 0; + } + //myWorkshop->contextMenuMgr()->disconnectViewer(); + + SUIT_ResourceMgr* aResMgr = application()->resourceMgr(); + aResMgr->setValue("Study", "store_positions", myIsStorePositions); + getApp()->setEditEnabled(myIsEditEnabled); + return LightApp_Module::deactivateModule(theStudy); } //****************************************************** void NewGeom_Module::onViewManagerAdded(SUIT_ViewManager* theMgr) { - if ((!mySelector)) { + if (!mySelector) { mySelector = createSelector(theMgr); } } +//****************************************************** +void NewGeom_Module::onViewManagerRemoved(SUIT_ViewManager* theMgr) +{ + if (mySelector) { + if (theMgr->getType() == OCCViewer_Viewer::Type()) { + OCCViewer_Viewer* aViewer = static_cast(theMgr->getViewModel()); + if (mySelector->viewer() == aViewer) { + XGUI_Displayer* aDisp = myWorkshop->displayer(); + QObjectPtrList aObjects = aDisp->displayedObjects(); + foreach(ObjectPtr aObj, aObjects) + aObj->setDisplayed(false); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + myProxyViewer->setSelector(0); + delete mySelector; + mySelector = 0; + } + } + } +} + +//****************************************************** +QtxPopupMgr* NewGeom_Module::popupMgr() +{ + if (!myPopupMgr) + myPopupMgr = new QtxPopupMgr( 0, this ); + return myPopupMgr; +} + +//****************************************************** +void NewGeom_Module::onDefaultPreferences() +{ + ModuleBase_Preferences::resetConfig(); + ModuleBase_Preferences::updateResourcesByConfig(); + + LightApp_Preferences* pref = preferences(); + if (pref) + pref->retrieve(); +} + +//****************************************************** +void NewGeom_Module::onUpdateCommandStatus() +{ + getApp()->updateActions(); +} + //****************************************************** NewGeom_OCCSelector* NewGeom_Module::createSelector(SUIT_ViewManager* theMgr) { @@ -191,7 +341,24 @@ NewGeom_OCCSelector* NewGeom_Module::createSelector(SUIT_ViewManager* theMgr) //****************************************************** CAM_DataModel* NewGeom_Module::createDataModel() { - return new NewGeom_DataModel(this); + NewGeom_DataModel* aDataModel = new NewGeom_DataModel(this); + + // Calling addComponent() for persistent functionality work in the SalomeApp_Study + LightApp_Study* aStudy = dynamic_cast(application()->activeStudy() ); + aStudy->addComponent(aDataModel); + + return aDataModel; +} + +QAction* NewGeom_Module::addFeature(const QString& theWBName, const ActionInfo& theInfo) +{ + return addFeature(theWBName, + theInfo.id, + theInfo.text, + theInfo.toolTip, + theInfo.icon, + theInfo.shortcut, + theInfo.checkable); } //****************************************************** @@ -200,8 +367,21 @@ QAction* NewGeom_Module::addFeature(const QString& theWBName, const QString& the const QIcon& theIcon, const QKeySequence& theKeys, bool isCheckable) { + static QString aLastTool = ""; + static int aNb = 0; + if (aLastTool.isEmpty()) + aLastTool = theWBName; + else if (theWBName != aLastTool) { + aLastTool = theWBName; + if (aNb > 20) { + desktop()->addToolBarBreak(); + aNb = 0; + } + } + aNb++; + int aMenu = createMenu(theWBName, -1, -1, 50); - int aTool = createTool(theWBName); + int aTool = createTool(theWBName, theWBName); int aId = myActionsList.size(); myActionsList.append(theId); @@ -214,15 +394,47 @@ QAction* NewGeom_Module::addFeature(const QString& theWBName, const QString& the aAction->setData(theId); int aItemId = createMenu(aId, aMenu, -1, 10); int aToolId = createTool(aId, aTool); + return aAction; } + +QAction* NewGeom_Module::addNestedFeature(const QString& theWBName, + const ActionInfo& theInfo, + const QList& theNestedActions) +{ + int aMenu = createMenu(theWBName, -1, -1, 50); + int aTool = createTool(theWBName, theWBName); + + int aId = myActionsList.size(); + myActionsList.append(theInfo.id); + SUIT_Desktop* aDesk = application()->desktop(); + NewGeom_NestedButton* anAction = new NewGeom_NestedButton(aDesk, theNestedActions); + anAction->setData(theInfo.id); + anAction->setCheckable(theInfo.checkable); + anAction->setChecked(theInfo.checked); + anAction->setEnabled(theInfo.enabled); + anAction->setVisible(theInfo.visible); + anAction->setIcon(theInfo.icon); + anAction->setText(theInfo.text); + anAction->setToolTip(theInfo.toolTip); + anAction->setShortcut(theInfo.shortcut); + anAction->setFont(theInfo.font); + + //int aItemId = createMenu(aId, aMenu, -1, 10); + int aToolId = createTool(anAction, aTool, aId); + + return anAction; +} + + //****************************************************** -QAction* NewGeom_Module::addEditCommand(const QString& theId, const QString& theTitle, - const QString& theTip, const QIcon& theIcon, - const QKeySequence& theKeys, bool isCheckable) +QAction* NewGeom_Module::addDesktopCommand(const QString& theId, const QString& theTitle, + const QString& theTip, const QIcon& theIcon, + const QKeySequence& theKeys, bool isCheckable, + const char* theMenuSourceText, const int theMenuPosition) { - int aMenu = createMenu(tr("MEN_DESK_EDIT"), -1, -1); + int aMenu = createMenu(tr(theMenuSourceText), -1, -1); int aId = myActionsList.size(); myActionsList.append(theId); @@ -233,23 +445,43 @@ QAction* NewGeom_Module::addEditCommand(const QString& theId, const QString& the QAction* aAction = createAction(aId, theTip, theIcon, theTitle, theTip, aKeys, aDesk, isCheckable); aAction->setData(theId); - createMenu(aId, aMenu, 10); + createMenu(aId, aMenu, theMenuPosition); return aAction; } //****************************************************** -void NewGeom_Module::addEditMenuSeparator() +void NewGeom_Module::addDesktopMenuSeparator(const char* theMenuSourceText, const int theMenuPosition) +{ + int aMenu = createMenu(tr(theMenuSourceText), -1, -1); + createMenu(separator(), aMenu, -1, theMenuPosition); +} + +bool NewGeom_Module::addActionInToolbar( QAction* theAction, const QString& theToolBarTitle ) { - int aMenu = createMenu(tr("MEN_DESK_EDIT"), -1, -1); - createMenu(separator(), aMenu, -1, 10); + if( !theAction ) + return false; + + SUIT_Desktop* aDesktop = application()->desktop(); + if( !aDesktop ) + return false; + + QtxActionToolMgr* aToolMgr = aDesktop->toolMgr(); + if( !aToolMgr ) + return false; + + aToolMgr->append( theAction, theToolBarTitle ); + return true; } //****************************************************** QList NewGeom_Module::commandList() const { QList aActions; - for (int i = 0; i < myActionsList.size(); i++) - aActions.append(action(i)); + for (int i = 0; i < myActionsList.size(); i++) { + QAction* aCmd = action(i); + if (aCmd && myActionsList.contains(aCmd->data().toString())) + aActions.append(aCmd); + } return aActions; } @@ -298,6 +530,21 @@ QStringList NewGeom_Module::nestedActions(const QString& theId) const return QStringList(); } +//****************************************************** +void NewGeom_Module::setDocumentKind(const QString& theId, const QString& theKind) +{ + myDocumentType[theId] = theKind; +} + +//****************************************************** +QString NewGeom_Module::documentKind(const QString& theId) const +{ + if (myDocumentType.contains(theId)) + return myDocumentType[theId]; + return QString(); + +} + //****************************************************** void NewGeom_Module::selectionChanged() { @@ -308,7 +555,8 @@ void NewGeom_Module::selectionChanged() //****************************************************** void NewGeom_Module::contextMenuPopup(const QString& theClient, QMenu* theMenu, QString& theTitle) { - myWorkshop->contextMenuMgr()->addViewerItems(theMenu); + myWorkshop->contextMenuMgr()->updateViewerMenu(); + myWorkshop->contextMenuMgr()->addViewerMenu(theMenu); LightApp_Module::contextMenuPopup(theClient, theMenu, theTitle); } @@ -319,7 +567,7 @@ void NewGeom_Module::createPreferences() LightApp_Preferences* pref = preferences(); if (!pref) return; - XGUI_Preferences::updateCustomProps(); + ModuleBase_Preferences::updateConfigByResources(); QString aModName = moduleName(); QtxPreferenceItem* item = pref->findItem(aModName, true ); @@ -332,7 +580,7 @@ void NewGeom_Module::createPreferences() if ( catId == -1 ) return; NewGeom_PrefMgr aMgr(pref, aModName); - XGUI_Preferences::createEditContent(&aMgr, catId); + ModuleBase_Preferences::createEditContent(&aMgr, catId); pref->retrieve(); } @@ -341,8 +589,25 @@ void NewGeom_Module::preferencesChanged(const QString& theSection, const QString { SUIT_ResourceMgr* aResMgr = application()->resourceMgr(); QString aVal = aResMgr->stringValue(theSection, theParam); - if (!aVal.isNull()) { - Config_Prop* aProp = Config_PropManager::findProp(theSection.toStdString(), theParam.toStdString()); - aProp->setValue(aVal.toStdString()); + Config_Prop* aProp = Config_PropManager::findProp(theSection.toStdString(), theParam.toStdString()); + std::string aValue = aVal.toStdString(); + if (aValue.empty()) { + aValue = aProp->defaultValue(); + aResMgr->setValue(theSection, theParam, QString(aValue.c_str())); + + LightApp_Preferences* pref = preferences(); + if (pref) + pref->retrieve(); + } + aProp->setValue(aValue); + +} + +void NewGeom_Module::inspectSalomeModules() +{ + QStringList aModuleNames; + getApp()->modules(aModuleNames, false); + foreach(QString eachModule, aModuleNames) { + Config_ModuleReader::addDependencyModule(eachModule.toStdString()); } }