Removing dependencies on CORBA

diff --git a/src/SPlot2d/Makefile.in b/src/SPlot2d/Makefile.in
index 82007215e81206fee014a4cb0e1f3d9804785f16..d0a8d16044e78e359aafb14d6591b1ff1f6e1f5f 100644 (file)
--- a/src/SPlot2d/Makefile.in
+++ b/src/SPlot2d/Makefile.in
@@ -11,8 +11,7 @@ EXPORT_HEADERS = \
            SPlot2d.h \
            SPlot2d_Curve.h \
           SPlot2d_Prs.h \
-          SPlot2d_ViewModel.h \
-          SPlot2d_SetupPlot2dDlg.h
+          SPlot2d_ViewModel.h
 
 # .po files to transform in .qm
 PO_FILES = SPlot2d_msg_en.po
@@ -23,16 +22,14 @@ LIB = libSPlot2d.la
 LIB_SRC =        \
            SPlot2d_Curve.cxx \
           SPlot2d_Prs.cxx \
-          SPlot2d_ViewModel.cxx \
-          SPlot2d_SetupPlot2dDlg.cxx
+          SPlot2d_ViewModel.cxx
 
 LIB_MOC = \
-          SPlot2d_ViewModel.h \
-          SPlot2d_SetupPlot2dDlg.h
+          SPlot2d_ViewModel.h
 
-LIB_CLIENT_IDL = SALOMEDS.idl \
-                SALOME_Exception.idl \
-                SALOME_GenericObj.idl
+#LIB_CLIENT_IDL = SALOMEDS.idl \
+#               SALOME_Exception.idl \
+#               SALOME_GenericObj.idl
 
 #LIB_CLIENT_IDL = SALOMEDS.idl \
 #               SALOME_ModuleCatalog.idl \

diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx
index 1e84a8d91bb61d8ab294db291bfefe23f4ab1d64..e17d757eb5c1a5131724fab61334b2be9ae9253e 100644 (file)
--- a/src/SPlot2d/SPlot2d_ViewModel.cxx
+++ b/src/SPlot2d/SPlot2d_ViewModel.cxx
@@ -21,14 +21,16 @@
 
 using namespace std;
 
-#include "SALOMEDSClient.hxx"
-#include "SALOMEDS_StudyManager.hxx"
+//ASL: Temporary commented in order to avoir dependency on SALOMEDS
+
+//#include "SALOMEDSClient.hxx"
+//#include "SALOMEDS_StudyManager.hxx"
 
 // in order NOT TO link with SalomeApp, here the code returns SALOMEDS_Study.
 // SalomeApp_Study::studyDS() does it as well, but -- here it is retrieved from
 // SALOMEDS::StudyManager - no linkage with SalomeApp.  
 
-static _PTR(Study) getStudyDS()
+/*static _PTR(Study) getStudyDS()
 {
   SALOMEDSClient_Study* aStudy = NULL;
   _PTR(StudyManager) aMgr( new SALOMEDS_StudyManager() );
@@ -42,7 +44,7 @@ static _PTR(Study) getStudyDS()
   const int id = stud->id(); // virtual method, must return SALOMEDS_Study id
   // get SALOMEDS_Study with this id from StudyMgr
   return aMgr->GetStudyByID( id );
-}                
+} */               
 
 //=================================================================================
 // SPlot2d_Viewer implementation
@@ -152,7 +154,8 @@ void SPlot2d_Viewer::Erase( const Handle(SALOME_InteractiveObject)& IObject, boo
     aViewFrame->eraseCurve( curve, update );
 
   // it can be table or container object selected
-  _PTR(Study) aStudy = getStudyDS();
+  //ASL: Temporary commented in order to avoid dependency on SALOMEDS
+/*  _PTR(Study) aStudy = getStudyDS();
   _PTR(SObject) aSO = aStudy->FindObjectID(IObject->getEntry());
   if ( aSO ) {
     _PTR(ChildIterator) aIter = aStudy->NewChildIterator( aSO );
@@ -166,7 +169,7 @@ void SPlot2d_Viewer::Erase( const Handle(SALOME_InteractiveObject)& IObject, boo
        aViewFrame->eraseCurve( curve, update );
     }
   }
-
+*/
 
 }
 

diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in
index 11f7c6500fa65806152b333615df07b876b09001..9e0d9be84a168dc547907a5e5169be37b98e6951 100755 (executable)
--- a/src/SUPERVGraph/Makefile.in
+++ b/src/SUPERVGraph/Makefile.in
@@ -24,12 +24,7 @@ LIB_MOC =      SUPERVGraph_moc.cxx \
                  SUPERVGraph_ViewManager_moc.cxx \
                  SUPERVGraph_ViewModel_moc.cxx 
 
-LIB_CLIENT_IDL = SALOMEDS.idl \
-                SALOME_ModuleCatalog.idl \
-                SALOME_Component.idl \
-                SALOME_Exception.idl \
-                SALOME_GenericObj.idl
-
+LIB_CLIENT_IDL = 
 
 CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 LDFLAGS+=$(QT_MT_LIBS) -L$(top_builddir)/lib

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
index ddab29d9507401760e91e64a41858169ebc337bc..297be488d8a640c10bfd9648e15f42f4b601f183 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
@@ -28,8 +28,6 @@
 
 #include "SUPERVGraph_ViewFrame.h"
 
-#include "utilities.h"
-
 //QT Include
 #include <qlayout.h>
 #include <qcolordialog.h>
@@ -103,7 +101,7 @@ void SUPERVGraph_ViewFrame::setViewWidget( SUPERVGraph_View* theView )
 */
 void SUPERVGraph_ViewFrame::onViewTrihedron()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewTrihedron" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewTrihedron" )
 }
 
 /*!
@@ -111,7 +109,7 @@ void SUPERVGraph_ViewFrame::onViewTrihedron()
 */
 void SUPERVGraph_ViewFrame::onViewTop()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewTop" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewTop" )
 }
 
 /*!
@@ -119,7 +117,7 @@ void SUPERVGraph_ViewFrame::onViewTop()
 */
 void SUPERVGraph_ViewFrame::onViewBottom()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewBottom" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewBottom" )
 }
 
 /*!
@@ -127,7 +125,7 @@ void SUPERVGraph_ViewFrame::onViewBottom()
 */
 void SUPERVGraph_ViewFrame::onViewLeft()    
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewLeft" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewLeft" )
 }
 
 /*!
@@ -135,7 +133,7 @@ void SUPERVGraph_ViewFrame::onViewLeft()
 */
 void SUPERVGraph_ViewFrame::onViewRight()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewRight" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewRight" )
 }
 
 /*!
@@ -143,7 +141,7 @@ void SUPERVGraph_ViewFrame::onViewRight()
 */
 void SUPERVGraph_ViewFrame::onViewBack()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewBack" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewBack" )
 }
 
 /*!
@@ -151,7 +149,7 @@ void SUPERVGraph_ViewFrame::onViewBack()
 */
 void SUPERVGraph_ViewFrame::onViewFront()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewFront" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewFront" )
 }
 
 /*!
@@ -159,7 +157,7 @@ void SUPERVGraph_ViewFrame::onViewFront()
 */
 void SUPERVGraph_ViewFrame::onViewReset()    
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewReset" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewReset" )
     if (myView)
       myView->ResetView();
 }
@@ -169,7 +167,7 @@ void SUPERVGraph_ViewFrame::onViewReset()
 */
 void SUPERVGraph_ViewFrame::onViewRotate()
 {
-   MESSAGE ( "SUPERVGraph_ViewFrame::onViewRotate" )
+//   MESSAGE ( "SUPERVGraph_ViewFrame::onViewRotate" )
 }
 
 /*!
@@ -177,7 +175,7 @@ void SUPERVGraph_ViewFrame::onViewRotate()
 */
 void SUPERVGraph_ViewFrame::onViewGlobalPan()
 {
-   MESSAGE ( "SUPERVGraph_ViewFrame::onViewGlobalPan" )
+//   MESSAGE ( "SUPERVGraph_ViewFrame::onViewGlobalPan" )
 }
 
 /*!
@@ -185,7 +183,7 @@ void SUPERVGraph_ViewFrame::onViewGlobalPan()
 */
 void SUPERVGraph_ViewFrame::onViewZoom()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewZoom" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewZoom" )
 }
 
 /*!
@@ -193,7 +191,7 @@ void SUPERVGraph_ViewFrame::onViewZoom()
 */
 void SUPERVGraph_ViewFrame::onViewPan()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewPan" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewPan" )
     if (myView != NULL)
       myView->ActivatePanning();
 }
