ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-12 23:34:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

more code cleanup

Browse Source
This commit is contained in:
mbs 2023-03-26 00:43:13 +00:00
parent 1026c29d39
commit 104da2cf24
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -112,7 +112,6 @@ IF(SALOME_BUILD_GUI)
IF(EXISTS ${GUI_ROOT_DIR}) IF(EXISTS ${GUI_ROOT_DIR})
FIND_PACKAGE(SalomeGUI) FIND_PACKAGE(SalomeGUI)
SALOME_GUI_WITH_CORBA() #check whether GUI built with CORBA 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 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) OPTIONAL SALOME_USE_PLOT2DVIEWER SALOME_USE_GRAPHICSVIEW SALOME_USE_PYCONSOLE)
ADD_DEFINITIONS(${GUI_DEFINITIONS}) ADD_DEFINITIONS(${GUI_DEFINITIONS})

4
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -78,7 +78,6 @@
#include <SVTK_Prs.h> #include <SVTK_Prs.h>
#include <SVTK_ViewModel.h> #include <SVTK_ViewModel.h>
//MBS:
#include <SPV3D_Prs.h> #include <SPV3D_Prs.h>
#include <SPV3D_ViewModel.h> #include <SPV3D_ViewModel.h>
@ -1741,7 +1740,6 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
} }
} }
//MBS:
//================================================================= //=================================================================
/*! /*!
* GEOM_Displayer::Update * 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 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 isGeomObj = (!CORBA::is_nil( aGeomObj ) || !CORBA::is_nil( aFieldStepObj ) || !CORBA::is_nil( aCompObj ));
bool ret = ( isGeomObj ) && 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)); MSGEL("..... --> isCorbaObj=" << YesNo(isCorbaObj) << ", isGeomObj=" << YesNo(isGeomObj) << ", canBeDisp=" << YesNo(ret));
return ret; return ret;
} }

4
src/GEOMGUI/GEOM_Displayer.h
View File

@ -38,7 +38,7 @@ class SALOME_View;
class SALOME_Prs; class SALOME_Prs;
class SALOME_OCCPrs; class SALOME_OCCPrs;
class SALOME_VTKPrs; class SALOME_VTKPrs;
class SALOME_PV3DPrs;//MBS: class SALOME_PV3DPrs;
class SALOME_OCCViewType; class SALOME_OCCViewType;
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
@ -188,7 +188,7 @@ public:
/* Reimplemented from SALOME_Displayer */ /* Reimplemented from SALOME_Displayer */
virtual void Update( SALOME_OCCPrs* ); virtual void Update( SALOME_OCCPrs* );
virtual void Update( SALOME_VTKPrs* ); 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 BeforeDisplay( SALOME_View*, const SALOME_OCCPrs* );
virtual void AfterDisplay ( SALOME_View*, const SALOME_OCCPrs* ); virtual void AfterDisplay ( SALOME_View*, const SALOME_OCCPrs* );
virtual void BeforeErase ( SALOME_View*, const SALOME_OCCPrs* ); virtual void BeforeErase ( SALOME_View*, const SALOME_OCCPrs* );

11
src/GEOMGUI/GeometryGUI.cxx
View File

@ -60,7 +60,6 @@
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewManager.h> #include <OCCViewer_ViewManager.h>
//MBS:
#include <PV3DViewer_ViewWindow.h> #include <PV3DViewer_ViewWindow.h>
#include <PV3DViewer_ViewModel.h> #include <PV3DViewer_ViewModel.h>
#include <PV3DViewer_ViewManager.h> #include <PV3DViewer_ViewManager.h>
@ -394,7 +393,7 @@ void GeometryGUI::ActiveWorkingPlane()
SUIT_ViewWindow* window = application()->desktop()->activeWindow(); SUIT_ViewWindow* window = application()->desktop()->activeWindow();
bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
bool ViewVTK = ( window && window->getViewManager()->getType() == SVTK_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 ) { if ( ViewOCC ) {
OCCViewer_ViewWindow* vw = dynamic_cast<OCCViewer_ViewWindow*>( window ); OCCViewer_ViewWindow* vw = dynamic_cast<OCCViewer_ViewWindow*>( window );
@ -418,18 +417,10 @@ void GeometryGUI::ActiveWorkingPlane()
vw->onFitAll(); vw->onFitAll();
} }
} }
//MBS:
else if ( ViewPV3D ) { else if ( ViewPV3D ) {
PV3DViewer_ViewWindow* vw = dynamic_cast<PV3DViewer_ViewWindow*>( window ); PV3DViewer_ViewWindow* vw = dynamic_cast<PV3DViewer_ViewWindow*>( window );
if ( vw ) { if ( vw ) {
MSGEL("...(NYI) => orient view to active plane"); 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();
} }
} }
} }