Return deleted code.

diff --git a/src/genericgui/GenericGui.cxx b/src/genericgui/GenericGui.cxx
index bca1cd3efb91a69c651f3a8ef50dae671e8142d1..cd53c27745cee1ab47816f7c8fb2e85f97699e28 100644 (file)
--- a/src/genericgui/GenericGui.cxx
+++ b/src/genericgui/GenericGui.cxx
@@ -1089,6 +1089,7 @@ void GenericGui::createContext(YACS::ENGINE::Proc* proc,
   GraphicsView* gView = new GraphicsView(viewWindow);
   gView->setScene(scene);
   gView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+  _wrapper->AssociateViewToWindow(gView, viewWindow);
   context->setScene(scene);
   context->setView(gView);
   context->setWindow(viewWindow);

diff --git a/src/runtime/StudyNodes.cxx b/src/runtime/StudyNodes.cxx
index 6067003b60b3d39a4dc4ad01dd7c0f2896265a42..77bc09a05b4aba34d52ce47d7f41e542657275c0 100644 (file)
--- a/src/runtime/StudyNodes.cxx
+++ b/src/runtime/StudyNodes.cxx
@@ -252,7 +252,7 @@ void StudyOutNode::execute()
   // save in file if ref is given
   if(_ref != "")
     {
-         myStudy->SaveAs(_ref.c_str(), false);
+         myStudy->SaveAs(_ref.c_str(), false, false);
     }
   DEBTRACE("+++++++ end StudyOutNode::execute +++++++++++" );
 }

diff --git a/src/salomegui/Yacsgui.cxx b/src/salomegui/Yacsgui.cxx
index 904d70909a673f03a917d5b0df535141e96d02c2..c457d5da8d3fe64c0545ffb65d2402ea0bf6551a 100644 (file)
--- a/src/salomegui/Yacsgui.cxx
+++ b/src/salomegui/Yacsgui.cxx
@@ -65,7 +65,7 @@ Yacsgui::Yacsgui() :
   _wrapper = 0;
   _genericGui = 0;
   _selectFromTree = false;
-  _studyContextMap = 0;
+  _studyContext = 0;
 }
 
 Yacsgui::~Yacsgui()
@@ -109,7 +109,7 @@ void Yacsgui::initialize( CAM_Application* app )
   _genericGui->createActions();
   _genericGui->createMenus();
   _genericGui->createTools();
-  _studyContextMap = QtGuiContext::getQtCurrent();
+  _studyContext = QtGuiContext::getQtCurrent();
 
   // VSR 23/10/2014: note that this is not a good way to create SComponent from this point
   // as initialize() method can be potentially called when there's no yet open study;
@@ -205,8 +205,8 @@ bool Yacsgui::deactivateModule( SUIT_Study* theStudy )
   setToolShown( false );
   _genericGui->showDockWidgets(false);
   QtGuiContext *context = QtGuiContext::getQtCurrent();
-  _studyContextMap = context;
-  DEBTRACE("_studyContextMap " << theStudy << " " << context);
+  _studyContext = context;
+  DEBTRACE("_studyContext " << theStudy << " " << context);
   return SalomeApp_Module::deactivateModule( theStudy );
 }
 
@@ -278,7 +278,7 @@ void Yacsgui::onWindowActivated( SUIT_ViewWindow* svw)
 
   YASSERT(_genericGui);
   _genericGui->switchContext(viewWindow);
-  _studyContextMap = QtGuiContext::getQtCurrent();
+  _studyContext = QtGuiContext::getQtCurrent();
   
   if (_selectFromTree) return;
   SalomeWrap_DataModel *model = dynamic_cast<SalomeWrap_DataModel*>(dataModel());

diff --git a/src/salomegui/Yacsgui.hxx b/src/salomegui/Yacsgui.hxx
index b3e22cf0ebca3a291c4ffcdd2044161fc8f1f4fc..27dc99d366b34e4c64aa9c31ca80dc887e9c4dc0 100644 (file)
--- a/src/salomegui/Yacsgui.hxx
+++ b/src/salomegui/Yacsgui.hxx
@@ -80,7 +80,7 @@ protected:
   bool _selectFromTree;
   Yacsgui_Resource* _myresource;
   SUIT_ViewWindow* _currentSVW;
