*** empty log message ***

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 4f276dfa8ea1cbc5545d22de1ea07d47b28ae19a..d20e26ad7e16cdb4355b893898913c53cd1ea96d 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -482,11 +482,11 @@ void CAM_Application::createEmptyStudy()
 
   STD_Application::createEmptyStudy();
 
-  SUIT_Study* newStudy = activeStudy();
-  if ( study != newStudy ) 
-  {
-    CAM_Study* camStudy = dynamic_cast<CAM_Study*>( newStudy );
-    for ( ModuleListIterator it( myModules ); it.current(); ++it )
-      camStudy->insertDataModel( it.current()->dataModel() );
-  }
+  //SUIT_Study* newStudy = activeStudy();
+  //if ( study != newStudy ) 
+  //{
+  //  CAM_Study* camStudy = dynamic_cast<CAM_Study*>( newStudy );
+  //  for ( ModuleListIterator it( myModules ); it.current(); ++it )
+  //    camStudy->insertDataModel( it.current()->dataModel() );
+  //}
 }

diff --git a/src/GLViewer/Makefile.in b/src/GLViewer/Makefile.in
index d921dd29453b57fb2c8bfff6c6f180c3655850ca..28bb5bf766ac171b3e862829e607b5c9513a1f5a 100644 (file)
--- a/src/GLViewer/Makefile.in
+++ b/src/GLViewer/Makefile.in
@@ -98,6 +98,6 @@ CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES)
 
 LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL)
 
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -L/usr/X11R6/lib -lGLU
+LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lqtx -L/usr/X11R6/lib -lGLU
 
 @CONCLUDE@

diff --git a/src/Makefile.in b/src/Makefile.in
index e1899da8d0d615b090609a1454d2bd3269e73fc9..9d6a17933b053600d023f3f7abfac9a3008efe22 100755 (executable)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -34,6 +34,6 @@ VPATH=.:@srcdir@
 
 SUBDIRS = Qtx SUIT STD CAF CAM SUITApp VTKViewer OCCViewer GLViewer \
           LogWindow Event OBJECT Prs PyInterp PythonConsole ObjBrowser \
-          RegistryDisplay Plot2d TOOLSGUI SOCC SVTK SPlot2d Session SalomeApp SALOME_SWIG SALOME_PY SUPERVGraph SALOME_PYQT Style ResExporter
+          RegistryDisplay Plot2d TOOLSGUI SOCC SVTK SPlot2d LightApp Session SalomeApp SALOME_SWIG SALOME_PY SUPERVGraph SALOME_PYQT Style ResExporter
 
 @MODULE@

diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index b6dfae0e1a54f8c35d8a6c7b41bd37b24881fbbe..9bcbc4cec8790e766c9c96f044baf0d5e103b9f7 100755 (executable)
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -52,7 +52,7 @@ LIB_CLIENT_IDL =
 BIN = 
 BIN_SRC        =
 
-CPPFLAGS+=$(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(QT_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+=$(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(QT_INCLUDES) $(OGL_INCLUDES)
 LDFLAGS+= $(PYTHON_LIBS) $(VTK_LIBS) $(QT_LIBS) $(OGL_LIBS) $(CAS_LDPATH) -lTKV3d -lVTKViewer -lsuit
 
 

diff --git a/src/Plot2d/Makefile.in b/src/Plot2d/Makefile.in
index 65ccacd41dd13ebe9db33c9dd7fea4efc56c168c..ef3d4742b7fccebeeba867254c2b087b746a80fc 100755 (executable)
--- a/src/Plot2d/Makefile.in
+++ b/src/Plot2d/Makefile.in
@@ -66,9 +66,9 @@ plot2d_settings.png \
 plot2d_splines.png \
 plot2d_zoom.png
 
-CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) -I$(KERNEL_ROOT_DIR)/include/salome
+CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES)
 
-LDFLAGS+=$(QWT_LIBS) $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit
+LDFLAGS+=$(QWT_LIBS) $(QT_MT_LIBS) -lsuit
 
 @CONCLUDE@
 

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index 03540eabd1bd5a2097cfcb1854331c5275b8a9c0..7b1da6225c9e94162a01815c6c9eb8ee8ae1e643 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -12,8 +12,6 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Application.h"
 
-//#include "utilities.h"
-
 #include "qapplication.h"
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
@@ -381,7 +379,6 @@ QString Plot2d_ViewFrame::getInfo( const QPoint& pnt )
     if ( xmark-2 == pnt.x() ) {
       xCoord = majXmark; 
       xFound = true;
-//      MESSAGE("Plot2d_ViewFrame::getInfo : close maj X mark("<<i<<") = "<<majXmark<<" "<<xmark<<" "<<pnt.x());
       break;
     }
   }
@@ -392,7 +389,6 @@ QString Plot2d_ViewFrame::getInfo( const QPoint& pnt )
       if ( xmark-2 == pnt.x() ) {
         xCoord = minXmark; 
         xFound = true;
-//        MESSAGE("Plot2d_ViewFrame::getInfo : close min X mark("<<i<<") = "<<minXmark<<" "<<xmark<<" "<<pnt.x());
         break;
       }
     }
@@ -890,12 +886,6 @@ void Plot2d_ViewFrame::onSettings()
     if ( cols[ "blue-min" ] > color.blue() )
       cols[ "blue-min" ] = color.blue();
   }
-  for (IList::Iterator it = mars.begin();  it != mars.end(); ++it)
-    MESSAGE("markers( " << it.key() << ") = " << it.data() );
-  for (IList::Iterator it = lins.begin();  it != lins.end(); ++it)
-    MESSAGE("lines( " << it.key() << ") = " << it.data() );
-  for (SList::Iterator it = cols.begin();  it != cols.end(); ++it)
-    MESSAGE("colors( " << it.key() << ") = " << it.data() );
 #endif
   
   Plot2d_SetupViewDlg* dlg = new Plot2d_SetupViewDlg( this, true, mySecondY );