From 104da2cf247e517aa8d6f1e522c400dd25cc6e72 Mon Sep 17 00:00:00 2001 From: mbs Date: Sun, 26 Mar 2023 00:43:13 +0000 Subject: [PATCH] more code cleanup --- CMakeLists.txt | 1 - src/GEOMGUI/GEOM_Displayer.cxx | 4 +--- src/GEOMGUI/GEOM_Displayer.h | 4 ++-- src/GEOMGUI/GeometryGUI.cxx | 11 +---------- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bccf5a9a5..ce951a798 100644 --- 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 6c900a99f..bb395b9c8 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -78,7 +78,6 @@ #include #include -//MBS: #include #include @@ -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 e51c88b32..11f35c1b0 100644 --- 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 @@ -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 6b1693e5a..f5281fad2 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -60,7 +60,6 @@ #include #include -//MBS: #include #include #include @@ -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( window ); @@ -418,18 +417,10 @@ void GeometryGUI::ActiveWorkingPlane() vw->onFitAll(); } } - //MBS: else if ( ViewPV3D ) { PV3DViewer_ViewWindow* vw = dynamic_cast( 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(); } } } -- 2.39.2