-  YACS::HMI::QtGuiContext* _studyContextMap;
+  YACS::HMI::QtGuiContext* _studyContext;
 };
 
 #endif

diff --git a/src/salomeloader/samples/testvisu20.xml b/src/salomeloader/samples/testvisu20.xml
index 9532414f50b43942995659d2813b49b6feb1b4e2..f8f658566e4b995b7e21bfc4a5054dda18054985 100644 (file)
--- a/src/salomeloader/samples/testvisu20.xml
+++ b/src/salomeloader/samples/testvisu20.xml
@@ -112,7 +112,7 @@
       <PyFunc><![CDATA[    lcc = LifeCycleCORBA(orb)                     ]]></PyFunc>
       <PyFunc><![CDATA[    # --- create a naming service instance              ]]></PyFunc>
       <PyFunc><![CDATA[    naming_service = SALOME_NamingServicePy_i(orb)    ]]></PyFunc>
-      <PyFunc><![CDATA[    # --- get Study Manager reference                     ]]></PyFunc>
+      <PyFunc><![CDATA[    # --- get Study reference                     ]]></PyFunc>
       <PyFunc><![CDATA[    obj = naming_service.Resolve('Study')    ]]></PyFunc>
       <PyFunc><![CDATA[    aStudy = obj._narrow(SALOMEDS.Study)    ]]></PyFunc>
       <PyFunc><![CDATA[    # --- load visu component                          ]]></PyFunc>

diff --git a/src/salomewrap/SalomeWrap_Module.cxx b/src/salomewrap/SalomeWrap_Module.cxx
index 955e417c21928ecc78a45efb026479f4d45e6a39..f98a59c79887d1b5f7fb665b0bf561e354434f38 100644 (file)
--- a/src/salomewrap/SalomeWrap_Module.cxx
+++ b/src/salomewrap/SalomeWrap_Module.cxx
@@ -71,6 +71,13 @@ QxScene_ViewWindow* SalomeWrap_Module::getNewWindow(QGraphicsScene *scene)
   return aView;
 }
 
+void SalomeWrap_Module::AssociateViewToWindow(QGraphicsView* gView,
+                                             QxScene_ViewWindow* viewWindow)
+{
+  viewWindow->setSceneView(gView);
+  viewWindow->setCentralWidget(gView);
+}
+
 QDockWidget* SalomeWrap_Module::objectBrowser() {
   if ( !getApp()->objectBrowser() )
     return 0;

diff --git a/src/salomewrap/SalomeWrap_Module.hxx b/src/salomewrap/SalomeWrap_Module.hxx
index 302de575eede09f5e830cd16beb7a00c4d191a77..9ad35365ab4e8b8412c00ee6d0ffba4e96ed3d15 100644 (file)
--- a/src/salomewrap/SalomeWrap_Module.hxx
+++ b/src/salomewrap/SalomeWrap_Module.hxx
@@ -45,6 +45,9 @@ public:
 
   QxScene_ViewWindow* getNewWindow(QGraphicsScene *scene);
 
+  void AssociateViewToWindow(QGraphicsView* gView,
+                            QxScene_ViewWindow* viewWindow);
+
   QDockWidget* objectBrowser();
 
   QAction* wCreateAction(const int id,

diff --git a/src/salomewrap/SuitWrapper.cxx b/src/salomewrap/SuitWrapper.cxx
index 7d0177130eebfa4006e77fd9cae4c1dca4db99e3..453326a12f2df8e66c8ffcf6d894c940250920d1 100644 (file)
--- a/src/salomewrap/SuitWrapper.cxx
+++ b/src/salomewrap/SuitWrapper.cxx
@@ -60,6 +60,60 @@ QWidget* SuitWrapper::getNewWindow(QGraphicsScene *scene)
   return module->getNewWindow(scene);
 }
 
+/*!
+ * return studyId used in context delete when study is closed.
+ */
+void SuitWrapper::AssociateViewToWindow(QGraphicsView* gView, QWidget* viewWindow)
+{
+  SalomeWrap_Module* module = dynamic_cast<SalomeWrap_Module*>(_wrapped);
+  QxScene_ViewWindow *svw = dynamic_cast<QxScene_ViewWindow*>(viewWindow);
+  YASSERT(svw);
+  module->AssociateViewToWindow(gView, svw);
+  WrapGraphicsView* wgv = dynamic_cast<WrapGraphicsView*>(gView);
+  YASSERT(wgv);
+  QObject::disconnect(svw->toolMgr()->action(QxScene_ViewWindow::FitAllId),
+                      SIGNAL(triggered(bool)),
+                      svw, SLOT(onViewFitAll()));
+  QObject::connect(svw->toolMgr()->action(QxScene_ViewWindow::FitAllId),
+                   SIGNAL(triggered(bool)),
+                   wgv, SLOT(onViewFitAll()));
+
+  QObject::disconnect(svw->toolMgr()->action(QxScene_ViewWindow::FitRectId),
+                      SIGNAL(triggered(bool)),
+                      svw, SLOT(onViewFitArea()));
+  QObject::connect(svw->toolMgr()->action(QxScene_ViewWindow::FitRectId),
+                   SIGNAL(triggered(bool)),
+                   wgv, SLOT(onViewFitArea()));
+
+  QObject::disconnect(svw->toolMgr()->action(QxScene_ViewWindow::ZoomId),
+                      SIGNAL(triggered(bool)),
+                      svw, SLOT(onViewZoom()));
+  QObject::connect(svw->toolMgr()->action(QxScene_ViewWindow::ZoomId),
+                   SIGNAL(triggered(bool)),
+                   wgv, SLOT(onViewZoom()));
+
+  QObject::disconnect(svw->toolMgr()->action(QxScene_ViewWindow::PanId),
+                      SIGNAL(triggered(bool)),
+                      svw, SLOT(onViewPan()));
+  QObject::connect(svw->toolMgr()->action(QxScene_ViewWindow::PanId),
+                   SIGNAL(triggered(bool)),
+                   wgv, SLOT(onViewPan()));
+
+  QObject::disconnect(svw->toolMgr()->action(QxScene_ViewWindow::GlobalPanId),
+                      SIGNAL(triggered(bool)),
+                      svw, SLOT(onViewGlobalPan()));
+  QObject::connect(svw->toolMgr()->action(QxScene_ViewWindow::GlobalPanId),
+                   SIGNAL(triggered(bool)),
+                   wgv, SLOT(onViewGlobalPan()));
+
+  QObject::disconnect(svw->toolMgr()->action(QxScene_ViewWindow::ResetId),
+                      SIGNAL(triggered(bool)),
+                      svw, SLOT(onViewReset()));
+  QObject::connect(svw->toolMgr()->action(QxScene_ViewWindow::ResetId),
+                   SIGNAL(triggered(bool)),
+                   wgv, SLOT(onViewReset()));
+}
+
 QDockWidget* SuitWrapper::objectBrowser()
 {
   SalomeWrap_Module* module = dynamic_cast<SalomeWrap_Module*>(_wrapped);

diff --git a/src/salomewrap/SuitWrapper.hxx b/src/salomewrap/SuitWrapper.hxx
index 9ce3234f5104fff462d7514ed7f2e1ccbcf4433f..5135f2b85e8bf53582a62db9184e22d76d50957e 100644 (file)
--- a/src/salomewrap/SuitWrapper.hxx
+++ b/src/salomewrap/SuitWrapper.hxx
@@ -47,6 +47,8 @@ namespace YACS
       virtual ~SuitWrapper();
 
       QWidget* getNewWindow(QGraphicsScene *scene);
+      void AssociateViewToWindow(QGraphicsView* gView, QWidget* viewWindow);
+
       QDockWidget* objectBrowser();
 
       QAction* createAction(const int id,