]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
MPV: merge from branch BR_GUI_AutoTools
authormpv <mpv@opencascade.com>
Thu, 15 Feb 2007 08:26:14 +0000 (08:26 +0000)
committermpv <mpv@opencascade.com>
Thu, 15 Feb 2007 08:26:14 +0000 (08:26 +0000)
71 files changed:
Makefile.in [deleted file]
configure.ac
configure.in.base [deleted file]
doc/salome/Makefile.am [new file with mode: 0644]
doc/salome/gui/Makefile.am [new file with mode: 0644]
doc/salome/gui/Makefile.in [deleted file]
doc/salome/tui/Makefile.am [new file with mode: 0644]
doc/salome/tui/Makefile.in [deleted file]
idl/Makefile.am [new file with mode: 0644]
resources/Makefile.am [new file with mode: 0644]
src/CAF/Makefile.am [new file with mode: 0755]
src/CAM/Makefile.am [new file with mode: 0755]
src/DDS/Makefile.am [new file with mode: 0755]
src/DDS/Makefile.in [deleted file]
src/Event/Makefile.am [new file with mode: 0755]
src/GLViewer/Makefile.am [new file with mode: 0644]
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_Application.h
src/LightApp/Makefile.am [new file with mode: 0755]
src/LogWindow/Makefile.am [new file with mode: 0755]
src/LogWindow/Makefile.in [deleted file]
src/Makefile.am [new file with mode: 0755]
src/OBJECT/Makefile.am [new file with mode: 0755]
src/OBJECT/Makefile.in [deleted file]
src/OCCViewer/Makefile.am [new file with mode: 0755]
src/ObjBrowser/Makefile.am [new file with mode: 0755]
src/Plot2d/Makefile.am [new file with mode: 0755]
src/Plot2d/resources/plot2d_rotate.png [deleted file]
src/Prs/Makefile.am [new file with mode: 0755]
src/Prs/Makefile.in [deleted file]
src/PyInterp/Makefile.am [new file with mode: 0755]
src/PyInterp/Makefile.in [deleted file]
src/PythonConsole/Makefile.am [new file with mode: 0755]
src/QDS/Makefile.am [new file with mode: 0755]
src/QDS/Makefile.in [deleted file]
src/Qtx/Makefile.am [new file with mode: 0755]
src/RegistryDisplay/Makefile.am [new file with mode: 0755]
src/ResExporter/Makefile.am [new file with mode: 0755]
src/SALOME_PY/Makefile.am [new file with mode: 0755]
src/SALOME_PYQT/Makefile.am [new file with mode: 0755]
src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am [new file with mode: 0644]
src/SALOME_PYQT/SalomePyQt/Makefile.am [new file with mode: 0644]
src/SALOME_SWIG/Makefile.am [new file with mode: 0755]
src/SALOME_SWIG/supervisionexample.py [deleted file]
src/SALOME_SWIG/supervisiongeomexample.py [deleted file]
src/SALOME_SWIG/testattr.py [deleted file]
src/SOCC/Makefile.am [new file with mode: 0755]
src/SOCC/Makefile.in [deleted file]
src/SPlot2d/Makefile.am [new file with mode: 0644]
src/SPlot2d/Makefile.in [deleted file]
src/SPlot2d/SPlot2d_msg_en.po [deleted file]
src/SPlot2d/resources/SPlot2d_msg_en.po [new file with mode: 0644]
src/STD/Makefile.am [new file with mode: 0755]
src/SUIT/Makefile.am [new file with mode: 0755]
src/SUITApp/Makefile.am [new file with mode: 0644]
src/SUPERVGraph/Makefile.am [new file with mode: 0755]
src/SUPERVGraph/Makefile.in [deleted file]
src/SVTK/Makefile.am [new file with mode: 0755]
src/SalomeApp/Makefile.am [new file with mode: 0755]
src/SalomeApp/SalomeApp_Displayer.cxx [deleted file]
src/SalomeApp/SalomeApp_Displayer.h [deleted file]
src/SalomeApp/Test/Makefile.am [new file with mode: 0644]
src/SalomeApp/Test/Makefile.in [deleted file]
src/Session/Makefile.am [new file with mode: 0755]
src/Session/runSession [deleted file]
src/Style/Makefile.am [new file with mode: 0644]
src/TOOLSGUI/Makefile.am [new file with mode: 0755]
src/VTKViewer/Makefile.am [new file with mode: 0755]
src/VTKViewer/VTKViewer.cxx
src/VTKViewer/VTKViewer_CellRectPicker.cxx [deleted file]
src/VTKViewer/VTKViewer_RectPicker.h [deleted file]

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644 (file)
index 81a618a..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# -* Makefile *- 
-#
-# Author : Patrick GOLDBRONN (CEA)
-# Date : 28/06/2001
-# $Header$
-#
-
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=.
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:@top_srcdir@/resources:./bin:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-SUBDIRS = src doc adm_local
-
-RESOURCES_FILES = \
-back.xpm \
-cascade.png \
-close.png \
-default.png \
-dl_delete.png \
-dl_insert.png \
-dl_moveup.png \
-dl_movedown.png \
-forward.xpm \
-help.png \
-home.xpm \
-new.png \
-open.png \
-print.png \
-reset.png \
-save.png \
-select1.png \
-tile.png \
-Tools_en.xml \
-view_back.png \
-view_bottom.png \
-view_camera_dump.png \
-view_fitall.png \
-view_fitarea.png \
-view_front.png \
-view_glpan.png \
-view_left.png \
-view_pan.png \
-view_reset.png \
-view_right.png \
-view_rotate.png \
-view_top.png \
-view_triedre.png \
-view_zoom.png \
-copy.png \
-paste.png \
-plot2d_dump.png \
-plot2d_fitall.png \
-plot2d_fitarea.png \
-plot2d_legend.png \
-plot2d_linear.png \
-plot2d_linear_y.png \
-plot2d_lines.png \
-plot2d_log.png \
-plot2d_log_y.png \
-plot2d_pan.png \
-plot2d_points.png \
-plot2d_settings.png \
-plot2d_splines.png \
-plot2d_zoom.png \
-uc_add.png \
-uc_current.png \
-uc_del.png \
-uc_new.png \
-uc_clear.png \
-channel.cfg \
-
-BIN_SCRIPT= VERSION \
-runLightSalome.csh \
-runLightSalome.sh
-
-# copy header files in common directory
-OWN_CONFIG_H=@OWN_CONFIG_H@
-
-include_list = include/salome/SALOMEconfig.h \
-               include/salome/GUI_version.h
-
-ifeq ($(OWN_CONFIG_H),yes)
-       include_list += include/salome/config.h
-endif
-
-ifneq ($(HAVE_SSTREAM),yes)
-       include_list += include/salome/sstream
-endif
-
-inc: idl $(include_list)
-
-bin: bin/salome/VERSION
-
-bin/salome/VERSION : bin/VERSION
-       -$(RM) $@
-       $(LN_S) ../../$< $@
-
-include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
-       -$(RM) $@
-       $(LN_S) ../../$< $@
-
-# test if SALOMEconfig.h has changed (contents)
-salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
-       @if ! [ -a $@ ]; then \
-         cp -p $< $@;        \
-       fi;                   \
-       if ! cmp $< $@; then  \
-         cp -p $< $@;        \
-       fi;                   \
-
-include/salome/config.h: salome_adm/unix/config.h
-       -$(RM) $@
-       $(LN_S) ../../$< $@
-
-include/salome/sstream: salome_adm/unix/sstream
-       -$(RM) $@
-       $(LN_S) ../../$< $@
-
-include/salome/GUI_version.h: GUI_version.h
-       -$(RM) $@
-       $(LN_S) ../../$< $@
-
-depend:
-#depend: depend_idl
-#depend_idl:
-#      (cd idl ; $(MAKE) $@) || exit 1
-
-# doc is already build : if you want to had documents, go manually to doc and run 'make doc'
-#doc:
-#      (cd doc && $(MAKE) $@) || exit 1
-
-# Install make_commence make_conclude ... for other modules
-install-make:
-       ($(INSTALL) -d  $(incmakedir) || exit 1);
-       (sed 's/^prefix=/#prefix=/' $(top_builddir)/adm_local/unix/make_commence > $(incmakedir)/make_commence || exit 1);
-
-
-install-end:
-# finish libtool install
-#      @$(LT) --mode=finish $(libdir)
-
-install-include: $(include_list)
-       $(INSTALL) -d  $(includedir)
-       @for f in X $(include_list); do                         \
-          if test $$f != X; then                               \
-            (cp -p $$f $(includedir) || exit 1);               \
-          fi;                                                  \
-       done
-
-# install script in $(bindir) :
-install-bin: $(BIN_SCRIPT)
-       $(INSTALL) -d  $(bindir)
-       $(INSTALL_PROGRAM) $^ $(bindir)
-
-uninstall:
-#uninstall: uninstall-idl
-#uninstall-idl:
-#      $(RM) $(idldir)/*.idl
-
-distclean: distclean-other
-
-distclean-other:
-       -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old
-       -$(RM) salome_adm/unix/make_* 
-       -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h salome_adm/unix/config.h 
-       -$(RM) config.cache config.log config.status 
-
-@MODULE@
-
-install: install-bin install-include install-make install-end
-
index 018ff7d32ba9a2ffdb707a9f26779dfd4be9b11d..d6ed63709998b621f1dbf5690ecb7024b7fc28ea 100644 (file)
@@ -18,8 +18,8 @@ AM_INIT_AUTOMAKE
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.2
-XVERSION=0x030202
+VERSION=4.0.0
+XVERSION=0x040000
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
diff --git a/configure.in.base b/configure.in.base
deleted file mode 100644 (file)
index de2bdd3..0000000
+++ /dev/null
@@ -1,595 +0,0 @@
-#
-#  PLEASE DO NOT MODIFY configure.in FILE
-#
-#  ALL CHANGES WILL BE DISCARDED BY THE NEXT
-#  build_configure COMMAND
-#
-#  CHANGES MUST BE MADE IN configure.in.base FILE
-#
-#
-# Author : Marc Tajchman (CEA)
-# Date : 28/06/2001
-# Modified by : Patrick GOLDBRONN (CEA)
-# Modified by : Marc Tajchman (CEA)
-#
-# Created from configure.in.base
-#
-
-
-AC_INIT(src)
-AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files)
-AC_CANONICAL_HOST
-
-PACKAGE=salome
-AC_SUBST(PACKAGE)
-
-VERSION=4.0.0
-XVERSION=0x040000
-AC_SUBST(VERSION)
-AC_SUBST(XVERSION)
-
-# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
-MODULE_NAME=gui
-AC_SUBST(MODULE_NAME)
-
-########################################################################
-# Check --disable-corba-gen and other --disable-* options
-
-GUI_DISABLE_CORBA="no"
-DISABLE_PYCONSOLE="no"
-DISABLE_GLVIEWER="no"
-DISABLE_PLOT2DVIEWER="no"
-DISABLE_SUPERVGRAPHVIEWER="no"
-DISABLE_OCCVIEWER="no"
-DISABLE_VTKVIEWER="no"
-DISABLE_SALOMEOBJECT="no"
-
-for option
-do
-  case $option in
-      -disable-corba-gen=yes | --disable-corba-gen=yes | -disable-corba-gen | --disable-corba-gen)
-          GUI_DISABLE_CORBA="yes";;
-      -disable-pyConsole=yes | --disable-pyConsole=yes | -disable-pyConsole | --disable-pyConsole)
-          DISABLE_PYCONSOLE="yes";;
-      -disable-glViewer=yes | --disable-glViewer=yes | -disable-glViewer | --disable-glViewer)
-          DISABLE_GLVIEWER="yes";;
-      -disable-plot2dViewer=yes | --disable-plot2dViewer=yes | -disable-plot2dViewer | --disable-plot2dViewer)
-          DISABLE_PLOT2DVIEWER="yes";;
-      -disable-supervGraphViewer=yes | --disable-supervGraphViewer=yes | \
-      -disable-supervGraphViewer | --disable-supervGraphViewer)
-          DISABLE_SUPERVGRAPHVIEWER="yes";;
-      -disable-occViewer=yes | --disable-occViewer=yes | -disable-occViewer | --disable-occViewer)
-          DISABLE_OCCVIEWER="yes";;
-      -disable-vtkViewer=yes | --disable-vtkViewer=yes | -disable-vtkViewer | --disable-vtkViewer)
-          DISABLE_VTKVIEWER="yes";;
-      -disable-salomeObject=yes | --disable-salomeObject=yes | -disable-salomeObject | --disable-salomeObject)
-          DISABLE_SALOMEOBJECT="yes";;
-  esac
-done
-
-dnl
-dnl Initialize source and build root directories
-dnl
-
-ROOT_BUILDDIR=`pwd`
-ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-cd $ROOT_SRCDIR
-ROOT_SRCDIR=`pwd`
-cd $ROOT_BUILDDIR
-
-AC_SUBST(ROOT_SRCDIR)
-AC_SUBST(ROOT_BUILDDIR)
-
-echo
-echo Source root directory : $ROOT_SRCDIR
-echo Build  root directory : $ROOT_BUILDDIR
-echo
-echo
-
-if test -z "$AR"; then
-   AC_CHECK_PROGS(AR,ar xar,:,$PATH)
-fi
-AC_SUBST(AR)
-
-dnl Export the AR macro so that it will be placed in the libtool file
-dnl correctly.
-export AR
-
-echo
-echo ---------------------------------------------
-echo testing make
-echo ---------------------------------------------
-echo
-
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-dnl 
-dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
-
-AC_ENABLE_DEBUG(yes)
-AC_DISABLE_PRODUCTION
-
-echo ---------------------------------------------
-echo testing libtool
-echo ---------------------------------------------
-
-dnl first, we set static to no!
-dnl if we want it, use --enable-static
-AC_ENABLE_STATIC(no)
-
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
-dnl Fix up the INSTALL macro if it s a relative path. We want the
-dnl full-path to the binary instead.
-case "$INSTALL" in
-   *install-sh*)
-      INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
-      ;;
-esac
-
-echo
-echo ---------------------------------------------
-echo testing C/C++
-echo ---------------------------------------------
-echo
-
-cc_ok=no
-dnl inutil car libtool
-dnl AC_PROG_CC
-AC_PROG_CXX
-AC_CXX_WARNINGS
-AC_CXX_TEMPLATE_OPTIONS
-AC_DEPEND_FLAG
-# AC_CC_WARNINGS([ansi])
-cc_ok=yes
-
-dnl Library libdl :
-AC_CHECK_LIB(dl,dlopen)
-
-dnl add library libm :
-AC_CHECK_LIB(m,ceil)
-
-dnl 
-dnl Well we use sstream which is not in gcc pre-2.95.3
-dnl We must test if it exists. If not, add it in include !
-dnl
-
-AC_CXX_HAVE_SSTREAM
-
-dnl
-dnl ---------------------------------------------
-dnl testing MPICH
-dnl ---------------------------------------------
-dnl
-
-CHECK_MPICH
-
-echo
-echo ---------------------------------------------
-echo testing LEX \& YACC
-echo ---------------------------------------------
-echo
-
-lex_yacc_ok=no
-AC_PROG_YACC
-AC_PROG_LEX
-lex_yacc_ok=yes
-
-echo
-echo ---------------------------------------------
-echo testing python
-echo ---------------------------------------------
-echo
-
-CHECK_PYTHON
-
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing java
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_JAVA
-
-echo
-echo ---------------------------------------------
-echo Testing Disable Corba
-echo ---------------------------------------------
-echo
-
-CHECK_DISABLE_CORBA
-echo "GUI_DISABLE_CORBA = "$GUI_DISABLE_CORBA
-
-if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then
-
-echo
-echo ---------------------------------------------
-echo testing swig
-echo ---------------------------------------------
-echo
-
-CHECK_SWIG
-fi
-
-echo
-echo ---------------------------------------------
-echo testing threads
-echo ---------------------------------------------
-echo
-
-ENABLE_PTHREADS
-
-if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then
-echo
-echo ---------------------------------------------
-echo testing omniORB
-echo ---------------------------------------------
-echo
-
-CHECK_OMNIORB
-
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing mico
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_MICO
-
-echo
-echo ---------------------------------------------
-echo default ORB : omniORB
-echo ---------------------------------------------
-echo
-
-DEFAULT_ORB=omniORB
-
-echo
-echo ---------------------------------------------
-echo testing Corba
-echo ---------------------------------------------
-echo
-
-CHECK_CORBA
-
-AC_SUBST_FILE(CORBA)
-corba=make_$ORB
-CORBA=adm_local/unix/$corba
-
-fi
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
-
-CHECK_OPENGL
-
-echo
-echo ---------------------------------------------
-echo testing QT
-echo ---------------------------------------------
-echo
-
-CHECK_QT
-
-echo
-echo ---------------------------------------------
-echo testing msg2qm
-echo ---------------------------------------------
-echo
-
-CHECK_MSG2QM
-
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
-
-CHECK_VTK
-
-echo
-echo ---------------------------------------------
-echo testing HDF5
-echo ---------------------------------------------
-echo
-
-CHECK_HDF5
-
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
-
-CHECK_BOOST
-
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
-
-CHECK_CAS
-
-echo
-echo ---------------------------------------------
-echo Testing sip
-echo ---------------------------------------------
-echo
-
-CHECK_SIP
-
-echo
-echo ---------------------------------------------
-echo Testing pyqt
-echo ---------------------------------------------
-echo
-
-CHECK_PYQT
-
-echo
-echo ---------------------------------------------
-echo Testing qwt
-echo ---------------------------------------------
-echo
-
-CHECK_QWT 
-
-echo
-echo ---------------------------------------------
-echo Testing PyConsole
-echo ---------------------------------------------
-echo
-
-CHECK_PYCONSOLE
-echo "DISABLE_PYCONSOLE = "$DISABLE_PYCONSOLE
-
-echo
-echo ---------------------------------------------
-echo Testing GlViewer
-echo ---------------------------------------------
-echo
-
-CHECK_GLVIEWER
-echo "DISABLE_GLVIEWER = "$DISABLE_GLVIEWER
-
-echo
-echo ---------------------------------------------
-echo Testing Plot2dViewer
-echo ---------------------------------------------
-echo
-
-CHECK_PLOT2DVIEWER
-echo "DISABLE_PLOT2DVIEWER = "$DISABLE_PLOT2DVIEWER
-
-echo
-echo ---------------------------------------------
-echo Testing SupervGraphViewer
-echo ---------------------------------------------
-echo
-
-CHECK_SUPERVGRAPHVIEWER
-echo "DISABLE_SUPERVGRAPHVIEWER = "$DISABLE_SUPERVGRAPHVIEWER
-
-echo
-echo ---------------------------------------------
-echo Testing OCCViewer
-echo ---------------------------------------------
-echo
-
-CHECK_OCCVIEWER
-echo "DISABLE_OCCVIEWER = "$DISABLE_OCCVIEWER
-
-echo
-echo ---------------------------------------------
-echo Testing VTKViewer
-echo ---------------------------------------------
-echo
-
-CHECK_VTKVIEWER
-echo "DISABLE_VTKVIEWER = "$DISABLE_VTKVIEWER
-
-echo
-echo ---------------------------------------------
-echo Testing SalomeObject
-echo ---------------------------------------------
-echo
-
-CHECK_SALOMEOBJECT
-echo "DISABLE_SALOMEOBJECT = "$DISABLE_SALOMEOBJECT
-
-if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then
-  if test "x${DISABLE_PYCONSOLE}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable PyConsole !"
-    exit
-  fi
-  if test "x${DISABLE_GLVIEWER}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable GlViewer !"
-    exit
-  fi
-  if test "x${DISABLE_PLOT2DVIEWER}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable Plot2dViewer !"
-    exit
-  fi
-  if test "x${DISABLE_SUPERVGRAPHVIEWER}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable SupervGraphViewer !"
-    exit
-  fi
-  if test "x${DISABLE_OCCVIEWER}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable OCCViewer !"
-    exit
-  fi
-  if test "x${DISABLE_VTKVIEWER}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable VTKViewer !"
-    exit
-  fi
-  if test "x${DISABLE_SALOMEOBJECT}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable SalomeObject !"
-    exit
-  fi
-fi
-
-echo
-echo ---------------------------------------------
-echo Testing html generators
-echo ---------------------------------------------
-echo 
-
-CHECK_HTML_GENERATORS
-
-echo
-echo ---------------------------------------------
-echo Testing Kernel
-echo ---------------------------------------------
-echo
-CHECK_KERNEL
-
-echo
-echo ---------------------------------------------
-echo Testing CPPUNIT only required for unit testing
-echo ---------------------------------------------
-echo
-
-CHECK_CPPUNIT
-
-echo
-echo ---------------------------------------------
-echo Summary
-echo ---------------------------------------------
-echo
-
-if test "$GUI_DISABLE_CORBA" == "yes"; then 
-   echo "Configure (without Corba)"
-else
-   echo Configure
-fi
-
-
-if test "$GUI_DISABLE_CORBA" != "yes"; then 
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok"
-else
-variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok boost_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok"
-fi
-
-for var in $variables
-do
-   printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
-   eval echo \$$var
-done
-
-echo "---Optional:"
-variables="cppunit_ok"
-for var in $variables
-do
-   eval toto=\$$var
-   if test x$toto != "x"; then
-     printf "   %10s : " `echo \$var | sed -e "s,_ok,,"`
-     eval echo \$$var
-   fi
-done
-
-if test "$GUI_DISABLE_CORBA" != "yes"; then 
-echo
-echo "Default ORB   : $DEFAULT_ORB"
-echo
-fi
-dnl generals files which could be included in every makefile
-
-AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude
-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
-
-dnl les dependences
-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend
-
-dnl We don t need to say when we re entering directories if we re using
-dnl GNU make becuase make does it for us.
-if test "X$GMAKE" = "Xyes"; then
-   AC_SUBST(SETX) SETX=":"
-else
-   AC_SUBST(SETX) SETX="set -x"
-fi
-
-# make other build directories
-if test "$GUI_DISABLE_CORBA" == "yes"; then 
-  dir_variables="salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl"
-else
-  dir_variables="salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME}"
-fi
-
-for rep in $dir_variables
-do
-#   if test ! -d $rep ; then
-#      eval mkdir $rep
-#   fi
-    $INSTALL -d $rep
-done
-
-echo 
-echo ---------------------------------------------
-echo copying resource files, shell scripts, and 
-echo xml files
-echo ---------------------------------------------
-echo
-
-
-dnl copy resources directories
-
-#for i in `find $ROOT_SRCDIR -name 'resources' -print`
-#do
-#  local_res=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
-#  local_res_dir=`echo $local_res | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-#  mkdir -p $local_res_dir
-#  cd $local_res_dir
-#  ln -fs $i
-#  echo $local_res
-#  cd $ROOT_BUILDDIR
-#done
-
-dnl copy shells and utilities contained in the bin directory
-dnl excluding .in files (treated in AC-OUTPUT below) and CVS 
-dnl directory
-
-mkdir -p bin/salome
-cd bin/salome
-
-for i in $ROOT_SRCDIR/bin/*
-do
-  local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
-  case "$local_bin" in
-        *.in | *~)                    ;;
-        ./bin/CVS | ./bin/salome)                    ;;
-        *) $INSTALL $i . ; echo $local_bin ;;
-  esac
-done
-cd $ROOT_BUILDDIR
-
-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript
-
-dnl copy xml files to the build tree (lib directory)
-dnl pourquoi ????
-
-#cd lib
-#for i in `find $ROOT_SRCDIR -name "*.xml" -print`
-#do
-#  ln -fs $i
-#  echo `echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
-#done
-#cd $ROOT_BUILDDIR
-
-
-echo
-echo ---------------------------------------------
-echo generating Makefiles and configure files
-echo ---------------------------------------------
-echo
-
-AC_OUTPUT_COMMANDS([ \
-       chmod +x ./bin/* \
-])
-
-## do not delete this line
diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
new file mode 100644 (file)
index 0000000..29f7e18
--- /dev/null
@@ -0,0 +1,41 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# -* Makefile *- 
+#
+# Author : Patrick GOLDBRONN (CEA)
+# Date : 30/11/2001
+# $Header$
+#
+
+SUBDIRS= tui gui
+SUBDIRSTUI= tui
+SUBDIRSGUI= gui
+
+usr_docs:
+       @@SETX@; for d in $(SUBDIRSGUI); do     \
+          (cd $$d && $(MAKE) $@) || exit 1;    \
+       done;
+
+docs: usr_docs
+
+dev_docs:
+       @@SETX@; for d in $(SUBDIRSTUI); do     \
+          (cd $$d && $(MAKE) $@) || exit 1;    \
+       done;
diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
new file mode 100644 (file)
index 0000000..8471928
--- /dev/null
@@ -0,0 +1,43 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vasily Rusyaev (Open Cascade NN)
+#  Module : doc
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+EXTRA_DIST+=GUI
+
+usr_docs:
+       cp -fr $(srcdir)/GUI ./
+       -find $(PWD) -name CVS -prune -exec rm -rf {} \;
+
+docs: usr_docs
+
+clean-local:
+       rm -fr `ls | grep -v "Makefile"`
+       rm -fr GUI
+
+install-data-local: usr_docs
+       mkdir -p $(docdir)/gui
+       cp -rf GUI $(docdir)/gui
+       -find $(PWD) -name CVS -prune -exec rm -rf {} \;
+
+uninstall-local:
+       rm -rf $(docdir)/gui/GUI
diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in
deleted file mode 100644 (file)
index 926f149..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  File   : Makefile.in
-#  Author : Vasily Rusyaev (Open Cascade NN)
-#  Module : doc
-
-top_srcdir=@top_srcdir@
-top_builddir=../../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-
-@COMMENCE@
-
-usr_docs:
-       cp -fr $(srcdir)/GUI ./
-       -find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
-docs: usr_docs
-
-clean:
-       rm -fr `ls | grep -v "Makefile"`
-
-distclean: clean
-       rm -fr GUI
-
-install:
-       mkdir -p $(docdir)/gui
-       cp -rf GUI $(docdir)/gui
-       -find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
-uninstall:
-       rm -rf $(docdir)/gui/GUI
diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
new file mode 100644 (file)
index 0000000..d0b26bb
--- /dev/null
@@ -0,0 +1,57 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vasily Rusyaev (Open Cascade NN)
+#  Module : doc
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+EXTRA_DIST+=GUI
+
+dev_docs:
+       cp -fr $(srcdir)/GUI ./INPUT; \
+       cp -f ./GUI/doxyfile ./INPUT; \
+       cd INPUT; \
+       sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
+       sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
+       mv -f doxyfile2 doxyfile1; \
+       echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
+       if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
+         sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+         $(doxygen) -u ./doxyfile1; \
+       else \
+         sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+       fi; \
+       if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \
+         sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+       fi; \
+       mv -f doxyfile1 doxyfile; \
+       echo "Running doxygen in directory:"`pwd`; \
+       $(doxygen) ./doxyfile; \
+       cd ../; \
+       cp -fr $(srcdir)/GUI/sources/ GUI ; \
+       rm -fr INPUT
+
+doctuidir=$(docdir)/tui/GUI
+
+nodist_doctui_DATA= GUI/doxyfile
+EXTRA_DIST+= GUI/doxyfile.in
diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
deleted file mode 100644 (file)
index dc94bcb..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  File   : Makefile.in
-#  Author : Vasily Rusyaev (Open Cascade NN)
-#  Module : doc
-
-top_srcdir=@top_srcdir@
-top_builddir=../../..
-root_srcdir=@ROOT_SRCDIR@
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-doxygen=@DOXYGEN@
-
-@COMMENCE@
-
-dev_docs:
-       cp -fr $(srcdir)/GUI ./INPUT; \
-       cp -f ./GUI/doxyfile ./INPUT; \
-       cd INPUT; \
-       sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
-       sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
-       mv -f doxyfile2 doxyfile1; \
-       echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
-       if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
-         sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
-         $(doxygen) -u ./doxyfile1; \
-       else \
-         sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
-       fi; \
-       if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \
-         sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' ./doxyfile1 > ./doxyfile2; \
-         mv -f doxyfile2 doxyfile1; \
-       fi; \
-       mv -f doxyfile1 doxyfile; \
-       echo "Running doxygen in directory:"`pwd`; \
-       $(doxygen) ./doxyfile; \
-       cd ../; \
-       cp -fr $(srcdir)/GUI/sources/ GUI ; \
-       rm -fr INPUT
-
-clean:
-       rm -fr GUI
-
-distclean: clean
-       rm -fr INPUT
-
-install:
-       $(INSTALL) -d $(docdir); \
-       mkdir -p $(docdir)/tui
-       cp -fr GUI $(docdir)/tui
-
-uninstall:
-       rm -fr $(docdir)/tui/GUI
diff --git a/idl/Makefile.am b/idl/Makefile.am
new file mode 100644 (file)
index 0000000..cd0eb79
--- /dev/null
@@ -0,0 +1,93 @@
+# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
+#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License.
+# 
+# This library is distributed in the hope that it will be useful 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public  
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 
+
+#
+# This Makefile is responsible of generating the client and server
+# implementation of IDL interfaces for both C++ and python usage.
+# The building process of the C++ files is in charge of each source
+# package and then is not manage here.
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+BASEIDL_FILES= SalomeApp_Engine.idl
+
+EXTRA_DIST+= $(BASEIDL_FILES)
+
+# This variable defines the files to be installed
+salomeidl_DATA = $(BASEIDL_FILES)
+
+# GUI idl common library
+lib_LTLIBRARIES = libSalomeIDLGUI.la
+
+# Sources built from idl files
+nodist_libSalomeIDLGUI_la_SOURCES= SalomeApp_EngineSK.cc
+
+# header files must be exported: other modules have to use this library
+nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh)
+
+libSalomeIDLGUI_la_CPPFLAGS =\
+       -I$(top_builddir)/salome_adm/unix \
+       -I$(top_builddir)/idl \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@
+libSalomeIDLGUI_la_LDFLAGS = -no-undefined -version-info=0:0:0
+libSalomeIDLGUI_la_LIBADD  = @CORBA_LIBS@
+
+# These variables defines the building process of CORBA files
+OMNIORB_IDL         = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome 
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix
+IDLPYFLAGS  = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
+
+# potential problem on parallel make on the following - multiple outputs
+SUFFIXES = .idl .hh SK.cc
+.idlSK.cc:
+       $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+.idl.hh:
+       $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+
+install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
+       $(INSTALL) -d  $(pkgpythondir)
+       ls $^ | while read file; do \
+         $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \
+       done
+
+# uninstall-local removes too much, but it works in distcheck
+uninstall-local:
+       rm -rf $(pkgpythondir)/*
+
+mostlyclean-local:
+       -rm -f *.hh *.cc .depidl
+
+# we use cpp to generate dependencies between idl files.
+# option x c tells the preprocessor to consider idl as a c file.
+# if an idl is modified, all idl dependencies are rebuilt
+
+.depidl: $(BASEIDL_FILES)
+       @echo "" > $@
+       @for dep in $^ dummy; do \
+         if [ $$dep != "dummy" ]; then \
+           echo Building dependencies for $$dep; \
+           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
+           sed 's/\.o/\SK.cc/' >>$@; \
+         fi; \
+       done ;
+
+-include .depidl
diff --git a/resources/Makefile.am b/resources/Makefile.am
new file mode 100644 (file)
index 0000000..c9700c3
--- /dev/null
@@ -0,0 +1,95 @@
+# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
+#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License.
+# 
+# This library is distributed in the hope that it will be useful 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public  
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 
+# -* Makefile *- 
+#
+# Author : Guillaume Boulant (CSSI)
+# Module : KERNEL 
+# $Header$
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+#
+# ===============================================================
+# Files to be installed
+# ===============================================================
+#
+
+DEPRECATED_FILES=\
+plot2d_settings.png \
+view_fitall.png \
+cascade.png \
+plot2d_fitarea.png \
+view_reset.png \
+save.png \
+view_back.png \
+plot2d_linear_y.png \
+plot2d_legend.png \
+paste.png \
+plot2d_fitall.png \
+view_bottom.png \
+plot2d_log_y.png \
+plot2d_log.png \
+view_triedre.png \
+view_glpan.png \
+new.png \
+copy.png \
+plot2d_linear.png \
+reset.png \
+plot2d_points.png \
+view_front.png \
+view_rotate.png \
+open.png \
+close.png \
+view_fitarea.png \
+view_top.png \
+view_camera_dump.png \
+plot2d_pan.png \
+view_left.png \
+view_zoom.png \
+view_right.png \
+plot2d_lines.png \
+plot2d_splines.png \
+plot2d_zoom.png \
+view_pan.png \
+print.png \
+help.png
+
+dist_salomeres_DATA=\
+default.png \
+uc_new.png \
+uc_add.png \
+select1.png \
+dl_delete.png \
+dl_moveup.png \
+home.xpm \
+forward.xpm \
+Tools_en.xml \
+plot2d_dump.png \
+uc_clear.png \
+dl_movedown.png \
+back.xpm \
+uc_del.png \
+uc_current.png \
+tile.png \
+dl_insert.png \
+channel.cfg \
+$(DEPRECATED_FILES)
+
+EXTRA_DIST+= Tools_fr.xml
diff --git a/src/CAF/Makefile.am b/src/CAF/Makefile.am
new file mode 100755 (executable)
index 0000000..f60c261
--- /dev/null
@@ -0,0 +1,59 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : caf
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libcaf.la
+
+salomeinclude_HEADERS= \
+       CAF.h \
+       CAF_Application.h \
+       CAF_Operation.h \
+       CAF_Study.h \
+       CAF_Tools.h
+
+dist_libcaf_la_SOURCES= \
+       CAF_Application.cxx \
+       CAF_Operation.cxx \
+       CAF_Study.cxx \
+       CAF_Tools.cxx           
+
+MOC_FILES= \
+       CAF_Application_moc.cxx \
+       CAF_Operation_moc.cxx \
+       CAF_Study_moc.cxx
+nodist_libcaf_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA = \
+       resources/redo.png \
+       resources/undo.png
+
+nodist_salomeres_DATA = \
+       CAF_images.qm \
+       CAF_msg_en.qm
+
+libcaf_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) -I${QTDIR}/src/kernel -I$(QTDIR)/mkspecs/linux-g++ \
+                   -I$(srcdir)/../STD -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+libcaf_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_OCAF) $(CAS_OCAFVIS)
+libcaf_la_LIBADD=../STD/libstd.la ../SUIT/libsuit.la
+
diff --git a/src/CAM/Makefile.am b/src/CAM/Makefile.am
new file mode 100755 (executable)
index 0000000..4e0a1e5
--- /dev/null
@@ -0,0 +1,59 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : CAM
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libCAM.la
+
+salomeinclude_HEADERS= \
+       CAM_Application.h \
+       CAM_DataModel.h \
+       CAM_DataObject.h \
+       CAM.h \
+       CAM_Module.h \
+       CAM_Study.h \
+       CAM_RootObject.h
+
+dist_libCAM_la_SOURCES= \
+       CAM_Application.cxx \
+       CAM_DataModel.cxx \
+       CAM_DataObject.cxx \
+       CAM_Module.cxx \
+       CAM_Study.cxx \
+       CAM_RootObject.cxx
+
+MOC_FILES= \
+       CAM_Application_moc.cxx \
+       CAM_Module_moc.cxx \
+       CAM_Study_moc.cxx \
+       CAM_DataModel_moc.cxx
+nodist_libCAM_la_SOURCES= $(MOC_FILES)
+
+nodist_salomeres_DATA=CAM_msg_en.qm
+
+libCAM_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../STD -I$(srcdir)/../Qtx
+libCAM_la_LDFLAGS=$(QT_MT_LIBS)
+libCAM_la_LIBS=../SUIT/libsuit.la ../STD/libstd.la
+
+# what is that?
+#LDFLAGSFORBIN= -lSUITApp
diff --git a/src/DDS/Makefile.am b/src/DDS/Makefile.am
new file mode 100755 (executable)
index 0000000..508e544
--- /dev/null
@@ -0,0 +1,44 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Alexander SOLOVYOV (OCN)
+#  Module : DDS
+#  $Header: /home/server/cvs/GUI/GUI_SRC/src/DDS/Makefile.in
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libDDS.la
+
+salomeinclude_HEADERS = DDS.h \
+       DDS_DicGroup.h \
+       DDS_DicItem.h \
+       DDS_Dictionary.h \
+       DDS_KeyWords.h
+
+dist_libDDS_la_SOURCES = DDS_DicGroup.cxx \
+       DDS_DicItem.cxx \
+       DDS_Dictionary.cxx \
+       DDS_KeyWords.cxx
+
+libDDS_la_CPPFLAGS=$(CAS_CPPFLAGS)
+
+libDDS_la_LDFLAGS= $(CAS_KERNEL) $(CAS_OCAF)
+
+
+
diff --git a/src/DDS/Makefile.in b/src/DDS/Makefile.in
deleted file mode 100755 (executable)
index 1d42a6c..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  File   : Makefile.in
-#  Author : Alexander SOLOVYOV (OCN)
-#  Module : DDS
-#  $Header: /home/server/cvs/GUI/GUI_SRC/src/DDS/Makefile.in
-
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-
-@COMMENCE@
-
-# header files 
-EXPORT_HEADERS= DDS.h \
-       DDS_DicGroup.h \
-       DDS_DicItem.h \
-       DDS_Dictionary.h \
-       DDS_KeyWords.h
-                    
-# Libraries targets
-LIB = libDDS.la
-
-LIB_SRC= DDS_DicGroup.cxx \
-       DDS_DicItem.cxx \
-       DDS_Dictionary.cxx \
-       DDS_KeyWords.cxx
-
-CPPFLAGS+= $(OCC_INCLUDES)
-
-LDFLAGS+= $(CAS_KERNEL) $(CAS_OCAF)
-
-@CONCLUDE@
-
-
diff --git a/src/Event/Makefile.am b/src/Event/Makefile.am
new file mode 100755 (executable)
index 0000000..c994896
--- /dev/null
@@ -0,0 +1,42 @@
+#  SALOME Utils : general SALOME's definitions and tools
+#
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Marc Tajchman (CEA)
+#  Module : SALOME
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libEvent.la 
+
+salomeinclude_HEADERS= \
+       Event.h \
+       SALOME_Event.hxx 
+
+dist_libEvent_la_SOURCES = SALOME_Event.cxx 
+
+libEvent_la_CPPFLAGS=$(QT_INCLUDES) @KERNEL_CXXFLAGS@
+libEvent_la_LDFLAGS=$(QT_MT_LIBS)
+
+
diff --git a/src/GLViewer/Makefile.am b/src/GLViewer/Makefile.am
new file mode 100644 (file)
index 0000000..e20fde4
--- /dev/null
@@ -0,0 +1,115 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : caf
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libGLViewer.la
+
+salomeinclude_HEADERS= \
+       GLViewer.h \
+       GLViewer_AspectLine.h \
+       GLViewer_BaseDrawers.h \
+       GLViewer_BaseObjects.h \
+       GLViewer_Compass.h \
+       GLViewer_Context.h \
+       GLViewer_CoordSystem.h \
+       GLViewer_Defs.h \
+       GLViewer_Drawer.h \
+       GLViewer_Geom.h \
+       GLViewer_Grid.h \
+       GLViewer_Group.h \
+       GLViewer_MimeSource.h \
+       GLViewer_Object.h \
+       GLViewer_Selector.h \
+       GLViewer_Selector2d.h \
+       GLViewer_Text.h \
+       GLViewer_Tools.h \
+       GLViewer_ToolTip.h \
+       GLViewer_ViewFrame.h \
+       GLViewer_ViewManager.h \
+       GLViewer_ViewPort.h \
+       GLViewer_ViewPort2d.h \
+       GLViewer_Viewer.h \
+       GLViewer_Viewer2d.h \
+       GLViewer_Widget.h
+
+dist_libGLViewer_la_SOURCES= \
+       GLViewer_AspectLine.cxx \
+       GLViewer_BaseDrawers.cxx \
+       GLViewer_BaseObjects.cxx \
+       GLViewer_Compass.cxx \
+       GLViewer_Context.cxx \
+       GLViewer_CoordSystem.cxx \
+       GLViewer_Drawer.cxx \
+       GLViewer_Geom.cxx \
+       GLViewer_Grid.cxx \
+       GLViewer_Group.cxx \
+       GLViewer_MimeSource.cxx \
+       GLViewer_Object.cxx \
+       GLViewer_Selector.cxx \
+       GLViewer_Selector2d.cxx \
+       GLViewer_Text.cxx \
+       GLViewer_Tools.cxx \
+       GLViewer_ToolTip.cxx \
+       GLViewer_ViewFrame.cxx \
+       GLViewer_ViewManager.cxx \
+       GLViewer_ViewPort.cxx \
+       GLViewer_ViewPort2d.cxx \
+       GLViewer_Viewer.cxx \
+       GLViewer_Viewer2d.cxx \
+       GLViewer_Widget.cxx
+
+MOC_FILES= \
+       GLViewer_Selector_moc.cxx \
+       GLViewer_Selector2d_moc.cxx \
+       GLViewer_ToolTip_moc.cxx \
+       GLViewer_ViewFrame_moc.cxx \
+       GLViewer_ViewManager_moc.cxx \
+       GLViewer_ViewPort_moc.cxx \
+       GLViewer_ViewPort2d_moc.cxx \
+       GLViewer_Viewer_moc.cxx \
+       GLViewer_Viewer2d_moc.cxx \
+       GLViewer_Widget_moc.cxx
+nodist_libGLViewer_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA= \
+       resources/cursor_rotate.png \
+       resources/cursor_sketch.png \
+       resources/cursor_zoom.png \
+       resources/view_dump.png \
+       resources/view_fitall.png \
+       resources/view_fitarea.png \
+       resources/view_fitselect.png \
+       resources/view_glpan.png \
+       resources/view_pan.png \
+       resources/view_reset.png \
+       resources/view_zoom.png
+
+nodist_salomeres_DATA= \
+       GLViewer_images.qm \
+       GLViewer_msg_en.qm
+
+libGLViewer_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+libGLViewer_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_KERNEL)
+
+libGLViewer_la_LIBADD= ../SUIT/libsuit.la -L/usr/X11R6/lib@LIB_LOCATION_SUFFIX@ -lGLU
index f77fbe38ed878b5986dcba13576961361d6856d1..e91cb94c7b4412919cdffdc0dc9742328f8bcc29 100644 (file)
@@ -458,8 +458,8 @@ void LightApp_Application::createActions()
   QString root;
   QAction* a;
   if (dir = getenv("GUI_ROOT_DIR")) {
-    root = Qtx::addSlash( Qtx::addSlash(dir) +  Qtx::addSlash("doc") +  Qtx::addSlash("salome") + 
-                         Qtx::addSlash("gui") +  Qtx::addSlash("GUI") );
+    root = Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("share") + Qtx::addSlash("doc") +
+                          Qtx::addSlash("salome") + Qtx::addSlash("gui") +  Qtx::addSlash("GUI") );
     if ( QFileInfo( root + aFileName ).exists() ) {
       a = createAction( id, tr( QString("GUI Help") ), QIconSet(),
                        tr( QString("GUI Help") ),
@@ -494,8 +494,8 @@ void LightApp_Application::createActions()
     QString modName = moduleName( *it );
     
     if (dir = getenv( modName + "_ROOT_DIR")) {
-      root = Qtx::addSlash( Qtx::addSlash(dir) +  Qtx::addSlash("doc") +  Qtx::addSlash("salome") + 
-                           Qtx::addSlash("gui") +  Qtx::addSlash(modName) );
+      root = Qtx::addSlash( Qtx::addSlash(dir) +  Qtx::addSlash("share") + Qtx::addSlash("doc") + 
+                            Qtx::addSlash("salome") + Qtx::addSlash("gui") +  Qtx::addSlash(modName) );
       if ( QFileInfo( root + aFileName ).exists() ) {
 
        QAction* a = createAction( id, tr( moduleTitle(modName) + QString(" Help") ), QIconSet(),
@@ -974,7 +974,7 @@ void LightApp_Application::onHelpContentsModule()
   QCString dir = getenv( aComponentName + "_ROOT_DIR");
   QString homeDir = !aComponentName.compare(QString("KERNEL")) ? 
     Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("share") + Qtx::addSlash("doc") + Qtx::addSlash("salome") ) : 
-    Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("doc") + Qtx::addSlash("salome") + Qtx::addSlash("gui") +  Qtx::addSlash(aComponentName) );
+    Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("share") + Qtx::addSlash("doc") + Qtx::addSlash("salome") + Qtx::addSlash("gui") +  Qtx::addSlash(aComponentName) );
   
   QString helpFile = QFileInfo( homeDir + (!aComponentName.compare(QString("KERNEL")) ? aFileNameKernel : aFileName) ).absFilePath();
   SUIT_ResourceMgr* resMgr = resourceMgr();
@@ -1010,7 +1010,7 @@ void LightApp_Application::onHelpContentsModule()
 void LightApp_Application::onHelpContextModule(const QString& theComponentName, const QString& theFileName)
 {
   QCString dir = getenv( theComponentName + "_ROOT_DIR");
-  QString homeDir = Qtx::addSlash(Qtx::addSlash(dir)+Qtx::addSlash("doc")+Qtx::addSlash("salome")+Qtx::addSlash("gui")+Qtx::addSlash(theComponentName));
+  QString homeDir = Qtx::addSlash(Qtx::addSlash(dir)+Qtx::addSlash("share")+Qtx::addSlash("doc")+Qtx::addSlash("salome")+Qtx::addSlash("gui")+Qtx::addSlash(theComponentName));
 
   QString helpFile = QFileInfo( homeDir + theFileName ).absFilePath();
   SUIT_ResourceMgr* resMgr = resourceMgr();
index b061966babc3ac3ce269dcc2fd442eed42d0fc49..a433a45638201676791f5c43f6edf0aa84e7aed5 100644 (file)
@@ -127,6 +127,7 @@ public:
   void                                updateActions();
 
   SUIT_ViewManager*                   getViewManager( const QString&, const bool );
+  virtual SUIT_ViewManager*           createViewManager( const QString& vmType );
   virtual void                        addViewManager( SUIT_ViewManager* );
   virtual void                        removeViewManager( SUIT_ViewManager* );
   virtual SUIT_ViewManager*           createViewManager( const QString& vmType );
diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am
new file mode 100755 (executable)
index 0000000..b15ed5e
--- /dev/null
@@ -0,0 +1,242 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : OCC team (OCN)
+#  Module : LightApp
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libLightApp.la
+
+salomeinclude_HEADERS= \
+       LightApp.h \
+       LightApp_AboutDlg.h \
+       LightApp_Application.h \
+       LightApp_DataModel.h \
+       LightApp_DataObject.h \
+       LightApp_DataOwner.h \
+       LightApp_DataSubOwner.h \
+       LightApp_Dialog.h \
+       LightApp_Displayer.h \
+       LightApp_Driver.h \
+       LightApp_EventFilter.h \
+       LightApp_HDFDriver.h \
+       LightApp_Module.h \
+       LightApp_ModuleDlg.h \
+       LightApp_NameDlg.h \
+       LightApp_OBFilter.h \
+       LightApp_OBSelector.h \
+       LightApp_Operation.h \
+       LightApp_Selection.h \
+       LightApp_SelectionMgr.h \
+       LightApp_ShowHideOp.h \
+       LightApp_Study.h \
+       LightApp_SwitchOp.h \
+       LightApp_Preferences.h \
+       LightApp_PreferencesDlg.h \
+       LightApp_RootObject.h \
+       LightApp_UpdateFlags.h \
+       LightApp_WidgetContainer.h
+
+if ENABLE_VTKVIEWER
+if ENABLE_SALOMEOBJECT
+  salomeinclude_HEADERS+= LightApp_VTKSelector.h
+endif
+endif
+if ENABLE_OCCVIEWER
+  salomeinclude_HEADERS+= LightApp_OCCSelector.h
+endif
+if ENABLE_GLVIEWER
+  salomeinclude_HEADERS+= LightApp_GLSelector.h
+endif
+
+dist_libLightApp_la_SOURCES= \
+       LightApp_AboutDlg.cxx \
+       LightApp_Application.cxx \
+       LightApp_DataModel.cxx \
+       LightApp_DataObject.cxx \
+       LightApp_DataOwner.cxx \
+       LightApp_DataSubOwner.cxx \
+       LightApp_Dialog.cxx \
+       LightApp_Displayer.cxx \
+       LightApp_Driver.cxx \
+       LightApp_EventFilter.cxx \
+       LightApp_HDFDriver.cxx \
+       LightApp_Module.cxx \
+       LightApp_ModuleDlg.cxx \
+       LightApp_NameDlg.cxx \
+       LightApp_OBFilter.cxx \
+       LightApp_OBSelector.cxx \
+       LightApp_Operation.cxx \
+       LightApp_Selection.cxx \
+       LightApp_SelectionMgr.cxx \
+       LightApp_ShowHideOp.cxx \
+       LightApp_Study.cxx \
+       LightApp_SwitchOp.cxx \
+       LightApp_Preferences.cxx \
+       LightApp_PreferencesDlg.cxx \
+       LightApp_WidgetContainer.cxx
+
+if ENABLE_VTKVIEWER
+if ENABLE_SALOMEOBJECT
+  dist_libLightApp_la_SOURCES+= LightApp_VTKSelector.cxx
+endif
+endif
+if ENABLE_OCCVIEWER
+  dist_libLightApp_la_SOURCES+= LightApp_OCCSelector.cxx
+endif
+if ENABLE_GLVIEWER
+  dist_libLightApp_la_SOURCES+= LightApp_GLSelector.cxx
+endif
+
+MOC_FILES= \
+       LightApp_AboutDlg_moc.cxx \
+       LightApp_Application_moc.cxx \
+       LightApp_DataModel_moc.cxx \
+       LightApp_Dialog_moc.cxx \
+       LightApp_OBSelector_moc.cxx \
+       LightApp_Operation_moc.cxx \
+       LightApp_Module_moc.cxx \
+       LightApp_ModuleDlg_moc.cxx \
+       LightApp_NameDlg_moc.cxx \
+       LightApp_SelectionMgr_moc.cxx \
+       LightApp_ShowHideOp_moc.cxx \
+       LightApp_Study_moc.cxx \
+       LightApp_SwitchOp_moc.cxx \
+       LightApp_Preferences_moc.cxx \
+       LightApp_PreferencesDlg_moc.cxx \
+       LightApp_WidgetContainer_moc.cxx
+
+if ENABLE_VTKVIEWER
+if ENABLE_SALOMEOBJECT
+  MOC_FILES+= LightApp_VTKSelector_moc.cxx
+endif
+endif
+if ENABLE_OCCVIEWER
+  MOC_FILES+= LightApp_OCCSelector_moc.cxx
+endif
+if ENABLE_GLVIEWER
+  MOC_FILES+= LightApp_GLSelector_moc.cxx
+endif
+nodist_libLightApp_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA= \
+       resources/icon_about.png \
+       resources/icon_applogo.png \
+       resources/icon_default.png \
+       resources/icon_module.png \
+       resources/icon_module_big.png \
+       resources/icon_select.png \
+       resources/LightApp.ini \
+       resources/LightApp.xml
+
+nodist_salomeres_DATA= \
+       LightApp_images.qm \
+       LightApp_msg_en.qm
+
+libLightApp_la_CPPFLAGS=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(CAS_CPPFLAGS) \
+       $(HDF5_INCLUDES) @KERNEL_CXXFLAGS@ -I$(srcdir)/../SUIT -I$(srcdir)/../STD \
+       -I$(srcdir)/../CAM -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LogWindow \
+       -I$(srcdir)/../Prs -I$(srcdir)/../Qtx
+libLightApp_la_LDFLAGS=$(QT_MT_LIBS)
+
+if ENABLE_VTKVIEWER
+  libLightApp_la_CPPFLAGS+= $(VTK_INCLUDES) -I$(srcdir)/../VTKViewer
+else
+  libLightApp_la_CPPFLAGS+= -DDISABLE_VTKVIEWER
+endif
+if ENABLE_PLOT2DVIEWER
+  libLightApp_la_CPPFLAGS+= $(QWT_INCLUDES) -I$(srcdir)/../Plot2d
+else
+  libLightApp_la_CPPFLAGS+= -DDISABLE_PLOT2DVIEWER
+endif
+if ENABLE_OCCVIEWER
+  libLightApp_la_CPPFLAGS+= -I$(srcdir)/../OCCViewer
+else !ENABLE_OCCVIEWER
+  libLightApp_la_CPPFLAGS+= -DDISABLE_OCCVIEWER
+endif
+if ENABLE_PYCONSOLE
+  libLightApp_la_CPPFLAGS+= $(PYTHON_INCLUDES) -I$(srcdir)/../PythonConsole -I$(srcdir)/../PyInterp
+  libLightApp_la_LDFLAGS+= $(PYTHON_LIBS)
+else !ENABLE_PYCONSOLE
+  libLightApp_la_CPPFLAGS+= -DDISABLE_PYCONSOLE
+endif
+if ENABLE_GLVIEWER
+  libLightApp_la_CPPFLAGS+= -I$(srcdir)/../GLViewer
+else !ENABLE_GLVIEWER
+  libLightApp_la_CPPFLAGS+= -DDISABLE_GLVIEWER
+endif
+if ENABLE_SUPERVGRAPHVIEWER
+  libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SUPERVGraph
+else !ENABLE_SUPERVGRAPHVIEWER
+  libLightApp_la_CPPFLAGS+= -DDISABLE_SUPERVGRAPHVIEWER
+endif
+
+if ENABLE_SALOMEOBJECT
+
+  libLightApp_la_CPPFLAGS+= -I$(srcdir)/../OBJECT
+if ENABLE_PLOT2DVIEWER
+  libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SPlot2d
+endif
+if ENABLE_OCCVIEWER
+  libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SOCC
+endif
+if ENABLE_VTKVIEWER
+  libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SVTK
+endif
+else !ENABLE_SALOMEOBJECT
+  libLightApp_la_CPPFLAGS+= -DDISABLE_SALOMEOBJECT
+  
+endif
+
+libLightApp_la_LIBADD= ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la \
+       ../ObjBrowser/libObjBrowser.la ../LogWindow/libLogWindow.la $(CAS_KERNEL) \
+       ../Prs/libSalomePrs.la $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist
+
+if ENABLE_SALOMEOBJECT
+  libLightApp_la_LIBADD+= ../OBJECT/libSalomeObject.la
+endif
+if ENABLE_VTKVIEWER
+  libLightApp_la_LIBADD+= ../VTKViewer/libVTKViewer.la
+if ENABLE_SALOMEOBJECT
+  libLightApp_la_LIBADD+= ../SVTK/libSVTK.la
+endif
+endif
+if ENABLE_OCCVIEWER
+  libLightApp_la_LIBADD+= ../OCCViewer/libOCCViewer.la
+if ENABLE_SALOMEOBJECT
+  libLightApp_la_LIBADD+= ../SOCC/libSOCC.la
+endif
+endif
+if ENABLE_GLVIEWER
+  libLightApp_la_LIBADD+= ../GLViewer/libGLViewer.la
+endif
+if ENABLE_PLOT2DVIEWER
+  libLightApp_la_LIBADD+= ../Plot2d/libPlot2d.la
+if ENABLE_SALOMEOBJECT
+  libLightApp_la_LIBADD+= ../SPlot2d/libSPlot2d.la
+endif
+endif
+if ENABLE_PYCONSOLE
+  libLightApp_la_LIBADD+= ../PyInterp/libPyInterp.la ../PythonConsole/libPythonConsole.la
+endif
+if ENABLE_SUPERVGRAPHVIEWER
+  libLightApp_la_LIBADD+= ../SUPERVGraph/libSUPERVGraph.la
+endif
diff --git a/src/LogWindow/Makefile.am b/src/LogWindow/Makefile.am
new file mode 100755 (executable)
index 0000000..83dcacd
--- /dev/null
@@ -0,0 +1,39 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : LogWindow
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libLogWindow.la
+
+salomeinclude_HEADERS= LogWindow.h
+
+dist_libLogWindow_la_SOURCES= LogWindow.cxx            
+
+MOC_FILES= LogWindow_moc.cxx
+nodist_libLogWindow_la_SOURCES = $(MOC_FILES)
+
+libLogWindow_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+
+libLogWindow_la_LDFLAGS=$(QT_MT_LIBS) ../SUIT/libsuit.la ../Qtx/libqtx.la 
+
+
diff --git a/src/LogWindow/Makefile.in b/src/LogWindow/Makefile.in
deleted file mode 100755 (executable)
index d868371..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  File   : Makefile.in
-#  Author : Vladimir Klyachin (OCN)
-#  Module : LogWindow
-#  $Header$
-
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-
-@COMMENCE@
-
-# header files 
-EXPORT_HEADERS= LogWindow.h
-                    
-# Libraries targets
-LIB = libLogWindow.la
-
-LIB_SRC= LogWindow.cxx         
-LIB_MOC = LogWindow.h
-
-CPPFLAGS+=$(QT_INCLUDES)
-
-LDFLAGS+=$(QT_MT_LIBS)
-
-@CONCLUDE@
-
-
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100755 (executable)
index 0000000..1f3b489
--- /dev/null
@@ -0,0 +1,66 @@
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Patrick GOLDBRONN (CEA)
+#  Module : SALOME
+# $Header$
+
+SUBDIRS = Qtx Style DDS QDS SUIT STD CAF CAM SUITApp LogWindow ObjBrowser Prs
+
+if ENABLE_SALOMEOBJECT
+  SUBDIRS += OBJECT
+endif
+
+if ENABLE_GLVIEWER
+  SUBDIRS += GLViewer
+endif
+
+if ENABLE_VTKVIEWER
+  SUBDIRS += VTKViewer
+if ENABLE_SALOMEOBJECT
+  SUBDIRS += SVTK
+endif
+endif
+if ENABLE_OCCVIEWER
+ SUBDIRS += OCCViewer
+if ENABLE_SALOMEOBJECT
+  SUBDIRS += SOCC
+endif
+endif
+if ENABLE_PYCONSOLE
+  SUBDIRS += PyInterp PythonConsole
+endif
+if ENABLE_PLOT2DVIEWER
+  SUBDIRS += Plot2d
+if ENABLE_SALOMEOBJECT
+  SUBDIRS += SPlot2d
+endif
+endif
+if ENABLE_SUPERVGRAPHVIEWER
+  SUBDIRS += SUPERVGraph
+endif
+SUBDIRS += LightApp ResExporter
+
+if GUI_ENABLE_CORBA
+  SUBDIRS +=  RegistryDisplay TOOLSGUI \
+          Event Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT
+endif
diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
new file mode 100755 (executable)
index 0000000..106033a
--- /dev/null
@@ -0,0 +1,71 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libSalomeObject.la
+
+salomeinclude_HEADERS= \
+       SALOME_InteractiveObject.hxx \
+       Handle_SALOME_InteractiveObject.hxx \
+       SALOME_AISShape.hxx \
+       Handle_SALOME_AISShape.hxx \
+       SALOME_AISObject.hxx \
+       Handle_SALOME_AISObject.hxx \
+       SALOME_ListIO.hxx \
+       SALOME_ListIteratorOfListIO.hxx \
+       Handle_SALOME_ListNodeOfListIO.hxx \
+       SALOME_ListNodeOfListIO.hxx \
+       Handle_SALOME_Filter.hxx \
+       SALOME_Filter.hxx \
+       Handle_SALOME_TypeFilter.hxx \
+       SALOME_TypeFilter.hxx \
+       SALOME_DataMapOfIOMapOfInteger.hxx \
+       SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx \
+       Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx \
+       SALOME_Selection.h
+
+dist_libSalomeObject_la_SOURCES= \
+       SALOME_InteractiveObject.cxx \
+       SALOME_AISShape.cxx\
+       SALOME_AISObject.cxx\
+       SALOME_ListIO_0.cxx \
+       SALOME_ListIteratorOfListIO_0.cxx \
+       SALOME_ListNodeOfListIO_0.cxx \
+       SALOME_Filter.cxx \
+       SALOME_TypeFilter.cxx \
+       SALOME_DataMapOfIOMapOfInteger_0.cxx \
+       SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx \
+       SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
+
+libSalomeObject_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS)
+libSalomeObject_la_LDFLAGS=$(QT_LIBS) $(CAS_LDPATH) -lTKV3d
+
+EXTRA_DIST+= \
+       SALOME_AISObject.ixx \
+       SALOME_AISObject.jxx \
+       SALOME_AISShape.ixx \
+       SALOME_AISShape.jxx \
+       SALOME_Filter.ixx \
+       SALOME_Filter.jxx \
+       SALOME_InteractiveObject.ixx \
+       SALOME_InteractiveObject.jxx \
+       SALOME_TypeFilter.ixx \
+       SALOME_TypeFilter.jxx \
+       SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx
diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
deleted file mode 100755 (executable)
index ad9e94c..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-EXPORT_HEADERS = SALOME_InteractiveObject.hxx \
-                Handle_SALOME_InteractiveObject.hxx \
-                SALOME_AISShape.hxx \
-                Handle_SALOME_AISShape.hxx \
-                SALOME_AISObject.hxx \
-                Handle_SALOME_AISObject.hxx \
-                SALOME_ListIO.hxx \
-                SALOME_ListIteratorOfListIO.hxx \
-                Handle_SALOME_ListNodeOfListIO.hxx \
-                SALOME_ListNodeOfListIO.hxx \
-                Handle_SALOME_Filter.hxx \
-                SALOME_Filter.hxx \
-                Handle_SALOME_TypeFilter.hxx \
-                SALOME_TypeFilter.hxx \
-                SALOME_DataMapOfIOMapOfInteger.hxx \
-                SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx \
-                Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx \
-                SALOME_Selection.h
-
-
-# Libraries targets
-
-LIB = libSalomeObject.la
-LIB_SRC =       SALOME_InteractiveObject.cxx \
-                SALOME_AISShape.cxx\
-                SALOME_AISObject.cxx\
-                SALOME_ListIO_0.cxx \
-                SALOME_ListIteratorOfListIO_0.cxx \
-                SALOME_ListNodeOfListIO_0.cxx \
-                SALOME_Filter.cxx \
-                SALOME_TypeFilter.cxx \
-                SALOME_DataMapOfIOMapOfInteger_0.cxx \
-                SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx \
-                SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
-
-LIB_CLIENT_IDL =
-
-# Executables targets
-BIN = 
-BIN_SRC        =
-
-CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES)
-LDFLAGS+= $(QT_LIBS) $(CAS_LDPATH) -lTKV3d
-
-
-@CONCLUDE@
diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am
new file mode 100755 (executable)
index 0000000..4299b7d
--- /dev/null
@@ -0,0 +1,90 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : OCCViewer
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libOCCViewer.la
+
+salomeinclude_HEADERS= \
+       OCCViewer_AISSelector.h \
+       OCCViewer_ViewManager.h \
+       OCCViewer_ViewModel.h \
+       OCCViewer_ViewPort3d.h \
+       OCCViewer_ViewPort.h \
+       OCCViewer_ViewWindow.h \
+       OCCViewer_VService.h \
+       OCCViewer_CreateRestoreViewDlg.h \
+       OCCViewer.h
+
+dist_libOCCViewer_la_SOURCES= \
+       OCCViewer_AISSelector.cxx \
+       OCCViewer_ViewManager.cxx \
+       OCCViewer_ViewModel.cxx \
+       OCCViewer_ViewPort3d.cxx \
+       OCCViewer_ViewPort.cxx \
+       OCCViewer_ViewWindow.cxx \
+       OCCViewer_VService.cxx \
+       OCCViewer_CreateRestoreViewDlg.cxx \
+       OCCViewer_ClippingDlg.cxx
+
+MOC_FILES= \
+       OCCViewer_AISSelector_moc.cxx \
+       OCCViewer_ViewModel_moc.cxx \
+       OCCViewer_ViewPort3d_moc.cxx \
+       OCCViewer_ViewPort_moc.cxx \
+       OCCViewer_ViewWindow_moc.cxx \
+       OCCViewer_ViewManager_moc.cxx \
+       OCCViewer_CreateRestoreViewDlg_moc.cxx \
+       OCCViewer_ClippingDlg_moc.cxx
+nodist_libOCCViewer_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA = \
+       resources/view_back.png \
+       resources/view_bottom.png \
+       resources/view_camera_dump.png \
+       resources/view_clone.png \
+       resources/view_clipping.png \
+       resources/view_clipping_pressed.png \
+       resources/view_fitall.png \
+       resources/view_fitarea.png \
+       resources/view_front.png \
+       resources/view_glpan.png \
+       resources/view_left.png \
+       resources/view_pan.png \
+       resources/view_presets.png \
+       resources/view_reset.png \
+       resources/view_right.png \
+       resources/view_rotate.png \
+       resources/view_shoot.png \
+       resources/view_top.png \
+       resources/view_triedre.png \
+       resources/view_zoom.png
+
+nodist_salomeres_DATA = \
+       OCCViewer_images.qm \
+       OCCViewer_msg_en.qm 
+
+libOCCViewer_la_CPPFLAGS=$(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \
+       -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+
+libOCCViewer_la_LDFLAGS=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) ../SUIT/libsuit.la
diff --git a/src/ObjBrowser/Makefile.am b/src/ObjBrowser/Makefile.am
new file mode 100755 (executable)
index 0000000..ff1db50
--- /dev/null
@@ -0,0 +1,51 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : ObjectBrowser
+# $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libObjBrowser.la
+
+salomeinclude_HEADERS=\
+       OB.h \
+       OB_Browser.h \
+       OB_ListItem.h \
+       OB_ListView.h \
+       OB_Filter.h
+
+dist_libObjBrowser_la_SOURCES= \
+       OB_Browser.cxx \
+       OB_ListItem.cxx \
+       OB_ListView.cxx \
+       OB_Filter.cxx
+
+MOC_FILES= \
+       OB_Browser_moc.cxx \
+       OB_ListView_moc.cxx
+nodist_libObjBrowser_la_SOURCES= $(MOC_FILES)
+
+nodist_salomeres_DATA = OB_msg_en.qm
+
+libObjBrowser_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+
+libObjBrowser_la_LDFLAGS=$(QT_MT_LIBS)
+libObjBrowser_la_LIBADD= ../SUIT/libsuit.la ../Qtx/libqtx.la
diff --git a/src/Plot2d/Makefile.am b/src/Plot2d/Makefile.am
new file mode 100755 (executable)
index 0000000..b2fd5cf
--- /dev/null
@@ -0,0 +1,92 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : Plot2d
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES= libPlot2d.la
+
+# header files 
+salomeinclude_HEADERS= \
+       Plot2d.h \
+       Plot2d_Curve.h \
+       Plot2d_FitDataDlg.h \
+       Plot2d_Prs.h \
+       Plot2d_SetupViewDlg.h \
+       Plot2d_ViewFrame.h \
+       Plot2d_ViewManager.h \
+       Plot2d_ViewModel.h \
+       Plot2d_ViewWindow.h \
+       Plot2d_SetupCurveDlg.h \
+       Plot2d_ToolTip.h
+
+dist_libPlot2d_la_SOURCES= \
+       Plot2d_Curve.cxx \
+       Plot2d_FitDataDlg.cxx \
+       Plot2d_Prs.cxx \
+       Plot2d_SetupViewDlg.cxx \
+       Plot2d_ViewFrame.cxx \
+       Plot2d_ViewManager.cxx \
+       Plot2d_ViewModel.cxx \
+       Plot2d_ViewWindow.cxx \
+       Plot2d_SetupCurveDlg.cxx \
+       Plot2d_ToolTip.cxx
+
+MOC_FILES = \
+       Plot2d_FitDataDlg_moc.cxx \
+       Plot2d_SetupViewDlg_moc.cxx \
+       Plot2d_ViewFrame_moc.cxx \
+       Plot2d_ViewManager_moc.cxx \
+       Plot2d_ViewModel_moc.cxx \
+       Plot2d_ViewWindow_moc.cxx \
+       Plot2d_SetupCurveDlg_moc.cxx \
+       Plot2d_ToolTip_moc.cxx
+nodist_libPlot2d_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA = \
+       resources/plot2d_clone.png \
+       resources/plot2d_camera_dump.png \
+       resources/plot2d_fitall.png \
+       resources/plot2d_fitarea.png \
+       resources/plot2d_glpan.png \
+       resources/plot2d_legend.png \
+       resources/plot2d_linear.png \
+       resources/plot2d_linear_y.png \
+       resources/plot2d_lines.png \
+       resources/plot2d_log.png \
+       resources/plot2d_log_y.png \
+       resources/plot2d_pan.png \
+       resources/plot2d_points.png \
+       resources/plot2d_settings.png \
+       resources/plot2d_splines.png \
+       resources/plot2d_zoom.png
+
+nodist_salomeres_DATA= \
+       Plot2d_images.qm \
+       Plot2d_msg_en.qm 
+
+libPlot2d_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
+
+libPlot2d_la_LDFLAGS=$(QWT_LIBS) $(QT_MT_LIBS) ../SUIT/libsuit.la
+
+
diff --git a/src/Plot2d/resources/plot2d_rotate.png b/src/Plot2d/resources/plot2d_rotate.png
deleted file mode 100755 (executable)
index 80926c5..0000000
Binary files a/src/Plot2d/resources/plot2d_rotate.png and /dev/null differ
diff --git a/src/Prs/Makefile.am b/src/Prs/Makefile.am
new file mode 100755 (executable)
index 0000000..7f5d31a
--- /dev/null
@@ -0,0 +1,26 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libSalomePrs.la
+
+salomeinclude_HEADERS = SALOME_Prs.h
+
+dist_libSalomePrs_la_SOURCES = SALOME_Prs.cxx
diff --git a/src/Prs/Makefile.in b/src/Prs/Makefile.in
deleted file mode 100755 (executable)
index 56c07d0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-EXPORT_HEADERS = SALOME_Prs.h
-
-# Libraries targets
-
-LIB = libSalomePrs.la
-LIB_SRC =       SALOME_Prs.cxx
-
-LIB_CLIENT_IDL = 
-
-# Executables targets
-BIN = 
-BIN_SRC        =
-
-CPPFLAGS+=
-LDFLAGS+=
-
-
-@CONCLUDE@
diff --git a/src/PyInterp/Makefile.am b/src/PyInterp/Makefile.am
new file mode 100755 (executable)
index 0000000..9a783f2
--- /dev/null
@@ -0,0 +1,43 @@
+#  SALOME PyInterp : implementation of base thread-safe Python services
+#
+#  Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Module : SALOME
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libPyInterp.la
+
+salomeinclude_HEADERS= \
+       PyInterp.h \
+       PyInterp_base.h \
+       PyInterp_Dispatcher.h
+
+dist_libPyInterp_la_SOURCES= \
+       PyInterp_base.cxx \
+       PyInterp_Dispatcher.cxx
+
+MOC_FILES= PyInterp_Watcher_moc.cxx
+nodist_libPyInterp_la_SOURCES= $(MOC_FILES)
+
+libPyInterp_la_CPPFLAGS= $(PYTHON_INCLUDES) $(QT_INCLUDES)
+libPyInterp_la_LDFLAGS= $(PYTHON_LIBS) $(QT_MT_LIBS)
diff --git a/src/PyInterp/Makefile.in b/src/PyInterp/Makefile.in
deleted file mode 100755 (executable)
index d9af0dc..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#  SALOME PyInterp : implementation of base thread-safe Python services
-#
-#  Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  License along with this library; if not, write to the Free Software 
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#
-#
-#  File   : Makefile.in
-#  Module : SALOME
-
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-
-
-@COMMENCE@
-
-# header files 
-EXPORT_HEADERS= PyInterp.h \
-               PyInterp_base.h \
-               PyInterp_Dispatcher.h
-                    
-# Libraries targets
-LIB = libPyInterp.la
-
-LIB_SRC= PyInterp_base.cxx \
-        PyInterp_Dispatcher.cxx
-
-LIB_MOC = PyInterp_Watcher.h
-
-CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_INCLUDES)
-
-LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS)
-
-@CONCLUDE@
diff --git a/src/PythonConsole/Makefile.am b/src/PythonConsole/Makefile.am
new file mode 100755 (executable)
index 0000000..8884cfa
--- /dev/null
@@ -0,0 +1,50 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : PythonConsole
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libPythonConsole.la
+
+salomeinclude_HEADERS= \
+       PythonConsole.h \
+       PythonConsole_PyConsole.h \
+       PythonConsole_PyEditor.h \
+       PythonConsole_PyInterp.h
+
+dist_libPythonConsole_la_SOURCES= \
+       PythonConsole_PyConsole.cxx \
+       PythonConsole_PyEditor.cxx \
+       PythonConsole_PyInterp.cxx              
+
+MOC_FILES= \
+       PythonConsole_PyEditor_moc.cxx \
+       PythonConsole_PyConsole_moc.cxx
+nodist_libPythonConsole_la_SOURCES= $(MOC_FILES)
+
+
+libPythonConsole_la_CPPFLAGS= $(PYTHON_INCLUDES) $(QT_INCLUDES) \
+       -I$(srcdir)/../PyInterp -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+
+libPythonConsole_la_LDFLAGS= $(PYTHON_LIBS) $(QT_MT_LIBS)
+
+
diff --git a/src/QDS/Makefile.am b/src/QDS/Makefile.am
new file mode 100755 (executable)
index 0000000..03513ac
--- /dev/null
@@ -0,0 +1,68 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Alexander SOLOVYOV (OCN)
+#  Module : QDS
+#  $Header: /home/server/cvs/GUI/GUI_SRC/src/QDS/Makefile.in
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libQDS.la
+
+# header files 
+salomeinclude_HEADERS= QDS.h \
+       QDS_CheckBox.h \
+       QDS_ComboBox.h \
+       QDS_Datum.h \
+       QDS_LineEdit.h \
+       QDS_SpinBox.h \
+       QDS_SpinBoxDbl.h \
+       QDS_TextEdit.h \
+       QDS_Validator.h
+
+dist_libQDS_la_SOURCES= \
+       QDS.cxx \
+       QDS_CheckBox.cxx \
+       QDS_ComboBox.cxx \
+       QDS_Datum.cxx \
+       QDS_LineEdit.cxx \
+       QDS_SpinBox.cxx \
+       QDS_SpinBoxDbl.cxx \
+       QDS_TextEdit.cxx \
+       QDS_Validator.cxx
+MOC_FILES= \
+       QDS_CheckBox_moc.cxx \
+       QDS_ComboBox_moc.cxx \
+       QDS_Datum_moc.cxx \
+       QDS_LineEdit_moc.cxx \
+       QDS_SpinBox_moc.cxx \
+       QDS_SpinBoxDbl_moc.cxx \
+       QDS_TextEdit_moc.cxx
+nodist_libQDS_la_SOURCES= $(MOC_FILES)
+
+# may be neccessary for the external projects or future improvements
+EXTRA_DIST+= QDS_RadioBox.cxx QDS_RadioBox.h resources/QDS_msg_en.po
+
+libQDS_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) \
+                   -I$(srcdir)/../Qtx -I$(srcdir)/../DDS
+
+libQDS_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_KERNEL)
+libQDS_la_LIBADD=../DDS/libDDS.la ../Qtx/libqtx.la
+
diff --git a/src/QDS/Makefile.in b/src/QDS/Makefile.in
deleted file mode 100755 (executable)
index 290054d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  File   : Makefile.in
-#  Author : Alexander SOLOVYOV (OCN)
-#  Module : QDS
-#  $Header: /home/server/cvs/GUI/GUI_SRC/src/QDS/Makefile.in
-
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-
-@COMMENCE@
-
-# header files 
-EXPORT_HEADERS= QDS.h \
-       QDS_CheckBox.h \
-       QDS_ComboBox.h \
-       QDS_Datum.h \
-       QDS_LineEdit.h \
-       QDS_SpinBox.h \
-       QDS_SpinBoxDbl.h \
-       QDS_TextEdit.h \
-       QDS_Validator.h
-                    
-# Libraries targets
-LIB = libQDS.la
-
-LIB_SRC= QDS.cxx \
-       QDS_CheckBox.cxx \
-       QDS_ComboBox.cxx \
-       QDS_Datum.cxx \
-       QDS_LineEdit.cxx \
-       QDS_SpinBox.cxx \
-       QDS_SpinBoxDbl.cxx \
-       QDS_TextEdit.cxx \
-       QDS_Validator.cxx
-LIB_MOC = QDS_CheckBox.h \
-       QDS_ComboBox.h \
-       QDS_Datum.h \
-       QDS_LineEdit.h \
-       QDS_SpinBox.h \
-       QDS_SpinBoxDbl.h \
-       QDS_TextEdit.h
-
-CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES)
-
-LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) -lDDS -lqtx
-
-@CONCLUDE@
-
-
diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am
new file mode 100755 (executable)
index 0000000..b71936b
--- /dev/null
@@ -0,0 +1,150 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : suit
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+# header files
+
+salomeinclude_HEADERS= Qtx.h \
+       QtxAction.h \
+       QtxColorScale.h \
+       QtxComboBox.h \
+       QtxDblSpinBox.h \
+       QtxDialog.h \
+       QtxDockAction.h \
+       QtxDockWindow.h \
+       QtxGroupBox.h \
+       QtxIntSpinBox.h \
+       QtxListAction.h \
+       QtxListBox.h \
+       QtxListOfOperations.h \
+       QtxLogoMgr.h \
+       QtxMenuButton.h \
+       QtxMRUAction.h \
+       QtxOperations.h \
+       QtxPathDialog.h \
+       QtxPopupMgr.h \
+       QtxResourceMgr.h \
+       QtxStdOperations.h \
+       QtxTable.h \
+       QtxToolBar.h \
+       QtxToolTip.h \
+       QtxParser.h \
+       QtxPopupMenu.h \
+       QtxActionMgr.h \
+       QtxActionMenuMgr.h \
+       QtxActionToolMgr.h \
+       QtxMainWindow.h \
+       QtxWorkspaceAction.h \
+       QtxWorkstackAction.h \
+       QtxListResourceEdit.h \
+       QtxWorkstack.h \
+       QtxResourceEdit.h \
+       QtxListView.h \
+       QtxDirListEditor.h \
+       QtxDblValidator.h \
+       QtxSplash.h
+
+# Libraries targets
+
+lib_LTLIBRARIES= libqtx.la
+
+dist_libqtx_la_SOURCES= \
+       Qtx.cxx \
+       QtxAction.cxx \
+       QtxColorScale.cxx \
+       QtxComboBox.cxx \
+       QtxDblSpinBox.cxx \
+       QtxDialog.cxx \
+       QtxDockAction.cxx \
+       QtxDockWindow.cxx \
+       QtxGroupBox.cxx \
+       QtxIntSpinBox.cxx \
+       QtxListAction.cxx \
+       QtxListBox.cxx \
+       QtxListOfOperations.cxx \
+       QtxLogoMgr.cxx \
+       QtxMenuButton.cxx \
+       QtxMRUAction.cxx \
+       QtxPathDialog.cxx \
+       QtxPopupMgr.cxx \
+       QtxResourceMgr.cxx \
+       QtxStdOperations.cxx \
+       QtxTable.cxx \
+       QtxToolBar.cxx \
+       QtxToolTip.cxx \
+       QtxOperations.cxx \
+       QtxParser.cxx \
+       QtxPopupMenu.cxx \
+       QtxActionMgr.cxx \
+       QtxActionMenuMgr.cxx \
+       QtxActionToolMgr.cxx \
+       QtxMainWindow.cxx \
+       QtxWorkspaceAction.cxx \
+       QtxWorkstackAction.cxx \
+       QtxListResourceEdit.cxx \
+       QtxResourceEdit.cxx \
+       QtxWorkstack.cxx \
+       QtxListView.cxx \
+       QtxDirListEditor.cxx \
+       QtxDblValidator.cxx \
+       QtxSplash.cxx
+
+MOC_FILES= \
+       QtxAction_moc.cxx \
+       QtxColorScale_moc.cxx \
+       QtxComboBox_moc.cxx \
+       QtxDblSpinBox_moc.cxx \
+       QtxDialog_moc.cxx \
+       QtxDockAction_moc.cxx \
+       QtxDockWindow_moc.cxx \
+       QtxGroupBox_moc.cxx \
+       QtxIntSpinBox_moc.cxx \
+       QtxListAction_moc.cxx \
+       QtxListBox_moc.cxx \
+       QtxLogoMgr_moc.cxx \
+       QtxMenuButton_moc.cxx \
+       QtxMRUAction_moc.cxx \
+       QtxPathDialog_moc.cxx \
+       QtxPopupMgr_moc.cxx \
+       QtxPopupMenu_moc.cxx \
+       QtxTable_moc.cxx \
+       QtxToolBar_moc.cxx \
+       QtxToolTip_moc.cxx \
+       QtxActionMgr_moc.cxx \
+       QtxActionMenuMgr_moc.cxx \
+       QtxActionToolMgr_moc.cxx \
+       QtxMainWindow_moc.cxx \
+       QtxWorkspaceAction_moc.cxx \
+       QtxWorkstackAction_moc.cxx \
+       QtxWorkstack_moc.cxx \
+       QtxListView_moc.cxx \
+       QtxListResourceEdit_moc.cxx \
+       QtxDirListEditor_moc.cxx \
+       QtxDblValidator_moc.cxx \
+       QtxSplash_moc.cxx
+nodist_libqtx_la_SOURCES= $(MOC_FILES)
+
+libqtx_la_CPPFLAGS=$(QT_INCLUDES)
+
+libqtx_la_LDFLAGS=$(QT_MT_LIBS)
diff --git a/src/RegistryDisplay/Makefile.am b/src/RegistryDisplay/Makefile.am
new file mode 100755 (executable)
index 0000000..2034b50
--- /dev/null
@@ -0,0 +1,49 @@
+#  SALOME RegistryDisplay : GUI for Registry server implementation
+#
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Paul RASCLE, EDF
+#  Module : SALOME
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libRegistryDisplay.la 
+
+salomeinclude_HEADERS= \
+       HelpWindow.hxx \
+       IntervalWindow.hxx \
+       RegWidget.h
+
+dist_libRegistryDisplay_la_SOURCES= \
+       HelpWindow.cxx \
+       RegWidget.cxx \
+       RegWidgetFactory.cxx \
+       IntervalWindow.cxx
+
+MOC_FILES = RegWidget_moc.cxx
+nodist_libRegistryDisplay_la_SOURCES= $(MOC_FILES)
+
+libRegistryDisplay_la_CPPFLAGS=$(QT_INCLUDES) @KERNEL_CXXFLAGS@ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@\
+       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl
+libRegistryDisplay_la_LDFLAGS=$(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil -lSalomeIDLKernel
diff --git a/src/ResExporter/Makefile.am b/src/ResExporter/Makefile.am
new file mode 100755 (executable)
index 0000000..bc9d55e
--- /dev/null
@@ -0,0 +1,33 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vadim SANDLER (OCN)
+#  Module : SalomeApp
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+bin_PROGRAMS= ResourceExporter
+
+dist_ResourceExporter_SOURCES=ResourceExporter.cxx
+
+ResourceExporter_CPPFLAGS= $(QT_INCLUDES) -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
+
+ResourceExporter_LDFLAGS= $(QT_MT_LIBS) 
+ResourceExporter_LDADD= ../SUIT/libsuit.la ../Qtx/libqtx.la
diff --git a/src/SALOME_PY/Makefile.am b/src/SALOME_PY/Makefile.am
new file mode 100755 (executable)
index 0000000..d2e4392
--- /dev/null
@@ -0,0 +1,44 @@
+#  SALOME SALOME_PY : binding of VTK graphics and Python
+#
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Paul RASCLE, EDF
+#  Module : SALOME
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES= libSalomePy.la
+dist_libSalomePy_la_SOURCES= SalomePy.cxx
+
+libSalomePy_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \
+       $(OGL_INCLUDES) $(CAS_CXXFLAGS) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ \
+       -DHAVE_CONFIG_H -I$(srcdir)/../SalomeApp -I$(srcdir)/../LightApp \
+       -I$(srcdir)/../Event -I$(srcdir)/../Session -I$(srcdir)/../SVTK \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../CAM \
+       -I$(srcdir)/../STD -I$(srcdir)/../VTKViewer -I$(srcdir)/../OBJECT \
+       @CAS_CPPFLAGS@ \
+       -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+libSalomePy_la_LDFLAGS=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) \
+       ../SalomeApp/libSalomeApp.la \
+       -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython
diff --git a/src/SALOME_PYQT/Makefile.am b/src/SALOME_PYQT/Makefile.am
new file mode 100755 (executable)
index 0000000..a96896a
--- /dev/null
@@ -0,0 +1,29 @@
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Patrick GOLDBRONN (CEA)
+#  Module : SALOME
+# $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+SUBDIRS = SALOME_PYQT_GUI SalomePyQt 
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
new file mode 100644 (file)
index 0000000..9363776
--- /dev/null
@@ -0,0 +1,85 @@
+# Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public  
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Nicolas REJNERI
+#  Module : SALOME
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+# small trick for Mandrake-10.1: PyQt 3.13 does not support Qt 3.3.3
+# Sip flags
+if IS_QT_3_0_0
+SIP_FLAGS = -t WS_X11 -t Qt_3_0_0 $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
+else !IS_QT_3_0_0
+SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
+endif
+
+
+######################
+
+# Library target
+lib_LTLIBRARIES= libSalomePyQtGUI.la
+
+
+# Sip sources
+if IS_SIP_V4
+SIP_SRC   = sipSalomePyQtGUIcmodule.cc
+SIP_FILES = SALOME_PYQT_GUI.sip
+else !IS_SIP_V4
+SIP_SRC   = SalomePyQtGUIcmodule.cc
+SIP_FILES = SALOME_PYQT_GUI.sip
+endif
+
+EXTRA_DIST+= $(SIP_FILES)
+
+salomeinclude_HEADERS = \
+       SALOME_PYQT_GUI.h \
+       SALOME_PYQT_PyInterp.h \
+       SALOME_PYQT_Module.h
+
+dist_libSalomePyQtGUI_la_SOURCES= \
+       SALOME_PYQT_PyInterp.cxx \
+       SALOME_PYQT_Module.cxx
+
+dist_libSalomePyQtGUI_la_SOURCES: $(SIP_SRC)
+
+# moc pre-processing
+MOC_FILES= SALOME_PYQT_Module_moc.cxx
+nodist_libSalomePyQtGUI_la_SOURCES= $(MOC_FILES) $(SIP_SRC)
+
+libSalomePyQtGUI_la_CPPFLAGS= $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \
+       $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \
+       -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -D__CALL_OLD_METHODS__ \
+       -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp \
+       -I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp \
+       -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \
+       -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+libSalomePyQtGUI_la_LIBADD= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \
+       $(OGL_LIBS) ../../PyInterp/libPyInterp.la ../../SalomeApp/libSalomeApp.la
+
+##################################
+
+# Custom build step: generate C++ wrapping according to $(SIP_FILES)
+
+$(SIP_SRC): $(SIP_FILES)
+       $(SIP) $(SIP_FLAGS) $<
+
+$(dist_libSalomePyQtGUI_la_SOURCES): $(SIP_SRC)
+
+###################################
diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am
new file mode 100644 (file)
index 0000000..06df0d1
--- /dev/null
@@ -0,0 +1,132 @@
+# Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public  
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Nicolas REJNERI
+#  Module : SALOME
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+# small trick for Mandrake-10.1: PyQt 3.13 does not support Qt 3.3.3
+# Sip flags
+if IS_QT_3_0_0
+SIP_FLAGS = -t WS_X11 -t Qt_3_0_0 $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
+else !IS_QT_3_0_0
+SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
+endif
+
+# Sip common sources
+SIP_SRC = sipSalomePyQtSalomePyQt.cc \
+         sipSalomePyQtSALOME_Selection.cc \
+          sipSalomePyQtQtxAction.cc
+
+# Sip version-specific sources
+if IS_SIP_V4
+SIP_SRC  += sipSalomePyQtcmodule.cc
+else !IS_SIP_V4
+SIP_SRC  += SalomePyQtcmodule.cc
+endif
+
+# Sip/moc sources and Sip definition files
+if IS_SIP_V4
+if IS_SIP_NEW
+MOC_SRC   = 
+MOC_H     = 
+SIP_FILES = SalomePyQt_v4.sip
+else !IS_SIP_NEW
+MOC_SRC   = sipSalomePyQtcmodule_moc.cxx
+MOC_H     = sipSalomePyQtcmodule.h
+SIP_FILES = SalomePyQt_v4.sip
+endif
+else !IS_SIP_V4
+SIP_FILES = SalomePyQt.sip
+if IS_SIP_NEW
+MOC_SRC   = SalomePyQtcmodule_moc.cxx
+MOC_H     = SalomePyQtcmodule.h
+else !IS_SIP_NEW
+MOC_SRC   = sipSalomePyQtProxySalomePyQt_moc.cxx
+MOC_H     = sipSalomePyQtProxySalomePyQt.h
+endif
+endif
+
+EXTRA_DIST+= SalomePyQt.sip SalomePyQt_v4.sip
+
+# Libraries targets
+MOC_FILES= SalomePyQt_moc.cxx
+
+COMMON_CPP_FLAGS=$(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \
+       $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \
+       -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -I$(top_builddir)/salomeadn/unix \
+       -I$(top_builddir)/idl \
+       -I$(srcdir)/../../SUIT -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \
+       -I$(srcdir)/../../Qtx -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../Event \
+       -I$(srcdir)/../../SalomeSession -I$(srcdir)/../../LogWindow \
+       -I$(srcdir)/../../VTKViewer -I$(srcdir)/../../TOOLSGUI \
+       -I$(srcdir)/../SALOME_PYQT_GUI -I$(srcdir)/../../PyInterp \
+       -I$(srcdir)/../../LightApp -I$(srcdir)/../../ObjBrowser \
+       -I$(srcdir)/../../OBJECT \
+       -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+COMMON_LIBS=$(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \
+       $(OGL_LIBS) ../../SUIT/libsuit.la ../../CAM/libCAM.la ../../STD/libstd.la \
+       ../../Qtx/libqtx.la ../../SalomeApp/libSalomeApp.la ../../Event/libEvent.la \
+       ../../Session/libSalomeSession.la ../../LogWindow/libLogWindow.la \
+       ../../VTKViewer/libVTKViewer.la ../../TOOLSGUI/libToolsGUI.la \
+       ../SALOME_PYQT_GUI/libSalomePyQtGUI.la
+
+if IS_SIP_V4
+
+lib_LTLIBRARIES = libSalomePyQt.la
+dist_libSalomePyQt_la_SOURCES= SalomePyQt.cxx
+nodist_libSalomePyQt_la_SOURCES= $(MOC_FILES) $(SIP_SRC) $(MOC_SRC) 
+libSalomePyQt_la_CPPFLAGS = $(COMMON_CPP_FLAGS)
+libSalomePyQt_la_LIBADD = $(COMMON_LIBS)
+
+else !IS_SIP_V4
+
+lib_LTLIBRARIES = libSalomePyQtcmodule.la
+dist_libSalomePyQtcmodule_la_SOURCES= SalomePyQt.cxx
+nodist_libSalomePyQtcmodule_la_SOURCES= $(MOC_FILES) $(SIP_SRC) $(MOC_SRC)
+libSalomePyQtcmodule_la_CPPFLAGS = $(MY_CPP_FLAGS)
+libSalomePyQtcmodule_la_LIBADD = $(COMMON_LIBS)
+
+endif
+
+if IS_SIP_V4
+else
+nodist_sharedpkgpython_PYTHON= SalomePyQt.py
+endif
+
+# Custom build step: generate C++ wrapping according to $(SIP_FILES)
+$(SIP_SRC): $(SIP_FILES)
+       $(SIP) $(SIP_FLAGS) $<
+
+$(MOC_H): $(SIP_FILES)
+       $(SIP) $(SIP_FLAGS) $<
+
+if IS_SIP_V4
+install-exec-hook: $(libdir)/SalomePyQt.so
+$(libdir)/SalomePyQt.so:
+       ln -s $(libdir)/libSalomePyQt.so $@
+else !IS_SIP_V4
+install-exec-hook: $(libdir)/SalomePyQtcmodule.so
+$(libdir)/SalomePyQt.so:
+       ln -sf $(libdir)/libSalomePyQtcmodule.so $@
+endif
+
+$(SIP_SRC): $(MOC_SRC)
diff --git a/src/SALOME_SWIG/Makefile.am b/src/SALOME_SWIG/Makefile.am
new file mode 100755 (executable)
index 0000000..e2265d4
--- /dev/null
@@ -0,0 +1,115 @@
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Paul RASCLE, EDF
+#  Module : SALOME
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+# ===============================================================
+# Swig targets
+# ===============================================================
+# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm)
+#
+# Step 1: build the wrapping source files with swig
+#
+# libSALOME_LifeCycleCORBA.i -- swig --> swig_wrap.cpp
+#                                        libSALOME_Swig.py
+#
+# Step 2: build the dynamic library from cpp built source files and
+#         dependant libraries.
+#
+# swig_wrap.cpp -- gcc --> swig_wrap.o    |-- link --> _libSALOME_Swig.la
+#                          +              |
+#                          dependant libs |
+#
+# The file libSALOME_Swigcmodule.py will be installed in
+# <prefix>/lib/python<version>/site-package/salome.
+# The library will be installed in the same place.
+#
+
+# this option puts it to dist
+#BUILT_SOURCES = swig_wrap.cpp
+
+SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir)
+SWIG_SOURCES  = libSALOME_Swig.i
+
+nodist_pkgpython_DATA = libSALOME_Swig.py
+libSALOME_Swig.py: swig_wrap.cpp
+
+# library
+lib_LTLIBRARIES = libSALOME_Swigcmodule.la
+libSALOME_Swigcmodule_la_SOURCES  = $(BUILT_SOURCES) $(SWIG_SOURCES) SALOMEGUI_Swig.cxx
+nodist_libSALOME_Swigcmodule_la_SOURCES = swig_wrap.cpp
+salomeinclude_HEADERS= SALOMEGUI_Swig.hxx SALOMEGUI_Swig.i
+
+libSALOME_Swigcmodule_la_CPPFLAGS =\
+       $(QT_INCLUDES) $(PYTHON_INCLUDES) $(CAS_CPPFLAGS) $(VTK_INCLUDES) \
+       $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ \
+       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \
+       -I$(srcdir)/../SalomeApp -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT \
+       -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LightApp -I$(srcdir)/../SOCC \
+       -I$(srcdir)/../SVTK -I$(srcdir)/../Event -I$(srcdir)/../OBJECT \
+       -I$(srcdir)/../CAM -I$(srcdir)/../STD -I$(srcdir)/../OCCViewer \
+       -I$(srcdir)/../Prs -I$(srcdir)/../VTKViewer \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+
+libSALOME_Swigcmodule_la_LDFLAGS  = -module
+libSALOME_Swigcmodule_la_LIBADD   = \
+       ../SalomeApp/libSalomeApp.la \
+       @PYTHON_LIBS@
+
+swig_wrap.cpp : $(SWIG_SOURCES)
+       $(SWIG) $(SWIG_FLAGS) -o $@ $<
+
+CLEANFILES = swig_wrap.cpp
+
+#
+# ===============================================================
+# Files to be installed
+# ===============================================================
+#
+
+# Scripts to be installed.
+dist_salomescript_DATA= \
+       examplevtk1.py \
+       test_table.py \
+       test_big_table.py \
+       test_many_objects.py \
+       test_remove_ref.py \
+       libSALOME_Swig.py
+
+nodist_salomescript_DATA= \
+       supervisionexample.py \
+       supervisiongeomexample.py
+
+EXTRA_DIST+= \
+       supervisionexample.py.in \
+       supervisiongeomexample.py.in
+
+sharedpkgpython_PYTHON= SALOMEGUI_shared_modules.py
+
+install-exec-hook: $(libdir)/_libSALOME_Swig.so
+
+$(libdir)/_libSALOME_Swig.so:
+       ln -sf $(libdir)/libSALOME_Swigcmodule.so $@
diff --git a/src/SALOME_SWIG/supervisionexample.py b/src/SALOME_SWIG/supervisionexample.py
deleted file mode 100755 (executable)
index 7e75912..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#==============================================================================
-#  File      : supervisionexample.py
-#  Created   : 23 nov 2001
-#  Author    : Jean Rahuel
-#  Project   : SALOME
-#  Copyright : CEA
-#==============================================================================
-
-from SuperV import *
-
-
-
-# load this object with Nodes, Links and Datas stored in GraphEssai.xml
-# (GraphEssai.xml was created with python in SuperVisionTest and GraphEssai.py)
-myGraph = Graph("@ROOT_BUILDDIR@/share/salome/resources/superv/GraphEssai.xml")
-
-#myGraph = Graph("/home/data/jr_HEAD/build/share/salome/resources/superv/GraphEssai.xml")
-# This DataFlow is "valid" : no loop, correct links between Nodes etc...
-
-print myGraph.IsValid()
-
-# Get Nodes
-myGraph.PrintNodes()
-Add,Sub,Mul,Div = myGraph.Nodes()
-
-# Load Datas
-Addx = Add.Input("x",3.)
-Addy = Add.Input("y",4.5)
-Subx = Sub.Input("x",1.5)
-
-# Get Output Port
-Addz = Add.Port('z')
-Subz = Sub.Port('z')
-Mulz = Mul.Port('z')
-Divz = Div.Port('z')
-
-# This DataFlow is "executable" : all pending Ports are defined with Datas
-print myGraph.IsExecutable()
-
-# Starts only execution of that DataFlow and gets control immediatly
-print myGraph.Run()
-
-# That DataFlow is running ==> 0 (false)
-print myGraph.IsDone()
-
-# Events of execution :
-aStatus,aNode,anEvent,aState = myGraph.Event()
-while aStatus :
-    print aNode.Thread(),aNode.SubGraph(),aNode.Name(),anEvent,aState
-    aStatus,aNode,anEvent,aState = myGraph.Event()
-print myGraph.IsDone()
-
-# Wait for Completion (but it is already done after event loop ...)
-print "Done : ",myGraph.DoneW()
-
-# Get result
-print "Result : ",Divz.ToString()
-
-# Intermediate results :
-print "Intermediate Result Add\z : ",Addz.ToString()
-print "Intermediate Result Sub\z : ",Subz.ToString()
-print "Intermediate Result Mul\z : ",Mulz.ToString()
-
-print " "
-print "Type : print myGraph.IsDone()"
-print "       If execution is finished ==> 1 (true)"
-print " "
-print "Type : print Divz.ToString()"
-print "       You will get the result"
-print " "
-print "Type : myGraph.PrintPorts()"
-print "       to see input and output values of the graph"
-print " "
-print "Type : Add.PrintPorts()"
-print "Type : Sub.PrintPorts()"
-print "Type : Mul.PrintPorts()"
-print "Type : Div.PrintPorts()"
-print "       to see input and output values of nodes"
-
-# Export will create newsupervisionexample.xml and the corresponding .py file
-print myGraph.Export("@ROOT_BUILDDIR@/share/salome/resources/superv/newsupervisionexample.xml")
-
-print " "
-print "See file @ROOT_BUILDDIR@/share/salome/resources/superv/newsupervisionexample.xml"
-print "See file @ROOT_BUILDDIR@/share/salome/resources/superv/newsupervisionexample.py"
diff --git a/src/SALOME_SWIG/supervisiongeomexample.py b/src/SALOME_SWIG/supervisiongeomexample.py
deleted file mode 100755 (executable)
index bf9e5b7..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# Generated python file of Graph GraphGeom2Essai
-
-from SuperV import *
-
-import salome
-
-import geompy
-
-
-geom = lcc.FindOrLoadComponent("FactoryServer", "Geometry")
-geom.GetCurrentStudy(salome.myStudyId)
-
-myBuilder = salome.myStudy.NewBuilder()
-
-# Graph creation 
-GraphGeom2Essai = Graph( 'GraphGeom2Essai' )
-print GraphGeom2Essai.SetAuthor( '' )
-print GraphGeom2Essai.SetComment( '' )
-GraphGeom2Essai.Coords( 0 , 0 )
-
-# Creation of Nodes
-MakeSphere = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeSphere' )
-print MakeSphere.SetAuthor( '' )
-print MakeSphere.SetContainer( 'FactoryServer' )
-print MakeSphere.SetComment( '' )
-MakeSphere.Coords( 26 , 13 )
-MakeCopy = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeCopy' )
-print MakeCopy.SetAuthor( '' )
-print MakeCopy.SetContainer( 'FactoryServer' )
-print MakeCopy.SetComment( '' )
-MakeCopy.Coords( 219 , 12 )
-MakeTranslation = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeTranslation' )
-print MakeTranslation.SetAuthor( '' )
-print MakeTranslation.SetContainer( 'FactoryServer' )
-print MakeTranslation.SetComment( '' )
-MakeTranslation.Coords( 219 , 159 )
-MakeFuse = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeFuse' )
-print MakeFuse.SetAuthor( '' )
-print MakeFuse.SetContainer( 'FactoryServer' )
-print MakeFuse.SetComment( '' )
-MakeFuse.Coords( 465 , 106 )
-
-# Creation of intermediate Output variables and of links
-MakeSphereshape = MakeSphere.Port( 'shape' )
-MakeCopyshape1 = GraphGeom2Essai.Link( MakeSphereshape , MakeCopy.Port( 'shape1' ) )
-MakeTranslationshape1 = GraphGeom2Essai.Link( MakeSphereshape , MakeTranslation.Port( 'shape1' ) )
-MakeCopyshape = MakeCopy.Port( 'shape' )
-MakeFuseshape1 = GraphGeom2Essai.Link( MakeCopyshape , MakeFuse.Port( 'shape1' ) )
-MakeTranslationshape = MakeTranslation.Port( 'shape' )
-MakeFuseshape2 = GraphGeom2Essai.Link( MakeTranslationshape , MakeFuse.Port( 'shape2' ) )
-
-# Creation of Input datas
-MakeSpherex1 = MakeSphere.Input( 'x1' , 0)
-MakeSpherey1 = MakeSphere.Input( 'y1' , 0)
-MakeSpherez1 = MakeSphere.Input( 'z1' , 0)
-MakeSphereradius = MakeSphere.Input( 'radius' , 50)
-MakeTranslationx1 = MakeTranslation.Input( 'x1' , 80)
-MakeTranslationy1 = MakeTranslation.Input( 'y1' , 0)
-MakeTranslationz1 = MakeTranslation.Input( 'z1' , 0)
-
-# Missing Input datas : None
-
-# Creation of Output variables
-MakeFuseshape = MakeFuse.Port( 'shape' )
-
-# State of Ports of the Graph
-GraphGeom2Essai.PrintPorts()
-
-# Start asynchronous run
-print GraphGeom2Essai.Run()
-
-# Done ?
-print GraphGeom2Essai.IsDone()
-
-# Events of execution :
-aStatus,aNode,anEvent,aState = GraphGeom2Essai.Event()
-while aStatus :
-    print aNode.Thread(),aNode.SubGraph(),aNode.Name(),anEvent,aState
-    aStatus,aNode,anEvent,aState = GraphGeom2Essai.Event()
-print GraphGeom2Essai.IsDone()
-
-# Waiting end of execution :
-print GraphGeom2Essai.DoneW()
-
-print " "
-print "Type print GraphGeom2Essai.IsDone()"
-print "1 <==> It's done"
-print " "
-print "Type print GraphGeom2Essai.DoneW()"
-print "Wait until end of execution : 1(success)"
-print " "
-print "Type GraphGeom2Essai.PrintPorts()"
-print "     to see input and output values of the graph"
-print " "
-print "Type MakeSphere.PrintPorts()"
-print "Type MakeCopy.PrintPorts()"
-print "Type MakeTranslation.PrintPorts()"
-print "Type MakeFuse.PrintPorts()"
-print "     to see input and output values of nodes"
-print " "
-print "Type print GraphGeom2Essai.Export('File-Name')"
-print "You will get a .py and a .xml file of this graph"
diff --git a/src/SALOME_SWIG/testattr.py b/src/SALOME_SWIG/testattr.py
deleted file mode 100755 (executable)
index 18f0915..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  License along with this library; if not, write to the Free Software 
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#
-#
-#  File   : testattr.py
-#  Module : SALOME
-
-import SALOMEDS
-#import SALOMEDS_Attributes_idl
-import geompy
-import salome
-# ===============================================================
-
-# creating new object ===========================================
-obj = geompy.myBuilder.NewObject(geompy.father)
-
-# adding Name attribute =========================================
-A1 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeName")
-name = A1._narrow(SALOMEDS.AttributeName)
-name.SetValue("First Object")
-
-# adding Comment attribute ======================================
-A2 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeComment")
-comment = A2._narrow(SALOMEDS.AttributeComment)
-comment.SetValue("This is Comment attribute")
-
-# adding IOR attribute ==========================================
-#A3 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeIOR")
-# ...
-
-# adding integer attribute ======================================
-A4 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeInteger")
-integer = A4._narrow(SALOMEDS.AttributeInteger)
-integer.SetValue(12)
-
-# adding real attribute =========================================
-A5 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeReal")
-real = A5._narrow(SALOMEDS.AttributeReal)
-real.SetValue(0.25)
-
-# adding sequence of integer attribute ==========================
-A6 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeSequenceOfInteger")
-intseq = A6._narrow(SALOMEDS.AttributeSequenceOfInteger)
-intseq.Add(1)
-intseq.Add(2)
-intseq.Add(3)
-
-
-# adding sequence of real attribute =============================
-A7 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeSequenceOfReal")
-realseq = A7._narrow(SALOMEDS.AttributeSequenceOfReal)
-realseq.Add(0.001)
-realseq.Add(0.002)
-realseq.Add(0.003)
-
-# adding PersistentRef attribute ================================
-#A8 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributePersistentRef")
-# ...
-
-# adding Drawable attribute =====================================
-A9 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeDrawable")
-drawable = A9._narrow(SALOMEDS.AttributeDrawable)
-drawable.SetDrawable(1)
-
-# adding Selectable attribute ===================================
-#A10 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeSelectable")
-# ...
-
-# adding Expandable attribute ===================================
-#A11 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeExpandable")
-# ...
-
-# adding Opened attribute =======================================
-#A12 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeOpened")
-# ...
-
-# adding TextColor attribute ====================================
-A13 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeTextColor")
-textcolor = A13._narrow(SALOMEDS.AttributeTextColor)
-
-# ...
-
-# adding TextHighlightColor of real attribute ===================
-#A14 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeTextHighlightColor")
-# ...
-
-# adding PixMap of real attribute ===============================
-#A15 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributePixMap")
-# ...
-
-# opening OCAF Browser ==========================================
-# result = salome.myStudy.OCAFBrowser()
diff --git a/src/SOCC/Makefile.am b/src/SOCC/Makefile.am
new file mode 100755 (executable)
index 0000000..25db606
--- /dev/null
@@ -0,0 +1,50 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Alexander Solovyov(OCN)
+#  Module : SOCC
+# $Header: /dn06/SALOME_CVS/GUI_SRC/src/SOCC/Makefile.in,v 1.1
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES=libSOCC.la
+
+salomeinclude_HEADERS= \
+       SOCC.h \
+       SOCC_ViewModel.h \
+       SOCC_Prs.h \
+       SOCC_ViewWindow.h
+
+dist_libSOCC_la_SOURCES= \
+       SOCC_ViewModel.cxx \
+       SOCC_Prs.cxx \
+       SOCC_ViewWindow.cxx
+
+MOC_FILES= \
+       SOCC_ViewModel_moc.cxx \
+       SOCC_ViewWindow_moc.cxx
+nodist_libSOCC_la_SOURCES= $(MOC_FILES)
+
+libSOCC_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \
+       -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \
+       -I$(srcdir)/../OCCViewer -I$(srcdir)/../Qtx
+
+libSOCC_la_LDFLAGS=$(QT_MT_LIBS)
+libSOCC_la_LIBADD= ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
+       ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la
diff --git a/src/SOCC/Makefile.in b/src/SOCC/Makefile.in
deleted file mode 100755 (executable)
index f1ad967..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  File   : Makefile.in
-#  Author : Alexander Solovyov(OCN)
-#  Module : SOCC
-# $Header: /dn06/SALOME_CVS/GUI_SRC/src/SOCC/Makefile.in,v 1.1
-
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-
-
-@COMMENCE@
-
-# header files
-EXPORT_HEADERS= SOCC.h \
-               SOCC_ViewModel.h \
-               SOCC_Prs.h \
-               SOCC_ViewWindow.h
-
-# Libraries targets
-LIB = libSOCC.la
-
-LIB_SRC= SOCC_ViewModel.cxx \
-        SOCC_Prs.cxx \
-        SOCC_ViewWindow.cxx
-
-LIB_MOC = SOCC_ViewModel.h \
-         SOCC_ViewWindow.h
-
-CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) 
-
-LDFLAGS+=$(QT_MT_LIBS)
-LIBS+= -lsuit -lSalomeObject -lSalomePrs -lOCCViewer
-
-@CONCLUDE@
diff --git a/src/SPlot2d/Makefile.am b/src/SPlot2d/Makefile.am
new file mode 100644 (file)
index 0000000..17dc25b
--- /dev/null
@@ -0,0 +1,52 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libSPlot2d.la
+
+salomeinclude_HEADERS = \
+       SPlot2d.h \
+       SPlot2d_Curve.h \
+       SPlot2d_Prs.h \
+       SPlot2d_ViewModel.h \
+       SPlot2d_ViewWindow.h
+
+dist_libSPlot2d_la_SOURCES = \
+       SPlot2d_Curve.cxx \
+       SPlot2d_Prs.cxx \
+       SPlot2d_ViewModel.cxx \
+       SPlot2d_ViewWindow.cxx
+
+MOC_FILES = \
+       SPlot2d_ViewModel_moc.cxx \
+       SPlot2d_ViewWindow_moc.cxx
+nodist_libSPlot2d_la_SOURCES = $(MOC_FILES)
+
+nodist_salomeres_DATA = SPlot2d_msg_en.qm
+
+libSPlot2d_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(QWT_INCLUDES) $(BOOST_CPPFLAGS) \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Plot2d -I$(srcdir)/../Prs \
+       -I$(srcdir)/../OBJECT
+libSPlot2d_la_LDFLAGS=$(QT_MT_LIBS) $(QWT_LIBS) ../SUIT/libsuit.la ../Plot2d/libPlot2d.la ../Prs/libSalomePrs.la
+
+
+
+
+
diff --git a/src/SPlot2d/Makefile.in b/src/SPlot2d/Makefile.in
deleted file mode 100644 (file)
index 7e92409..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-EXPORT_HEADERS = \
-           SPlot2d.h \
-           SPlot2d_Curve.h \
-          SPlot2d_Prs.h \
-          SPlot2d_ViewModel.h \
-          SPlot2d_ViewWindow.h
-
-# .po files to transform in .qm
-PO_FILES = SPlot2d_msg_en.po
-
-# Libraries targets
-
-LIB = libSPlot2d.la
-LIB_SRC =        \
-           SPlot2d_Curve.cxx \
-          SPlot2d_Prs.cxx \
-          SPlot2d_ViewModel.cxx \
-          SPlot2d_ViewWindow.cxx
-
-LIB_MOC = \
-          SPlot2d_ViewModel.h \
-          SPlot2d_ViewWindow.h
-
-CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(QWT_INCLUDES) $(BOOST_CPPFLAGS)
-LDFLAGS+=$(QT_MT_LIBS) $(QWT_LIBS) -lsuit -lPlot2d -lSalomePrs
-
-
-@CONCLUDE@
-
-
-
-
-
diff --git a/src/SPlot2d/SPlot2d_msg_en.po b/src/SPlot2d/SPlot2d_msg_en.po
deleted file mode 100644 (file)
index b5ec921..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# This is a Qt message file in .po format.  Each msgid starts with
-# a scope.  This scope should *NOT* be translated - eg. translating
-# from French to English, "Foo::Bar" would be translated to "Pub",
-# not "Foo::Pub".
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2005-06-16 12:01:13 PM MSD\n"
-"PO-Revision-Date: YYYY-MM-DD\n"
-"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-
diff --git a/src/SPlot2d/resources/SPlot2d_msg_en.po b/src/SPlot2d/resources/SPlot2d_msg_en.po
new file mode 100644 (file)
index 0000000..b5ec921
--- /dev/null
@@ -0,0 +1,30 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# This is a Qt message file in .po format.  Each msgid starts with
+# a scope.  This scope should *NOT* be translated - eg. translating
+# from French to English, "Foo::Bar" would be translated to "Pub",
+# not "Foo::Pub".
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2005-06-16 12:01:13 PM MSD\n"
+"PO-Revision-Date: YYYY-MM-DD\n"
+"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+
diff --git a/src/STD/Makefile.am b/src/STD/Makefile.am
new file mode 100755 (executable)
index 0000000..9b52950
--- /dev/null
@@ -0,0 +1,79 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : STD
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libstd.la
+
+salomeinclude_HEADERS= \
+       STD_Application.h \
+       STD.h \
+       STD_MDIDesktop.h \
+       STD_SDIDesktop.h \
+       STD_TabDesktop.h \
+       STD_CloseDlg.h \
+       STD_LoadStudiesDlg.h
+
+dist_libstd_la_SOURCES=\
+       STD_Application.cxx \
+       STD_MDIDesktop.cxx \
+       STD_SDIDesktop.cxx \
+       STD_TabDesktop.cxx \
+       STD_CloseDlg.cxx \
+       STD_LoadStudiesDlg.cxx
+
+MOC_FILES= \
+       STD_Application_moc.cxx \
+       STD_MDIDesktop_moc.cxx \
+       STD_SDIDesktop_moc.cxx \
+       STD_TabDesktop_moc.cxx \
+       STD_CloseDlg_moc.cxx \
+       STD_LoadStudiesDlg_moc.cxx
+nodist_libstd_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA=\
+       resources/config \
+       resources/cut.png \
+       resources/copy.png \
+       resources/close.png \
+       resources/cursor_rotate.png \
+       resources/cursor_zoom.png \
+       resources/help.png \
+       resources/new.png \
+       resources/open.png \
+       resources/print.png \
+       resources/paste.png \
+       resources/redo.png \
+       resources/reset.png \
+       resources/save.png \
+       resources/undo_arrow.png \
+       resources/undo.png \
+       resources/std.ini
+
+nodist_salomeres_DATA=\
+       STD_images.qm \
+       STD_msg_en.qm
+
+libstd_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+libstd_la_LDFLAGS=$(QT_MT_LIBS)
+libstd_la_LIBADD=../SUIT/libsuit.la
diff --git a/src/SUIT/Makefile.am b/src/SUIT/Makefile.am
new file mode 100755 (executable)
index 0000000..a87d39f
--- /dev/null
@@ -0,0 +1,120 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : suit
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libsuit.la
+
+salomeinclude_HEADERS= \
+       SUIT.h \
+       SUIT_ActionOperation.h \
+       SUIT_Application.h \
+       SUIT_Convertor.h \
+       SUIT_DataObject.h \
+       SUIT_DataObjectIterator.h \
+       SUIT_DataObjectKey.h \
+       SUIT_DataOwner.h \
+       SUIT_Desktop.h \
+       SUIT_ExceptionHandler.h \
+       SUIT_FileDlg.h \
+       SUIT_FileValidator.h \
+       SUIT_MessageBox.h \
+       SUIT_Operation.h \
+       SUIT_OverrideCursor.h \
+       SUIT_ParserSettings.h \
+       SUIT_PopupClient.h \
+       SUIT_ResourceMgr.h \
+       SUIT_SelectionMgr.h \
+       SUIT_Selector.h \
+       SUIT_Session.h \
+       SUIT_SmartPtr.h \
+       SUIT_Study.h \
+       SUIT_ToolButton.h \
+       SUIT_Tools.h \
+       SUIT_ViewManager.h \
+       SUIT_ViewModel.h \
+       SUIT_ViewWindow.h \
+       SUIT_SelectionFilter.h \
+       SUIT_Accel.h \
+       SUIT_TreeSync.h
+
+dist_libsuit_la_SOURCES= \
+       SUIT_ActionOperation.cxx \
+       SUIT_Application.cxx \
+       SUIT_DataObject.cxx \
+       SUIT_DataObjectIterator.cxx \
+       SUIT_DataObjectKey.cxx \
+       SUIT_DataOwner.cxx \
+       SUIT_Desktop.cxx \
+       SUIT_ExceptionHandler.cxx \
+       SUIT_FileDlg.cxx \
+       SUIT_FileValidator.cxx \
+       SUIT_MessageBox.cxx \
+       SUIT_Operation.cxx \
+       SUIT_OverrideCursor.cxx \
+       SUIT_ParserSettings.cxx \
+       SUIT_PopupClient.cxx \
+       SUIT_ResourceMgr.cxx \
+       SUIT_SelectionMgr.cxx \
+       SUIT_Selector.cxx \
+       SUIT_Session.cxx \
+       SUIT_Study.cxx \
+       SUIT_ToolButton.cxx \
+       SUIT_Tools.cxx \
+       SUIT_ViewManager.cxx \
+       SUIT_ViewModel.cxx \
+       SUIT_ViewWindow.cxx \
+       SUIT_SelectionFilter.cxx \
+       SUIT_Accel.cxx
+
+MOC_FILES= \
+       SUIT_ActionOperation_moc.cxx \
+       SUIT_Application_moc.cxx \
+       SUIT_DataObject_moc.cxx \
+       SUIT_Desktop_moc.cxx \
+       SUIT_FileDlg_moc.cxx \
+       SUIT_Operation_moc.cxx \
+       SUIT_PopupClient_moc.cxx \
+       SUIT_Session_moc.cxx \
+       SUIT_Study_moc.cxx \
+       SUIT_ToolButton_moc.cxx \
+       SUIT_ViewModel_moc.cxx \
+       SUIT_ViewWindow_moc.cxx \
+       SUIT_ViewManager_moc.cxx \
+       SUIT_SelectionMgr_moc.cxx \
+       SUIT_Selector_moc.cxx \
+       SUIT_Accel_moc.cxx
+nodist_libsuit_la_SOURCES=$(MOC_FILES)
+
+dist_salomeres_DATA = \
+       resources/cascade.png \
+       resources/htile.png \
+       resources/vtile.png
+
+nodist_salomeres_DATA = \
+       SUIT_images.qm \
+       SUIT_msg_en.qm
+
+libsuit_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../Qtx
+libsuit_la_LDFLAGS=$(QT_MT_LIBS)
+libsuit_la_LIBADD=../Qtx/libqtx.la
diff --git a/src/SUITApp/Makefile.am b/src/SUITApp/Makefile.am
new file mode 100644 (file)
index 0000000..6e76029
--- /dev/null
@@ -0,0 +1,57 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : suitApp
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libSUITApp.la
+
+salomeinclude_HEADERS= SUITApp_Application.h
+
+dist_libSUITApp_la_SOURCES= \
+       SUITApp.cxx \
+       SUITApp_Application.cxx 
+
+MOC_FILES=SUITApp_Application_moc.cxx
+nodist_libSUITApp_la_SOURCES= $(MOC_FILES)
+
+nodist_salomeres_DATA= SUITApp_msg_en.qm
+
+libSUITApp_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) \
+                       -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+
+libSUITApp_la_LDFLAGS=$(QT_MT_LIBS) 
+libSUITApp_la_LIBADD= ../SUIT/libsuit.la ../Qtx/libqtx.la
+
+if ENABLE_PYCONSOLE
+libSUITApp_la_LDFLAGS+= -Xlinker -export-dynamic $(PYTHON_LIBS)
+endif
+
+# Executable
+bin_PROGRAMS= SUITApp
+
+dist_SUITApp_SOURCES=SUITApp.cxx
+
+SUITApp_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) \
+                 -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
+
+SUITApp_LDADD= libSUITApp.la ../SUIT/libsuit.la ../Qtx/libqtx.la
diff --git a/src/SUPERVGraph/Makefile.am b/src/SUPERVGraph/Makefile.am
new file mode 100755 (executable)
index 0000000..c82a4dc
--- /dev/null
@@ -0,0 +1,53 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libSUPERVGraph.la
+
+salomeinclude_HEADERS= \
+       SUPERVGraph_ViewFrame.h \
+       SUPERVGraph_ViewManager.h \
+       SUPERVGraph_ViewModel.h \
+       SUPERVGraph.h
+
+dist_libSUPERVGraph_la_SOURCES= \
+       SUPERVGraph.cxx \
+       SUPERVGraph_ViewFrame.cxx \
+       SUPERVGraph_ViewManager.cxx \
+       SUPERVGraph_ViewModel.cxx 
+
+MOC_FILES= \
+       SUPERVGraph_moc.cxx \
+       SUPERVGraph_ViewFrame_moc.cxx \
+       SUPERVGraph_ViewManager_moc.cxx \
+       SUPERVGraph_ViewModel_moc.cxx 
+nodist_libSUPERVGraph_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA= \
+       resources/view_pan.png \
+       resources/view_reset.png
+
+nodist_salomeres_DATA= \
+       SUPERVGraph_images.qm \
+       SUPERVGraph_msg_en.qm  
+
+libSUPERVGraph_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT
+libSUPERVGraph_la_LDFLAGS=$(QT_MT_LIBS) ../SUIT/libsuit.la
diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in
deleted file mode 100755 (executable)
index 334a2c9..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:@srcdir@/resources
-
-
-@COMMENCE@
-
-EXPORT_HEADERS = SUPERVGraph_ViewFrame.h \
-                SUPERVGraph_ViewManager.h \
-                SUPERVGraph_ViewModel.h \
-                SUPERVGraph.h
-
-# .po files to transmit in .qm
-PO_FILES = SUPERVGraph_images.po \
-          SUPERVGraph_msg_en.po  
-
-# Libraries targets
-
-LIB = libSUPERVGraph.la
-LIB_SRC =        SUPERVGraph.cxx \
-                 SUPERVGraph_ViewFrame.cxx \
-                 SUPERVGraph_ViewManager.cxx \
-                 SUPERVGraph_ViewModel.cxx 
-
-LIB_MOC =        SUPERVGraph_moc.cxx \
-                 SUPERVGraph_ViewFrame_moc.cxx \
-                 SUPERVGraph_ViewManager_moc.cxx \
-                 SUPERVGraph_ViewModel_moc.cxx 
-
-RESOURCES_FILES = view_pan.png \
-                 view_reset.png
-
-LIB_CLIENT_IDL = 
-
-CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS)
-LDFLAGS+=$(QT_MT_LIBS) -lsuit
-
-
-@CONCLUDE@
diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am
new file mode 100755 (executable)
index 0000000..7f96a1f
--- /dev/null
@@ -0,0 +1,129 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Alexander Solovyov(OCN)
+#  Module : SVTK
+# $Header: 
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libSVTK.la
+
+salomeinclude_HEADERS= \
+       SVTK.h \
+       SVTK_Prs.h \
+       SVTK_Actor.h \
+       SALOME_Actor.h \
+       SVTK_RectPicker.h \
+       SVTK_DeviceActor.h \
+       SVTK_DialogBase.h \
+       SVTK_FontWidget.h \
+       SVTK_CubeAxesActor2D.h \
+       SVTK_Functor.h \
+       SVTK_MainWindow.h \
+       SVTK_View.h \
+       SVTK_ViewManager.h \
+       SVTK_ViewModel.h \
+       SVTK_ViewWindow.h \
+       SVTK_Renderer.h \
+       SVTK_InteractorStyle.h \
+       SVTK_RenderWindowInteractor.h \
+       SVTK_GenericRenderWindowInteractor.h \
+       SVTK_Selector.h \
+       SVTK_Selection.h \
+       SVTK_SelectionEvent.h \
+       SVTK_SpaceMouse.h \
+       SVTK_Event.h \
+       SVTK_ViewModelBase.h
+
+dist_libSVTK_la_SOURCES= \
+       SVTK_Prs.cxx \
+       SVTK_Actor.cxx \
+       SALOME_Actor.cxx \
+       SVTK_RectPicker.cxx \
+       SVTK_DeviceActor.cxx \
+       SVTK_CubeAxesActor2D.cxx \
+       SVTK_NonIsometricDlg.cxx \
+       SVTK_UpdateRateDlg.cxx \
+       SVTK_CubeAxesDlg.cxx \
+       SVTK_DialogBase.cxx \
+       SVTK_FontWidget.cxx \
+       SVTK_Trihedron.cxx \
+       SVTK_MainWindow.cxx \
+       SVTK_View.cxx \
+       SVTK_ViewManager.cxx \
+       SVTK_ViewModel.cxx \
+       SVTK_Renderer.cxx \
+       SVTK_ViewWindow.cxx \
+       SVTK_InteractorStyle.cxx \
+       SVTK_RenderWindowInteractor.cxx \
+       SVTK_GenericRenderWindowInteractor.cxx \
+       SVTK_SpaceMouse.cxx \
+       SVTK_Selector.cxx
+
+EXTRA_DIST+= SVTK_SelectorDef.h SVTK_Trihedron.h
+
+MOC_FILES= \
+       SVTK_GenericRenderWindowInteractor_moc.cxx \
+       SVTK_RenderWindowInteractor_moc.cxx \
+       SVTK_NonIsometricDlg_moc.cxx \
+       SVTK_UpdateRateDlg_moc.cxx \
+       SVTK_CubeAxesDlg_moc.cxx \
+       SVTK_FontWidget_moc.cxx \
+       SVTK_DialogBase_moc.cxx \
+       SVTK_ViewModelBase_moc.cxx \
+       SVTK_ViewManager_moc.cxx \
+       SVTK_ViewWindow_moc.cxx \
+       SVTK_MainWindow_moc.cxx \
+       SVTK_ViewModel_moc.cxx \
+       SVTK_View_moc.cxx
+nodist_libSVTK_la_SOURCES= $(MOC_FILES)
+
+nodist_salomeres_DATA= \
+       SVTK_msg_en.qm \
+       SVTK_images.qm
+
+libSVTK_la_CPPFLAGS= \
+       $(QT_INCLUDES) \
+       $(CAS_CPPFLAGS) \
+       $(VTK_INCLUDES) \
+       $(QWT_INCLUDES) \
+       $(BOOST_CPPFLAGS) \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../STD \
+       -I$(srcdir)/../CAM -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \
+       -I$(srcdir)/../VTKViewer
+
+libSVTK_la_LDFLAGS= \
+       $(QT_MT_LIBS) \
+       $(OCC_LIBS) \
+       $(QWT_LIBS) \
+       $(VTK_LIBS)
+
+libSVTK_la_LIBADD= ../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la \
+                  ../CAM/libCAM.la ../OBJECT/libSalomeObject.la \
+                  ../Prs/libSalomePrs.la ../VTKViewer/libVTKViewer.la
+
+# Executable
+bin_PROGRAMS = SVTK
+
+dist_SVTK_SOURCES= SVTK.cxx
+
+SVTK_CPPFLAGS=$(libSVTK_la_CPPFLAGS)
+SVTK_LDFLAGS=$(libSVTK_la_LDFLAGS)
+SVTK_LDADD=libSVTK.la $(libSVTK_la_LIBADD)
diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am
new file mode 100755 (executable)
index 0000000..87d7cf2
--- /dev/null
@@ -0,0 +1,101 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : SalomeApp
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+SUBDIRS=Test
+
+lib_LTLIBRARIES= libSalomeApp.la
+
+salomeinclude_HEADERS= \
+       SalomeApp.h \
+       SalomeApp_Application.h \
+       SalomeApp_DataModel.h \
+       SalomeApp_DataObject.h \
+       SalomeApp_Module.h \
+       SalomeApp_Study.h \
+       SalomeApp_ExceptionHandler.h \
+       SalomeApp_EventFilter.h \
+       SalomeApp_Tools.h \
+       SalomeApp_ImportOperation.h \
+       SalomeApp_Filter.h \
+       SalomeApp_TypeFilter.h \
+       SalomeApp_StudyPropertiesDlg.h \
+       SalomeApp_CheckFileDlg.h \
+       SalomeApp_VisualState.h
+
+dist_libSalomeApp_la_SOURCES= \
+       SalomeApp_Module.cxx \
+       SalomeApp_Application.cxx \
+       SalomeApp_DataModel.cxx \
+       SalomeApp_DataObject.cxx \
+       SalomeApp_Study.cxx \
+       SalomeApp_ExceptionHandler.cxx \
+       SalomeApp_EventFilter.cxx \
+       SalomeApp_PyInterp.cxx \
+       SalomeApp_Tools.cxx \
+       SalomeApp_ImportOperation.cxx \
+       SalomeApp_Filter.cxx \
+       SalomeApp_TypeFilter.cxx \
+       SalomeApp_StudyPropertiesDlg.cxx \
+       SalomeApp_ListView.cxx \
+       SalomeApp_CheckFileDlg.cxx \
+       SalomeApp_VisualState.cxx
+
+MOC_FILES= \
+       SalomeApp_Application_moc.cxx \
+       SalomeApp_DataModel_moc.cxx \
+       SalomeApp_Module_moc.cxx \
+       SalomeApp_Study_moc.cxx \
+       SalomeApp_StudyPropertiesDlg_moc.cxx \
+       SalomeApp_ListView_moc.cxx \
+       SalomeApp_CheckFileDlg_moc.cxx
+nodist_libSalomeApp_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA= \
+       resources/SalomeApp.ini \
+       resources/SalomeApp.xml
+
+nodist_salomeres_DATA= \
+       SalomeApp_images.qm \
+       SalomeApp_msg_en.qm
+
+libSalomeApp_la_CPPFLAGS=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) \
+       $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ \
+       -I$(srcdir)/../LightApp -I$(srcdir)/../CAM -I$(srcdir)/../Qtx \
+       -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../SVTK \
+       -I$(srcdir)/../STD -I$(srcdir)/../VTKViewer -I$(srcdir)/../ObjBrowser \
+       -I$(srcdir)/../PythonConsole -I$(srcdir)/../TOOLSGUI \
+       -I$(srcdir)/../PyInterp -I$(srcdir)/../Session -I$(top_builddir)/idl \
+       -I$(srcdir)/../Event \
+       -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+libSalomeApp_la_LDFLAGS=$(PYTHON_LIBS) $(QT_MT_LIBS) 
+libSalomeApp_la_LIBADD= $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient \
+       ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la ../ObjBrowser/libObjBrowser.la \
+       ../Prs/libSalomePrs.la ../SPlot2d/libSPlot2d.la ../GLViewer/libGLViewer.la \
+       ../OCCViewer/libOCCViewer.la ../VTKViewer/libVTKViewer.la ../OBJECT/libSalomeObject.la \
+       ../SVTK/libSVTK.la ../SOCC/libSOCC.la ../PyInterp/libPyInterp.la \
+       ../PythonConsole/libPythonConsole.la ../LogWindow/libLogWindow.la \
+       ../LightApp/libLightApp.la ../TOOLSGUI/libToolsGUI.la $(CAS_KERNEL)
+
+EXTRA_DIST+=SalomeApp_PyInterp.h
\ No newline at end of file
diff --git a/src/SalomeApp/SalomeApp_Displayer.cxx b/src/SalomeApp/SalomeApp_Displayer.cxx
deleted file mode 100644 (file)
index 55ac92b..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#include "SalomeApp_Displayer.h"
-#include "SalomeApp_Application.h"
-
-#include <SALOME_InteractiveObject.hxx>
-
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewModel.h>
-#include <SUIT_ViewWindow.h>
-
-#include <qstring.h>
-
-/*!
-  Default constructor
-*/
-SalomeApp_Displayer::SalomeApp_Displayer()
-{
-}
-
-/*!
-  Destructor
-*/
-SalomeApp_Displayer::~SalomeApp_Displayer()
-{
-}
-
-/*!
-  Displays object in view
-  \param entry - object entry
-  \param updateViewer - is it necessary to update viewer
-  \param theViewFrame - view
-*/
-void SalomeApp_Displayer::Display( const QString& entry, const bool updateViewer, SALOME_View* theViewFrame )
-{
-  SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
-  if ( vf )
-  {
-    SALOME_Prs* prs = buildPresentation( entry, vf );
-
-    if ( prs )
-    {
-      vf->BeforeDisplay( this );
-      vf->Display( prs );
-      vf->AfterDisplay( this );
-
-      if ( updateViewer )
-        vf->Repaint();
-
-      delete prs;  // delete presentation because displayer is its owner
-    }
-  }
-}
-
-/*!
-  Redisplays object in view
-  \param entry - object entry
-  \param updateViewer - is it necessary to update viewer
-*/
-void SalomeApp_Displayer::Redisplay( const QString& entry, const bool updateViewer )
-{
-  // Remove the object permanently (<forced> == true)
-  SUIT_Session* ses = SUIT_Session::session();
-  SUIT_Application* app = ses->activeApplication();
-  if ( app )
-  {
-    SUIT_Desktop* desk = app->desktop();
-    QPtrList<SUIT_ViewWindow> wnds = desk->windows();
-    SUIT_ViewWindow* wnd;
-    for ( wnd = wnds.first(); wnd; wnd = wnds.next() )
-    {
-      SUIT_ViewManager* vman = wnd->getViewManager();
-      if( !vman )
-        continue;
-
-      SUIT_ViewModel* vmodel = vman->getViewModel();
-      if( !vmodel )
-       continue;
-       
-      SALOME_View* view = dynamic_cast<SALOME_View*>(vmodel);
-      if( view && ( IsDisplayed( entry, view ) || view == GetActiveView() ) )
-      {
-       Erase( entry, true, false, view );
-       Display( entry, updateViewer, view );
-      }
-    }
-  }
-}
-
-/*!
-  Erases object in view
-  \param entry - object entry
-  \param forced - deletes object from viewer (otherwise it will be erased, but cached)
-  \param updateViewer - is it necessary to update viewer
-  \param theViewFrame - view
-*/
-void SalomeApp_Displayer::Erase( const QString& entry, const bool forced,
-                                const bool updateViewer, SALOME_View* theViewFrame )
-{
-  SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
-
-  if ( vf ) {
-    SALOME_Prs* prs = vf->CreatePrs( entry.latin1() );
-    if ( prs ) {
-      vf->Erase( prs, forced );
-      if ( updateViewer )
-       vf->Repaint();
-      delete prs;  // delete presentation because displayer is its owner
-    }
-  }
-}
-
-/*!
-  Erases all objects in view
-  \param forced - deletes objects from viewer
-  \param updateViewer - is it necessary to update viewer
-  \param theViewFrame - view
-*/
-void SalomeApp_Displayer::EraseAll( const bool forced, const bool updateViewer, SALOME_View* theViewFrame ) const
-{
-  SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
-
-  if ( vf ) {
-    vf->EraseAll( forced );
-    if ( updateViewer )
-      vf->Repaint();
-  }
-}
-
-/*!
-  \return true if object is displayed in viewer
-  \param entry - object entry
-  \param theViewFrame - view
-*/
-bool SalomeApp_Displayer::IsDisplayed( const QString& entry, SALOME_View* theViewFrame ) const
-{
-  SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
-  if( vf )
-  {
-    Handle( SALOME_InteractiveObject ) temp = new SALOME_InteractiveObject();
-    temp->setEntry( entry.latin1() );
-    return vf->isVisible( temp );
-  }
-  else
-    return false;
-}
-
-/*!
-  Updates active view
-*/
-void SalomeApp_Displayer::UpdateViewer() const
-{
-  SALOME_View* vf = GetActiveView();
-  if ( vf )
-    vf->Repaint();
-}
-
-/*!
-  \return presentation of object, built with help of CreatePrs method
-  \param entry - object entry
-  \param theViewFrame - view
-  \sa CreatePrs()
-*/
-SALOME_Prs* SalomeApp_Displayer::buildPresentation( const QString& entry, SALOME_View* theViewFrame )
-{
-  SALOME_Prs* prs = 0;
-
-  SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
-
-  if ( vf )
-    prs = vf->CreatePrs( entry.latin1() );
-
-  return prs;
-}
-
-/*!
-  \return active view
-*/
-SALOME_View* SalomeApp_Displayer::GetActiveView()
-{
-  SUIT_Session* session = SUIT_Session::session();
-  if (  SUIT_Application* app = session->activeApplication() ) {
-    if ( SalomeApp_Application* sApp = dynamic_cast<SalomeApp_Application*>( app ) ) {
-      if( SUIT_ViewManager* vman = sApp->activeViewManager() ) {
-       if ( SUIT_ViewModel* vmod = vman->getViewModel() )
-         return dynamic_cast<SALOME_View*>( vmod );
-      }
-    }
-  }
-  return 0;
-}
diff --git a/src/SalomeApp/SalomeApp_Displayer.h b/src/SalomeApp/SalomeApp_Displayer.h
deleted file mode 100644 (file)
index db53193..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#ifndef SALOMEAPP_DISPLAYER_HEADER
-#define SALOMEAPP_DISPLAYER_HEADER
-
-#include <SALOME_Prs.h>
-
-class QString;
-
-class SalomeApp_Displayer : public SALOME_Displayer
-{
-public:
-  SalomeApp_Displayer();
-  virtual ~SalomeApp_Displayer();
-
-  void Display( const QString&, const bool = true, SALOME_View* = 0 );
-  void Redisplay( const QString&, const bool = true );
-  void Erase( const QString&, const bool forced = false, const bool updateViewer = true, SALOME_View* = 0 );
-  void EraseAll( const bool forced = false, const bool updateViewer = true, SALOME_View* = 0 ) const;
-  bool IsDisplayed( const QString&, SALOME_View* = 0 ) const;
-  void UpdateViewer() const;
-
-  static SALOME_View*  GetActiveView();
-
-protected:
-  virtual SALOME_Prs* buildPresentation( const QString&, SALOME_View* = 0 );
-};
-
-#endif
diff --git a/src/SalomeApp/Test/Makefile.am b/src/SalomeApp/Test/Makefile.am
new file mode 100644 (file)
index 0000000..3971f30
--- /dev/null
@@ -0,0 +1,47 @@
+#  SALOMELocalTrace : log on local machine
+#
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Sergey RUIN
+#  Module : SALOME
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES= libSalomeAppTest.la
+
+salomeinclude_HEADERS= SalomeAppTest.hxx
+
+dist_libSalomeAppTest_la_SOURCES= SalomeAppTest.cxx
+
+libSalomeAppTest_la_CXXFLAGS= @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS)
+libSalomeAppTest_la_LIBADD= @CPPUNIT_LIBS@
+
+bin_PROGRAMS= TestSalomeApp
+
+TestSalomeApp_SOURCES= TestSalomeApp.cxx
+
+TestSalomeApp_CXXFLAGS= $(libSalomeAppTest_la_CXXFLAGS)
+TestSalomeApp_LDADD= $(libSalomeAppTest_la_LIBADD) libSalomeAppTest.la
+
+dist_salomescript_PYTHON = TestSalomeApp.py
+UNIT_TEST_PROG = TestSalomeApp
diff --git a/src/SalomeApp/Test/Makefile.in b/src/SalomeApp/Test/Makefile.in
deleted file mode 100644 (file)
index 4754fe7..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#  SALOMELocalTrace : log on local machine
-#
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  License along with this library; if not, write to the Free Software 
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#
-#
-#  File   : Makefile.in
-#  Author : Sergey RUIN
-#  Module : SALOME
-
-top_srcdir=@top_srcdir@
-top_builddir=../../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-# header files  
-EXPORT_HEADERS= SalomeAppTest.hxx
-
-EXPORT_PYSCRIPTS = TestSalomeApp.py
-
-# Libraries targets
-
-LIB = libSalomeAppTest.la 
-LIB_SRC = SalomeAppTest.cxx
-LIB_CLIENT_IDL = 
-
-# Executables targets
-
-BIN = TestSalomeApp
-BIN_SRC = 
-BIN_CLIENT_IDL =
-
-
-CXXFLAGS += $ @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS)
-CPPFLAGS += $ @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS)
-
-LIBS= @LIBS@ @CPPUNIT_LIBS@
-
-LDFLAGS+= 
-
-LDFLAGSFORBIN+= $(LDFLAGS) -lSalomeAppTest     
-
-UNIT_TEST_PROG = TestSalomeApp
-
-@CONCLUDE@
diff --git a/src/Session/Makefile.am b/src/Session/Makefile.am
new file mode 100755 (executable)
index 0000000..63f54c9
--- /dev/null
@@ -0,0 +1,76 @@
+#  SALOME Session : implementation of Session.idl
+#
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Paul RASCLE, EDF
+#  Module : SALOME
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libSalomeSession.la
+
+salomeinclude_HEADERS= \
+       Session_Session_i.hxx \
+       Session_ServerLauncher.hxx \
+       Session_ServerThread.hxx \
+       Session_ServerCheck.hxx \
+       SalomeApp_Engine_i.hxx
+
+# Libraries targets
+
+dist_libSalomeSession_la_SOURCES= \
+       Session_Session_i.cxx \
+       Session_ServerThread.cxx \
+       Session_ServerLauncher.cxx \
+       Session_ServerCheck.cxx \
+       SalomeApp_Engine_i.cxx
+
+libSalomeSession_la_CPPFLAGS= $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) \
+       $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ $(CAS_CPPFLAGS) \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \
+       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Event
+
+libSalomeSession_la_LDFLAGS= $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS \
+       -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSalomeCatalog \
+       -lSalomeDSClient $(CAS_KERNEL) -lwith_loggerTraceCollector \
+       ../SUIT/libsuit.la ../Event/libEvent.la ../../idl/libSalomeIDLGUI.la
+
+# Executable
+bin_PROGRAMS= SALOME_Session_Server
+
+dist_SALOME_Session_Server_SOURCES= SALOME_Session_Server.cxx
+
+SALOME_Session_Server_CPPFLAGS= $(libSalomeSession_la_CPPFLAGS)
+SALOME_Session_Server_LDADD= $(libSalomeSession_la_LDFLAGS) $(OMNIORB_LIBS) \
+       $(HDF5_LIBS) -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS \
+       -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry \
+       -lSalomeNotification -lSALOMEBasics ../Qtx/libqtx.la \
+       $(top_builddir)/idl/libSalomeIDLGUI.la \
+       libSalomeSession.la
+
+lib-hook:
+       ln -sf $(top_builddir)/bin/salome/styles styles
+
+# ../SalomeApp/libSalomeApp.la
diff --git a/src/Session/runSession b/src/Session/runSession
deleted file mode 100755 (executable)
index cbb98a2..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-export SALOME_HOME_DIR=`pwd`
-export ORB_HOME_DIR=${HOME}/public/omni
-
-# OCAF
-export CSF_PluginDefaults=${SALOME_HOME_DIR}/../resources
-export CSF_ResourcesDefaults=${SALOME_HOME_DIR}/../resources
-
-export CSF_SALOMEGUIResources=${SALOME_HOME_DIR}/../SALOME/resources
-export CSF_SALOMEGUILanguage=en
-export CSF_QADResources=${SALOME_HOME_DIR}/../SALOME/resources
-export CSF_QADLanguage=en
-
-export CSF_CatalogueResources=${SALOME_HOME_DIR}/../resources
-
-export CSF_GeometryResources=${SALOME_HOME_DIR}/../GEOM/resources
-
-export CSF_MeshResources=${SALOME_HOME_DIR}/../MESH/resources
-
-export CSF_PATHComponents=${SALOME_HOME_DIR}/../lib
-
-export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/../lib/:${LD_LIBRARY_PATH}
-
-runNS.sh
-geom&
-mesh&
-SALOME_Session_Server
-
diff --git a/src/Style/Makefile.am b/src/Style/Makefile.am
new file mode 100644 (file)
index 0000000..8a9c807
--- /dev/null
@@ -0,0 +1,41 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : SalomeApp
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+# Libraries targets
+lib_LTLIBRARIES = libSalomeStyle.la
+
+libSalomeStyle_la_SOURCES = SalomeStyle.cxx
+
+libSalomeStyle_la_CPPFLAGS=$(QT_INCLUDES)
+
+libSalomeStyle_la_LDFLAGS=$(QT_MT_LIBS)
+
+EXTRA_DIST+=SalomeStyle.h
+
+install-exec-hook:
+       mkdir -p $(bindir)/styles
+       ln -sf $(libdir)/libSalomeStyle.so $(bindir)/styles
+
+uninstall-hook:
+       rm -f $(bindir)/styles/libSalomeStyle.so
diff --git a/src/TOOLSGUI/Makefile.am b/src/TOOLSGUI/Makefile.am
new file mode 100755 (executable)
index 0000000..3f718f4
--- /dev/null
@@ -0,0 +1,62 @@
+#  SALOME TOOLSGUI : implementation of desktop "Tools" optioins
+#
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  This library is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU Lesser General Public 
+#  License as published by the Free Software Foundation; either 
+#  version 2.1 of the License. 
+# 
+#  This library is distributed in the hope that it will be useful, 
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+#  Lesser General Public License for more details. 
+# 
+#  You should have received a copy of the GNU Lesser General Public 
+#  License along with this library; if not, write to the Free Software 
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Marc Tajchman (CEA)
+#  Module : SALOME
+#  $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libToolsGUI.la
+
+salomeinclude_HEADERS= \
+       ToolsGUI.h \
+       ToolsGUI_RegWidget.h \
+       ToolsGUI_CatalogGeneratorDlg.h
+
+dist_libToolsGUI_la_SOURCES= \
+       ToolsGUI_CatalogGeneratorDlg.cxx \
+       ToolsGUI_HelpWindow.cxx \
+       ToolsGUI_RegWidget.cxx \
+       ToolsGUI_IntervalWindow.cxx \
+       ToolsGUI.cxx
+
+EXTRA_DIST+= ToolsGUI_HelpWindow.h ToolsGUI_IntervalWindow.h
+
+MOC_FILES= \
+       ToolsGUI_CatalogGeneratorDlg_moc.cxx \
+       ToolsGUI_RegWidget_moc.cxx
+nodist_libToolsGUI_la_SOURCES= $(MOC_FILES)
+
+# .po files to transform in .qm
+nodist_salomeres_DATA= \
+       ToolsGUI_icons.qm \
+       ToolsGUI_msg_en.qm
+
+libToolsGUI_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \
+       @KERNEL_CXXFLAGS@ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \
+       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
+libToolsGUI_la_LDFLAGS = $(QT_MT_LIBS) ../SUIT/libsuit.la $(CAS_KERNEL) $(KERNEL_LDFLAGS) \
+       -lSalomeNS -lOpUtil $(top_builddir)/idl/libSalomeIDLGUI.so
diff --git a/src/VTKViewer/Makefile.am b/src/VTKViewer/Makefile.am
new file mode 100755 (executable)
index 0000000..f959428
--- /dev/null
@@ -0,0 +1,120 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  File   : Makefile.in
+#  Author : Vladimir Klyachin (OCN)
+#  Module : VTKViewer
+# $Header$
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+lib_LTLIBRARIES = libVTKViewer.la
+
+salomeinclude_HEADERS= \
+       VTKViewer.h \
+       VTKViewer_CellLocationsArray.h \
+       VTKViewer_Actor.h \
+       VTKViewer_ExtractUnstructuredGrid.h \
+       VTKViewer_ConvexTool.h \
+       VTKViewer_Filter.h \
+       VTKViewer_GeometryFilter.h \
+       VTKViewer_AppendFilter.h \
+       VTKViewer_Algorithm.h \
+       VTKViewer_InteractorStyle.h \
+       VTKViewer_PassThroughFilter.h \
+       VTKViewer_RenderWindow.h \
+       VTKViewer_RenderWindowInteractor.h \
+       VTKViewer_ShrinkFilter.h \
+       VTKViewer_TransformFilter.h \
+       VTKViewer_Transform.h \
+       VTKViewer_Trihedron.h \
+       VTKViewer_Utilities.h \
+       VTKViewer_VectorText.h \
+       VTKViewer_ViewManager.h \
+       VTKViewer_ViewModel.h \
+       VTKViewer_ViewWindow.h \
+       VTKViewer_Functor.h
+
+dist_libVTKViewer_la_SOURCES= \
+       VTKViewer_CellLocationsArray.cxx \
+       VTKViewer_Actor.cxx \
+       VTKViewer_ExtractUnstructuredGrid.cxx \
+       VTKViewer_Filter.cxx \
+       VTKViewer_GeometryFilter.cxx \
+       VTKViewer_AppendFilter.cxx \
+       VTKViewer_InteractorStyle.cxx \
+       VTKViewer_PassThroughFilter.cxx \
+       VTKViewer_RenderWindow.cxx \
+       VTKViewer_RenderWindowInteractor.cxx \
+       VTKViewer_ShrinkFilter.cxx \
+       VTKViewer_Transform.cxx \
+       VTKViewer_TransformFilter.cxx \
+       VTKViewer_Trihedron.cxx \
+       VTKViewer_Utilities.cxx \
+       VTKViewer_VectorText.cxx \
+       VTKViewer_ViewManager.cxx \
+       VTKViewer_ViewModel.cxx \
+       VTKViewer_ConvexTool.cxx \
+       VTKViewer_ViewWindow.cxx                
+
+MOC_FILES= \
+       VTKViewer_RenderWindow_moc.cxx \
+       VTKViewer_RenderWindowInteractor_moc.cxx \
+       VTKViewer_ViewManager_moc.cxx \
+       VTKViewer_ViewModel_moc.cxx \
+       VTKViewer_ViewWindow_moc.cxx 
+nodist_libVTKViewer_la_SOURCES= $(MOC_FILES)
+
+dist_salomeres_DATA=\
+       resources/view_back.png \
+       resources/view_bottom.png \
+       resources/view_camera_dump.png \
+       resources/view_fitall.png \
+       resources/view_fitarea.png \
+       resources/view_front.png \
+       resources/view_glpan.png \
+       resources/view_graduated_axes.png \
+       resources/view_left.png \
+       resources/view_pan.png \
+       resources/view_reset.png \
+       resources/view_right.png \
+       resources/view_rotate.png \
+       resources/view_scaling.png \
+       resources/view_top.png \
+       resources/view_triedre.png \
+       resources/view_update_rate.png \
+       resources/view_zoom.png
+
+nodist_salomeres_DATA= \
+       VTKViewer_images.qm \
+       VTKViewer_msg_en.qm
+
+libVTKViewer_la_CPPFLAGS=$(QT_INCLUDES) $(VTK_INCLUDES) $(CAS_CPPFLAGS) \
+       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
+libVTKViewer_la_LDFLAGS=$(VTK_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) \
+       ../Qtx/libqtx.la ../SUIT/libsuit.la
+
+# Executable
+
+bin_PROGRAMS = VTKViewer
+
+dist_VTKViewer_SOURCES=VTKViewer.cxx
+
+VTKViewer_CPPFLAGS=$(libVTKViewer_la_CPPFLAGS)
+VTKViewer_LDADD=libVTKViewer.la $(libVTKViewer_la_LDFLAGS)
+
index 6a548f1df2a924398cd185c3579e77886f2bf998..8a35f8bc192dd355c66579b9b61335cfb110d29a 100644 (file)
@@ -27,7 +27,6 @@
 //  $Header$
 
 #include "VTKViewer_Actor.h"
