more code cleanup

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bccf5a9a52f9890cedfd8b6df45dc2478ef6e19b..ce951a7989c86199da1ef1d0c15c033269386e5a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,6 @@ IF(SALOME_BUILD_GUI)
   IF(EXISTS ${GUI_ROOT_DIR})
     FIND_PACKAGE(SalomeGUI)
     SALOME_GUI_WITH_CORBA() #check whether GUI built with CORBA
-    #MBS:
     SALOME_GUI_MODE(SALOME_USE_OCCVIEWER SALOME_USE_VTKVIEWER SALOME_USE_PV3DVIEWER SALOME_USE_SALOMEOBJECT
                     OPTIONAL SALOME_USE_PLOT2DVIEWER SALOME_USE_GRAPHICSVIEW SALOME_USE_PYCONSOLE)
     ADD_DEFINITIONS(${GUI_DEFINITIONS})

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index 6c900a99f8c4c8cfa14e9406d2d049f5c07146d0..bb395b9c8369ed25c6a0949d8fb15e91d0829d20 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -78,7 +78,6 @@
 #include <SVTK_Prs.h>
 #include <SVTK_ViewModel.h>
 
-//MBS:
 #include <SPV3D_Prs.h>
 #include <SPV3D_ViewModel.h>
 
@@ -1741,7 +1740,6 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
   }
 }
 
-//MBS:
 //=================================================================
 /*!
  *  GEOM_Displayer::Update
@@ -2562,7 +2560,7 @@ bool GEOM_Displayer::canBeDisplayed( const QString& entry, const QString& viewer
   GEOM::GEOM_Gen_var aCompObj = GEOM::GEOM_Gen::_narrow(anOrbObj); // enable displaying of whole GEOM component
   bool isGeomObj = (!CORBA::is_nil( aGeomObj ) || !CORBA::is_nil( aFieldStepObj ) || !CORBA::is_nil( aCompObj ));
   bool ret = ( isGeomObj ) &&
-         (viewer_type == SOCC_Viewer::Type() || viewer_type == SVTK_Viewer::Type() || viewer_type == SPV3D_ViewModel::Type());//MBS:
+         (viewer_type == SOCC_Viewer::Type() || viewer_type == SVTK_Viewer::Type() || viewer_type == SPV3D_ViewModel::Type());
   MSGEL("..... --> isCorbaObj=" << YesNo(isCorbaObj) << ", isGeomObj=" << YesNo(isGeomObj) << ", canBeDisp=" << YesNo(ret));
   return ret;
 }

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index e51c88b32fbdb92ae0395e018dede03a850ffb2c..11f35c1b08b6bc3894d8cbcc296bd845e4f0ab8d 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -38,7 +38,7 @@ class SALOME_View;
 class SALOME_Prs;
 class SALOME_OCCPrs;
 class SALOME_VTKPrs;
-class SALOME_PV3DPrs;//MBS:
+class SALOME_PV3DPrs;
 class SALOME_OCCViewType;
 
 #include <TopoDS_Shape.hxx>
@@ -188,7 +188,7 @@ public:
   /* Reimplemented from SALOME_Displayer */
   virtual void  Update( SALOME_OCCPrs* );
   virtual void  Update( SALOME_VTKPrs* );
-  virtual void  Update( SALOME_PV3DPrs* ); // MBS:
+  virtual void  Update( SALOME_PV3DPrs* );
   virtual void  BeforeDisplay( SALOME_View*, const SALOME_OCCPrs* );
   virtual void  AfterDisplay ( SALOME_View*, const SALOME_OCCPrs* );
   virtual void  BeforeErase  ( SALOME_View*, const SALOME_OCCPrs* );

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 6b1693e5ae0604ebfd66fb77977a7a78686d72b3..f5281fad299fa0399b1a2167e7e62466f155cee4 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -60,7 +60,6 @@
 #include <OCCViewer_ViewModel.h>
 #include <OCCViewer_ViewManager.h>
 
-//MBS:
 #include <PV3DViewer_ViewWindow.h>
 #include <PV3DViewer_ViewModel.h>
 #include <PV3DViewer_ViewManager.h>
@@ -394,7 +393,7 @@ void GeometryGUI::ActiveWorkingPlane()
   SUIT_ViewWindow* window = application()->desktop()->activeWindow();
   bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
   bool ViewVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() );
-  bool ViewPV3D = ( window && window->getViewManager()->getType() == PV3DViewer_ViewModel::Type() ); //MBS:
+  bool ViewPV3D = ( window && window->getViewManager()->getType() == PV3DViewer_ViewModel::Type() );
 
   if ( ViewOCC ) {
     OCCViewer_ViewWindow* vw = dynamic_cast<OCCViewer_ViewWindow*>( window );
@@ -418,18 +417,10 @@ void GeometryGUI::ActiveWorkingPlane()
       vw->onFitAll();
     }
   }
-  //MBS:
   else if ( ViewPV3D ) {
     PV3DViewer_ViewWindow* vw = dynamic_cast<PV3DViewer_ViewWindow*>( window );
     if ( vw ) {
       MSGEL("...(NYI) => orient view to active plane");
-      // vtkCamera* camera = vw->getRenderer()->GetActiveCamera();
-      //
-      // camera->SetPosition(DZ.X(), DZ.Y(), DZ.Z());
-      // camera->SetViewUp(DY.X(), DY.Y(), DY.Z());
-      // camera->SetFocalPoint(0,0,0);
-      //
-      //vw->onFitAll();
     }
   }
 }