@@ -203,7 +201,7 @@ void SUPERVGraph_ViewFrame::onViewPan()
 */
 void SUPERVGraph_ViewFrame::onViewFitArea()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewFitArea" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewFitArea" )
 }
 
 /*!
@@ -211,7 +209,7 @@ void SUPERVGraph_ViewFrame::onViewFitArea()
 */
 void SUPERVGraph_ViewFrame::onViewFitAll()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onViewFitAll" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onViewFitAll" )
 }
 
 /*!
@@ -235,50 +233,38 @@ QColor SUPERVGraph_ViewFrame::backgroundColor() const
 
 void SUPERVGraph_ViewFrame::onAdjustTrihedron()
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::onAdjustTrihedron" )  
+//  MESSAGE ( "SUPERVGraph_ViewFrame::onAdjustTrihedron" )  
 }
 
 void SUPERVGraph_ViewFrame::rename( const Handle(SALOME_InteractiveObject)& IObject, 
                                    QString newName )
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::rename" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::rename" )
 }
 
 void SUPERVGraph_ViewFrame::unHighlightAll() 
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::unHighlightAll" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::unHighlightAll" )
 }
 
 void SUPERVGraph_ViewFrame::highlight( const Handle(SALOME_InteractiveObject)& IObject, 
                                       bool highlight, bool immediatly ) 
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::highlight" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::highlight" )
 }
 
 bool SUPERVGraph_ViewFrame::isInViewer( const Handle(SALOME_InteractiveObject)& IObject ) 
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::isInViewer" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::isInViewer" )
   return false;
 }
 
 bool SUPERVGraph_ViewFrame::isVisible( const Handle(SALOME_InteractiveObject)& IObject ) 
 {
-  MESSAGE ( "SUPERVGraph_ViewFrame::isVisible" )
+//  MESSAGE ( "SUPERVGraph_ViewFrame::isVisible" )
   return false;
 }
 
-void SUPERVGraph_ViewFrame::undo( const _PTR(Study)& aStudy,
-                                 const char* StudyFrameEntry )
-{
-  MESSAGE ( "SUPERVGraph_ViewFrame::undo" )
-}
-
-void SUPERVGraph_ViewFrame::redo( const _PTR(Study)& aStudy,
-                                 const char* StudyFrameEntry )
-{
-  MESSAGE ( "SUPERVGraph_ViewFrame::redo" )
-}
-
 void SUPERVGraph_ViewFrame::resizeEvent( QResizeEvent* theEvent )
 {
   QMainWindow::resizeEvent( theEvent );

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
index e4d76feaf5dbe8641f8df2d1718b8a9435953731..351241aa8939a9c004e859a5707155855c17625c 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
@@ -30,10 +30,6 @@
 #define SUPERVGraph_ViewFrame_H
 
 #include "SALOME_InteractiveObject.hxx"
-
-#include "SALOMEDSClient.hxx"
-
-#include "SalomeApp_Application.h"
 #include "SUIT_PopupClient.h"
 #include "SUIT_ViewWindow.h"
 
@@ -82,11 +78,6 @@ class /*SUPERVGRAPH_EXPORT*/ SUPERVGraph_ViewFrame : public SUIT_ViewWindow {
                                         QString newName );
   bool                           isInViewer( const Handle(SALOME_InteractiveObject)& IObject );
   bool                           isVisible( const Handle(SALOME_InteractiveObject)& IObject );
-
-  /*  undo/redo management */
-  void              undo(const _PTR(Study)& aStudy, const char* StudyFrameEntry);
-  void              redo(const _PTR(Study)& aStudy, const char* StudyFrameEntry);
-
   
   /* selection */
   Handle(SALOME_InteractiveObject) FindIObject(const char* Entry) { Handle(SALOME_InteractiveObject) o; return o; };
@@ -120,6 +111,5 @@ class /*SUPERVGRAPH_EXPORT*/ SUPERVGraph_ViewFrame : public SUIT_ViewWindow {
   
  private:
   SUPERVGraph_View* myView;
-  SalomeApp_Application* myApp;
 }; 
 #endif

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewManager.h b/src/SUPERVGraph/SUPERVGraph_ViewManager.h
index 57b134f34629272d410fd1b5e38baf2de0b815cf..9ffb49f67cb3fd76822a7d40e979ddcc8fb4262d 100644 (file)
--- a/src/SUPERVGraph/SUPERVGraph_ViewManager.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewManager.h
@@ -2,7 +2,6 @@
 #define SUPERVGRAPH_VIEWMANAGER_H
 
 #include "SUPERVGraph_ViewModel.h"
-
 #include "SUIT_ViewManager.h"
 
 class SUIT_Desktop;