-#include "VTKViewer_CellRectPicker.h"
 #include "VTKViewer_ExtractUnstructuredGrid.h"
 #include "VTKViewer_ConvexTool.h"
 #include "VTKViewer_Filter.h"
@@ -36,7 +35,6 @@
 #include "VTKViewer_Algorithm.h"
 #include "VTKViewer_InteractorStyle.h"
 #include "VTKViewer_PassThroughFilter.h"
-#include "VTKViewer_RectPicker.h"
 #include "VTKViewer_RenderWindow.h"
 #include "VTKViewer_RenderWindowInteractor.h"
 #include "VTKViewer_ShrinkFilter.h"
diff --git a/src/VTKViewer/VTKViewer_CellRectPicker.cxx b/src/VTKViewer/VTKViewer_CellRectPicker.cxx
deleted file mode 100755 (executable)
index 016da1f..0000000
+++ /dev/null
@@ -1,443 +0,0 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#include <VTKViewer_CellRectPicker.h>
-
-#include "vtkGenericCell.h"
-#include "vtkAssemblyNode.h"
-#include "vtkAssemblyPath.h"
-#include "vtkObjectFactory.h"
-#include "vtkImageData.h"
-#include "vtkMapper.h"
-#include "vtkVolumeMapper.h"
-#include "vtkMath.h"
-#include "vtkLine.h"
-#include "vtkQuad.h"
-#include "vtkPoints.h"
-#include "vtkPlane.h"
-#include "vtkActor.h"
-
-vtkStandardNewMacro(VTKViewer_CellRectPicker);
-
-/*!Constructor.\n
- * \li create instance of generic cell
- * \li create two instances of Quad.
- */
-VTKViewer_CellRectPicker::VTKViewer_CellRectPicker()
-{
-  this->Cell = vtkGenericCell::New();
-  this->Quad1 = vtkQuad::New();
-  this->Quad2 = vtkQuad::New();
-}
-
-/*!Destructor.
- * \li Delete generic cell
- * \li Delete two quads.
- */
-VTKViewer_CellRectPicker::~VTKViewer_CellRectPicker()
-{
-  this->Cell->Delete();
-  this->Quad1->Delete();
-  this->Quad2->Delete();
-}
-
-/*!Clear \a ActorData and call VTKViewer_RectPicker::Initialize() method*/
-void VTKViewer_CellRectPicker::Initialize()
-{
-  ActorData.clear();
-  this->VTKViewer_RectPicker::Initialize();
-}
-
-/*!*/
-float VTKViewer_CellRectPicker::IntersectWithHex(float p1[4][4], float p2[4][4], float tol, 
-                                                 vtkAssemblyPath *path, vtkProp3D *prop3D, 
-                                                 vtkAbstractMapper3D *m)
-{
-  vtkDataSet *input;
-  vtkMapper *mapper;
-  vtkVolumeMapper *volumeMapper;
-  
-  // Get the underlying dataset
-  if ( (mapper=vtkMapper::SafeDownCast(m)) != NULL ) {
-    input = mapper->GetInput();
-  }
-  else if ( (volumeMapper=vtkVolumeMapper::SafeDownCast(m)) != NULL ) {
-    input = volumeMapper->GetInput();
-  }
-  else {
-    return VTK_LARGE_FLOAT;
-  }
-  
-  vtkIdType numCells;
-  if ( (numCells = input->GetNumberOfCells()) < 1 ) {
-    return 2.0;
-  }
-  
-  int i, k, subId;
-  float bounds[6], center[3], cp1[3], cp2[3];
-  float pcoord[3], weight[4], dist;
-  float t1[2], t2[2], x[3], t;
-  
-  for (k = 0; k < 4; k++) {
-    this->Quad1->PointIds->SetId(k, k);
-    this->Quad1->Points->SetPoint(k, p1[k]);
-    this->Quad2->PointIds->SetId(k, k);
-    this->Quad2->Points->SetPoint(k, p2[k]);
-  }
-  
-  /*
-  cout << "---> Selection area:"   << endl;
-  for (k = 0; k < 4; k++)
-  cout << "\t(" << p1[k][0] << ", " << p1[k][1] << ", " << p1[k][2] << ")";
-  cout << endl;
-  for (k = 0; k < 4; k++)
-  cout << "\t(" << p2[k][0] << ", " << p2[k][1] << ", " << p2[k][2] << ")";
-  cout << endl;
-  */
-  
-  vtkIdType cellId;
-  VTKViewer_CellData cellData;
-  VTKViewer_CellDataSet dataList;
-  
-  char inside; int n; float *point;
-  float tMin = VTK_LARGE_FLOAT, xMin[3];
-  for (cellId = 0; cellId < numCells; cellId++) {
-    input->GetCell(cellId, this->Cell);
-    
-    this->Cell->GetBounds(bounds);
-    for (i = 0; i < 3; i++)
-      center[i] = (bounds[2*i]+bounds[2*i+1])/2;
-    
-      /*
-      if (!VTKViewer_RectPicker::PointInside(center, p1, p2, 0.01))
-      continue;
-    */
-    
-    inside = 1;
-    n = this->Cell->Points->GetNumberOfPoints();
-    //cout << "---> Info cell " << cellId << " (" << n << "): " << endl;
-    for (k = 0; k < n; k++) {
-      point = this->Cell->Points->GetPoint(k);
-      //cout << "  P (" << point[0] << ", " << point[1] << ", " << point[2] << ")";
-      if (!VTKViewer_RectPicker::PointInside(point, p1, p2)) {
-        inside = 0; break;
-      }
-    }
-    //cout << endl;
-    if (!inside) continue;
-    
-    //cout << "---> Inside cell " << cellId << endl;
-    
-    this->Quad1->EvaluatePosition(center, 0, subId, pcoord, dist, weight);
-    t1[0] = pcoord[0]; t1[1] = pcoord[1];
-    this->Quad2->EvaluatePosition(center, 0, subId, pcoord, dist, weight);
-    t2[0] = pcoord[0]; t2[1] = pcoord[1];
-    
-    pcoord[0] = (t1[0]+t2[0])/2; pcoord[1] = (t1[1]+t2[1])/2; pcoord[2] = 0;
-    
-    this->Quad1->EvaluateLocation(subId, pcoord, cp1, weight);
-    this->Quad2->EvaluateLocation(subId, pcoord, cp2, weight);
-    
-    if (this->Cell->IntersectWithLine(cp1, cp2, tol, t, x, pcoord, subId)) {
-      cellData.cellId = cellId;
-      cellData.subId = subId;
-      cellData.depth = t;
-      for (i = 0; i < 3; i++) {
-        cellData.p1[i] = cp1[i];
-        cellData.p2[i] = cp2[i];
-      }
-      /*
-      cout << "---> Include cell " << cellId << ", depth = " << t   << endl;
-      cout << "     P1 = (" << cp1[0] << ", " << cp1[1] << ", " << cp1[2] << ")"  << endl;
-      cout << "     P2 = (" << cp2[0] << ", " << cp2[1] << ", " << cp2[2] << ")"  << endl;
-      */
-      IncludeCell(input, cellData, dataList);
-      if (t < tMin) {
-        tMin = t;
-        for (i = 0; i < 3; i++)
-          xMin[i] = x[i];
-      }
-    }
-  }
-  
-  if (!dataList.empty()) {
-    // compare against other actors
-    IncludeActor(prop3D, input, dataList);
-    if (tMin < this->GlobalTMin) {
-      this->MarkPicked(path, prop3D, m, tMin, xMin);
-    }
-  }
-  
-  return tMin;
-}
-
-/*!*/
-void VTKViewer_CellRectPicker::IncludeCell(vtkDataSet* input, 
-                                           VTKViewer_CellData cellData, 
-                                           VTKViewer_CellDataSet& dataList)
-{
-  vtkGenericCell* cell1 = vtkGenericCell::New();
-  vtkGenericCell* cell2 = vtkGenericCell::New();
-  vtkCell* sub1 = 0;
-  vtkCell* sub2 = 0;
-  
-  input->GetCell(cellData.cellId, cell1);
-  if (cell1->GetNumberOfFaces() > 0)
-    sub1 = cell1->GetFace(cellData.subId);
-  
-  int i, result;
-  float p1[3], p2[3], dir[3];
-  char add = 1;
-  
-  VTKViewer_CellData curData;
-  VTKViewer_CellDataSet::iterator it;
-  for (it = dataList.begin(); it != dataList.end();) {
-    curData = *it;
-    for (i = 0; i < 3; i++) {
-      p1[i] = (cellData.p1[i]+curData.p1[i])/2;
-      p2[i] = (cellData.p2[i]+curData.p2[i])/2;
-      dir[i] = p2[i] - p1[i];
-    }
-    
-    input->GetCell(curData.cellId, cell2);
-    sub2 = 0;
-    if (cell2->GetNumberOfFaces() > 0)
-      sub2 = cell2->GetFace(curData.subId);
-    
-    if (sub1) {
-      if (sub2)
-        result = IntersectCells(sub1, cellData.depth, 
-        sub2, curData.depth, dir);
-      else 
-        result = IntersectCells(sub1, cellData.depth, 
-        cell2, curData.depth, dir);
-    }
-    else {
-      if (sub2)
-        result = IntersectCells(cell1, cellData.depth, 
-        sub2, curData.depth, dir);
-      else
-        result = IntersectCells(cell1, cellData.depth, 
-        cell2, curData.depth, dir);
-    }
-    /*
-    cout << "     Direction = (" << dir[0] << ", " << dir[1] << ", " << dir[2] << ")";
-    cout << "     depth = " << cellData.depth << ", " << curData.depth << ", " << result << endl;
-    */
-    if (result > 0) {
-      if (result == 1) {
-        it = dataList.erase(it);
-        continue;
-      } 
-      else {
-        add = 0;
-        break;
-      }
-    }
-    ++it;
-  }
-  if (add) {
-    //cout << "     add "   << endl;
-    dataList.push_back(cellData);
-  }
-  
-  cell1->Delete();
-  cell2->Delete();
-}
-
-/*!*/
-void VTKViewer_CellRectPicker::IncludeActor(vtkProp3D* prop, 
-                                            vtkDataSet* input, 
-                                            VTKViewer_CellDataSet& dataList)
-{
-  vtkGenericCell* cell1 = vtkGenericCell::New();
-  vtkGenericCell* cell2 = vtkGenericCell::New();
-  
-  int i, result;
-  float p1[3], p2[3], dir[3];
-  char removed;
-  
-  VTKViewer_CellDataSet actorData;
-  VTKViewer_CellData curData, cellData;
-  VTKViewer_CellDataSet::iterator it1, it2;
-  VTKViewer_ActorDataMap::iterator it;
-  
-  for (it1 = dataList.begin(); it1 != dataList.end();) {
-    cellData = *it1;
-    input->GetCell(cellData.cellId, cell1);
-    removed = 0;
-    
-    for (it = ActorData.begin(); it != ActorData.end(); ++it) {
-      //vtkActor* actor = (*it).first;
-      actorData = (*it).second;
-      
-      for (it2 = actorData.begin(); it2 != actorData.end();) {
-        curData = *it2;
-        for (i = 0; i < 3; i++) {
-          p1[i] = (cellData.p1[i]+curData.p1[i])/2;
-          p2[i] = (cellData.p2[i]+curData.p2[i])/2;
-          dir[i] = p2[i] - p1[i];
-        }
-        
-        input->GetCell(curData.cellId, cell2);
-        result = IntersectCells(cell1, cellData.depth,
-          cell2, curData.depth, dir);
-        if (result > 0) {
-          if (result == 1) {
-            it2 = actorData.erase(it2);
-            continue;
-          }
-          else {
-            removed = 1;
-            it1 = dataList.erase(it1);
-            break;
-          }
-          break;
-        }
-        ++it2;
-      }
-      if (removed) break;
-    } // by actors
-    if (!removed) ++it1;
-  }
-  
-  if (!dataList.empty()) {
-    vtkActor* actor;
-    if ((actor = vtkActor::SafeDownCast(prop)) != NULL)
-      ActorData[actor] = dataList;
-  }
-  
-  cell1->Delete();
-  cell2->Delete();
-}
-
-/*! The method returns a non-zero value, if the cells intersect each other 
- * in the direction dir[3].
- * \param c1 - first vtkCell pointer
- * \param d1 - 
- * \param c2 - second vtkCell pointer
- * \param d2 - 
- * \param dir[3] - direction
- * \retval integer - Returned value is 1 if the first cell is top of 
- * the second one according to direction and 2 if the second cell is top.
- */
-int VTKViewer_CellRectPicker::IntersectCells(vtkCell* c1, float d1, vtkCell* c2, float d2, float dir[3])
-{
-  int i, k;
-  float *orig, cp[3], bounds[6];
-  vtkCell* cell = 0;
-  vtkCell* tcell = 0;
-  
-  // define the central point and cell for projection
-  if (fabs(d1-d2) < 1.e-7) return 0;
-  
-  if (d1 < d2) {
-    orig = c1->Points->GetPoint(0);
-    cell = c1;
-    tcell = c2;
-    c2->GetBounds(bounds);
-    for (i = 0; i < 3; i++)
-      cp[i] = (bounds[2*i] + bounds[2*i+1])/2;
-  }
-  else if (d1 > d2) {
-    orig = c2->Points->GetPoint(0);
-    cell = c2;
-    tcell = c1;
-    c1->GetBounds(bounds);
-    for (i = 0; i < 3; i++)
-      cp[i] = (bounds[2*i] + bounds[2*i+1])/2;
-  }
-  
-  float proj[3];
-  vtkPlane::GeneralizedProjectPoint(cp, orig, dir, proj);
-  
-  float *p, pp[3];
-  vtkPoints* aPoints = vtkPoints::New();
-  for (k = 0; k < cell->Points->GetNumberOfPoints(); k++) {
-    p = cell->Points->GetPoint(k);
-    vtkPlane::GeneralizedProjectPoint(p, orig, dir, pp);
-    aPoints->InsertNextPoint(pp[0], pp[1], pp[2]);
-  }
-  
-  int result = 0;
-  if (PointInside(proj, aPoints)) {
-    result = (d1<d2) ? 1 : 2;
-  }
-  
-  if (result == 0) {
-    // test for boundary cells
-    for (k = 0; k < tcell->Points->GetNumberOfPoints(); k++) {
-      p = tcell->Points->GetPoint(k);
-      vtkPlane::GeneralizedProjectPoint(p, orig, dir, pp);
-      if (PointInside(pp, aPoints)) {
-        result = 1; break;
-      }
-    }
-    if (result && d2<d1) result = 2;
-  }
-  
-  aPoints->Delete();
-  return result;
-}
-
-/*! Check point position.
- * \param point[3] - point
- * \param list - point data set
- * \retval 0 or 1 - The method returns a non-zero value, if the point is inlide point data set
- */
-char VTKViewer_CellRectPicker::PointInside(float point[3], vtkPoints* list)
-{
-  int i, k, l, n;
-  float x[3], *a1, *a2, v[3], p[3], q[3];
-  
-  n = list->GetNumberOfPoints();
-  if (n < 3) return 0;
-  
-  for (k = 0; k < n; k++) {
-    l = k+1; if (l == n) l = 0;
-    a1 = list->GetPoint(k);
-    a2 = list->GetPoint(l);
-    
-    // compute vectors
-    for (i = 0; i < 3; i++) {
-      x[i] = point[i] - a1[i];
-      v[i] = a2[i]-a1[i];
-    }
-    
-    // check if point coincides with vertex
-    if (x[0]*x[0] + x[1]*x[1] + x[2]*x[2] < 1.e-7) return 0;
-    
-    // compute normal
-    vtkMath::Cross(x, v, p);
-    
-    // check if point lays on edge
-    if (p[0]*p[0] + p[1]*p[1] + p[2]*p[2] < 1.e-7) return 0;
-    
-    // check if normals are in the same direction
-    if (k > 0) {
-      if (vtkMath::Dot(p, q) < 0.0) return 0;
-    }
-    
-    // remember normal direction
-    for (i = 0; i < 3; i++) {
-      q[i] = p[i];
-    }
-  }
-  
-  return 1;
-}
diff --git a/src/VTKViewer/VTKViewer_RectPicker.h b/src/VTKViewer/VTKViewer_RectPicker.h
deleted file mode 100755 (executable)
index e202016..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-//  File   : VTKViewer_RectPicker.h
-//  Author : Natalia KOPNOVA
-//  Module : SALOME
-
-#ifndef __VTKViewer_RectPicker_h
-#define __VTKViewer_RectPicker_h
-
-#include <vtkPicker.h>
-
-/*! \class vtkPicker
- * \brief For more information see <a href="http://www.vtk.org/">VTK documentation
- */
-/*! \class VTKViewer_RectPicker
- * \brief Rectangular picker class.
- */
-class VTK_EXPORT VTKViewer_RectPicker : public vtkPicker
-{
-public:
-  /*!Create new instance of VTKViewer_RectPicker.*/
-  static VTKViewer_RectPicker *New();
-  vtkTypeMacro(VTKViewer_RectPicker,vtkPicker);
-  
-  virtual int Pick(float selectionX1, float selectionY1, float selectionZ1, 
-                  float selectionX2, float selectionY2, float selectionZ2,
-                   vtkRenderer *renderer);  
-
-  /*!
-   * Perform pick operation with selection rectangle provided. Normally the first
-   * two values for the selection top-left and right-bottom points are x-y pixel 
-   * coordinate, and the third value is =0. 
-   * \retval Return non-zero if something was successfully picked.
-   */
-  int Pick(float selectionPt1[3], float selectionPt2[3], vtkRenderer *ren)
-    {return this->Pick(selectionPt1[0], selectionPt1[1], selectionPt1[2], 
-                      selectionPt2[0], selectionPt2[1], selectionPt2[2],
-                      ren);};
-
-  static char HitBBox(float bounds[6], float origin[4][4], float dir[4][3]);
-
-  static char PointInside(float point[3], float p1[4][4], float p2[4][4], float tol=0);
-
-protected:
-  VTKViewer_RectPicker();
-  ~VTKViewer_RectPicker() {};
-
-  virtual float IntersectWithHex(float p1[4][4], float p2[4][4], float tol, 
-                                vtkAssemblyPath *path, vtkProp3D *p, 
-                                vtkAbstractMapper3D *m);
-
-private:
-};
-
-#endif
-
-