From: san Date: Thu, 9 Jun 2005 13:53:56 +0000 (+0000) Subject: SPlot2d_Viewer connected to Plot2d_ViewManager X-Git-Tag: T3_0_0_a3~20 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eb50cc96beed1cfa1db92f94e5f5364a48b171b6;p=modules%2Fgui.git SPlot2d_Viewer connected to Plot2d_ViewManager --- diff --git a/src/SalomeApp/Makefile.in b/src/SalomeApp/Makefile.in index fad37ab57..48f75cb03 100755 --- a/src/SalomeApp/Makefile.in +++ b/src/SalomeApp/Makefile.in @@ -102,7 +102,7 @@ RESOURCES_FILES = icon_about.png \ CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) -LIBS+= -L$(GUI_ROOT_DIR)/lib/salome -lsuit -lstd -lCAM -lObjBrowser -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace $(CAS_KERNEL) -lPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lSalomeContainer +LIBS+= -L$(GUI_ROOT_DIR)/lib/salome -lsuit -lstd -lCAM -lObjBrowser -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace $(CAS_KERNEL) -lPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lSPlot2d -lPyInterp -lPythonConsole -lLogWindow -lSalomeContainer @CONCLUDE@ diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx index c620afb41..c8e92652e 100644 --- a/src/SalomeApp/SalomeApp_Application.cxx +++ b/src/SalomeApp/SalomeApp_Application.cxx @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -696,7 +697,10 @@ SUIT_ViewManager* SalomeApp_Application::createViewManager( const QString& vmTyp new SalomeApp_GLSelector( (GLViewer_Viewer2d*)viewMgr->getViewModel(), mySelMgr ); } else if ( vmType == Plot2d_Viewer::Type() ) + { viewMgr = new Plot2d_ViewManager( activeStudy(), desktop() ); + viewMgr->setViewModel( new SPlot2d_Viewer() );// custom view model, which extends SALOME_View interface + } else if ( vmType == OCCViewer_Viewer::Type() ) { viewMgr = new OCCViewer_ViewManager( activeStudy(), desktop() );