Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / NewGeom / NewGeom_Module.cpp

diff --git a/src/NewGeom/NewGeom_Module.cpp b/src/NewGeom/NewGeom_Module.cpp
index f56deda0dc3b8c266e7c2c855fa32c01099e1913..7ef9d61f18c100692f12f54a3bec8d58f1196d1c 100644 (file)
--- a/src/NewGeom/NewGeom_Module.cpp
+++ b/src/NewGeom/NewGeom_Module.cpp
@@ -33,6 +33,7 @@ NewGeom_Module::NewGeom_Module()
 : LightApp_Module( "NewGeom" ), mySelector(0)
 {
   myWorkshop = new XGUI_Workshop(this);
+  myProxyViewer = new NewGeom_SalomeViewer(this);
 }
 
 //******************************************************
@@ -100,6 +101,7 @@ NewGeom_OCCSelector* NewGeom_Module::createSelector(SUIT_ViewManager* theMgr)
     foreach(SUIT_Selector* aSel, aList) {
       aSel->setEnabled(aSel == aSelector);
     }
+    myProxyViewer->setSelector(aSelector);
     return aSelector;
   }
   return 0;
@@ -201,14 +203,17 @@ QAction* NewGeom_Module::command(const QString& theId) const
 }
 
 //******************************************************
-Handle(AIS_InteractiveContext) NewGeom_Module::AISContext() const
+void NewGeom_Module::setNestedActions(const QString& theId, const QStringList& theActions)
 {
-  Handle(AIS_InteractiveContext) aContext;
-  OCCViewer_Viewer* aViewer = mySelector->viewer();
-  if (aViewer) {
-    aContext = aViewer->getAISContext();
-  }
-  return aContext;
+  myNestedActions[theId] = theActions;
+}
+
+//******************************************************
+QStringList NewGeom_Module::nestedActions(const QString& theId) const
+{
+  if (myNestedActions.contains(theId))
+    return myNestedActions[theId];
+  return QStringList();
 }
 
 //******************************************************