]> SALOME platform Git repositories - modules/gui.git/commit
Salome HOME
Merge from V6_main BR_OPENCV
authorgdd <gdd>
Tue, 8 Nov 2011 13:12:05 +0000 (13:12 +0000)
committergdd <gdd>
Tue, 8 Nov 2011 13:12:05 +0000 (13:12 +0000)
commit041af3ad6a2745320113cbf491874fc4fa379235
treedd7414ffcf2e9c4bf8f3f1f557a2c0ffab7f7045
parenta16933093a5eca8d32dd04c4ad9c011c38e7c984
Merge from V6_main
156 files changed:
Makefile.am
adm_local/cmake_files/FindQT4.cmake
adm_local/cmake_files/FindSIPPYQT.cmake
adm_local/unix/config_files/check_qt.m4
adm_local/unix/make_common_starter.am
configure.ac
doc/salome/gui/images/occviewer_toolbar.png
doc/salome/gui/images/plot2d_view_settings.png
doc/salome/gui/images/pref11.png
doc/salome/gui/images/pref12.png
doc/salome/gui/images/pref21.png
doc/salome/gui/images/pref22.png
doc/salome/gui/images/vtkviewer_toolbar.png
doc/salome/gui/input/mesh_preferences.doc
doc/salome/gui/input/occ_3d_viewer.doc
doc/salome/gui/input/plot2d_viewer.doc
doc/salome/gui/input/salome_preferences.doc
doc/salome/gui/input/vtk_3d_viewer.doc
src/CAF/CAF_Study.cxx
src/CAM/CAM_Application.cxx
src/CAM/CAM_Application.h
src/CAM/Makefile.am
src/GLViewer/GLViewer_BaseObjects.cxx
src/GLViewer/GLViewer_ViewPort2d.cxx
src/GUI_PY/Makefile.am
src/GUI_PY/genericdialog.py [new file with mode: 0644]
src/GUI_PY/genericdialog.ui [new file with mode: 0644]
src/GUI_PY/helper.py [new file with mode: 0644]
src/GUI_PY/mytestdialog.py [new file with mode: 0644]
src/GUI_PY/mytestdialog.ui [new file with mode: 0644]
src/GUI_PY/selectvars.py
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_Application.h
src/LightApp/LightApp_DataObject.cxx
src/LightApp/LightApp_DataObject.h
src/LightApp/LightApp_FullScreenHelper.cxx [new file with mode: 0644]
src/LightApp/LightApp_FullScreenHelper.h [new file with mode: 0644]
src/LightApp/LightApp_Module.cxx
src/LightApp/LightApp_Module.h
src/LightApp/LightApp_Plot2dSelector.cxx
src/LightApp/LightApp_Plot2dSelector.h
src/LightApp/LightApp_WgViewModel.cxx
src/LightApp/Makefile.am
src/LightApp/resources/LightApp.xml
src/LightApp/resources/LightApp_images.ts
src/LightApp/resources/LightApp_msg_en.ts
src/LightApp/resources/LightApp_msg_fr.ts
src/OCCViewer/Makefile.am
src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
src/OCCViewer/OCCViewer_ViewManager.cxx
src/OCCViewer/OCCViewer_ViewModel.cxx
src/OCCViewer/OCCViewer_ViewModel.h
src/OCCViewer/OCCViewer_ViewPort.cxx
src/OCCViewer/OCCViewer_ViewPort.h
src/OCCViewer/OCCViewer_ViewPort3d.cxx
src/OCCViewer/OCCViewer_ViewPort3d.h
src/OCCViewer/OCCViewer_ViewWindow.cxx
src/OCCViewer/OCCViewer_ViewWindow.h
src/OCCViewer/resources/OCCViewer_images.ts
src/OCCViewer/resources/OCCViewer_msg_en.ts
src/OCCViewer/resources/OCCViewer_msg_fr.ts
src/OCCViewer/resources/occ_view_sync.png [new file with mode: 0755]
src/ObjBrowser/OB_Browser.cxx
src/ObjBrowser/OB_Browser.h
src/Plot2d/Makefile.am
src/Plot2d/Plot2d_Curve.cxx
src/Plot2d/Plot2d_Histogram.cxx
src/Plot2d/Plot2d_Object.cxx
src/Plot2d/Plot2d_Object.h
src/Plot2d/Plot2d_PlotItems.cxx
src/Plot2d/Plot2d_PlotItems.h
src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx [new file with mode: 0755]
src/Plot2d/Plot2d_SetupCurveScaleDlg.h [new file with mode: 0755]
src/Plot2d/Plot2d_SetupViewDlg.cxx
src/Plot2d/Plot2d_SetupViewDlg.h
src/Plot2d/Plot2d_ViewFrame.cxx
src/Plot2d/Plot2d_ViewFrame.h
src/Plot2d/Plot2d_ViewModel.cxx
src/Plot2d/Plot2d_ViewModel.h
src/Plot2d/resources/Plot2d_msg_en.ts
src/PyConsole/PyConsole_Console.cxx
src/Qtx/Makefile.am
src/Qtx/Qtx.cxx
src/Qtx/Qtx.h
src/Qtx/QtxBiColorTool.cxx [new file with mode: 0644]
src/Qtx/QtxBiColorTool.h [new file with mode: 0644]
src/Qtx/QtxMainWindow.cxx
src/Qtx/QtxMainWindow.h
src/Qtx/QtxPagePrefMgr.cxx
src/Qtx/QtxPagePrefMgr.h
src/Qtx/QtxResourceMgr.cxx
src/Qtx/QtxSearchTool.cxx
src/Qtx/QtxSearchTool.h
src/Qtx/QtxWebBrowser.cxx [new file with mode: 0644]
src/Qtx/QtxWebBrowser.h [new file with mode: 0644]
src/Qtx/resources/Qtx_msg_fr.ts
src/QxScene/resources/QxSceneViewer_msg_fr.ts
src/ResExporter/ResourceExporter.cxx
src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
src/SOCC/SOCC_ViewModel.cxx
src/SOCC/SOCC_ViewModel.h
src/SPlot2d/SPlot2d_ViewModel.cxx
src/SPlot2d/SPlot2d_ViewModel.h
src/SUIT/SUIT_Application.h
src/SUIT/SUIT_DataObject.cxx
src/SUIT/SUIT_DataObject.h
src/SUIT/SUIT_PreferenceMgr.cxx
src/SUIT/SUIT_PreferenceMgr.h
src/SUIT/SUIT_ResourceMgr.cxx
src/SUIT/SUIT_ResourceMgr.h
src/SUIT/SUIT_TreeModel.cxx
src/SUIT/SUIT_TreeModel.h
src/SUITApp/SUITApp.cxx
src/SVTK/Makefile.am
src/SVTK/SVTK_Event.h
src/SVTK/SVTK_InteractorStyle.cxx
src/SVTK/SVTK_Selector.cxx
src/SVTK/SVTK_Selector.h
src/SVTK/SVTK_SelectorDef.h
src/SVTK/SVTK_ViewModel.cxx
src/SVTK/SVTK_ViewModel.h
src/SVTK/SVTK_ViewWindow.cxx
src/SVTK/SVTK_ViewWindow.h
src/SVTK/resources/SVTK_images.ts
src/SVTK/resources/SVTK_msg_en.ts
src/SVTK/resources/SVTK_msg_fr.ts
src/SVTK/resources/vtk_view_highlight.png [new file with mode: 0755]
src/SVTK/resources/vtk_view_sync.png [new file with mode: 0755]
src/SalomeApp/SalomeApp_DataModel.cxx
src/SalomeApp/SalomeApp_DataObject.cxx
src/SalomeApp/SalomeApp_DataObject.h
src/SalomeApp/SalomeApp_Module.cxx
src/SalomeApp/SalomeApp_Module.h
src/SalomeApp/SalomeApp_Study.cxx
src/SalomeApp/resources/SalomeApp.xml
src/SalomeApp/resources/SalomeApp_msg_fr.ts
src/SalomeApp/salome_pluginsmanager.py
src/Session/SALOME_Session_Server.cxx
src/VTKViewer/VTKViewer_AppendFilter.cxx
src/VTKViewer/VTKViewer_TransformFilter.cxx
src/VTKViewer/resources/VTKViewer_msg_fr.ts
tools/Makefile.am [new file with mode: 0644]
tools/dlgfactory/GenericDialog.cxx [new file with mode: 0644]
tools/dlgfactory/GenericDialog.hxx [new file with mode: 0644]
tools/dlgfactory/GenericDialog.ui [new file with mode: 0644]
tools/dlgfactory/Makefile.am [new file with mode: 0644]
tools/dlgfactory/README.txt [new file with mode: 0644]
tools/dlgfactory/__GDIALOG__.cxx [new file with mode: 0644]
tools/dlgfactory/__GDIALOG__.hxx [new file with mode: 0644]
tools/dlgfactory/__GDIALOG__.ui [new file with mode: 0644]
tools/dlgfactory/__QDIALOG__.cxx [new file with mode: 0644]
tools/dlgfactory/__QDIALOG__.hxx [new file with mode: 0644]
tools/dlgfactory/__QDIALOG__.ui [new file with mode: 0644]
tools/dlgfactory/dlgfactory.sh [new file with mode: 0755]
tools/dlgfactory/gtester.cxx [new file with mode: 0644]
tools/dlgfactory/qtester.cxx [new file with mode: 0644]