From 0536e3b9706b7fa42f032f2435aff6fe62c25ae4 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 19 Oct 2006 06:38:15 +0000 Subject: [PATCH] First stable version after merging with V3_2_2 --- adm_local/unix/make_commence.in | 2 + adm_local/unix/make_conclude.in | 24 +- bin/runLightSalome.csh | 6 +- bin/runLightSalome.sh | 7 +- configure.in.base | 12 +- doc/salome/gui/GUI/geom_preferences.htm | 50 +- doc/salome/gui/GUI/pics/import.png | Bin 34672 -> 40393 bytes doc/salome/gui/GUI/pics/pref15.png | Bin 20075 -> 27974 bytes doc/salome/gui/GUI/setting_preferences.htm | 2 +- doc/salome/tui/GUI/sources/doxygen.css | 7 +- src/CAF/CAF_Study.cxx | 43 +- src/CAM/CAM_Application.cxx | 14 +- src/DDS/DDS_Dictionary.cxx | 6 + src/GLViewer/GLViewer_Object.cxx | 2 +- src/GLViewer/GLViewer_Object.h | 2 +- src/LightApp/LightApp_Application.cxx | 204 ++++--- src/LightApp/LightApp_DataOwner.h | 2 +- src/LightApp/LightApp_EventFilter.cxx | 81 +++ src/LightApp/LightApp_EventFilter.h | 56 ++ src/LightApp/LightApp_SelectionMgr.cxx | 11 +- src/LightApp/LightApp_VTKSelector.cxx | 510 +++++++++--------- src/LightApp/LightApp_VTKSelector.h | 212 ++++---- src/LightApp/Makefile.in | 2 + src/LightApp/resources/LightApp.ini | 16 +- src/LightApp/resources/LightApp.xml | 30 +- src/Makefile.in | 4 +- src/OCCViewer/OCCViewer_ClippingDlg.cxx | 12 +- src/OCCViewer/OCCViewer_ViewModel.cxx | 12 +- src/OCCViewer/OCCViewer_ViewModel.h | 4 +- src/ObjBrowser/OB_ListItem.cxx | 2 +- src/Plot2d/Makefile.in | 9 +- src/Plot2d/Plot2d_Curve.cxx | 41 +- src/Plot2d/Plot2d_Curve.h | 10 +- src/Plot2d/Plot2d_ToolTip.cxx | 93 ++++ src/Plot2d/Plot2d_ToolTip.h | 50 ++ src/Plot2d/Plot2d_ViewFrame.cxx | 132 +++-- src/Plot2d/Plot2d_ViewFrame.h | 10 + src/Plot2d/Plot2d_ViewModel.cxx | 1 + src/Plot2d/Plot2d_ViewWindow.cxx | 21 +- src/Plot2d/Plot2d_ViewWindow.h | 6 + src/PythonConsole/PythonConsole_PyEditor.cxx | 17 +- src/PythonConsole/PythonConsole_PyInterp.cxx | 6 +- src/Qtx/QtxListResourceEdit.cxx | 2 +- src/Qtx/QtxResourceMgr.h | 2 +- src/Qtx/QtxWorkstack.cxx | 10 +- src/RegistryDisplay/RegWidget.cxx | 2 + src/SALOME_PY/SalomePy.cxx | 21 +- src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in | 4 + .../SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx | 7 +- src/SALOME_PYQT/SalomePyQt/Makefile.in | 3 + src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip | 94 ++-- src/SALOME_SWIG/SALOMEGUI_Swig.cxx | 2 +- src/SALOME_SWIG/SALOMEGUI_Swig.i | 17 + src/SALOME_SWIG/supervisionexample.py | 10 +- src/SALOME_SWIG/supervisionexample.py.in | 10 +- src/SPlot2d/Makefile.in | 9 +- src/SPlot2d/SPlot2d_ViewModel.cxx | 13 + src/SPlot2d/SPlot2d_ViewModel.h | 2 + src/SPlot2d/SPlot2d_ViewWindow.cxx | 75 +++ src/SPlot2d/SPlot2d_ViewWindow.h | 46 ++ src/STD/STD_Application.cxx | 13 - src/STD/STD_Application.h | 3 +- src/SUIT/SUIT_DataObjectKey.h | 2 +- src/SUIT/SUIT_Desktop.cxx | 8 +- src/SUIT/SUIT_Desktop.h | 2 + src/SUIT/SUIT_PopupClient.h | 2 +- src/SUIT/SUIT_ResourceMgr.cxx | 2 +- src/SUIT/SUIT_SelectionFilter.h | 2 +- src/SUIT/SUIT_Session.cxx | 28 + src/SUIT/SUIT_Session.h | 5 + src/SUITApp/Makefile.in | 14 + src/SUITApp/SUITApp_Application.cxx | 15 + src/SVTK/SVTK_Actor.cxx | 1 + src/SVTK/SVTK_DeviceActor.cxx | 2 +- src/SVTK/SVTK_MainWindow.cxx | 4 +- src/SVTK/SVTK_MainWindow.h | 4 +- src/SVTK/SVTK_Renderer.cxx | 4 +- src/SVTK/SVTK_Renderer.h | 6 +- src/SVTK/SVTK_ViewModel.cxx | 5 +- src/SVTK/SVTK_ViewModel.h | 6 +- src/SVTK/SVTK_ViewWindow.cxx | 65 ++- src/SVTK/SVTK_ViewWindow.h | 24 +- src/SalomeApp/SalomeApp_Application.cxx | 39 +- src/SalomeApp/SalomeApp_Application.h | 8 +- src/SalomeApp/SalomeApp_ExceptionHandler.cxx | 32 +- src/SalomeApp/SalomeApp_Study.cxx | 8 +- src/SalomeApp/resources/SalomeApp.ini | 24 +- src/SalomeApp/resources/SalomeApp.xml | 38 +- src/SalomeApp/resources/SalomeApp_msg_en.po | 3 + src/Session/Makefile.in | 14 +- src/Session/SALOME_Session_Server.cxx | 17 +- src/Session/Session_ServerCheck.cxx | 34 +- src/Style/Makefile.in | 19 +- src/Style/SalomeStyle.cxx | 36 +- src/Style/SalomeStyle.h | 2 +- src/TOOLSGUI/ToolsGUI_RegWidget.cxx | 2 + src/VTKViewer/Makefile.in | 2 +- src/VTKViewer/VTKViewer_ConvexTool.cxx | 13 +- src/VTKViewer/VTKViewer_GeometryFilter.cxx | 1 - src/VTKViewer/VTKViewer_VectorText.cxx | 21 +- src/VTKViewer/VTKViewer_VectorText.h | 21 +- 101 files changed, 1766 insertions(+), 845 deletions(-) create mode 100644 src/LightApp/LightApp_EventFilter.cxx create mode 100644 src/LightApp/LightApp_EventFilter.h create mode 100644 src/Plot2d/Plot2d_ToolTip.cxx create mode 100644 src/Plot2d/Plot2d_ToolTip.h create mode 100644 src/SPlot2d/SPlot2d_ViewWindow.cxx create mode 100644 src/SPlot2d/SPlot2d_ViewWindow.h diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 0a5de34a2..b3af3f710 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -1,6 +1,8 @@ # common directories to put headerfiles inc_builddir=$(top_builddir)/include/salome +MODULE_NAME=@MODULE_NAME@ + GUI_DISABLE_CORBA=@GUI_DISABLE_CORBA@ DISABLE_GLVIEWER=@DISABLE_GLVIEWER@ DISABLE_PYCONSOLE=@DISABLE_PYCONSOLE@ diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in index 897154a7a..da7a678e1 100644 --- a/adm_local/unix/make_conclude.in +++ b/adm_local/unix/make_conclude.in @@ -191,11 +191,11 @@ RESOURCES_FILES ?= $(RESOURCES_FILES_ALL) resources: resources-po resources-cp -resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm) +resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) -resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%) +resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%) -$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : % +$(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%): $(top_builddir)/share/salome/resources/$(MODULE_NAME)/% : % cp -fr $< $@; # Make installation directories if they don't exist. @@ -255,19 +255,19 @@ $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % # generic rule to install .qm files : install-qm: resources - $(INSTALL) -d $(datadir)/resources - @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm); do \ + $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) + @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1); \ + ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ fi; \ done # generic rule to install resources files (png, ini ...): install-res: resources - $(INSTALL) -d $(datadir)/resources - @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%); do \ + $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) + @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \ if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/. || exit 1); \ + ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ fi; \ done @@ -318,7 +318,7 @@ uninstall: # Uninstall qm files @for f in X $(PO_FILES:%.po=%.qm); do \ if test $$f != X; then \ - $(LT_UNINSTALL) $(datadir)/resources/$$f ; \ + $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ fi; \ done @@ -363,7 +363,7 @@ clean: mostlyclean # distclean: clean #remove qm file ! - -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm) + -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) #remove include files -$(RM) $(DEST_HEADERS) -$(RM) $(DISTCLEAN) *.bak *.old *.new .dep* @@ -410,7 +410,7 @@ distclean: clean %_wrap.cxx : %.i $(SWIG) $(SWIG_FLAGS) -o $@ $< -$(top_builddir)/share/salome/resources/%.qm: %.po +$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm: %.po $(MSG2QM) $< $@ ; \ #------------------------------------------------------------------------------ diff --git a/bin/runLightSalome.csh b/bin/runLightSalome.csh index 85675de23..3a751e993 100755 --- a/bin/runLightSalome.csh +++ b/bin/runLightSalome.csh @@ -1,9 +1,7 @@ #!/bin/csh -f -if ( ! $?SUITRoot ) setenv SUITRoot ${GUI_ROOT_DIR}/share/salome - # this variable necessary for loading .ini or .xml file -if ( ! $?LightAppConfig ) setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources -if ( ! $?LightAppResources ) setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources +if ( ! $?LightAppConfig ) setenv LightAppConfig ${GUI_ROOT_DIR}/share/salome/resources/gui +if ( ! $?LightAppResources ) setenv LightAppResources ${GUI_ROOT_DIR}/share/salome/resources/gui SUITApp LightApp -style salome $* & diff --git a/bin/runLightSalome.sh b/bin/runLightSalome.sh index b2f67d65e..df19ca7ba 100755 --- a/bin/runLightSalome.sh +++ b/bin/runLightSalome.sh @@ -18,15 +18,12 @@ # #!/bin/bash -f -if [ -z "$SUITRoot" ] ; then - export SUITRoot=${GUI_ROOT_DIR}/share/salome -fi # this variable necessary for loading .ini or .xml file if [ -z "$LightAppConfig" ] ; then - export LightAppConfig=${GUI_ROOT_DIR}/share/salome/resources + export LightAppConfig=${GUI_ROOT_DIR}/share/salome/resources/gui fi if [ -z "$LightAppResources" ] ; then - export LightAppResources=${GUI_ROOT_DIR}/share/salome/resources + export LightAppResources=${GUI_ROOT_DIR}/share/salome/resources/gui fi SUITApp LightApp -style salome $* & diff --git a/configure.in.base b/configure.in.base index 4b7af75f9..b9e3aa93a 100644 --- a/configure.in.base +++ b/configure.in.base @@ -23,11 +23,15 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=3.2.0 -XVERSION=0x030200 +VERSION=3.2.2 +XVERSION=0x030202 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 @@ -512,9 +516,9 @@ 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 idl" + 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" + 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 diff --git a/doc/salome/gui/GUI/geom_preferences.htm b/doc/salome/gui/GUI/geom_preferences.htm index 8a098a3b2..1ba06dce4 100755 --- a/doc/salome/gui/GUI/geom_preferences.htm +++ b/doc/salome/gui/GUI/geom_preferences.htm @@ -15,10 +15,10 @@ if (navigator.appName !="Netscape")