From 89c33033151baa33eeac8fb09d9c0488acb43c35 Mon Sep 17 00:00:00 2001
From: vsr
Date: Thu, 9 Aug 2012 11:16:07 +0000
Subject: [PATCH] Merge from V6_main_20120808 08Aug12
---
CMakeLists.txt | 323 +-
INSTALL | 25 +-
PARAVIS_version.h.in | 22 +-
adm_local/CMakeLists.txt | 51 +-
adm_local/cmake_files/CMakeLists.txt | 123 +-
adm_local/cmake_files/FindPARAVIEW.cmake | 67 +-
adm_local/unix/CMakeLists.txt | 44 -
adm_local/unix/config_files/CMakeLists.txt | 113 -
adm_local/unix/config_files/check_Med.m4 | 92 -
adm_local/unix/config_files/check_Med2.m4 | 200 -
adm_local/unix/config_files/check_ParaView.m4 | 175 -
adm_local/unix/config_files/check_VISU.m4 | 73 -
.../config_files/med_check_sizeof_medint.m4 | 38 -
bin/CMakeLists.txt | 198 +-
bin/VERSION.in | 4 +-
bin/paravis_setenv.py | 35 +
doc/CMakeLists.txt | 67 +-
doc/UserDocumentation.html | 131 +-
doc/salome/CMakeLists.txt | 69 +-
doc/salome/gui/CMakeLists.txt | 88 +-
doc/salome/gui/doxyfile.in | 20 +
getwrapclasses.py | 43 +-
idl/CMakeLists.txt | 765 +-
idl/PARAVIS_Gen.idl | 43 +-
idl/PARAVIS_Gen_Types.idl | 30 +-
idl/create_header.py | 39 +
idl/create_header.sh | 19 +
idl/create_hints.py | 38 +
idl/create_hints.sh | 19 +
idl/vtkWrapIDL.c | 1256 +-
idl/wrap.cmake | 45 +-
resources/CMakeLists.txt | 233 +-
resources/LightApp.xml | 13 -
resources/PARAVISCatalog.xml.in | 5 +-
resources/ParaViewFilters.xml | 39 +-
resources/ParaViewReaders.xml | 23 +-
resources/ParaViewWriters.xml | 3 +-
resources/SalomeApp.xml | 21 -
resources/SalomeApp.xml.in | 47 +
src/CMakeLists.txt | 80 +-
src/ENGINE/CMakeLists.txt | 415 +-
src/ENGINE/PARAVIS_Engine_i.cc | 54 +-
src/ENGINE/PARAVIS_Engine_i.hh | 34 +-
src/Macro/CMakeLists.txt | 26 +
src/Macro/modes.py | 93 +
src/PVGUI/CMakeLists.txt | 872 +-
src/PVGUI/PARAVIS_Gen_i.cc | 215 +-
src/PVGUI/PARAVIS_Gen_i.hh | 49 +-
src/PVGUI/PVGUI.qrc.in | 6 +
src/PVGUI/PVGUI_Module.cxx | 885 +-
src/PVGUI/PVGUI_Module.h | 143 +-
src/PVGUI/PVGUI_Module_actions.cxx | 154 +-
src/PVGUI/PVGUI_Module_impl.h | 61 -
src/PVGUI/PVGUI_Module_widgets.cxx | 199 +-
src/PVGUI/PVGUI_OutputWindowAdapter.cxx | 60 +-
src/PVGUI/PVGUI_OutputWindowAdapter.h | 19 +-
src/PVGUI/PVGUI_ParaViewSettingsPane.cxx | 647 +
src/PVGUI/PVGUI_ParaViewSettingsPane.h | 123 +
src/PVGUI/PVGUI_Tools.cxx | 47 +-
src/PVGUI/PVGUI_Tools.h | 6 +-
src/PVGUI/PVGUI_ViewManager.cxx | 24 +-
src/PVGUI/PVGUI_ViewManager.h | 22 +-
src/PVGUI/PVGUI_ViewModel.cxx | 19 +-
src/PVGUI/PVGUI_ViewModel.h | 18 +-
src/PVGUI/PVGUI_ViewWindow.cxx | 38 +-
src/PVGUI/PVGUI_ViewWindow.h | 25 +-
src/PVGUI/PV_Events.h | 64 +-
src/PVGUI/PV_I.h | 31 +-
src/PVGUI/PV_Tools.cxx | 30 +-
src/PVGUI/PV_Tools.h | 34 +-
src/PVGUI/create_class.py | 55 +
src/PVGUI/create_class.sh | 18 +
src/PVGUI/resources/PARAVIS_msg_en.ts | 118 +-
src/PVGUI/resources/PARAVIS_msg_fr.ts | 1213 ++
src/PVGUI/ui_pqOptionsDialog.h | 145 +
src/PVGUI/wrap.cmake | 49 +-
src/PV_SWIG/CMakeLists.txt | 139 +-
src/PV_SWIG/paravis.py | 31 +-
src/PV_SWIG/paravisSM.py | 891 +-
src/PV_SWIG/presentations.py | 2504 +++
src/PV_SWIG/pvsimple.py | 407 +-
src/PV_SWIG/servermanager.diff | 167 +-
src/PV_SWIG/simple.diff | 276 +-
src/ParaView/lex.yy.c | 6335 +++++---
src/ParaView/vtkParse.h | 167 -
src/ParaView/vtkParse.tab.c | 12773 ++++++++++++----
src/ParaView/vtkParseExtras.c | 1570 ++
src/ParaView/vtkParseExtras.h | 173 +
src/ParaView/vtkParseHierarchy.c | 988 ++
src/ParaView/vtkParseHierarchy.h | 157 +
src/ParaView/vtkParseInternal.h | 137 +
src/ParaView/vtkParseMain.c | 309 +
src/ParaView/vtkParsePreprocess.c | 2635 ++++
src/ParaView/vtkParsePreprocess.h | 225 +
src/ParaView/vtkWrap.c | 973 ++
src/ParaView/vtkWrap.h | 242 +
src/ParaView/vtkWrapHierarchy.c | 1015 ++
src/ParaView/vtkWrapText.c | 988 ++
src/ParaView/vtkWrapText.h | 61 +
src/Plugins/CMakeLists.txt | 31 +-
src/Plugins/ElevationSurface/CMakeLists.txt | 42 +
.../ElevationSurface/ElevationSurface.xml | 93 +
.../ElevationSurfaceClient.xml | 5 +
.../vtkElevationSurfaceFilter.cxx | 363 +
.../vtkElevationSurfaceFilter.h | 92 +
src/Plugins/Filter/CMakeLists.txt | 18 +
src/Plugins/Filter/vtkMySampleFilter.cxx | 19 +
src/Plugins/Filter/vtkMySampleFilter.h | 19 +
src/Plugins/IntegrationPoints/CMakeLists.txt | 45 +
src/Plugins/IntegrationPoints/ELNOFilter.xml | 281 +
.../IntegrationPoints/ELNOFilterClient.xml | 8 +
.../IntegrationPoints/vtkELNOFilter.cxx | 128 +
src/Plugins/IntegrationPoints/vtkELNOFilter.h | 54 +
.../IntegrationPoints/vtkELNOMeshFilter.cxx | 203 +
.../IntegrationPoints/vtkELNOMeshFilter.h | 43 +
.../vtkELNOSurfaceFilter.cxx | 211 +
.../IntegrationPoints/vtkELNOSurfaceFilter.h | 43 +
.../MedReader/CMake/CTestCustom.ctest.in | 103 +
src/Plugins/MedReader/CMake/FindMED.cmake | 96 +
src/Plugins/MedReader/CMakeLists.txt | 83 +
src/Plugins/MedReader/IO/CMakeLists.txt | 131 +
.../MedReader/IO/Testing/CMakeLists.txt | 20 +
.../MedReader/IO/Testing/Cxx/CMakeLists.txt | 77 +
.../Cxx/TestMedDescendingPolyhedron.cxx | 189 +
.../IO/Testing/Cxx/TestMedParallelRead.cxx | 110 +
.../IO/Testing/Cxx/TestMedParallelWrite.cxx | 343 +
.../IO/Testing/Cxx/TestMedPolyhedron.cxx | 165 +
.../Cxx/TestMedReadDescendingPolyhedron.cxx | 234 +
.../IO/Testing/Cxx/TestMedReadPolyhedron.cxx | 191 +
.../IO/Testing/Cxx/TestMedReader.cxx | 80 +
.../IO/Testing/Cxx/TestMedWriteOcta12.cxx | 149 +
src/Plugins/MedReader/IO/config.h.cmake | 25 +
src/Plugins/MedReader/IO/vtkExtractGroup.cxx | 425 +
src/Plugins/MedReader/IO/vtkExtractGroup.h | 134 +
.../MedReader/IO/vtkGenerateStructElement.cxx | 212 +
.../MedReader/IO/vtkGenerateStructElement.h | 58 +
src/Plugins/MedReader/IO/vtkMed.h | 45 +
.../MedReader/IO/vtkMedCartesianGrid.cxx | 38 +
.../MedReader/IO/vtkMedCartesianGrid.h | 42 +
.../MedReader/IO/vtkMedConstantAttribute.cxx | 66 +
.../MedReader/IO/vtkMedConstantAttribute.h | 109 +
.../MedReader/IO/vtkMedCurvilinearGrid.cxx | 172 +
.../MedReader/IO/vtkMedCurvilinearGrid.h | 80 +
src/Plugins/MedReader/IO/vtkMedDriver.cxx | 466 +
src/Plugins/MedReader/IO/vtkMedDriver.h | 232 +
src/Plugins/MedReader/IO/vtkMedDriver30.cxx | 2371 +++
src/Plugins/MedReader/IO/vtkMedDriver30.h | 168 +
.../MedReader/IO/vtkMedEntityArray.cxx | 531 +
src/Plugins/MedReader/IO/vtkMedEntityArray.h | 200 +
src/Plugins/MedReader/IO/vtkMedFactory.cxx | 45 +
src/Plugins/MedReader/IO/vtkMedFactory.h | 44 +
src/Plugins/MedReader/IO/vtkMedFamily.cxx | 63 +
src/Plugins/MedReader/IO/vtkMedFamily.h | 83 +
.../MedReader/IO/vtkMedFamilyOnEntity.cxx | 130 +
.../MedReader/IO/vtkMedFamilyOnEntity.h | 100 +
.../IO/vtkMedFamilyOnEntityOnProfile.cxx | 591 +
.../IO/vtkMedFamilyOnEntityOnProfile.h | 146 +
src/Plugins/MedReader/IO/vtkMedField.cxx | 326 +
src/Plugins/MedReader/IO/vtkMedField.h | 176 +
.../MedReader/IO/vtkMedFieldOnProfile.cxx | 88 +
.../MedReader/IO/vtkMedFieldOnProfile.h | 126 +
.../MedReader/IO/vtkMedFieldOverEntity.cxx | 56 +
.../MedReader/IO/vtkMedFieldOverEntity.h | 81 +
src/Plugins/MedReader/IO/vtkMedFieldStep.cxx | 77 +
src/Plugins/MedReader/IO/vtkMedFieldStep.h | 115 +
src/Plugins/MedReader/IO/vtkMedFile.cxx | 194 +
src/Plugins/MedReader/IO/vtkMedFile.h | 141 +
src/Plugins/MedReader/IO/vtkMedFilter.cxx | 63 +
src/Plugins/MedReader/IO/vtkMedFilter.h | 49 +
src/Plugins/MedReader/IO/vtkMedFraction.cxx | 211 +
src/Plugins/MedReader/IO/vtkMedFraction.h | 94 +
src/Plugins/MedReader/IO/vtkMedGrid.cxx | 98 +
src/Plugins/MedReader/IO/vtkMedGrid.h | 166 +
src/Plugins/MedReader/IO/vtkMedGroup.cxx | 43 +
src/Plugins/MedReader/IO/vtkMedGroup.h | 57 +
src/Plugins/MedReader/IO/vtkMedIntArray.cxx | 42 +
src/Plugins/MedReader/IO/vtkMedIntArray.h | 68 +
.../MedReader/IO/vtkMedIntArrayInternal.cxx | 53 +
.../MedReader/IO/vtkMedIntArrayInternal.h | 145 +
.../MedReader/IO/vtkMedInterpolation.cxx | 55 +
.../MedReader/IO/vtkMedInterpolation.h | 92 +
src/Plugins/MedReader/IO/vtkMedLink.cxx | 99 +
src/Plugins/MedReader/IO/vtkMedLink.h | 87 +
.../MedReader/IO/vtkMedLocalization.cxx | 701 +
src/Plugins/MedReader/IO/vtkMedLocalization.h | 154 +
src/Plugins/MedReader/IO/vtkMedMesh.cxx | 269 +
src/Plugins/MedReader/IO/vtkMedMesh.h | 204 +
src/Plugins/MedReader/IO/vtkMedPolarGrid.cxx | 38 +
src/Plugins/MedReader/IO/vtkMedPolarGrid.h | 42 +
src/Plugins/MedReader/IO/vtkMedProfile.cxx | 69 +
src/Plugins/MedReader/IO/vtkMedProfile.h | 87 +
src/Plugins/MedReader/IO/vtkMedReader.cxx | 3146 ++++
src/Plugins/MedReader/IO/vtkMedReader.h | 393 +
.../MedReader/IO/vtkMedRegularGrid.cxx | 217 +
src/Plugins/MedReader/IO/vtkMedRegularGrid.h | 84 +
src/Plugins/MedReader/IO/vtkMedSelection.cxx | 118 +
src/Plugins/MedReader/IO/vtkMedSelection.h | 62 +
src/Plugins/MedReader/IO/vtkMedSetGet.h | 136 +
.../MedReader/IO/vtkMedStructElement.cxx | 95 +
.../MedReader/IO/vtkMedStructElement.h | 150 +
.../MedReader/IO/vtkMedSupportMesh.cxx | 63 +
src/Plugins/MedReader/IO/vtkMedSupportMesh.h | 101 +
.../MedReader/IO/vtkMedUnstructuredGrid.cxx | 365 +
.../MedReader/IO/vtkMedUnstructuredGrid.h | 82 +
src/Plugins/MedReader/IO/vtkMedUtilities.cxx | 890 ++
src/Plugins/MedReader/IO/vtkMedUtilities.h | 468 +
.../MedReader/IO/vtkMedVariableAttribute.cxx | 60 +
.../MedReader/IO/vtkMedVariableAttribute.h | 83 +
.../MedReader/ParaViewPlugin/CMakeLists.txt | 110 +
.../Resources/Icons/pqCellData16.png | Bin 0 -> 899 bytes
.../Resources/Icons/pqElnoData16.png | Bin 0 -> 926 bytes
.../Resources/Icons/pqPointData16.png | Bin 0 -> 189 bytes
.../Resources/Icons/pqQuadratureData16.png | Bin 0 -> 391 bytes
.../Resources/MedReaderClient.xml | 7 +
.../Resources/MedReaderServer.xml | 494 +
.../Resources/UI/ExtractGroupPanel.ui | 141 +
.../Resources/UI/MedReaderPanel.ui | 286 +
.../ParaViewPlugin/Resources/pqMedReader.qrc | 9 +
.../ParaViewPlugin/pqExtractGroupPanel.cxx | 170 +
.../ParaViewPlugin/pqExtractGroupPanel.h | 59 +
.../ParaViewPlugin/pqMedReaderPanel.cxx | 338 +
.../ParaViewPlugin/pqMedReaderPanel.h | 74 +
.../vtkSMMedGroupSelectionDomain.cxx | 78 +
.../vtkSMMedGroupSelectionDomain.h | 49 +
src/Plugins/NavigationMode/CMakeLists.txt | 58 +
.../NavigationMode/pqSetModeStarter.cxx | 107 +
src/Plugins/NavigationMode/pqSetModeStarter.h | 49 +
src/Plugins/ParaMEDCorba/CMakeLists.txt | 92 +
.../ParaMEDCorbaServerManager.xml | 67 +
.../ParaMEDCorbaUserInterfaceSources.xml | 3 +
.../ParaMEDCorba/ParaMEDMEM2VTK_defines.hxx | 33 +
.../VTKMEDCouplingCMeshClient.cxx | 85 +
.../VTKMEDCouplingCMeshClient.hxx | 32 +
.../VTKMEDCouplingFieldClient.cxx | 212 +
.../VTKMEDCouplingFieldClient.hxx | 40 +
.../ParaMEDCorba/VTKMEDCouplingMeshClient.cxx | 80 +
.../ParaMEDCorba/VTKMEDCouplingMeshClient.hxx | 34 +
.../VTKMEDCouplingMultiFieldsClient.cxx | 337 +
.../VTKMEDCouplingMultiFieldsClient.hxx | 88 +
.../VTKMEDCouplingUMeshClient.cxx | 129 +
.../VTKMEDCouplingUMeshClient.hxx | 32 +
.../ParaMEDCorba/VTKParaMEDFieldClient.cxx | 56 +
.../ParaMEDCorba/VTKParaMEDFieldClient.hxx | 36 +
src/Plugins/ParaMEDCorba/testParaMEDCorba.cxx | 35 +
.../ParaMEDCorba/vtkParaMEDCorbaSource.cxx | 273 +
.../ParaMEDCorba/vtkParaMEDCorbaSource.h | 81 +
src/Plugins/ScaleVector/CMakeLists.txt | 42 +
src/Plugins/ScaleVector/ScaleVector.xml | 77 +
src/Plugins/ScaleVector/ScaleVectorClient.xml | 3 +
.../ScaleVector/vtkScaleVectorFilter.cxx | 170 +
.../ScaleVector/vtkScaleVectorFilter.h | 54 +
src/Plugins/TableReader/CMakeLists.txt | 47 +
.../TableReader/ParaViewPlugin/CMakeLists.txt | 89 +
.../ParaViewPlugin/Resources/TableReader.qrc | 5 +
.../Resources/TableReaderClient.xml | 6 +
.../Resources/TableReaderServer.xml | 80 +
.../ParaViewPlugin/Resources/TableTo3D.qrc | 5 +
.../Resources/TableTo3DClient.xml | 3 +
.../Resources/TableTo3DServer.xml | 78 +
.../UI/CustomLineChartDisplayPanel.ui | 335 +
.../Resources/UI/CustomXYChartDisplayPanel.ui | 319 +
.../Resources/UI/TableReaderPanel.ui | 103 +
...qCustomChartDisplayPanelImplementation.cxx | 79 +
.../pqCustomChartDisplayPanelImplementation.h | 51 +
.../pqCustomPlotSettingsModel.cxx | 218 +
.../pqCustomPlotSettingsModel.h | 68 +
.../pqCustomXYChartDisplayPanel.cxx | 511 +
.../pqCustomXYChartDisplayPanel.h | 91 +
.../ParaViewPlugin/pqTableReaderPanel.cxx | 112 +
.../ParaViewPlugin/pqTableReaderPanel.h | 56 +
.../ParaViewPlugin/pqTableTo3DPanel.cxx | 69 +
.../ParaViewPlugin/pqTableTo3DPanel.h | 42 +
src/Plugins/TableReader/Reader/CMakeLists.txt | 34 +
.../TableReader/Reader/TableParser.cxx | 261 +
src/Plugins/TableReader/Reader/TableParser.h | 53 +
.../TableReader/Reader/vtkVisuTableReader.cxx | 204 +
.../TableReader/Reader/vtkVisuTableReader.h | 103 +
.../TableTo3DFilter/CMakeLists.txt | 33 +
.../TableTo3DFilter/vtkTableTo3D.cxx | 214 +
.../TableTo3DFilter/vtkTableTo3D.h | 81 +
src/Plugins/ToolBar/CMakeLists.txt | 18 +
src/Plugins/ToolBar/MyToolBarActions.cxx | 19 +-
src/Plugins/ToolBar/MyToolBarActions.h | 18 +
src/Plugins/View/CMakeLists.txt | 33 +-
src/Plugins/View/MyDisplay.cxx | 18 +
src/Plugins/View/MyDisplay.h | 18 +
src/Plugins/View/MyView.cxx | 18 +
src/Plugins/View/MyView.h | 18 +
test/CMakeLists.txt | 21 +
test/VisuPrs/2D_viewer/A0.py | 75 +
test/VisuPrs/2D_viewer/A1.py | 55 +
test/VisuPrs/2D_viewer/CMakeLists.txt | 27 +
test/VisuPrs/3D_viewer/A1.py | 108 +
test/VisuPrs/3D_viewer/A2.py | 106 +
test/VisuPrs/3D_viewer/A3.py | 114 +
test/VisuPrs/3D_viewer/A4.py | 105 +
test/VisuPrs/3D_viewer/A5.py | 129 +
test/VisuPrs/3D_viewer/A6.py | 130 +
test/VisuPrs/3D_viewer/A7.py | 106 +
test/VisuPrs/3D_viewer/A8.py | 110 +
test/VisuPrs/3D_viewer/A9.py | 288 +
test/VisuPrs/3D_viewer/B0.py | 133 +
test/VisuPrs/3D_viewer/B2.py | 62 +
test/VisuPrs/3D_viewer/CMakeLists.txt | 37 +
test/VisuPrs/Animation/A0.py | 89 +
test/VisuPrs/Animation/A2.py | 89 +
test/VisuPrs/Animation/A4.py | 89 +
test/VisuPrs/Animation/A7.py | 89 +
test/VisuPrs/Animation/A8.py | 89 +
test/VisuPrs/Animation/B2.py | 89 +
test/VisuPrs/Animation/B5.py | 89 +
test/VisuPrs/Animation/B6.py | 89 +
test/VisuPrs/Animation/C0.py | 89 +
test/VisuPrs/Animation/C1.py | 89 +
test/VisuPrs/Animation/C3.py | 89 +
test/VisuPrs/Animation/C8.py | 89 +
test/VisuPrs/Animation/CMakeLists.txt | 55 +
test/VisuPrs/Animation/D1.py | 90 +
test/VisuPrs/Animation/D2.py | 89 +
test/VisuPrs/Animation/D6.py | 89 +
test/VisuPrs/Animation/D9.py | 89 +
test/VisuPrs/Animation/E0.py | 89 +
test/VisuPrs/Animation/E4.py | 89 +
test/VisuPrs/Animation/E7.py | 85 +
test/VisuPrs/Animation/E8.py | 89 +
test/VisuPrs/Animation/F2.py | 89 +
test/VisuPrs/Animation/F5.py | 89 +
test/VisuPrs/Animation/F6.py | 89 +
test/VisuPrs/Animation/G0.py | 89 +
test/VisuPrs/Animation/G3.py | 90 +
test/VisuPrs/Animation/G4.py | 90 +
test/VisuPrs/Animation/G8.py | 89 +
test/VisuPrs/Animation/H1.py | 89 +
test/VisuPrs/Animation/H2.py | 89 +
test/VisuPrs/CMakeLists.txt | 37 +
test/VisuPrs/CutLines/A0.py | 39 +
test/VisuPrs/CutLines/A1.py | 39 +
test/VisuPrs/CutLines/A2.py | 39 +
test/VisuPrs/CutLines/A3.py | 39 +
test/VisuPrs/CutLines/A4.py | 39 +
test/VisuPrs/CutLines/A5.py | 39 +
test/VisuPrs/CutLines/A6.py | 39 +
test/VisuPrs/CutLines/A7.py | 39 +
test/VisuPrs/CutLines/A8.py | 39 +
test/VisuPrs/CutLines/A9.py | 39 +
test/VisuPrs/CutLines/B0.py | 39 +
test/VisuPrs/CutLines/B1.py | 39 +
test/VisuPrs/CutLines/B2.py | 39 +
test/VisuPrs/CutLines/CMakeLists.txt | 63 +
test/VisuPrs/CutLines/E0.py | 39 +
test/VisuPrs/CutLines/E1.py | 39 +
test/VisuPrs/CutLines/E2.py | 39 +
test/VisuPrs/CutLines/E3.py | 39 +
test/VisuPrs/CutLines/E4.py | 39 +
test/VisuPrs/CutLines/E5.py | 39 +
test/VisuPrs/CutLines/E6.py | 39 +
test/VisuPrs/CutLines/E7.py | 39 +
test/VisuPrs/CutLines/E8.py | 39 +
test/VisuPrs/CutLines/E9.py | 39 +
test/VisuPrs/CutLines/F0.py | 39 +
test/VisuPrs/CutLines/F1.py | 39 +
test/VisuPrs/CutLines/F2.py | 39 +
test/VisuPrs/CutLines/F3.py | 39 +
test/VisuPrs/CutLines/F4.py | 39 +
test/VisuPrs/CutLines/F5.py | 39 +
test/VisuPrs/CutLines/F6.py | 39 +
test/VisuPrs/CutLines/F7.py | 39 +
test/VisuPrs/CutLines/F8.py | 39 +
test/VisuPrs/CutLines/F9.py | 39 +
test/VisuPrs/CutLines/G0.py | 39 +
test/VisuPrs/CutLines/G1.py | 39 +
test/VisuPrs/CutLines/G2.py | 82 +
test/VisuPrs/CutPlanes/A0.py | 39 +
test/VisuPrs/CutPlanes/A1.py | 39 +
test/VisuPrs/CutPlanes/A2.py | 39 +
test/VisuPrs/CutPlanes/A3.py | 39 +
test/VisuPrs/CutPlanes/A4.py | 39 +
test/VisuPrs/CutPlanes/A5.py | 39 +
test/VisuPrs/CutPlanes/A6.py | 39 +
test/VisuPrs/CutPlanes/A7.py | 39 +
test/VisuPrs/CutPlanes/A8.py | 39 +
test/VisuPrs/CutPlanes/A9.py | 39 +
test/VisuPrs/CutPlanes/B0.py | 39 +
test/VisuPrs/CutPlanes/B1.py | 39 +
test/VisuPrs/CutPlanes/B2.py | 39 +
test/VisuPrs/CutPlanes/B3.py | 55 +
test/VisuPrs/CutPlanes/CMakeLists.txt | 63 +
test/VisuPrs/CutPlanes/E0.py | 39 +
test/VisuPrs/CutPlanes/E1.py | 39 +
test/VisuPrs/CutPlanes/E2.py | 39 +
test/VisuPrs/CutPlanes/E3.py | 39 +
test/VisuPrs/CutPlanes/E4.py | 39 +
test/VisuPrs/CutPlanes/E5.py | 39 +
test/VisuPrs/CutPlanes/E6.py | 39 +
test/VisuPrs/CutPlanes/E7.py | 39 +
test/VisuPrs/CutPlanes/E8.py | 39 +
test/VisuPrs/CutPlanes/E9.py | 39 +
test/VisuPrs/CutPlanes/F0.py | 39 +
test/VisuPrs/CutPlanes/F1.py | 39 +
test/VisuPrs/CutPlanes/F2.py | 39 +
test/VisuPrs/CutPlanes/F3.py | 39 +
test/VisuPrs/CutPlanes/F4.py | 39 +
test/VisuPrs/CutPlanes/F5.py | 39 +
test/VisuPrs/CutPlanes/F6.py | 39 +
test/VisuPrs/CutPlanes/F7.py | 39 +
test/VisuPrs/CutPlanes/F8.py | 39 +
test/VisuPrs/CutPlanes/F9.py | 39 +
test/VisuPrs/CutPlanes/G0.py | 39 +
test/VisuPrs/CutPlanes/G1.py | 39 +
test/VisuPrs/CutPlanes/G2.py | 82 +
test/VisuPrs/DeformedShape/A0.py | 39 +
test/VisuPrs/DeformedShape/A1.py | 39 +
test/VisuPrs/DeformedShape/A2.py | 39 +
test/VisuPrs/DeformedShape/A3.py | 39 +
test/VisuPrs/DeformedShape/A4.py | 39 +
test/VisuPrs/DeformedShape/A5.py | 39 +
test/VisuPrs/DeformedShape/A6.py | 39 +
test/VisuPrs/DeformedShape/A7.py | 39 +
test/VisuPrs/DeformedShape/A8.py | 39 +
test/VisuPrs/DeformedShape/A9.py | 39 +
test/VisuPrs/DeformedShape/B0.py | 39 +
test/VisuPrs/DeformedShape/B1.py | 39 +
test/VisuPrs/DeformedShape/B2.py | 39 +
test/VisuPrs/DeformedShape/B3.py | 111 +
test/VisuPrs/DeformedShape/B4.py | 102 +
test/VisuPrs/DeformedShape/CMakeLists.txt | 61 +
test/VisuPrs/DeformedShape/E0.py | 39 +
test/VisuPrs/DeformedShape/E1.py | 39 +
test/VisuPrs/DeformedShape/E2.py | 39 +
test/VisuPrs/DeformedShape/E3.py | 39 +
test/VisuPrs/DeformedShape/E4.py | 39 +
test/VisuPrs/DeformedShape/E5.py | 39 +
test/VisuPrs/DeformedShape/E6.py | 39 +
test/VisuPrs/DeformedShape/E7.py | 39 +
test/VisuPrs/DeformedShape/E8.py | 39 +
test/VisuPrs/DeformedShape/E9.py | 39 +
test/VisuPrs/DeformedShape/F0.py | 39 +
test/VisuPrs/DeformedShape/F1.py | 39 +
test/VisuPrs/DeformedShape/F2.py | 39 +
test/VisuPrs/DeformedShape/F3.py | 39 +
test/VisuPrs/DeformedShape/F4.py | 39 +
test/VisuPrs/DeformedShape/F5.py | 39 +
test/VisuPrs/DeformedShape/F6.py | 39 +
test/VisuPrs/DeformedShape/F7.py | 39 +
test/VisuPrs/DeformedShape/F8.py | 39 +
test/VisuPrs/DeformedShape/F9.py | 86 +
test/VisuPrs/GaussPoints/A0.py | 59 +
test/VisuPrs/GaussPoints/A1.py | 57 +
test/VisuPrs/GaussPoints/A2.py | 59 +
test/VisuPrs/GaussPoints/A3.py | 59 +
test/VisuPrs/GaussPoints/A4.py | 59 +
test/VisuPrs/GaussPoints/A5.py | 59 +
test/VisuPrs/GaussPoints/A6.py | 59 +
test/VisuPrs/GaussPoints/A7.py | 59 +
test/VisuPrs/GaussPoints/A9.py | 59 +
test/VisuPrs/GaussPoints/B0.py | 57 +
test/VisuPrs/GaussPoints/B1.py | 57 +
test/VisuPrs/GaussPoints/B2.py | 57 +
test/VisuPrs/GaussPoints/B3.py | 57 +
test/VisuPrs/GaussPoints/B4.py | 57 +
test/VisuPrs/GaussPoints/B5.py | 57 +
test/VisuPrs/GaussPoints/B6.py | 57 +
test/VisuPrs/GaussPoints/B7.py | 57 +
test/VisuPrs/GaussPoints/B8.py | 57 +
test/VisuPrs/GaussPoints/B9.py | 57 +
test/VisuPrs/GaussPoints/C0.py | 57 +
test/VisuPrs/GaussPoints/C1.py | 57 +
test/VisuPrs/GaussPoints/C2.py | 57 +
test/VisuPrs/GaussPoints/C3.py | 57 +
test/VisuPrs/GaussPoints/C4.py | 58 +
test/VisuPrs/GaussPoints/C5.py | 61 +
test/VisuPrs/GaussPoints/C6.py | 58 +
test/VisuPrs/GaussPoints/C7.py | 58 +
test/VisuPrs/GaussPoints/CMakeLists.txt | 53 +
test/VisuPrs/IsoSurfaces/A0.py | 39 +
test/VisuPrs/IsoSurfaces/A1.py | 39 +
test/VisuPrs/IsoSurfaces/A2.py | 39 +
test/VisuPrs/IsoSurfaces/A3.py | 39 +
test/VisuPrs/IsoSurfaces/A4.py | 39 +
test/VisuPrs/IsoSurfaces/A5.py | 39 +
test/VisuPrs/IsoSurfaces/A6.py | 39 +
test/VisuPrs/IsoSurfaces/A7.py | 39 +
test/VisuPrs/IsoSurfaces/A8.py | 39 +
test/VisuPrs/IsoSurfaces/A9.py | 39 +
test/VisuPrs/IsoSurfaces/B0.py | 39 +
test/VisuPrs/IsoSurfaces/B1.py | 39 +
test/VisuPrs/IsoSurfaces/B2.py | 39 +
test/VisuPrs/IsoSurfaces/CMakeLists.txt | 62 +
test/VisuPrs/IsoSurfaces/E0.py | 39 +
test/VisuPrs/IsoSurfaces/E1.py | 39 +
test/VisuPrs/IsoSurfaces/E2.py | 39 +
test/VisuPrs/IsoSurfaces/E3.py | 39 +
test/VisuPrs/IsoSurfaces/E4.py | 39 +
test/VisuPrs/IsoSurfaces/E5.py | 39 +
test/VisuPrs/IsoSurfaces/E6.py | 39 +
test/VisuPrs/IsoSurfaces/E7.py | 39 +
test/VisuPrs/IsoSurfaces/E8.py | 39 +
test/VisuPrs/IsoSurfaces/E9.py | 39 +
test/VisuPrs/IsoSurfaces/F0.py | 39 +
test/VisuPrs/IsoSurfaces/F1.py | 39 +
test/VisuPrs/IsoSurfaces/F2.py | 39 +
test/VisuPrs/IsoSurfaces/F3.py | 39 +
test/VisuPrs/IsoSurfaces/F4.py | 39 +
test/VisuPrs/IsoSurfaces/F5.py | 39 +
test/VisuPrs/IsoSurfaces/F6.py | 39 +
test/VisuPrs/IsoSurfaces/F7.py | 39 +
test/VisuPrs/IsoSurfaces/F8.py | 39 +
test/VisuPrs/IsoSurfaces/F9.py | 39 +
test/VisuPrs/IsoSurfaces/G0.py | 39 +
test/VisuPrs/IsoSurfaces/G1.py | 39 +
test/VisuPrs/IsoSurfaces/G2.py | 82 +
test/VisuPrs/MeshPresentation/A0.py | 39 +
test/VisuPrs/MeshPresentation/A1.py | 39 +
test/VisuPrs/MeshPresentation/A2.py | 39 +
test/VisuPrs/MeshPresentation/A3.py | 39 +
test/VisuPrs/MeshPresentation/A4.py | 39 +
test/VisuPrs/MeshPresentation/A5.py | 39 +
test/VisuPrs/MeshPresentation/A6.py | 39 +
test/VisuPrs/MeshPresentation/A7.py | 39 +
test/VisuPrs/MeshPresentation/A8.py | 39 +
test/VisuPrs/MeshPresentation/A9.py | 39 +
test/VisuPrs/MeshPresentation/B0.py | 39 +
test/VisuPrs/MeshPresentation/B1.py | 39 +
test/VisuPrs/MeshPresentation/B2.py | 39 +
test/VisuPrs/MeshPresentation/CMakeLists.txt | 121 +
test/VisuPrs/MeshPresentation/E0.py | 39 +
test/VisuPrs/MeshPresentation/E1.py | 39 +
test/VisuPrs/MeshPresentation/E2.py | 39 +
test/VisuPrs/MeshPresentation/E3.py | 39 +
test/VisuPrs/MeshPresentation/E4.py | 39 +
test/VisuPrs/MeshPresentation/E5.py | 39 +
test/VisuPrs/MeshPresentation/E6.py | 39 +
test/VisuPrs/MeshPresentation/E7.py | 39 +
test/VisuPrs/MeshPresentation/E8.py | 39 +
test/VisuPrs/MeshPresentation/E9.py | 39 +
test/VisuPrs/MeshPresentation/F0.py | 39 +
test/VisuPrs/MeshPresentation/F1.py | 39 +
test/VisuPrs/MeshPresentation/F2.py | 39 +
test/VisuPrs/MeshPresentation/F3.py | 39 +
test/VisuPrs/MeshPresentation/F4.py | 39 +
test/VisuPrs/MeshPresentation/F5.py | 39 +
test/VisuPrs/MeshPresentation/F6.py | 39 +
test/VisuPrs/MeshPresentation/F7.py | 39 +
test/VisuPrs/MeshPresentation/F8.py | 39 +
test/VisuPrs/MeshPresentation/F9.py | 39 +
test/VisuPrs/MeshPresentation/G0.py | 39 +
test/VisuPrs/MeshPresentation/G1.py | 39 +
test/VisuPrs/MeshPresentation/G3.py | 69 +
test/VisuPrs/MeshPresentation/G4.py | 72 +
test/VisuPrs/MeshPresentation/G5.py | 72 +
test/VisuPrs/MeshPresentation/G6.py | 72 +
test/VisuPrs/MeshPresentation/G7.py | 69 +
test/VisuPrs/MeshPresentation/G8.py | 72 +
test/VisuPrs/MeshPresentation/G9.py | 72 +
test/VisuPrs/MeshPresentation/H0.py | 72 +
test/VisuPrs/MeshPresentation/H1.py | 72 +
test/VisuPrs/MeshPresentation/H2.py | 72 +
test/VisuPrs/MeshPresentation/H3.py | 72 +
test/VisuPrs/MeshPresentation/H4.py | 72 +
test/VisuPrs/MeshPresentation/H5.py | 72 +
test/VisuPrs/MeshPresentation/H6.py | 72 +
test/VisuPrs/MeshPresentation/H7.py | 72 +
test/VisuPrs/MeshPresentation/H8.py | 72 +
test/VisuPrs/MeshPresentation/H9.py | 72 +
test/VisuPrs/MeshPresentation/I0.py | 72 +
test/VisuPrs/MeshPresentation/I1.py | 72 +
test/VisuPrs/MeshPresentation/I2.py | 72 +
test/VisuPrs/MeshPresentation/I3.py | 72 +
test/VisuPrs/MeshPresentation/I4.py | 72 +
test/VisuPrs/MeshPresentation/I5.py | 72 +
test/VisuPrs/MeshPresentation/I6.py | 72 +
test/VisuPrs/MeshPresentation/I7.py | 72 +
test/VisuPrs/MeshPresentation/I8.py | 72 +
test/VisuPrs/MeshPresentation/I9.py | 72 +
test/VisuPrs/MeshPresentation/J0.py | 72 +
test/VisuPrs/MeshPresentation/J1.py | 72 +
test/VisuPrs/MeshPresentation/J2.py | 72 +
test/VisuPrs/MeshPresentation/J3.py | 72 +
test/VisuPrs/MeshPresentation/J4.py | 72 +
test/VisuPrs/MeshPresentation/J5.py | 72 +
test/VisuPrs/MeshPresentation/J6.py | 72 +
test/VisuPrs/MeshPresentation/J7.py | 72 +
test/VisuPrs/MeshPresentation/J8.py | 72 +
test/VisuPrs/MeshPresentation/J9.py | 72 +
test/VisuPrs/MeshPresentation/K0.py | 72 +
test/VisuPrs/MeshPresentation/K1.py | 72 +
test/VisuPrs/MeshPresentation/K2.py | 72 +
test/VisuPrs/MeshPresentation/K3.py | 72 +
test/VisuPrs/MeshPresentation/K4.py | 72 +
test/VisuPrs/MeshPresentation/K5.py | 72 +
test/VisuPrs/MeshPresentation/K6.py | 72 +
test/VisuPrs/MeshPresentation/K7.py | 72 +
test/VisuPrs/MeshPresentation/K8.py | 72 +
test/VisuPrs/MeshPresentation/K9.py | 72 +
test/VisuPrs/MeshPresentation/L0.py | 72 +
test/VisuPrs/MeshPresentation/L1.py | 72 +
test/VisuPrs/Plot3D/A0.py | 39 +
test/VisuPrs/Plot3D/A1.py | 39 +
test/VisuPrs/Plot3D/A2.py | 39 +
test/VisuPrs/Plot3D/A3.py | 39 +
test/VisuPrs/Plot3D/A4.py | 39 +
test/VisuPrs/Plot3D/A5.py | 39 +
test/VisuPrs/Plot3D/A6.py | 39 +
test/VisuPrs/Plot3D/A7.py | 39 +
test/VisuPrs/Plot3D/A8.py | 39 +
test/VisuPrs/Plot3D/A9.py | 39 +
test/VisuPrs/Plot3D/B0.py | 39 +
test/VisuPrs/Plot3D/B1.py | 39 +
test/VisuPrs/Plot3D/B2.py | 39 +
test/VisuPrs/Plot3D/CMakeLists.txt | 62 +
test/VisuPrs/Plot3D/E0.py | 39 +
test/VisuPrs/Plot3D/E1.py | 39 +
test/VisuPrs/Plot3D/E2.py | 39 +
test/VisuPrs/Plot3D/E3.py | 39 +
test/VisuPrs/Plot3D/E4.py | 39 +
test/VisuPrs/Plot3D/E5.py | 39 +
test/VisuPrs/Plot3D/E6.py | 39 +
test/VisuPrs/Plot3D/E7.py | 39 +
test/VisuPrs/Plot3D/E8.py | 39 +
test/VisuPrs/Plot3D/E9.py | 39 +
test/VisuPrs/Plot3D/F0.py | 39 +
test/VisuPrs/Plot3D/F1.py | 39 +
test/VisuPrs/Plot3D/F2.py | 39 +
test/VisuPrs/Plot3D/F3.py | 39 +
test/VisuPrs/Plot3D/F4.py | 39 +
test/VisuPrs/Plot3D/F5.py | 39 +
test/VisuPrs/Plot3D/F6.py | 39 +
test/VisuPrs/Plot3D/F7.py | 39 +
test/VisuPrs/Plot3D/F8.py | 39 +
test/VisuPrs/Plot3D/F9.py | 39 +
test/VisuPrs/Plot3D/G0.py | 39 +
test/VisuPrs/Plot3D/G1.py | 39 +
test/VisuPrs/Plot3D/G2.py | 81 +
test/VisuPrs/SWIG_scripts/A1.py | 215 +
test/VisuPrs/SWIG_scripts/A3.py | 70 +
test/VisuPrs/SWIG_scripts/A4.py | 267 +
test/VisuPrs/SWIG_scripts/A5.py | 82 +
test/VisuPrs/SWIG_scripts/A6.py | 51 +
test/VisuPrs/SWIG_scripts/A7.py | 172 +
test/VisuPrs/SWIG_scripts/A8.py | 65 +
test/VisuPrs/SWIG_scripts/A9.py | 280 +
test/VisuPrs/SWIG_scripts/B0.py | 66 +
test/VisuPrs/SWIG_scripts/B1.py | 299 +
test/VisuPrs/SWIG_scripts/B5.py | 175 +
test/VisuPrs/SWIG_scripts/B6.py | 151 +
test/VisuPrs/SWIG_scripts/B7.py | 124 +
test/VisuPrs/SWIG_scripts/B8.py | 23 +
test/VisuPrs/SWIG_scripts/B9.py | 58 +
test/VisuPrs/SWIG_scripts/C3.py | 100 +
test/VisuPrs/SWIG_scripts/C7.py | 120 +
test/VisuPrs/SWIG_scripts/CMakeLists.txt | 43 +
test/VisuPrs/ScalarMap/A0.py | 39 +
test/VisuPrs/ScalarMap/A1.py | 39 +
test/VisuPrs/ScalarMap/A2.py | 39 +
test/VisuPrs/ScalarMap/A3.py | 39 +
test/VisuPrs/ScalarMap/A4.py | 39 +
test/VisuPrs/ScalarMap/A5.py | 39 +
test/VisuPrs/ScalarMap/A6.py | 39 +
test/VisuPrs/ScalarMap/A7.py | 39 +
test/VisuPrs/ScalarMap/A8.py | 39 +
test/VisuPrs/ScalarMap/A9.py | 39 +
test/VisuPrs/ScalarMap/B0.py | 39 +
test/VisuPrs/ScalarMap/B1.py | 39 +
test/VisuPrs/ScalarMap/B2.py | 39 +
test/VisuPrs/ScalarMap/CMakeLists.txt | 62 +
test/VisuPrs/ScalarMap/E0.py | 39 +
test/VisuPrs/ScalarMap/E1.py | 39 +
test/VisuPrs/ScalarMap/E2.py | 39 +
test/VisuPrs/ScalarMap/E3.py | 39 +
test/VisuPrs/ScalarMap/E4.py | 39 +
test/VisuPrs/ScalarMap/E5.py | 39 +
test/VisuPrs/ScalarMap/E6.py | 39 +
test/VisuPrs/ScalarMap/E7.py | 39 +
test/VisuPrs/ScalarMap/E8.py | 39 +
test/VisuPrs/ScalarMap/E9.py | 39 +
test/VisuPrs/ScalarMap/F0.py | 39 +
test/VisuPrs/ScalarMap/F1.py | 39 +
test/VisuPrs/ScalarMap/F2.py | 39 +
test/VisuPrs/ScalarMap/F3.py | 39 +
test/VisuPrs/ScalarMap/F4.py | 39 +
test/VisuPrs/ScalarMap/F5.py | 39 +
test/VisuPrs/ScalarMap/F6.py | 39 +
test/VisuPrs/ScalarMap/F7.py | 39 +
test/VisuPrs/ScalarMap/F8.py | 39 +
test/VisuPrs/ScalarMap/F9.py | 39 +
test/VisuPrs/ScalarMap/G0.py | 39 +
test/VisuPrs/ScalarMap/G1.py | 39 +
test/VisuPrs/ScalarMap/G2.py | 90 +
test/VisuPrs/ScalarMap_On_DeformedShape/A0.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A1.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A2.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A3.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A4.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A5.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A6.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A7.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A8.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/A9.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/B0.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/B1.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/B2.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/B3.py | 241 +
.../ScalarMap_On_DeformedShape/CMakeLists.txt | 59 +
test/VisuPrs/ScalarMap_On_DeformedShape/E0.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E1.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E2.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E3.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E4.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E5.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E6.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E7.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E8.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/E9.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F0.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F1.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F2.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F3.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F4.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F5.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F6.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F7.py | 39 +
test/VisuPrs/ScalarMap_On_DeformedShape/F8.py | 39 +
test/VisuPrs/StreamLines/A0.py | 41 +
test/VisuPrs/StreamLines/A1.py | 41 +
test/VisuPrs/StreamLines/A2.py | 41 +
test/VisuPrs/StreamLines/A3.py | 41 +
test/VisuPrs/StreamLines/A4.py | 41 +
test/VisuPrs/StreamLines/A5.py | 41 +
test/VisuPrs/StreamLines/A6.py | 41 +
test/VisuPrs/StreamLines/A7.py | 41 +
test/VisuPrs/StreamLines/A8.py | 41 +
test/VisuPrs/StreamLines/A9.py | 41 +
test/VisuPrs/StreamLines/B0.py | 41 +
test/VisuPrs/StreamLines/B1.py | 41 +
test/VisuPrs/StreamLines/B2.py | 41 +
test/VisuPrs/StreamLines/CMakeLists.txt | 59 +
test/VisuPrs/StreamLines/E0.py | 41 +
test/VisuPrs/StreamLines/E1.py | 41 +
test/VisuPrs/StreamLines/E2.py | 41 +
test/VisuPrs/StreamLines/E3.py | 41 +
test/VisuPrs/StreamLines/E4.py | 41 +
test/VisuPrs/StreamLines/E5.py | 41 +
test/VisuPrs/StreamLines/E6.py | 41 +
test/VisuPrs/StreamLines/E7.py | 41 +
test/VisuPrs/StreamLines/E8.py | 41 +
test/VisuPrs/StreamLines/E9.py | 41 +
test/VisuPrs/StreamLines/F0.py | 41 +
test/VisuPrs/StreamLines/F1.py | 41 +
test/VisuPrs/StreamLines/F2.py | 41 +
test/VisuPrs/StreamLines/F3.py | 41 +
test/VisuPrs/StreamLines/F4.py | 41 +
test/VisuPrs/StreamLines/F5.py | 41 +
test/VisuPrs/StreamLines/F6.py | 41 +
test/VisuPrs/StreamLines/F7.py | 41 +
test/VisuPrs/StreamLines/F8.py | 41 +
test/VisuPrs/StreamLines/F9.py | 60 +
test/VisuPrs/Tables/A0.py | 78 +
test/VisuPrs/Tables/A2.py | 77 +
test/VisuPrs/Tables/CMakeLists.txt | 28 +
test/VisuPrs/Util/CMakeLists.txt | 33 +
test/VisuPrs/Util/paravistest.py | 204 +
test/VisuPrs/Vectors/A0.py | 39 +
test/VisuPrs/Vectors/A1.py | 39 +
test/VisuPrs/Vectors/A2.py | 39 +
test/VisuPrs/Vectors/A3.py | 39 +
test/VisuPrs/Vectors/A4.py | 39 +
test/VisuPrs/Vectors/A5.py | 39 +
test/VisuPrs/Vectors/A6.py | 39 +
test/VisuPrs/Vectors/A7.py | 39 +
test/VisuPrs/Vectors/A8.py | 39 +
test/VisuPrs/Vectors/A9.py | 39 +
test/VisuPrs/Vectors/B0.py | 39 +
test/VisuPrs/Vectors/B1.py | 39 +
test/VisuPrs/Vectors/B2.py | 39 +
test/VisuPrs/Vectors/B3.py | 128 +
test/VisuPrs/Vectors/CMakeLists.txt | 60 +
test/VisuPrs/Vectors/E0.py | 39 +
test/VisuPrs/Vectors/E1.py | 39 +
test/VisuPrs/Vectors/E2.py | 39 +
test/VisuPrs/Vectors/E3.py | 39 +
test/VisuPrs/Vectors/E4.py | 39 +
test/VisuPrs/Vectors/E5.py | 39 +
test/VisuPrs/Vectors/E6.py | 39 +
test/VisuPrs/Vectors/E7.py | 39 +
test/VisuPrs/Vectors/E8.py | 39 +
test/VisuPrs/Vectors/E9.py | 39 +
test/VisuPrs/Vectors/F0.py | 39 +
test/VisuPrs/Vectors/F1.py | 39 +
test/VisuPrs/Vectors/F2.py | 39 +
test/VisuPrs/Vectors/F3.py | 39 +
test/VisuPrs/Vectors/F4.py | 39 +
test/VisuPrs/Vectors/F5.py | 39 +
test/VisuPrs/Vectors/F6.py | 39 +
test/VisuPrs/Vectors/F7.py | 39 +
test/VisuPrs/Vectors/F8.py | 39 +
test/VisuPrs/Vectors/F9.py | 85 +
test/demo0.py | 49 +-
test/demo1.py | 19 +
test/demo10.py | 19 +
test/demo11.py | 19 +
test/demo12.py | 19 +
test/demo2.py | 19 +
test/demo3.py | 19 +
test/demo4.py | 19 +
test/demo5.py | 19 +
test/demo6.py | 19 +
test/demo7.py | 19 +
test/demo8.py | 19 +
test/demo9.py | 19 +
test/demo_14_med.py | 19 +
test/demo_15_med.py | 19 +
wrapfiles.cmake | 21 +-
812 files changed, 89655 insertions(+), 10727 deletions(-)
delete mode 100644 adm_local/unix/CMakeLists.txt
delete mode 100644 adm_local/unix/config_files/CMakeLists.txt
delete mode 100644 adm_local/unix/config_files/check_Med.m4
delete mode 100644 adm_local/unix/config_files/check_Med2.m4
delete mode 100644 adm_local/unix/config_files/check_ParaView.m4
delete mode 100755 adm_local/unix/config_files/check_VISU.m4
delete mode 100644 adm_local/unix/config_files/med_check_sizeof_medint.m4
create mode 100644 bin/paravis_setenv.py
create mode 100755 idl/create_header.py
create mode 100755 idl/create_hints.py
delete mode 100644 resources/LightApp.xml
delete mode 100644 resources/SalomeApp.xml
create mode 100644 resources/SalomeApp.xml.in
create mode 100644 src/Macro/CMakeLists.txt
create mode 100644 src/Macro/modes.py
create mode 100644 src/PVGUI/PVGUI.qrc.in
delete mode 100644 src/PVGUI/PVGUI_Module_impl.h
create mode 100644 src/PVGUI/PVGUI_ParaViewSettingsPane.cxx
create mode 100644 src/PVGUI/PVGUI_ParaViewSettingsPane.h
create mode 100755 src/PVGUI/create_class.py
create mode 100644 src/PVGUI/resources/PARAVIS_msg_fr.ts
create mode 100644 src/PVGUI/ui_pqOptionsDialog.h
create mode 100644 src/PV_SWIG/presentations.py
delete mode 100644 src/ParaView/vtkParse.h
create mode 100644 src/ParaView/vtkParseExtras.c
create mode 100644 src/ParaView/vtkParseExtras.h
create mode 100644 src/ParaView/vtkParseHierarchy.c
create mode 100644 src/ParaView/vtkParseHierarchy.h
create mode 100644 src/ParaView/vtkParseInternal.h
create mode 100644 src/ParaView/vtkParseMain.c
create mode 100644 src/ParaView/vtkParsePreprocess.c
create mode 100644 src/ParaView/vtkParsePreprocess.h
create mode 100644 src/ParaView/vtkWrap.c
create mode 100644 src/ParaView/vtkWrap.h
create mode 100644 src/ParaView/vtkWrapHierarchy.c
create mode 100644 src/ParaView/vtkWrapText.c
create mode 100644 src/ParaView/vtkWrapText.h
create mode 100644 src/Plugins/ElevationSurface/CMakeLists.txt
create mode 100644 src/Plugins/ElevationSurface/ElevationSurface.xml
create mode 100644 src/Plugins/ElevationSurface/ElevationSurfaceClient.xml
create mode 100644 src/Plugins/ElevationSurface/vtkElevationSurfaceFilter.cxx
create mode 100644 src/Plugins/ElevationSurface/vtkElevationSurfaceFilter.h
create mode 100644 src/Plugins/IntegrationPoints/CMakeLists.txt
create mode 100644 src/Plugins/IntegrationPoints/ELNOFilter.xml
create mode 100644 src/Plugins/IntegrationPoints/ELNOFilterClient.xml
create mode 100644 src/Plugins/IntegrationPoints/vtkELNOFilter.cxx
create mode 100644 src/Plugins/IntegrationPoints/vtkELNOFilter.h
create mode 100644 src/Plugins/IntegrationPoints/vtkELNOMeshFilter.cxx
create mode 100644 src/Plugins/IntegrationPoints/vtkELNOMeshFilter.h
create mode 100644 src/Plugins/IntegrationPoints/vtkELNOSurfaceFilter.cxx
create mode 100644 src/Plugins/IntegrationPoints/vtkELNOSurfaceFilter.h
create mode 100644 src/Plugins/MedReader/CMake/CTestCustom.ctest.in
create mode 100644 src/Plugins/MedReader/CMake/FindMED.cmake
create mode 100644 src/Plugins/MedReader/CMakeLists.txt
create mode 100644 src/Plugins/MedReader/IO/CMakeLists.txt
create mode 100644 src/Plugins/MedReader/IO/Testing/CMakeLists.txt
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/CMakeLists.txt
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedDescendingPolyhedron.cxx
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedParallelRead.cxx
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedParallelWrite.cxx
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedPolyhedron.cxx
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedReadDescendingPolyhedron.cxx
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedReadPolyhedron.cxx
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedReader.cxx
create mode 100644 src/Plugins/MedReader/IO/Testing/Cxx/TestMedWriteOcta12.cxx
create mode 100644 src/Plugins/MedReader/IO/config.h.cmake
create mode 100644 src/Plugins/MedReader/IO/vtkExtractGroup.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkExtractGroup.h
create mode 100644 src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkGenerateStructElement.h
create mode 100644 src/Plugins/MedReader/IO/vtkMed.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedCartesianGrid.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedCartesianGrid.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedConstantAttribute.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedConstantAttribute.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedCurvilinearGrid.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedCurvilinearGrid.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedDriver.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedDriver.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedDriver30.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedDriver30.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedEntityArray.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedEntityArray.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFactory.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFactory.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFamily.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFamily.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFamilyOnEntity.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFamilyOnEntity.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFamilyOnEntityOnProfile.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFamilyOnEntityOnProfile.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedField.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedField.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFieldOnProfile.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFieldOnProfile.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFieldOverEntity.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFieldOverEntity.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFieldStep.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFieldStep.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFile.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFile.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFilter.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFilter.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedFraction.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedFraction.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedGrid.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedGrid.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedGroup.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedGroup.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedIntArray.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedIntArray.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedIntArrayInternal.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedIntArrayInternal.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedInterpolation.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedInterpolation.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedLink.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedLink.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedLocalization.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedLocalization.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedMesh.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedMesh.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedPolarGrid.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedPolarGrid.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedProfile.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedProfile.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedReader.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedReader.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedRegularGrid.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedRegularGrid.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedSelection.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedSelection.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedSetGet.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedStructElement.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedStructElement.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedSupportMesh.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedSupportMesh.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedUnstructuredGrid.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedUnstructuredGrid.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedUtilities.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedUtilities.h
create mode 100644 src/Plugins/MedReader/IO/vtkMedVariableAttribute.cxx
create mode 100644 src/Plugins/MedReader/IO/vtkMedVariableAttribute.h
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/CMakeLists.txt
create mode 100755 src/Plugins/MedReader/ParaViewPlugin/Resources/Icons/pqCellData16.png
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/Resources/Icons/pqElnoData16.png
create mode 100755 src/Plugins/MedReader/ParaViewPlugin/Resources/Icons/pqPointData16.png
create mode 100755 src/Plugins/MedReader/ParaViewPlugin/Resources/Icons/pqQuadratureData16.png
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/Resources/MedReaderClient.xml
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/Resources/MedReaderServer.xml
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/Resources/UI/ExtractGroupPanel.ui
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/Resources/UI/MedReaderPanel.ui
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/Resources/pqMedReader.qrc
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/pqExtractGroupPanel.cxx
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/pqExtractGroupPanel.h
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/pqMedReaderPanel.cxx
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/pqMedReaderPanel.h
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/vtkSMMedGroupSelectionDomain.cxx
create mode 100644 src/Plugins/MedReader/ParaViewPlugin/vtkSMMedGroupSelectionDomain.h
create mode 100644 src/Plugins/NavigationMode/CMakeLists.txt
create mode 100644 src/Plugins/NavigationMode/pqSetModeStarter.cxx
create mode 100644 src/Plugins/NavigationMode/pqSetModeStarter.h
create mode 100644 src/Plugins/ParaMEDCorba/CMakeLists.txt
create mode 100644 src/Plugins/ParaMEDCorba/ParaMEDCorbaServerManager.xml
create mode 100644 src/Plugins/ParaMEDCorba/ParaMEDCorbaUserInterfaceSources.xml
create mode 100755 src/Plugins/ParaMEDCorba/ParaMEDMEM2VTK_defines.hxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingCMeshClient.cxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingCMeshClient.hxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingFieldClient.cxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingFieldClient.hxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingMeshClient.cxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingMeshClient.hxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingMultiFieldsClient.cxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingMultiFieldsClient.hxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingUMeshClient.cxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKMEDCouplingUMeshClient.hxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKParaMEDFieldClient.cxx
create mode 100644 src/Plugins/ParaMEDCorba/VTKParaMEDFieldClient.hxx
create mode 100644 src/Plugins/ParaMEDCorba/testParaMEDCorba.cxx
create mode 100644 src/Plugins/ParaMEDCorba/vtkParaMEDCorbaSource.cxx
create mode 100644 src/Plugins/ParaMEDCorba/vtkParaMEDCorbaSource.h
create mode 100644 src/Plugins/ScaleVector/CMakeLists.txt
create mode 100644 src/Plugins/ScaleVector/ScaleVector.xml
create mode 100644 src/Plugins/ScaleVector/ScaleVectorClient.xml
create mode 100644 src/Plugins/ScaleVector/vtkScaleVectorFilter.cxx
create mode 100644 src/Plugins/ScaleVector/vtkScaleVectorFilter.h
create mode 100644 src/Plugins/TableReader/CMakeLists.txt
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/CMakeLists.txt
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/TableReader.qrc
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/TableReaderClient.xml
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/TableReaderServer.xml
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/TableTo3D.qrc
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/TableTo3DClient.xml
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/TableTo3DServer.xml
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/UI/CustomLineChartDisplayPanel.ui
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/UI/CustomXYChartDisplayPanel.ui
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/Resources/UI/TableReaderPanel.ui
create mode 100755 src/Plugins/TableReader/ParaViewPlugin/pqCustomChartDisplayPanelImplementation.cxx
create mode 100755 src/Plugins/TableReader/ParaViewPlugin/pqCustomChartDisplayPanelImplementation.h
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqCustomPlotSettingsModel.cxx
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqCustomPlotSettingsModel.h
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqCustomXYChartDisplayPanel.cxx
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqCustomXYChartDisplayPanel.h
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqTableReaderPanel.cxx
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqTableReaderPanel.h
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqTableTo3DPanel.cxx
create mode 100644 src/Plugins/TableReader/ParaViewPlugin/pqTableTo3DPanel.h
create mode 100644 src/Plugins/TableReader/Reader/CMakeLists.txt
create mode 100644 src/Plugins/TableReader/Reader/TableParser.cxx
create mode 100644 src/Plugins/TableReader/Reader/TableParser.h
create mode 100644 src/Plugins/TableReader/Reader/vtkVisuTableReader.cxx
create mode 100644 src/Plugins/TableReader/Reader/vtkVisuTableReader.h
create mode 100644 src/Plugins/TableReader/TableTo3DFilter/CMakeLists.txt
create mode 100644 src/Plugins/TableReader/TableTo3DFilter/vtkTableTo3D.cxx
create mode 100644 src/Plugins/TableReader/TableTo3DFilter/vtkTableTo3D.h
create mode 100644 test/CMakeLists.txt
create mode 100755 test/VisuPrs/2D_viewer/A0.py
create mode 100755 test/VisuPrs/2D_viewer/A1.py
create mode 100644 test/VisuPrs/2D_viewer/CMakeLists.txt
create mode 100644 test/VisuPrs/3D_viewer/A1.py
create mode 100644 test/VisuPrs/3D_viewer/A2.py
create mode 100644 test/VisuPrs/3D_viewer/A3.py
create mode 100644 test/VisuPrs/3D_viewer/A4.py
create mode 100644 test/VisuPrs/3D_viewer/A5.py
create mode 100644 test/VisuPrs/3D_viewer/A6.py
create mode 100644 test/VisuPrs/3D_viewer/A7.py
create mode 100644 test/VisuPrs/3D_viewer/A8.py
create mode 100644 test/VisuPrs/3D_viewer/A9.py
create mode 100644 test/VisuPrs/3D_viewer/B0.py
create mode 100644 test/VisuPrs/3D_viewer/B2.py
create mode 100755 test/VisuPrs/3D_viewer/CMakeLists.txt
create mode 100755 test/VisuPrs/Animation/A0.py
create mode 100755 test/VisuPrs/Animation/A2.py
create mode 100644 test/VisuPrs/Animation/A4.py
create mode 100644 test/VisuPrs/Animation/A7.py
create mode 100644 test/VisuPrs/Animation/A8.py
create mode 100644 test/VisuPrs/Animation/B2.py
create mode 100644 test/VisuPrs/Animation/B5.py
create mode 100644 test/VisuPrs/Animation/B6.py
create mode 100644 test/VisuPrs/Animation/C0.py
create mode 100644 test/VisuPrs/Animation/C1.py
create mode 100644 test/VisuPrs/Animation/C3.py
create mode 100644 test/VisuPrs/Animation/C8.py
create mode 100755 test/VisuPrs/Animation/CMakeLists.txt
create mode 100644 test/VisuPrs/Animation/D1.py
create mode 100644 test/VisuPrs/Animation/D2.py
create mode 100644 test/VisuPrs/Animation/D6.py
create mode 100644 test/VisuPrs/Animation/D9.py
create mode 100644 test/VisuPrs/Animation/E0.py
create mode 100644 test/VisuPrs/Animation/E4.py
create mode 100644 test/VisuPrs/Animation/E7.py
create mode 100644 test/VisuPrs/Animation/E8.py
create mode 100644 test/VisuPrs/Animation/F2.py
create mode 100644 test/VisuPrs/Animation/F5.py
create mode 100644 test/VisuPrs/Animation/F6.py
create mode 100644 test/VisuPrs/Animation/G0.py
create mode 100644 test/VisuPrs/Animation/G3.py
create mode 100644 test/VisuPrs/Animation/G4.py
create mode 100644 test/VisuPrs/Animation/G8.py
create mode 100644 test/VisuPrs/Animation/H1.py
create mode 100644 test/VisuPrs/Animation/H2.py
create mode 100644 test/VisuPrs/CMakeLists.txt
create mode 100644 test/VisuPrs/CutLines/A0.py
create mode 100644 test/VisuPrs/CutLines/A1.py
create mode 100755 test/VisuPrs/CutLines/A2.py
create mode 100755 test/VisuPrs/CutLines/A3.py
create mode 100644 test/VisuPrs/CutLines/A4.py
create mode 100644 test/VisuPrs/CutLines/A5.py
create mode 100644 test/VisuPrs/CutLines/A6.py
create mode 100644 test/VisuPrs/CutLines/A7.py
create mode 100644 test/VisuPrs/CutLines/A8.py
create mode 100644 test/VisuPrs/CutLines/A9.py
create mode 100644 test/VisuPrs/CutLines/B0.py
create mode 100644 test/VisuPrs/CutLines/B1.py
create mode 100644 test/VisuPrs/CutLines/B2.py
create mode 100644 test/VisuPrs/CutLines/CMakeLists.txt
create mode 100644 test/VisuPrs/CutLines/E0.py
create mode 100644 test/VisuPrs/CutLines/E1.py
create mode 100644 test/VisuPrs/CutLines/E2.py
create mode 100644 test/VisuPrs/CutLines/E3.py
create mode 100644 test/VisuPrs/CutLines/E4.py
create mode 100644 test/VisuPrs/CutLines/E5.py
create mode 100644 test/VisuPrs/CutLines/E6.py
create mode 100644 test/VisuPrs/CutLines/E7.py
create mode 100644 test/VisuPrs/CutLines/E8.py
create mode 100644 test/VisuPrs/CutLines/E9.py
create mode 100644 test/VisuPrs/CutLines/F0.py
create mode 100644 test/VisuPrs/CutLines/F1.py
create mode 100644 test/VisuPrs/CutLines/F2.py
create mode 100644 test/VisuPrs/CutLines/F3.py
create mode 100644 test/VisuPrs/CutLines/F4.py
create mode 100644 test/VisuPrs/CutLines/F5.py
create mode 100644 test/VisuPrs/CutLines/F6.py
create mode 100644 test/VisuPrs/CutLines/F7.py
create mode 100755 test/VisuPrs/CutLines/F8.py
create mode 100644 test/VisuPrs/CutLines/F9.py
create mode 100644 test/VisuPrs/CutLines/G0.py
create mode 100644 test/VisuPrs/CutLines/G1.py
create mode 100644 test/VisuPrs/CutLines/G2.py
create mode 100644 test/VisuPrs/CutPlanes/A0.py
create mode 100644 test/VisuPrs/CutPlanes/A1.py
create mode 100755 test/VisuPrs/CutPlanes/A2.py
create mode 100755 test/VisuPrs/CutPlanes/A3.py
create mode 100644 test/VisuPrs/CutPlanes/A4.py
create mode 100644 test/VisuPrs/CutPlanes/A5.py
create mode 100644 test/VisuPrs/CutPlanes/A6.py
create mode 100644 test/VisuPrs/CutPlanes/A7.py
create mode 100644 test/VisuPrs/CutPlanes/A8.py
create mode 100644 test/VisuPrs/CutPlanes/A9.py
create mode 100644 test/VisuPrs/CutPlanes/B0.py
create mode 100644 test/VisuPrs/CutPlanes/B1.py
create mode 100644 test/VisuPrs/CutPlanes/B2.py
create mode 100644 test/VisuPrs/CutPlanes/B3.py
create mode 100644 test/VisuPrs/CutPlanes/CMakeLists.txt
create mode 100644 test/VisuPrs/CutPlanes/E0.py
create mode 100644 test/VisuPrs/CutPlanes/E1.py
create mode 100644 test/VisuPrs/CutPlanes/E2.py
create mode 100644 test/VisuPrs/CutPlanes/E3.py
create mode 100644 test/VisuPrs/CutPlanes/E4.py
create mode 100644 test/VisuPrs/CutPlanes/E5.py
create mode 100644 test/VisuPrs/CutPlanes/E6.py
create mode 100644 test/VisuPrs/CutPlanes/E7.py
create mode 100644 test/VisuPrs/CutPlanes/E8.py
create mode 100644 test/VisuPrs/CutPlanes/E9.py
create mode 100644 test/VisuPrs/CutPlanes/F0.py
create mode 100644 test/VisuPrs/CutPlanes/F1.py
create mode 100644 test/VisuPrs/CutPlanes/F2.py
create mode 100644 test/VisuPrs/CutPlanes/F3.py
create mode 100644 test/VisuPrs/CutPlanes/F4.py
create mode 100644 test/VisuPrs/CutPlanes/F5.py
create mode 100644 test/VisuPrs/CutPlanes/F6.py
create mode 100755 test/VisuPrs/CutPlanes/F7.py
create mode 100644 test/VisuPrs/CutPlanes/F8.py
create mode 100644 test/VisuPrs/CutPlanes/F9.py
create mode 100644 test/VisuPrs/CutPlanes/G0.py
create mode 100644 test/VisuPrs/CutPlanes/G1.py
create mode 100644 test/VisuPrs/CutPlanes/G2.py
create mode 100644 test/VisuPrs/DeformedShape/A0.py
create mode 100644 test/VisuPrs/DeformedShape/A1.py
create mode 100755 test/VisuPrs/DeformedShape/A2.py
create mode 100755 test/VisuPrs/DeformedShape/A3.py
create mode 100755 test/VisuPrs/DeformedShape/A4.py
create mode 100644 test/VisuPrs/DeformedShape/A5.py
create mode 100755 test/VisuPrs/DeformedShape/A6.py
create mode 100644 test/VisuPrs/DeformedShape/A7.py
create mode 100644 test/VisuPrs/DeformedShape/A8.py
create mode 100644 test/VisuPrs/DeformedShape/A9.py
create mode 100644 test/VisuPrs/DeformedShape/B0.py
create mode 100644 test/VisuPrs/DeformedShape/B1.py
create mode 100644 test/VisuPrs/DeformedShape/B2.py
create mode 100755 test/VisuPrs/DeformedShape/B3.py
create mode 100644 test/VisuPrs/DeformedShape/B4.py
create mode 100644 test/VisuPrs/DeformedShape/CMakeLists.txt
create mode 100644 test/VisuPrs/DeformedShape/E0.py
create mode 100644 test/VisuPrs/DeformedShape/E1.py
create mode 100644 test/VisuPrs/DeformedShape/E2.py
create mode 100755 test/VisuPrs/DeformedShape/E3.py
create mode 100644 test/VisuPrs/DeformedShape/E4.py
create mode 100644 test/VisuPrs/DeformedShape/E5.py
create mode 100644 test/VisuPrs/DeformedShape/E6.py
create mode 100644 test/VisuPrs/DeformedShape/E7.py
create mode 100644 test/VisuPrs/DeformedShape/E8.py
create mode 100644 test/VisuPrs/DeformedShape/E9.py
create mode 100755 test/VisuPrs/DeformedShape/F0.py
create mode 100644 test/VisuPrs/DeformedShape/F1.py
create mode 100644 test/VisuPrs/DeformedShape/F2.py
create mode 100644 test/VisuPrs/DeformedShape/F3.py
create mode 100644 test/VisuPrs/DeformedShape/F4.py
create mode 100644 test/VisuPrs/DeformedShape/F5.py
create mode 100644 test/VisuPrs/DeformedShape/F6.py
create mode 100755 test/VisuPrs/DeformedShape/F7.py
create mode 100644 test/VisuPrs/DeformedShape/F8.py
create mode 100644 test/VisuPrs/DeformedShape/F9.py
create mode 100644 test/VisuPrs/GaussPoints/A0.py
create mode 100644 test/VisuPrs/GaussPoints/A1.py
create mode 100644 test/VisuPrs/GaussPoints/A2.py
create mode 100644 test/VisuPrs/GaussPoints/A3.py
create mode 100644 test/VisuPrs/GaussPoints/A4.py
create mode 100644 test/VisuPrs/GaussPoints/A5.py
create mode 100644 test/VisuPrs/GaussPoints/A6.py
create mode 100644 test/VisuPrs/GaussPoints/A7.py
create mode 100644 test/VisuPrs/GaussPoints/A9.py
create mode 100644 test/VisuPrs/GaussPoints/B0.py
create mode 100644 test/VisuPrs/GaussPoints/B1.py
create mode 100644 test/VisuPrs/GaussPoints/B2.py
create mode 100644 test/VisuPrs/GaussPoints/B3.py
create mode 100644 test/VisuPrs/GaussPoints/B4.py
create mode 100644 test/VisuPrs/GaussPoints/B5.py
create mode 100644 test/VisuPrs/GaussPoints/B6.py
create mode 100644 test/VisuPrs/GaussPoints/B7.py
create mode 100644 test/VisuPrs/GaussPoints/B8.py
create mode 100644 test/VisuPrs/GaussPoints/B9.py
create mode 100644 test/VisuPrs/GaussPoints/C0.py
create mode 100644 test/VisuPrs/GaussPoints/C1.py
create mode 100644 test/VisuPrs/GaussPoints/C2.py
create mode 100644 test/VisuPrs/GaussPoints/C3.py
create mode 100644 test/VisuPrs/GaussPoints/C4.py
create mode 100644 test/VisuPrs/GaussPoints/C5.py
create mode 100644 test/VisuPrs/GaussPoints/C6.py
create mode 100644 test/VisuPrs/GaussPoints/C7.py
create mode 100644 test/VisuPrs/GaussPoints/CMakeLists.txt
create mode 100644 test/VisuPrs/IsoSurfaces/A0.py
create mode 100755 test/VisuPrs/IsoSurfaces/A1.py
create mode 100755 test/VisuPrs/IsoSurfaces/A2.py
create mode 100755 test/VisuPrs/IsoSurfaces/A3.py
create mode 100755 test/VisuPrs/IsoSurfaces/A4.py
create mode 100755 test/VisuPrs/IsoSurfaces/A5.py
create mode 100644 test/VisuPrs/IsoSurfaces/A6.py
create mode 100755 test/VisuPrs/IsoSurfaces/A7.py
create mode 100755 test/VisuPrs/IsoSurfaces/A8.py
create mode 100755 test/VisuPrs/IsoSurfaces/A9.py
create mode 100755 test/VisuPrs/IsoSurfaces/B0.py
create mode 100644 test/VisuPrs/IsoSurfaces/B1.py
create mode 100755 test/VisuPrs/IsoSurfaces/B2.py
create mode 100755 test/VisuPrs/IsoSurfaces/CMakeLists.txt
create mode 100755 test/VisuPrs/IsoSurfaces/E0.py
create mode 100755 test/VisuPrs/IsoSurfaces/E1.py
create mode 100755 test/VisuPrs/IsoSurfaces/E2.py
create mode 100644 test/VisuPrs/IsoSurfaces/E3.py
create mode 100755 test/VisuPrs/IsoSurfaces/E4.py
create mode 100755 test/VisuPrs/IsoSurfaces/E5.py
create mode 100755 test/VisuPrs/IsoSurfaces/E6.py
create mode 100755 test/VisuPrs/IsoSurfaces/E7.py
create mode 100755 test/VisuPrs/IsoSurfaces/E8.py
create mode 100644 test/VisuPrs/IsoSurfaces/E9.py
create mode 100644 test/VisuPrs/IsoSurfaces/F0.py
create mode 100755 test/VisuPrs/IsoSurfaces/F1.py
create mode 100755 test/VisuPrs/IsoSurfaces/F2.py
create mode 100755 test/VisuPrs/IsoSurfaces/F3.py
create mode 100755 test/VisuPrs/IsoSurfaces/F4.py
create mode 100755 test/VisuPrs/IsoSurfaces/F5.py
create mode 100755 test/VisuPrs/IsoSurfaces/F6.py
create mode 100644 test/VisuPrs/IsoSurfaces/F7.py
create mode 100755 test/VisuPrs/IsoSurfaces/F8.py
create mode 100644 test/VisuPrs/IsoSurfaces/F9.py
create mode 100644 test/VisuPrs/IsoSurfaces/G0.py
create mode 100755 test/VisuPrs/IsoSurfaces/G1.py
create mode 100644 test/VisuPrs/IsoSurfaces/G2.py
create mode 100644 test/VisuPrs/MeshPresentation/A0.py
create mode 100644 test/VisuPrs/MeshPresentation/A1.py
create mode 100644 test/VisuPrs/MeshPresentation/A2.py
create mode 100644 test/VisuPrs/MeshPresentation/A3.py
create mode 100644 test/VisuPrs/MeshPresentation/A4.py
create mode 100644 test/VisuPrs/MeshPresentation/A5.py
create mode 100644 test/VisuPrs/MeshPresentation/A6.py
create mode 100644 test/VisuPrs/MeshPresentation/A7.py
create mode 100644 test/VisuPrs/MeshPresentation/A8.py
create mode 100644 test/VisuPrs/MeshPresentation/A9.py
create mode 100644 test/VisuPrs/MeshPresentation/B0.py
create mode 100644 test/VisuPrs/MeshPresentation/B1.py
create mode 100644 test/VisuPrs/MeshPresentation/B2.py
create mode 100644 test/VisuPrs/MeshPresentation/CMakeLists.txt
create mode 100644 test/VisuPrs/MeshPresentation/E0.py
create mode 100644 test/VisuPrs/MeshPresentation/E1.py
create mode 100644 test/VisuPrs/MeshPresentation/E2.py
create mode 100644 test/VisuPrs/MeshPresentation/E3.py
create mode 100644 test/VisuPrs/MeshPresentation/E4.py
create mode 100644 test/VisuPrs/MeshPresentation/E5.py
create mode 100644 test/VisuPrs/MeshPresentation/E6.py
create mode 100644 test/VisuPrs/MeshPresentation/E7.py
create mode 100644 test/VisuPrs/MeshPresentation/E8.py
create mode 100644 test/VisuPrs/MeshPresentation/E9.py
create mode 100644 test/VisuPrs/MeshPresentation/F0.py
create mode 100644 test/VisuPrs/MeshPresentation/F1.py
create mode 100644 test/VisuPrs/MeshPresentation/F2.py
create mode 100644 test/VisuPrs/MeshPresentation/F3.py
create mode 100644 test/VisuPrs/MeshPresentation/F4.py
create mode 100644 test/VisuPrs/MeshPresentation/F5.py
create mode 100644 test/VisuPrs/MeshPresentation/F6.py
create mode 100644 test/VisuPrs/MeshPresentation/F7.py
create mode 100644 test/VisuPrs/MeshPresentation/F8.py
create mode 100644 test/VisuPrs/MeshPresentation/F9.py
create mode 100644 test/VisuPrs/MeshPresentation/G0.py
create mode 100644 test/VisuPrs/MeshPresentation/G1.py
create mode 100644 test/VisuPrs/MeshPresentation/G3.py
create mode 100644 test/VisuPrs/MeshPresentation/G4.py
create mode 100644 test/VisuPrs/MeshPresentation/G5.py
create mode 100644 test/VisuPrs/MeshPresentation/G6.py
create mode 100644 test/VisuPrs/MeshPresentation/G7.py
create mode 100644 test/VisuPrs/MeshPresentation/G8.py
create mode 100644 test/VisuPrs/MeshPresentation/G9.py
create mode 100644 test/VisuPrs/MeshPresentation/H0.py
create mode 100644 test/VisuPrs/MeshPresentation/H1.py
create mode 100644 test/VisuPrs/MeshPresentation/H2.py
create mode 100644 test/VisuPrs/MeshPresentation/H3.py
create mode 100644 test/VisuPrs/MeshPresentation/H4.py
create mode 100644 test/VisuPrs/MeshPresentation/H5.py
create mode 100644 test/VisuPrs/MeshPresentation/H6.py
create mode 100644 test/VisuPrs/MeshPresentation/H7.py
create mode 100644 test/VisuPrs/MeshPresentation/H8.py
create mode 100644 test/VisuPrs/MeshPresentation/H9.py
create mode 100644 test/VisuPrs/MeshPresentation/I0.py
create mode 100644 test/VisuPrs/MeshPresentation/I1.py
create mode 100644 test/VisuPrs/MeshPresentation/I2.py
create mode 100644 test/VisuPrs/MeshPresentation/I3.py
create mode 100644 test/VisuPrs/MeshPresentation/I4.py
create mode 100644 test/VisuPrs/MeshPresentation/I5.py
create mode 100644 test/VisuPrs/MeshPresentation/I6.py
create mode 100644 test/VisuPrs/MeshPresentation/I7.py
create mode 100644 test/VisuPrs/MeshPresentation/I8.py
create mode 100644 test/VisuPrs/MeshPresentation/I9.py
create mode 100644 test/VisuPrs/MeshPresentation/J0.py
create mode 100644 test/VisuPrs/MeshPresentation/J1.py
create mode 100644 test/VisuPrs/MeshPresentation/J2.py
create mode 100644 test/VisuPrs/MeshPresentation/J3.py
create mode 100644 test/VisuPrs/MeshPresentation/J4.py
create mode 100644 test/VisuPrs/MeshPresentation/J5.py
create mode 100644 test/VisuPrs/MeshPresentation/J6.py
create mode 100644 test/VisuPrs/MeshPresentation/J7.py
create mode 100644 test/VisuPrs/MeshPresentation/J8.py
create mode 100644 test/VisuPrs/MeshPresentation/J9.py
create mode 100644 test/VisuPrs/MeshPresentation/K0.py
create mode 100644 test/VisuPrs/MeshPresentation/K1.py
create mode 100644 test/VisuPrs/MeshPresentation/K2.py
create mode 100644 test/VisuPrs/MeshPresentation/K3.py
create mode 100644 test/VisuPrs/MeshPresentation/K4.py
create mode 100644 test/VisuPrs/MeshPresentation/K5.py
create mode 100644 test/VisuPrs/MeshPresentation/K6.py
create mode 100644 test/VisuPrs/MeshPresentation/K7.py
create mode 100644 test/VisuPrs/MeshPresentation/K8.py
create mode 100644 test/VisuPrs/MeshPresentation/K9.py
create mode 100644 test/VisuPrs/MeshPresentation/L0.py
create mode 100644 test/VisuPrs/MeshPresentation/L1.py
create mode 100644 test/VisuPrs/Plot3D/A0.py
create mode 100755 test/VisuPrs/Plot3D/A1.py
create mode 100755 test/VisuPrs/Plot3D/A2.py
create mode 100755 test/VisuPrs/Plot3D/A3.py
create mode 100755 test/VisuPrs/Plot3D/A4.py
create mode 100755 test/VisuPrs/Plot3D/A5.py
create mode 100644 test/VisuPrs/Plot3D/A6.py
create mode 100755 test/VisuPrs/Plot3D/A7.py
create mode 100755 test/VisuPrs/Plot3D/A8.py
create mode 100755 test/VisuPrs/Plot3D/A9.py
create mode 100755 test/VisuPrs/Plot3D/B0.py
create mode 100755 test/VisuPrs/Plot3D/B1.py
create mode 100755 test/VisuPrs/Plot3D/B2.py
create mode 100755 test/VisuPrs/Plot3D/CMakeLists.txt
create mode 100755 test/VisuPrs/Plot3D/E0.py
create mode 100755 test/VisuPrs/Plot3D/E1.py
create mode 100755 test/VisuPrs/Plot3D/E2.py
create mode 100644 test/VisuPrs/Plot3D/E3.py
create mode 100755 test/VisuPrs/Plot3D/E4.py
create mode 100755 test/VisuPrs/Plot3D/E5.py
create mode 100755 test/VisuPrs/Plot3D/E6.py
create mode 100755 test/VisuPrs/Plot3D/E7.py
create mode 100755 test/VisuPrs/Plot3D/E8.py
create mode 100755 test/VisuPrs/Plot3D/E9.py
create mode 100644 test/VisuPrs/Plot3D/F0.py
create mode 100755 test/VisuPrs/Plot3D/F1.py
create mode 100755 test/VisuPrs/Plot3D/F2.py
create mode 100755 test/VisuPrs/Plot3D/F3.py
create mode 100755 test/VisuPrs/Plot3D/F4.py
create mode 100755 test/VisuPrs/Plot3D/F5.py
create mode 100755 test/VisuPrs/Plot3D/F6.py
create mode 100644 test/VisuPrs/Plot3D/F7.py
create mode 100755 test/VisuPrs/Plot3D/F8.py
create mode 100644 test/VisuPrs/Plot3D/F9.py
create mode 100644 test/VisuPrs/Plot3D/G0.py
create mode 100755 test/VisuPrs/Plot3D/G1.py
create mode 100755 test/VisuPrs/Plot3D/G2.py
create mode 100644 test/VisuPrs/SWIG_scripts/A1.py
create mode 100644 test/VisuPrs/SWIG_scripts/A3.py
create mode 100644 test/VisuPrs/SWIG_scripts/A4.py
create mode 100644 test/VisuPrs/SWIG_scripts/A5.py
create mode 100644 test/VisuPrs/SWIG_scripts/A6.py
create mode 100644 test/VisuPrs/SWIG_scripts/A7.py
create mode 100644 test/VisuPrs/SWIG_scripts/A8.py
create mode 100644 test/VisuPrs/SWIG_scripts/A9.py
create mode 100644 test/VisuPrs/SWIG_scripts/B0.py
create mode 100644 test/VisuPrs/SWIG_scripts/B1.py
create mode 100644 test/VisuPrs/SWIG_scripts/B5.py
create mode 100644 test/VisuPrs/SWIG_scripts/B6.py
create mode 100644 test/VisuPrs/SWIG_scripts/B7.py
create mode 100644 test/VisuPrs/SWIG_scripts/B8.py
create mode 100644 test/VisuPrs/SWIG_scripts/B9.py
create mode 100644 test/VisuPrs/SWIG_scripts/C3.py
create mode 100755 test/VisuPrs/SWIG_scripts/C7.py
create mode 100644 test/VisuPrs/SWIG_scripts/CMakeLists.txt
create mode 100755 test/VisuPrs/ScalarMap/A0.py
create mode 100644 test/VisuPrs/ScalarMap/A1.py
create mode 100755 test/VisuPrs/ScalarMap/A2.py
create mode 100755 test/VisuPrs/ScalarMap/A3.py
create mode 100755 test/VisuPrs/ScalarMap/A4.py
create mode 100644 test/VisuPrs/ScalarMap/A5.py
create mode 100755 test/VisuPrs/ScalarMap/A6.py
create mode 100644 test/VisuPrs/ScalarMap/A7.py
create mode 100644 test/VisuPrs/ScalarMap/A8.py
create mode 100644 test/VisuPrs/ScalarMap/A9.py
create mode 100644 test/VisuPrs/ScalarMap/B0.py
create mode 100644 test/VisuPrs/ScalarMap/B1.py
create mode 100644 test/VisuPrs/ScalarMap/B2.py
create mode 100644 test/VisuPrs/ScalarMap/CMakeLists.txt
create mode 100644 test/VisuPrs/ScalarMap/E0.py
create mode 100644 test/VisuPrs/ScalarMap/E1.py
create mode 100644 test/VisuPrs/ScalarMap/E2.py
create mode 100755 test/VisuPrs/ScalarMap/E3.py
create mode 100644 test/VisuPrs/ScalarMap/E4.py
create mode 100644 test/VisuPrs/ScalarMap/E5.py
create mode 100644 test/VisuPrs/ScalarMap/E6.py
create mode 100644 test/VisuPrs/ScalarMap/E7.py
create mode 100644 test/VisuPrs/ScalarMap/E8.py
create mode 100644 test/VisuPrs/ScalarMap/E9.py
create mode 100755 test/VisuPrs/ScalarMap/F0.py
create mode 100644 test/VisuPrs/ScalarMap/F1.py
create mode 100644 test/VisuPrs/ScalarMap/F2.py
create mode 100644 test/VisuPrs/ScalarMap/F3.py
create mode 100644 test/VisuPrs/ScalarMap/F4.py
create mode 100644 test/VisuPrs/ScalarMap/F5.py
create mode 100644 test/VisuPrs/ScalarMap/F6.py
create mode 100644 test/VisuPrs/ScalarMap/F7.py
create mode 100644 test/VisuPrs/ScalarMap/F8.py
create mode 100644 test/VisuPrs/ScalarMap/F9.py
create mode 100644 test/VisuPrs/ScalarMap/G0.py
create mode 100644 test/VisuPrs/ScalarMap/G1.py
create mode 100644 test/VisuPrs/ScalarMap/G2.py
create mode 100644 test/VisuPrs/ScalarMap_On_DeformedShape/A0.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A1.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A2.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A3.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A4.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A5.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A6.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A7.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A8.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/A9.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/B0.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/B1.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/B2.py
create mode 100644 test/VisuPrs/ScalarMap_On_DeformedShape/B3.py
create mode 100644 test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E0.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E1.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E2.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E3.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E4.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E5.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E6.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E7.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E8.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/E9.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F0.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F1.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F2.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F3.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F4.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F5.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F6.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F7.py
create mode 100755 test/VisuPrs/ScalarMap_On_DeformedShape/F8.py
create mode 100644 test/VisuPrs/StreamLines/A0.py
create mode 100644 test/VisuPrs/StreamLines/A1.py
create mode 100644 test/VisuPrs/StreamLines/A2.py
create mode 100644 test/VisuPrs/StreamLines/A3.py
create mode 100644 test/VisuPrs/StreamLines/A4.py
create mode 100644 test/VisuPrs/StreamLines/A5.py
create mode 100644 test/VisuPrs/StreamLines/A6.py
create mode 100644 test/VisuPrs/StreamLines/A7.py
create mode 100644 test/VisuPrs/StreamLines/A8.py
create mode 100644 test/VisuPrs/StreamLines/A9.py
create mode 100644 test/VisuPrs/StreamLines/B0.py
create mode 100644 test/VisuPrs/StreamLines/B1.py
create mode 100644 test/VisuPrs/StreamLines/B2.py
create mode 100644 test/VisuPrs/StreamLines/CMakeLists.txt
create mode 100644 test/VisuPrs/StreamLines/E0.py
create mode 100644 test/VisuPrs/StreamLines/E1.py
create mode 100644 test/VisuPrs/StreamLines/E2.py
create mode 100644 test/VisuPrs/StreamLines/E3.py
create mode 100644 test/VisuPrs/StreamLines/E4.py
create mode 100644 test/VisuPrs/StreamLines/E5.py
create mode 100644 test/VisuPrs/StreamLines/E6.py
create mode 100644 test/VisuPrs/StreamLines/E7.py
create mode 100644 test/VisuPrs/StreamLines/E8.py
create mode 100644 test/VisuPrs/StreamLines/E9.py
create mode 100644 test/VisuPrs/StreamLines/F0.py
create mode 100644 test/VisuPrs/StreamLines/F1.py
create mode 100644 test/VisuPrs/StreamLines/F2.py
create mode 100644 test/VisuPrs/StreamLines/F3.py
create mode 100644 test/VisuPrs/StreamLines/F4.py
create mode 100644 test/VisuPrs/StreamLines/F5.py
create mode 100644 test/VisuPrs/StreamLines/F6.py
create mode 100644 test/VisuPrs/StreamLines/F7.py
create mode 100644 test/VisuPrs/StreamLines/F8.py
create mode 100644 test/VisuPrs/StreamLines/F9.py
create mode 100755 test/VisuPrs/Tables/A0.py
create mode 100755 test/VisuPrs/Tables/A2.py
create mode 100644 test/VisuPrs/Tables/CMakeLists.txt
create mode 100644 test/VisuPrs/Util/CMakeLists.txt
create mode 100755 test/VisuPrs/Util/paravistest.py
create mode 100644 test/VisuPrs/Vectors/A0.py
create mode 100755 test/VisuPrs/Vectors/A1.py
create mode 100644 test/VisuPrs/Vectors/A2.py
create mode 100755 test/VisuPrs/Vectors/A3.py
create mode 100755 test/VisuPrs/Vectors/A4.py
create mode 100755 test/VisuPrs/Vectors/A5.py
create mode 100644 test/VisuPrs/Vectors/A6.py
create mode 100755 test/VisuPrs/Vectors/A7.py
create mode 100755 test/VisuPrs/Vectors/A8.py
create mode 100755 test/VisuPrs/Vectors/A9.py
create mode 100755 test/VisuPrs/Vectors/B0.py
create mode 100755 test/VisuPrs/Vectors/B1.py
create mode 100755 test/VisuPrs/Vectors/B2.py
create mode 100644 test/VisuPrs/Vectors/B3.py
create mode 100644 test/VisuPrs/Vectors/CMakeLists.txt
create mode 100755 test/VisuPrs/Vectors/E0.py
create mode 100755 test/VisuPrs/Vectors/E1.py
create mode 100755 test/VisuPrs/Vectors/E2.py
create mode 100644 test/VisuPrs/Vectors/E3.py
create mode 100755 test/VisuPrs/Vectors/E4.py
create mode 100755 test/VisuPrs/Vectors/E5.py
create mode 100755 test/VisuPrs/Vectors/E6.py
create mode 100755 test/VisuPrs/Vectors/E7.py
create mode 100755 test/VisuPrs/Vectors/E8.py
create mode 100755 test/VisuPrs/Vectors/E9.py
create mode 100644 test/VisuPrs/Vectors/F0.py
create mode 100755 test/VisuPrs/Vectors/F1.py
create mode 100755 test/VisuPrs/Vectors/F2.py
create mode 100755 test/VisuPrs/Vectors/F3.py
create mode 100755 test/VisuPrs/Vectors/F4.py
create mode 100755 test/VisuPrs/Vectors/F5.py
create mode 100755 test/VisuPrs/Vectors/F6.py
create mode 100644 test/VisuPrs/Vectors/F7.py
create mode 100755 test/VisuPrs/Vectors/F8.py
create mode 100644 test/VisuPrs/Vectors/F9.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bc2f363..e6cd3bc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,223 +1,126 @@
-
- CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
- IF(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
- ENDIF(COMMAND cmake_policy)
-
-
- SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR})
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindPLATFORM.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindPYTHON.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindOMNIORB.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindPTHREADS.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindHDF5.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindBOOST.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindLIBXML2.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSWIG.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
- INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindKERNEL.cmake)
-
-
- INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindPARAVIEW.cmake)
- IF(EXISTS ${PARAVIEW_VTK_DIR}/VTKConfig.cmake)
- SET(VTK_DIR ${PARAVIEW_VTK_DIR})
- ENDIF(EXISTS ${PARAVIEW_VTK_DIR}/VTKConfig.cmake)
- SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR})
- INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindCAS.cmake)
- INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindQT4.cmake)
- INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindOPENGL.cmake)
- INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindVTK.cmake)
- INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindQWT.cmake)
- INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindSIPPYQT.cmake)
- INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindGUI.cmake)
-
-
- SET(BUILD_PLUGINS 1)
- SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR})
- SET(VISU_ROOT_DIR $ENV{VISU_ROOT_DIR})
- INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake)
- IF(EXISTS ${VISU_ROOT_DIR}/adm_local/cmake_files/FindVISU.cmake)
- INCLUDE(${VISU_ROOT_DIR}/adm_local/cmake_files/FindVISU.cmake)
- SET(WITH_VISU 1)
- ENDIF(EXISTS ${VISU_ROOT_DIR}/adm_local/cmake_files/FindVISU.cmake)
- EXECUTE_PROCESS(COMMAND pvpython ${CMAKE_SOURCE_DIR}/getwrapclasses.py ${PARAVIEW_INCLUDE_DIRS})
-
-
- SET(DOXYGEN_IS_OK 0)
-
-
- IF(WINDOWS)
- SET(CPPUNIT_IS_OK 0)
- ENDIF(WINDOWS)
-
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+# Copyright (C) 2010-2012 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 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.
+# 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
+# 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 :
-# Modified by : Alexander BORODIN (OCN) - autotools usage
-#
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SET(ACLOCAL_AMFLAGS
- -I
- adm_local/unix/config_files
- -I
- ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
- -I
- ${GUI_ROOT_DIR}/adm_local/unix/config_files
-)
+PROJECT(PARAVIS)
+
+IF(WINDOWS)
+ STRING( REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags ${CMAKE_SHARED_LINKER_FLAGS_DEBUG} )
+ SET( CMAKE_SHARED_LINKER_FLAGS_DEBUG "${replacementFlags}" )
+ENDIF(WINDOWS)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
+IF(COMMAND cmake_policy)
+ cmake_policy(SET CMP0003 NEW)
+ENDIF(COMMAND cmake_policy)
+
+SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "KERNEL_ROOT_DIR")
+SET(MODULE PARAVIS)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindPLATFORM.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindPYTHON.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindOMNIORB.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindPTHREADS.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindHDF5.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindBOOST.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindLIBXML2.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSWIG.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
+INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindKERNEL.cmake)
+
+INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindPARAVIEW.cmake)
+IF(EXISTS ${PARAVIEW_VTK_DIR}/VTKConfig.cmake)
+ SET(VTK_DIR ${PARAVIEW_VTK_DIR})
+ENDIF(EXISTS ${PARAVIEW_VTK_DIR}/VTKConfig.cmake)
+
+SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "GUI_ROOT_DIR")
+INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindCAS.cmake)
+INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindQT4.cmake)
+INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindOPENGL.cmake)
+INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindVTK.cmake)
+INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindQWT.cmake)
+INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindSIPPYQT.cmake)
+INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindGUI.cmake)
+
+SET(VERSION_MAJOR 6)
+SET(VERSION_MINOR 5)
+SET(VERSION_MAINTENANCE 0)
+SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINTENANCE}")
+SET(XVERSION 0x0${VERSION_MAJOR}0${VERSION_MINOR}0${VERSION_MAINTENANCE})
+SET(VERSION_DEV 1)
+
+SET(BUILD_PLUGINS 1)
+
+SET(VISU_ROOT_DIR $ENV{VISU_ROOT_DIR} CACHE PATH "VISU_ROOT_DIR")
+IF(EXISTS ${VISU_ROOT_DIR}/adm_local/cmake_files/FindVISU.cmake)
+ INCLUDE(${VISU_ROOT_DIR}/adm_local/cmake_files/FindVISU.cmake)
+ SET(WITH_VISU 1)
+ENDIF(EXISTS ${VISU_ROOT_DIR}/adm_local/cmake_files/FindVISU.cmake)
+
+SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "MED_ROOT_DIR")
+INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake)
+
+EXECUTE_PROCESS(COMMAND pvpython ${CMAKE_SOURCE_DIR}/getwrapclasses.py ${PARAVIEW_INCLUDE_DIRS})
SET(SUBDIRS
- idl
- adm_local
- resources
- src
- doc
- bin
-)
+ idl
+ adm_local
+ resources
+ src
+ doc
+ bin
+ )
SET(DISTCLEANFILES
- a.out
- aclocal.m4
- configure
- wrapfiles.txt
-)
-
-SET(salomeinclude_DATA
- PARAVIS_version.h
-)
-
-SET(EXTRA_DIST
- ${EXTRA_DIST}
- build_configure
- clean_configure
-)
-
-# include $(top_srcdir)/wrapfiles.am
+ wrapfiles.txt
+ )
+
INCLUDE(wrapfiles.cmake)
-# dist-hook:
-# rm -rf `find $(distdir) -name CVS`
-
-# dev_docs:
-# (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
-
-# docs: dev_docs
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/PARAVIS_version.h.in)
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/PARAVIS_version.h)
-
-
- MESSAGE(STATUS "Creation of ${output}")
- CONFIGURE_FILE(${input} ${output})
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-FOREACH(f ${salomeinclude_DATA})
-
- SET(DEST include/salome)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
-
- ENDIF(ext STREQUAL .py)
-
-ENDFOREACH(f ${salomeinclude_DATA})
+SET(input ${CMAKE_CURRENT_SOURCE_DIR}/PARAVIS_version.h.in)
+SET(output ${CMAKE_CURRENT_BINARY_DIR}/PARAVIS_version.h)
+
+MESSAGE(STATUS "Creation of ${output}")
+CONFIGURE_FILE(${input} ${output})
+
+ADD_DEFINITIONS(-DVTK_EXCLUDE_STRSTREAM_HEADERS)
+
+FOREACH(dir ${SUBDIRS})
+ ADD_SUBDIRECTORY(${dir})
+ENDFOREACH(dir ${SUBDIRS})
+
+# Reset CMAKE_CONFIGURATION_TYPES to the good value defined by CMAKE_BUILD_TYPE
+IF(CMAKE_BUILD_TYPE)
+ IF(WINDOWS)
+ MARK_AS_ADVANCED(CLEAR CMAKE_CONFIGURATION_TYPES)
+ SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE STRING "compilation types" FORCE)
+ ENDIF(WINDOWS)
+ENDIF(CMAKE_BUILD_TYPE)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PARAVIS_version.h DESTINATION include/salome)
+
+# Configure Testing
+SET(PARAVIS_TEST_OUTPUT_DIR /tmp/pic CACHE PATH "Directory for saving test pictures.")
+OPTION(BUILD_TESTING "Build ParaVis Testing" ON)
+IF(BUILD_TESTING)
+ SET(PARAVIS_TEST_DIR ${ParaVis_BINARY_DIR}/Test/Temporary)
+ MAKE_DIRECTORY(${PARAVIS_TEST_DIR})
+ ENABLE_TESTING()
+ INCLUDE (CTest)
+ ADD_SUBDIRECTORY(test)
+ENDIF(BUILD_TESTING)
diff --git a/INSTALL b/INSTALL
index ecaacbc7..4aff1376 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,44 +1,29 @@
Building and installing PARAVIS module
===============================================
-PARAVIS is a light SALOME module that wraps ParaView GUI and makes it available in
+PARAVIS is a SALOME module that wraps ParaView GUI and makes it available in
SALOME GUI.
Like any other SALOME module, PARAVIS requires PARAVIS_ROOT_DIR environment variable to be set to PARAVIS
installation directory.
Specific prerequisites:
-- cmake 2.4.5 or higher should be installed, path to cmake executable
+- cmake 2.6 or higher should be installed, path to cmake executable
should be added to PATH environment variable.
-- ParaView-3.4.0, both the build directory and the source files
+- ParaView-3.7.0, should be installed
-Environment variables needed for correct detection of ParaView location:
-- PVSRCHOME - points at the root of ParaView source directory tree
-- PVINSTALLHOME - points at the top of ParaView build tree (currently, due to some drawbacks in its buld procedure
-ParaView should not be installed, its build directory is used instead).
It also requires common SALOME environment including GUI_ROOT_DIR and
other standard SALOME prerequisites.
As soon as the environment is set, execute the following commands in a shell:
-mkdir PARAVIS_BUILD
-cd PARAVIS_BUILD
-../PARAVIS_SRC/build_configure
-../PARAVIS_SRC/configure --prefix=${PARAVIS_ROOT_DIR}
+mkdir PARAVIS_BIN
+ccmake ../PARAVIS_SRC
make
-make docs
make install
PARAVIS module can be launched using the following commands:
-- Light SALOME configuration
-
-runLightSalome.sh --modules="PARAVIS"
-
-or
-
-- Full SALOME configuration
-
runSalome --modules="PARAVIS"
diff --git a/PARAVIS_version.h.in b/PARAVIS_version.h.in
index 79c8971b..785aca16 100644
--- a/PARAVIS_version.h.in
+++ b/PARAVIS_version.h.in
@@ -1,21 +1,20 @@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2010-2012 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
+// 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
+//
+// 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
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : PARAVIS_version.h
// Author : Sergey ANIKIN
@@ -30,5 +29,6 @@
#define PARAVIS_VERSION_STR "@VERSION@"
#define PARAVIS_VERSION @XVERSION@
+#define PARAVIS_DEVELOPMENT @VERSION_DEV@
#endif // __PARAVIS_VERSION_H__
diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
index 8c289eaa..8900ecb3 100644
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,45 +1,20 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG
-# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# Copyright (C) 2010-2012 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
+# 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
+#
+# 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
+#
+# 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
-
-SET(SUBDIRS
- unix
- cmake_files
-)
-
+#
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
+ADD_SUBDIRECTORY(cmake_files)
diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 60fb019e..56c56abe 100644
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -1,115 +1,20 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2010-2012 CEA/DEN, EDF R&D
#
-# Copyright (C) 2003-2007 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 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.
#
-# 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
#
-# 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
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SET(dist_admlocal_cmake_DATA
- FindPARAVIEW.cmake
-)
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-FOREACH(f ${dist_admlocal_cmake_DATA})
-
- SET(DEST adm_local/cmake_files)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
- ENDIF(ext STREQUAL .py)
-
-ENDFOREACH(f ${dist_admlocal_cmake_DATA})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/FindPARAVIEW.cmake DESTINATION adm_local/cmake_files)
diff --git a/adm_local/cmake_files/FindPARAVIEW.cmake b/adm_local/cmake_files/FindPARAVIEW.cmake
index 52f73d7f..d0dd6abd 100644
--- a/adm_local/cmake_files/FindPARAVIEW.cmake
+++ b/adm_local/cmake_files/FindPARAVIEW.cmake
@@ -1,31 +1,56 @@
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2010-2012 CEA/DEN, EDF R&D
#
-# Copyright (C) 2003-2007 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 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.
#
-# 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
#
-# 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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
FIND_PACKAGE(ParaView REQUIRED)
-SET(PARAVIS_ROOT_DIR $ENV{PARAVIS_ROOT_DIR})
-
SET(PARAVIEW_INCLUDES -I${PARAVIEW_INCLUDE_DIRS})
-SET(PARAVIEW_LIBS -L${PARAVIEW_LIBRARY_DIRS} -lvtkPVServerManager -lpqApplicationComponents)
-FIND_LIBRARY(vtkPVServerManager vtkPVServerManager ${PARAVIEW_LIBRARY_DIRS})
-FIND_LIBRARY(pqApplicationComponents pqApplicationComponents ${PARAVIEW_LIBRARY_DIRS})
+FIND_LIBRARY(QtPython QtPython PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(QVTK QVTK PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkClientServer vtkClientServer PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkPVServerManager vtkPVServerManager PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(pqApplicationComponents pqApplicationComponents PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(pqComponents pqComponents PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(pqCore pqCore PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(pqWidgets pqWidgets PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkPVClientServerCore vtkPVClientServerCore PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkPVServerImplementation vtkPVServerImplementation PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkPVCommon vtkPVCommon PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkPVVTKExtensions vtkPVVTKExtensions PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkViews vtkViews PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(pqApplicationComponents pqApplicationComponents PATHS ${PARAVIEW_LIBRARY_DIRS} NO_DEFAULT_PATH)
+SET(PARAVIEW_LIBS
+ ${QtPython}
+ ${QVTK}
+ ${vtkClientServer}
+ ${vtkGenericFiltering}
+ ${vtkInfovis}
+ ${vtkVolumeRendering}
+ ${vtkPVServerManager}
+ ${pqApplicationComponents}
+ ${pqComponents}
+ ${pqCore}
+ ${pqWidgets}
+ ${vtkPVClientServerCore}
+ ${vtkPVServerImplementation}
+ ${vtkPVVTKExtensions}
+ ${vtkPVCommon}
+ ${vtkViews}
+ ${pqApplicationComponents}
+ )
diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
deleted file mode 100644
index 1694914d..00000000
--- a/adm_local/unix/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# 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
-#
-
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SET(SUBDIRS
- config_files
-)
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
deleted file mode 100644
index cca26ccd..00000000
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# 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
-#
-
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SET(dist_admlocalm4_DATA
- check_ParaView.m4
-)
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-FOREACH(f ${dist_admlocalm4_DATA})
-
- SET(DEST adm_local/unix/config_files)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
-
- ENDIF(ext STREQUAL .py)
-
-ENDFOREACH(f ${dist_admlocalm4_DATA})
diff --git a/adm_local/unix/config_files/check_Med.m4 b/adm_local/unix/config_files/check_Med.m4
deleted file mode 100644
index 576db978..00000000
--- a/adm_local/unix/config_files/check_Med.m4
+++ /dev/null
@@ -1,92 +0,0 @@
-dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-dnl
-dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-dnl
-# Check availability of Med binary distribution
-#
-# Author : Nicolas REJNERI (OPEN CASCADE, 2003)
-#
-
-AC_DEFUN([CHECK_MED],[
-AC_REQUIRE([AC_LINKER_OPTIONS])dnl
-AC_REQUIRE([CHECK_MED2])
-
-AC_CHECKING(for Med)
-
-Med_ok=no
-
-MED_LDFLAGS=""
-MED_CXXFLAGS=""
-
-AC_ARG_WITH(med,
- [ --with-med=DIR root directory path of MED installation ],
- MED_DIR="$withval",MED_DIR="")
-
-if test "x${MED_DIR}" == "x" ; then
- AC_MSG_RESULT(for \${MED_ROOT_DIR}: ${MED_ROOT_DIR})
-# no --with-med-dir option used
- if test "x${MED_ROOT_DIR}" != "x" ; then
-
- # MED_ROOT_DIR environment variable defined
- MED_DIR=${MED_ROOT_DIR}
-
- fi
-
-fi
-
-MED_ENABLE_MULTIPR=no
-
-if test -f ${MED_DIR}/idl/salome/MED.idl ; then
- AC_MSG_RESULT(Using Med module distribution in ${MED_DIR})
- Med_ok=yes
-
- if test "x$MED_ROOT_DIR" == "x" ; then
- MED_ROOT_DIR=${MED_DIR}
- fi
-
- AC_SUBST(MED_ROOT_DIR)
-
- MED_LDFLAGS=-L${MED_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
- MED_CXXFLAGS=-I${MED_DIR}/include/salome
-
- AC_SUBST(MED_LDFLAGS)
- AC_SUBST(MED_CXXFLAGS)
-
- # MULTIPR
- AC_CHECK_FILE(${MED_DIR}/include/salome/MULTIPR_Obj.hxx,
- ENABLE_MULTIPR=yes,
- ENABLE_MULTIPR=no)
- AC_SUBST(ENABLE_MULTIPR)
- MULTIPR_CPPFLAGS=""
- MULTIPR_LIBS=""
- if test "x${ENABLE_MULTIPR}" = "xyes" ; then
- MULTIPR_CPPFLAGS="-DENABLE_MULTIPR"
- MULTIPR_LIBS="-lMULTIPR_API"
- fi
- AC_SUBST(MULTIPR_CPPFLAGS)
- AC_SUBST(MULTIPR_LIBS)
-else
- AC_MSG_WARN("Cannot find Med module sources")
-fi
-
-AC_MSG_RESULT(for Med: $Med_ok)
-AC_MSG_RESULT(for MULTIPR Med package: $ENABLE_MULTIPR)
-
-])dnl
diff --git a/adm_local/unix/config_files/check_Med2.m4 b/adm_local/unix/config_files/check_Med2.m4
deleted file mode 100644
index c5cc625a..00000000
--- a/adm_local/unix/config_files/check_Med2.m4
+++ /dev/null
@@ -1,200 +0,0 @@
-dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-dnl
-dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-dnl
-AC_DEFUN([CHECK_MED2],[
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([CHECK_HDF5])dnl
-AC_REQUIRE([MED_CHECK_SIZEOF_MEDINT])
-
-AC_CHECKING(for MED2)
-
-AC_ARG_WITH(med2,
- [ --with-med2=DIR root directory path to med2 installation ],
- [MED2HOME="$withval"
- AC_MSG_RESULT("select $withval as path to med2")
- ])
-
-AC_SUBST(MED2_INCLUDES)
-AC_SUBST(MED2_LIBS)
-AC_SUBST(MED2_MT_LIBS)
-AC_SUBST(MED_CPPFLAGS)
-
-MED2_INCLUDES=""
-MED2_LIBS=""
-MED2_MT_LIBS=""
-MED_CPPFLAGS="$DEFINED_F77INT64"
-
-med2_ok=no
-
-LOCAL_INCLUDES="$HDF5_INCLUDES"
-LOCAL_LIBS="-lmed -lmedimportcxx $HDF5_LIBS"
-
-if test -z $MED2HOME
-then
- AC_MSG_WARN(undefined MED2HOME variable which specify med2 installation directory)
- AC_PATH_PROG(MDUMP, mdump)
- if test "xMDUMP" != "x" ; then
- MED2HOME=$MDUMP
- MED2HOME=`echo ${MED2HOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
- MED2HOME=`echo ${MED2HOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
- fi
-fi
-if test ! -z $MED2HOME
-then
- LOCAL_INCLUDES="$LOCAL_INCLUDES -I$MED2HOME/include"
- if test "x$MED2HOME" = "x/usr"
- then
- LOCAL_LIBS="-lmed $LOCAL_LIBS"
- else
- LOCAL_LIBS="-L$MED2HOME/lib $LOCAL_LIBS"
- fi
-fi
-
-dnl check med2 header
-
-f77int="F77INT32"
-case $host_os in
- irix5.* | irix6.* | osf4.* | osf5.* | linux* )
-
- linux64="true"
-# porting on intel processor 64 bits
- expr "$host_os" : 'linux' >/dev/null && ( test ! x"$host_cpu" = x"x86_64" && test ! x"$host_cpu" = x"ia64" ) && linux64="false"
- if test ! x"$linux64" = "xfalse" ; then
- echo "$as_me:$LINENO: checking for 64bits integers size in F77/F90" >&5
-echo $ECHO_N "checking for 64bits integers size in F77/F90... $ECHO_C" >&6
- # Check whether --enable-int64 or --disable-int64 was given.
-if test "${enable_int64+set}" = set; then
- enableval="$enable_int64"
-
-fi;
- case "X-$enable_int64" in
- X-no)
- echo "$as_me:$LINENO: result: \"disabled\"" >&5
-echo "${ECHO_T}\"disabled\"" >&6
- SUFFIXES="_32"
- ;;
- *)
- echo "$as_me:$LINENO: result: \"enabled\"" >&5
-echo "${ECHO_T}\"enabled\"" >&6
- SUFFIXES=""
- f77int="F77INT64"
- ;;
- esac
- fi
- ;;
- *)
- ;;
-esac
-
-case $host_os in
- linux*)
- test x"$linux64" = x"true" && \
- MACHINE="PCLINUX64${SUFFIXES}" || \
- MACHINE=PCLINUX
- ;;
- hpux*)
- MACHINE=HP9000
- ;;
- aix4.*)
- MACHINE=RS6000
- host_os_novers=aix4.x
- ;;
- irix5.*)
- MACHINE="IRIX64${SUFFIXES}"
- host_os_novers=irix5.x
- ;;
- irix6.*)
- MACHINE="IRIX64${SUFFIXES}"
- host_os_novers=irix6.x
- ;;
- osf4.*)
- MACHINE="OSF1${SUFFIXES}"
- host_os_novers=osf4.x
- ;;
- osf5.*)
- MACHINE="OSF1${SUFFIXES}"
- host_os_novers=osf5.x
- ;;
- solaris2.*)
- MACHINE=SUN4SOL2
- host_os_novers=solaris2.x
- ;;
- uxpv*)
- MACHINE=VPP5000
- ;;
- *)
- MACHINE=
- host_os_novers=$host_os
- ;;
-esac
-
-CPPFLAGS_old="$CPPFLAGS"
-dnl we must test system : linux = -DPCLINUX
-dnl we must test system : Alpha-OSF = -DOSF1
-case $host_os in
- linux*)
- CPPFLAGS="$CPPFLAGS -D$MACHINE $LOCAL_INCLUDES"
-dnl CPPFLAGS="$CPPFLAGS -DPCLINUX $LOCAL_INCLUDES"
- ;;
- osf*)
- CPPFLAGS="$CPPFLAGS -DOSF1 $LOCAL_INCLUDES"
- ;;
-esac
-AC_CHECK_HEADER(med.h,med2_ok=yes ,med2_ok=no)
-CPPFLAGS="$CPPFLAGS_old"
-
-if test "x$med2_ok" = "xyes"
-then
-
-dnl check med2 library
-
- LIBS_old="$LIBS"
- LIBS="$LIBS $LOCAL_LIBS"
- AC_CHECK_LIB(med,MEDouvrir,med2_ok=yes,med2_ok=no)
-
- if test "x$med2_ok" = "xyes"
- then
- AC_CHECK_LIB(medimportcxx,HAVE_MEDimport,med2_ok=yes,med2_ok=no)
- fi
- LIBS="$LIBS_old"
-
-fi
-
-if test "x$med2_ok" = "xyes"
-then
-case $host_os in
- linux*)
- MED2_INCLUDES="-D$MACHINE $LOCAL_INCLUDES"
-dnl MED2_INCLUDES="-DPCLINUX $LOCAL_INCLUDES"
- ;;
- osf*)
- MED2_INCLUDES="-DOSF1 $LOCAL_INCLUDES"
- ;;
-esac
- MED2_LIBS="$LOCAL_LIBS"
- MED2_MT_LIBS="$LOCAL_LIBS"
-fi
-
-
-AC_MSG_RESULT(for med2: $med2_ok)
-
-])dnl
diff --git a/adm_local/unix/config_files/check_ParaView.m4 b/adm_local/unix/config_files/check_ParaView.m4
deleted file mode 100644
index 51907bbe..00000000
--- a/adm_local/unix/config_files/check_ParaView.m4
+++ /dev/null
@@ -1,175 +0,0 @@
-dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
-dnl
-dnl
-dnl
-
-dnl
-dnl OPTIONS_PARAVIEW
-dnl ------------------------------------------------------------------------
-dnl Adds the --with-paraview=path
-dnl
-AC_DEFUN([OPTIONS_PARAVIEW], [
- AC_ARG_WITH([paraview],
- [AC_HELP_STRING([--with-paraview], [The prefix where ParaView is located (default "" means taking from PVHOME environment variable)])],
- [with_paraview=$withval], [with_paraview=""])
-])
-
-dnl
-dnl CHECK_PARAVIEW
-dnl ------------------------------------------------------------------------
-dnl a simplified check that assumes VTK is a part of ParaView, separate location
-dnl for VTK is not supported
-dnl
-AC_DEFUN([CHECK_PARAVIEW], [
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([AC_PROG_CXXCPP])dnl
-AC_REQUIRE([AC_LINKER_OPTIONS])dnl
-
-AC_REQUIRE([OPTIONS_PARAVIEW])dnl
-
-AC_CHECKING(for ParaView)
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-AC_SUBST(PARAVIEW_INCLUDES)
-AC_SUBST(PARAVIEW_LIBS)
-dnl AC_SUBST(VTKPY_MODULES)
-
-PARAVIEW_INCLUDES=""
-PARAVIEW_LIBS=""
-dnl VTKPY_MODULES=""
-
-paraview_ok=no
-
-if test "x$OpenGL_ok" != "xyes" ; then
- AC_MSG_WARN(ParaView needs OpenGL correct configuration, check configure output)
-fi
-
-
-if test "x$qt_ok" != "xyes" ; then
- AC_MSG_WARN(ParaView needs Qt correct configuration, check configure output)
-fi
-
-if test "x$hdf5_ok" != "xyes" ; then
- AC_MSG_WARN(ParaView needs correct HDF5 configuration, check configure output)
-fi
-
-AC_PATH_X
-if test "x$x_libraries" != "x"
-then
- LXLIB="-L$x_libraries"
-else
- LXLIB=""
-fi
-
-if test "x$x_libraries" = "x/usr/lib"
-then
- LXLIB=""
-fi
-
-if test "x$x_libraries" = "x/usr/lib${LIB_LOCATION_SUFFIX}"
-then
- LXLIB=""
-fi
-
-LOCAL_INCLUDES="$OGL_INCLUDES"
-LOCAL_LIBS="-lvtksys -lvtkzlib -lvtkpng -lvtkjpeg -lvtktiff -lvtkexpat -lvtksqlite -lvtkmetaio -lvtkverdict -lvtkNetCDF -lvtkDICOMParser -lvtkfreetype -lvtkftgl -lvtkexoIIc -lvtklibxml2 -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets -lvtkClientServer -lvtkCommonCS -lvtkFilteringCS -lvtkIOCS -lvtkImagingCS -lvtkGraphicsCS -lvtkGenericFiltering -lvtkGenericFilteringCS -lvtkRenderingCS -lvtkHybridCS -lvtkParallelCS -lvtkPVCommandOptions -lKWCommon -lvtkInfovis -lvtkInfovisCS -lvtkPVServerCommon -lvtkPVServerCommonCS -lvtkCommonPythonD -lvtkFilteringPythonD -lvtkIOPythonD -lXdmf -lvtkXdmf -lvtkXdmfCS -lvtkWidgetsCS -lvtkVolumeRendering -lvtkVolumeRenderingCS -lvtkPVFilters -lvtkPVFiltersCS -lvtkViews -lvtkPVServerManagerPythonD -lvtkPVServerCommonPythonD -lvtkPVPythonInterpretor -lvtkPVServerManager -lQVTK -lpqWidgets -lQtTesting -lvtkQtChart -lpqCore -lQtPython -lpqApplicationComponents -lpqComponents -lvtkalglib $LXLIB -lX11 -lXt"
-
-dnl VTK install dir
-if test -z $with_paraview ; then
- with_paraview=""
-fi
-if test "x$with_paraview" = "xyes" ; then
- dnl in case user wrote --with-paraview=yes
- with_paraview=""
-fi
-if test "x$with_paraview" = "xno" ; then
- dnl in case user wrote --with-paraview=no
- with_paraview=""
- AC_MSG_WARN(Value "no", specified for option --with-paraview, is not supported)
-fi
-
-if test "x$with_paraview" != "x" ; then
- PVHOME="$with_paraview"
-fi
-
- if test -z $PVHOME ; then
- AC_MSG_WARN(undefined PVHOME and PVSRCHOME variables which specify where ParaView is located)
- fi
-
-LOCAL_INCLUDES="-I$PVHOME/include/paraview-$PVVERSION $LOCAL_INCLUDES"
-
-LOCAL_LIBS="-L$PVHOME/lib/paraview-$PVVERSION $LOCAL_LIBS"
-
-dnl vtk headers
-CPPFLAGS_old="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES $QT_INCLUDES"
-
-AC_CHECK_HEADER(pqApplicationCore.h,paraview_ok="yes",paraview_ok="no")
-
-CPPFLAGS="$CPPFLAGS_old"
-
-if test "x$paraview_ok" = "xyes"
-then
- PARAVIEW_INCLUDES="$LOCAL_INCLUDES"
-
- dnl vtk libraries
-
- AC_MSG_CHECKING(linking ParaView component library)
-
- LIBS_old="$LIBS"
- LIBS="$LIBS $QT_LIBS $LOCAL_LIBS"
- CPPFLAGS_old="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $QT_INCLUDES $PARAVIEW_INCLUDES"
-
- dnl VTKPY_MODULES="$VTKHOME/python"
-
- AC_CACHE_VAL(salome_cv_lib_paraview,[
- AC_TRY_LINK([#include "pqApplicationCore.h"
- ],
- [pqApplicationCore::instance()],
- [salome_cv_lib_paraview=yes],
- [salome_cv_lib_paraview=no])
- ])
- paraview_ok="$salome_cv_lib_paraview"
- LIBS="$LIBS_old"
- CPPFLAGS="$CPPFLAGS_old"
-fi
-
-if test "x$paraview_ok" = "xno"
-then
- AC_MSG_RESULT(no)
- AC_MSG_WARN(unable to link with ParaView component library)
-else
- AC_MSG_RESULT(yes)
- PARAVIEW_LIBS="$LOCAL_LIBS"
-fi
-
-AC_MSG_RESULT(for ParaView: $paraview_ok)
-
-AC_LANG_RESTORE
-
-# Save cache
-AC_CACHE_SAVE
-
-])dnl
diff --git a/adm_local/unix/config_files/check_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4
deleted file mode 100755
index 1fde1814..00000000
--- a/adm_local/unix/config_files/check_VISU.m4
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-dnl
-dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-dnl
-###########################################################
-# File : check_Visu.m4
-# Author : Vadim SANDLER (OCN)
-# Created : 13/07/05
-# Check availability of VISU binary distribution
-###########################################################
-
-AC_DEFUN([CHECK_VISU],[
-
-AC_CHECKING(for VISU)
-
-Visu_ok=no
-
-VISU_LDFLAGS=""
-VISU_CXXFLAGS=""
-
-
-AC_ARG_WITH(visu,
- [ --with-visu=DIR root directory path of VISU module installation ],
- VISU_DIR="$withval",VISU_DIR="")
-
-if test "x$VISU_DIR" == "x" ; then
- # no --with-visu-dir option used
- if test "x$VISU_ROOT_DIR" != "x" ; then
- # VISU_ROOT_DIR environment variable defined
- VISU_DIR=$VISU_ROOT_DIR
- fi
-fi
-
-if test -f ${VISU_DIR}/idl/salome/VISU_Gen.idl ; then
- Visu_ok=yes
- AC_MSG_RESULT(Using VISU module distribution in ${VISU_DIR})
-
- if test "x$VISU_ROOT_DIR" == "x" ; then
- VISU_ROOT_DIR=${VISU_DIR}
- fi
- AC_SUBST(VISU_ROOT_DIR)
-
- VISU_LDFLAGS=-L${VISU_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
- VISU_CXXFLAGS=-I${VISU_DIR}/include/salome
-
- AC_SUBST(VISU_LDFLAGS)
- AC_SUBST(VISU_CXXFLAGS)
-
-else
- AC_MSG_WARN("Cannot find VISU module sources")
-fi
-
-AC_MSG_RESULT(for VISU: $Visu_ok)
-
-])dnl
-
diff --git a/adm_local/unix/config_files/med_check_sizeof_medint.m4 b/adm_local/unix/config_files/med_check_sizeof_medint.m4
deleted file mode 100644
index 97572a42..00000000
--- a/adm_local/unix/config_files/med_check_sizeof_medint.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-dnl
-dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-dnl
-AC_DEFUN([MED_CHECK_SIZEOF_MEDINT], [
-
- ## Guess the fortran int size
- AC_CHECK_SIZEOF_FORTRAN(integer)
- if test "x$ac_cv_sizeof_fortran_integer" = "x8" ; then
- AC_CHECK_SIZEOF(long)
- test "x$ac_cv_sizeof_long" = "x8" || AC_MSG_ERROR([Size of C type long expected to be eight bytes])
- DEFINED_F77INT64="-DHAVE_F77INT64"
- elif test "x$ac_cv_sizeof_fortran_integer" = "x4" ; then
- AC_CHECK_SIZEOF(int)
- test "x$ac_cv_sizeof_int" = "x4" || AC_MSG_ERROR([Size of C type int expected to be four bytes])
- DEFINED_F77INT64=""
- else
- AC_MSG_ERROR([Size of Fortran type integer is neither four nor eigth bytes])
- fi
- AC_SUBST(DEFINED_F77INT64)
-])
\ No newline at end of file
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index aebb6e4e..ab2ab6a3 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,192 +1,26 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG
-# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+# Copyright (C) 2010-2012 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
+# 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
+#
+# 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
+#
+# 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 :
-# Module : PARAVIS
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-# non-distributed files
-SET(nodist_salomescript_DATA
- VERSION
-)
-
-# distributed files
-SET(dist_salomescript_SCRIPTS
-)
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.in)
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/VERSION)
-
-
- MESSAGE(STATUS "Creation of ${output}")
- CONFIGURE_FILE(${input} ${output})
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-FOREACH(f ${nodist_salomescript_DATA})
-
- SET(DEST bin/salome)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
-
- ENDIF(ext STREQUAL .py)
-
-ENDFOREACH(f ${nodist_salomescript_DATA})
-FOREACH(f ${dist_salomescript_SCRIPTS})
-
- SET(DEST bin/salome)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
-
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
+SET(input ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.in)
+SET(output ${CMAKE_CURRENT_BINARY_DIR}/VERSION)
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
+MESSAGE(STATUS "Creation of ${output}")
+CONFIGURE_FILE(${input} ${output})
- ENDIF(ext STREQUAL .py)
-
-ENDFOREACH(f ${dist_salomescript_SCRIPTS})
+INSTALL(FILES paravis_setenv.py ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION bin/salome)
diff --git a/bin/VERSION.in b/bin/VERSION.in
index 4e8104ee..b91222e2 100755
--- a/bin/VERSION.in
+++ b/bin/VERSION.in
@@ -1 +1,3 @@
-THIS IS PARAVIS MODULE : VERSION: @VERSION@
+[SALOME PARAVIS] : @VERSION@
+[DEVELOPMENT] : @VERSION_DEV@
+[DESCRIPTION] : SALOME ParaVis (Paraview-based post-processing) module
diff --git a/bin/paravis_setenv.py b/bin/paravis_setenv.py
new file mode 100644
index 00000000..117d0795
--- /dev/null
+++ b/bin/paravis_setenv.py
@@ -0,0 +1,35 @@
+#! /usr/bin/env python
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2012 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
+#
+
+import os, re
+
+# -----------------------------------------------------------------------------
+
+def set_env( args ):
+ """Initialize environment of PARAVIS module"""
+ # set PV_PLUGIN_PATH to PARAVIS plug-ins
+ paravis_plugin_dir = os.path.join( os.getenv( "PARAVIS_ROOT_DIR" ), "lib", "paraview" )
+ plugin_path = re.split( ":|;", os.getenv( 'PV_PLUGIN_PATH', paravis_plugin_dir ) )
+ if paravis_plugin_dir not in plugin_path: plugin_path[0:0] = [paravis_plugin_dir]
+ os.environ['PV_PLUGIN_PATH'] = ";".join(plugin_path)
+ pass
+
+
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index fb443b9c..0b2bac41 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,59 +1,20 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# PARAVIS : ParaView wrapper SALOME module
-#
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 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.
+# Copyright (C) 2010-2012 CEA/DEN, EDF R&D
#
-# 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
+# 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.
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 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.
#
-# -* Makefile *-
+# 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
#
-# Author : Margarita KARPUNINA (OCN)
-# Date : 05/12/2008
-# $Header$
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-SET(SUBDIRS
- salome
-)
-
-# dev_docs:
-# (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
-
-# docs: dev_docs
-
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
+ADD_SUBDIRECTORY(salome)
diff --git a/doc/UserDocumentation.html b/doc/UserDocumentation.html
index 18b08d89..2960bc89 100644
--- a/doc/UserDocumentation.html
+++ b/doc/UserDocumentation.html
@@ -1,30 +1,32 @@
-
+
-
+
-
+
PARAVIS development
PARAVIS user documentation
-1.Introduction
-2.Building
-environment
-3.VTK
-library
-4.Building
-of PARAVIS
-5.Starting
-SALOME with PARAVIS
-6.Commands
-accessible in Python console
-7.Trace
-management
-8.PARAVIS
-GUI specific
+1.Introduction
+2.Building
+environment
+3.VTK
+library
+4.Building
+of PARAVIS
+5.Starting
+SALOME with PARAVIS
+6.Commands
+accessible in Python console
+7.Trace
+management
+8.PARAVIS
+GUI specific
+9.
+PARAVIEW options
Introduction
This document describes features of
ParaView Python extractor using in PARAVIS module of SALOME platform.
@@ -34,25 +36,8 @@ API extracted for using in SALOME Python console is similar to the
server manager API of ParaView. But there are some features what is
desirable to understand for effective using of extractor.
Building environment
-In addition to
-standard SALOME environment following environment variables has to be
-defined for PARAVIS building and testing:
-
- PVHOME â
- points to installation directory of ParaView.
- PVVERSION
- â defines a number of installed ParaView version.
- PATH="${PVHOME}/bin:${PATH}"
- LD_LIBRARY_PATH=â${PVHOME}/bin:${PVHOME}/lib/paraview-${PVVERSION}:${LD_LIBRARY_PATH}"
- PYTHONPATH="${PVHOME}/bin:${PVHOME}/lib/paraview-${PVVERSION}:${PYTHONPATH}"
- TESTDIR â
- points to a directory which contains test script files. Usually it
- is PARAVIS_SRC/test.
- PVDATA â
- points to ParaViewData directory.
-
-Also it is
-necessary to check that PARAVIS_SRC directory contains following
+
It is
+necessary to check that PARAVIS_SRC directory contains following
files and they are up-to-date:
src/Paraview/lex.yy.c
@@ -69,42 +54,37 @@ same version supplied with ParaView for all components and modules of
SALOME.
For this
-purposes a new option â--with-paraviewâ has been defined for
-configure script. This option configures building procedure to use
-VTK from ParaView. It means that GUI package and all modules has to
-be configured with this option.
+purposes a new option “--with-paraview” has been defined
+for configure script. This option configures building procedure to
+use VTK from ParaView. It means that GUI package and all modules has
+to be configured with this option.
Building of PARAVIS
- Call build_configure
- script in sources directory:
+ Call cmake in a build directory:
- >
- build configure
- Launch configure script from a build directory.
-
- > ../PARAVIS_SRC/configure --prefix=$PARAVIS_ROOT_DIR
+ >
+ ccmake ../PARAVIS_SRC
Call make command in build directory.
> make
- Call
- make install command
- in build directory.
+ Call
+ make install command in build directory.
- > make
- install
+ > make
+ install
Starting
SALOME with PARAVIS
-> runSalome âmodules="PARAVIS"
+> runSalome –modules="PARAVIS"
If it is necessary then other SALOME modules can be added to
-âmodulesâ list separated by comma.
+“modules” list separated by comma.
Commands
accessible in Python console
Loading ParaView Python API for PARAVIS can be done with help of
@@ -120,8 +100,9 @@ which can start/stop trace in any moment, in PARAVIS trace is
activating or deactivating for whole session.
Trace functionality can be switched on/off in SALOME preferences
dialog box in PARAVIS tab (main menu | Preferences...). It contains
-check box âDeactivate Traceâ. By default the trace is activated.
-Change of check box state makes effect only for next session.
+check box “Deactivate Trace”. By default the trace is
+activated. Change of check box state makes effect only for next
+session.
User can get the trace with help of two commands (after pvsimple
import):
@@ -129,29 +110,29 @@ import):
console window.
SaveTrace(fileName) - saves the trace into a given disk file.
-Also trace is using for âDump Studyâ functionality. But if the
-tracing is switched off then âDump Studyâ doesn't saves PARAVIS
-module state.
+Also trace is using for “Dump Study” functionality.
+But if the tracing is switched off then “Dump Study”
+doesn't saves PARAVIS module state.
SALOME study save
On SALOME study saving PARAVIS module data is also saved in the
study. This data is saved in form of ParaView state file. ParaView
state file could have references on external files imported during
PARAVIS working session. These referenced files can be saved with the
-current study depending on preference âParaview state saving typeâ
-defined in PARAVIS preferences dialog box. This preference can have
-three possible state:
+current study depending on preference “Paraview state saving
+type” defined in PARAVIS preferences dialog box. This
+preference can have three possible state:
- âSave referenced files only for built-in serverâ. In case
- if this option is active then referenced files will be saved in
- study together with ParaView state only if in PARAVIS was used
+
“Save referenced files only for built-in server”.
+ In case if this option is active then referenced files will be saved
+ in study together with ParaView state only if in PARAVIS was used
built-in ParaView server. In case of remote ParaView server the
state will be saved as it is without referenced files.
- âAlways save referenced files if they are accessibleâ. In
- this case referenced files will be saved with ParaView state for any
- type of ParaView server but only in case if they are accessible
+
“Always save referenced files if they are accessible”.
+ In this case referenced files will be saved with ParaView state for
+ any type of ParaView server but only in case if they are accessible
across local file system.
- âNever save referenced filesâ. In this case referenced
- files will be never saved with ParaView state.
+ “Never save referenced files”. In this case
+ referenced files will be never saved with ParaView state.
It is necessary to be aware that if referenced files are not saved
in study then there is no guarantee that the saved study will be
@@ -173,5 +154,13 @@ appeared after SALOME launch. Other desktops, even they opened with
study containing PARAVIS data, can not load PARAVIS module.
+PARAVIEW options
+If it is necessary to define a spcific command line
+parameters for ParaView application then it can be defined with help
+of PARAVIS_OPTIONS environment variable. For example:
+export PARAVIS_OPTIONS=--server=myServer
+If it is necessary to define several command line
+parameters then these parameters has to be separated by “:”
+symbol.
\ No newline at end of file
diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt
index d361b5b7..bd7f083f 100644
--- a/doc/salome/CMakeLists.txt
+++ b/doc/salome/CMakeLists.txt
@@ -1,61 +1,20 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# PARAVIS : ParaView wrapper SALOME module
-#
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 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.
+# Copyright (C) 2010-2012 CEA/DEN, EDF R&D
#
-# 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.
+# 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.
#
-# 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
+# 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.
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 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
#
-# -* Makefile *-
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author : Margarita KARPUNINA (OCN)
-# Date : 05/12/2008
-# $Header$
-#
-
-SET(SUBDIRS
- gui
-)
-SET(SUBDIRSGUI
- gui
-)
-
-# dev_docs:
-# @@SETX@; for d in $(SUBDIRSGUI); do (cd $$d && $(MAKE) $@) || exit 1; done;
-
-# docs: dev_docs
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
+ADD_SUBDIRECTORY(gui)
diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
index 4926eb87..1ccf8056 100644
--- a/doc/salome/gui/CMakeLists.txt
+++ b/doc/salome/gui/CMakeLists.txt
@@ -1,79 +1,25 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# PARAVIS : ParaView wrapper SALOME module
-#
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2010-2012 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 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.
+# 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
+# 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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# -* Makefile *-
-#
-# Author : Margarita KARPUNINA (OCN)
-# Date : 05/12/2008
-# $Header$
-#
-
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SET(EXTRA_DIST
- ${EXTRA_DIST}
- images
- static
-)
-
-# dev_docs: doxyfile
-# echo "Running doxygen in directory: "`pwd`; $(DOXYGEN) $<;
-
-# clean-local:
-# -rm -fr PARAVIS doxygen.bak
-
-# install-data-local:
-# if test -d PARAVIS; then $(INSTALL) -d $(DESTDIR)$(docdir)/gui ; cp -rp PARAVIS $(DESTDIR)$(docdir)/gui ; fi;
-
-# uninstall-local:
-# rm -rf $(DESTDIR)$(docdir)/gui/PARAVIS
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/doxyfile.in)
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/doxyfile)
-
+SET(input ${CMAKE_CURRENT_SOURCE_DIR}/doxyfile.in)
+SET(output ${CMAKE_CURRENT_BINARY_DIR}/doxyfile)
- MESSAGE(STATUS "Creation of ${output}")
- CONFIGURE_FILE(${input} ${output})
-
+MESSAGE(STATUS "Creation of ${output}")
+CONFIGURE_FILE(${input} ${output})
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
diff --git a/doc/salome/gui/doxyfile.in b/doc/salome/gui/doxyfile.in
index a60c13ef..eeda70aa 100755
--- a/doc/salome/gui/doxyfile.in
+++ b/doc/salome/gui/doxyfile.in
@@ -1,3 +1,22 @@
+# Copyright (C) 2010-2012 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
+#
+
# Doxyfile 1.4.6
#---------------------------------------------------------------------------
@@ -225,6 +244,7 @@ CALL_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = jpg
+DOT_FONTNAME = Arial
DOT_PATH =
DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
diff --git a/getwrapclasses.py b/getwrapclasses.py
index 41934659..883f1646 100644
--- a/getwrapclasses.py
+++ b/getwrapclasses.py
@@ -1,3 +1,22 @@
+# Copyright (C) 2010-2012 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
+#
+
import paraview, os, sys
import string
import re
@@ -5,12 +24,10 @@ import re
classeslistsm = []
classeslistvtk = []
-if os.name == "posix":
- from libvtkPVServerCommonPython import *
- from libvtkPVServerManagerPython import *
-else:
- from vtkPVServerCommonPython import *
- from vtkPVServerManagerPython import *
+from vtkPVClientServerCorePython import *
+from vtkPVServerImplementationPython import *
+from vtkPVServerManagerPython import *
+from vtkPVCommonPython import *
l1 = dir()
for a in l1:
@@ -24,12 +41,18 @@ for a in l2:
if (a not in l1) and a.startswith("vtk"):
classeslistvtk.append(a)
-dic=dict();
+dic=dict()
+
+non_wrap_list = ["vtkVariant", "vtkTimeStamp"]
+
pv_classes_new=classeslistsm
while len(pv_classes_new):
pv_classes_cur=pv_classes_new
pv_classes_new=[]
for c in pv_classes_cur:
+ ## ignore non wrappable classes
+ if c in non_wrap_list:
+ continue
filename=sys.argv[1]+"/"+c+".h"
if os.path.isfile(filename):
c_new=[]
@@ -64,6 +87,9 @@ while len(pv_classes_new):
if len(cm) == 0:
continue
for cn in cm:
+ ## do not extract Call Back classes
+ if cn.count('vtkClassMemberCallback'):
+ continue
if cn not in dic.keys() and cn not in pv_classes_new:
pv_classes_new.append(cn)
if cn not in c_new:
@@ -71,11 +97,14 @@ while len(pv_classes_new):
f.close()
dic[c]=[0, c_new]
+
pv_classes_sort=[]
def collect_dic(cc):
ret=[]
for c in cc:
+ if c not in dic.keys():
+ continue
if len(dic[c][1]) and dic[c][0] == 0:
ret+=collect_dic(dic[c][1])
if dic[c][0] == 0:
diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index c0535dd4..1c116fae 100644
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,665 +1,132 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2010-2012 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 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.
+# 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
+# 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
+# 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
-
-#Executable
-SET(bin_PROGRAMS
- vtkWrapIDL
-)
-# vtkWrapIDL.h:
-# @$(srcdir)/create_header.sh $(top_srcdir)
+SET(VERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINTENANCE})
+SET(SOVERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR})
-# $(srcdir)/vtkWrapIDL.c: vtkWrapIDL.h;
+ADD_DEFINITIONS(-DHAVE_SALOME_CONFIG)
+INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR}/idl)
-SET(dist_vtkWrapIDL_SOURCES
- ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParse.tab.c
- ${CMAKE_CURRENT_SOURCE_DIR}/vtkWrapIDL.c
-)
+#INCLUDE(vtkWrapHierarchy.cmake)
+#SET(VTK_WRAP_HIERARCHY_EXE vtkWrapHierarchy)
-SET(vtkWrapIDL_CPPFLAGS
- -I${CMAKE_SOURCE_DIR}/src/ParaView
- -I${CMAKE_BINARY_DIR}/idl
- ${PARAVIEW_INCLUDES}
- ${VTK_INCLUDES}
-)
-
-# hints: $(PVHOME)/lib/paraview-$(PVVERSION)/hints $(srcdir)/hints_paravis
-# @$(srcdir)/create_hints.sh $(PVHOME)/lib/paraview-$(PVVERSION)
-
-# $(srcdir)/wrap.am: $(top_srcdir)/wrapfiles.txt
-# @cd $(srcdir) && $(srcdir)/create_wrap.sh
-
-# include $(srcdir)/wrap.am
INCLUDE(wrap.cmake)
-SET(BASEIDL_FILES
- PARAVIS_Gen_Types.idl
- PARAVIS_Gen.idl
-)
-SET(BASEIDL_SK_FILES
- PARAVIS_Gen_TypesSK.cc
- PARAVIS_GenSK.cc
-)
-
-SET(IDL_FILES
- ${BASEIDL_FILES}
- ${WRAP_IDL}
-)
-
-# This variable defines the files to be installed
-SET(dist_salomeidl_DATA
- ${IDL_FILES}
-)
-
-# PARAVIS idl common library
-SET(lib_LTLIBRARIES
- libSalomeIDLPARAVIS.la
-)
-
-# Sources built from idl files
-SET(nodist_libSalomeIDLPARAVIS_la_SOURCES
- ${BASEIDL_SK_FILES}
- ${WRAP_SK_FILES}
-)
-# header files must be exported: other modules have to use this library
-SET(nodist_salomeinclude_HEADERS
-# ${BASEIDL_FILES:%.idl=%.hh}
-# ${WRAP_IDL:%.idl=%.hh}
-)
-
-SET(libSalomeIDLPARAVIS_la_CPPFLAGS
- -I${CMAKE_BINARY_DIR}/salome_adm/unix
- -I${CMAKE_BINARY_DIR}/idl
- ${CORBA_CXXFLAGS}
- ${CORBA_INCLUDES}
- ${KERNEL_CXXFLAGS}
-)
-SET(VERSION_INFO 0.0.0)
-SET(SOVERSION_INFO 0)
-SET(libSalomeIDLPARAVIS_la_LDFLAGS
- -no-undefined
-)
-SET(libSalomeIDLPARAVIS_la_LIBADD
- ${CORBA_LIBS}
-)
+SET(BASEIDL_FILES
+ PARAVIS_Gen_Types.idl
+ PARAVIS_Gen.idl
+ )
-# These variables defines the building process of CORBA files
-SET(OMNIORB_IDL
- ${OMNIORB_IDL}
-)
-SET(OMNIORB_IDLCXXFLAGS
- ${OMNIORB_IDLCXXFLAGS}
-)
-SET(OMNIORB_IDLPYFLAGS
- ${OMNIORB_IDLPYFLAGS}
- -I${KERNEL_ROOT_DIR}/idl/salome
-)
-SET(IDLCXXFLAGS
- -bcxx
- ${IDLCXXFLAGS}
- -I${CMAKE_CURRENT_SOURCE_DIR}
- -I${KERNEL_ROOT_DIR}/idl/salome
- -I${CMAKE_BINARY_DIR}/salome_adm/unix
-)
-SET(IDLPYFLAGS
- -bpythonIDL
- -nf
- -p${CMAKE_CURRENT_SOURCE_DIR}
- -I${CMAKE_CURRENT_SOURCE_DIR}
- -I${KERNEL_ROOT_DIR}/idl/salome
-)
+SET(BASEIDL_SK_FILES
+ PARAVIS_Gen_TypesSK.cc
+ PARAVIS_GenSK.cc
+ )
# potential problem on parallel make on the following - multiple outputs
SET(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/%) $(WRAP_IDL)
-# $(INSTALL) -d $(DESTDIR)$(salomepythondir)
-# ls $^ | while read file; do $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; done
-
-# uninstall-local removes too much, but it works in distcheck
-# uninstall-local:
-# rm -rf $(DESTDIR)$(salomepythondir)/*
-
-# mostlyclean-local: clean-idls
-
-# clean-idls:
-# @find . \( -name "*.hh" -or -name "*.cc" -or -name ".depidl" -or -name "*.idl" \) -exec rm -f {} \;
-# -rm -f hints vtkWrapIDL.h
-
-# 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) $(C_WRAP_IDL_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | sed 's/\.o/\SK.cc/' >>$@; fi; done ;
-
-# -include .depidl
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-
- FOREACH(amname ${lib_LTLIBRARIES})
-
-
- STRING(REPLACE .la _la amname ${amname})
-
-
- STRING(LENGTH ${amname} len)
- MATH(EXPR newlen "${len}-3")
- STRING(SUBSTRING ${amname} 0 ${newlen} name)
-
-
- STRING(REGEX MATCH "^lib" BEGIN_WITH_lib ${name})
- IF(BEGIN_WITH_lib)
- STRING(LENGTH ${name} len)
- MATH(EXPR newlen "${len}-3")
- STRING(SUBSTRING ${name} 3 ${newlen} name)
- ENDIF(BEGIN_WITH_lib)
-
-
- STRING(REGEX MATCH "IDL" ISIDL ${name})
-
-
- IF(ISIDL)
- IF(WINDOWS)
- SET(type STATIC)
- ELSE(WINDOWS)
- SET(type SHARED)
- ENDIF(WINDOWS)
- ELSE(ISIDL)
- SET(type SHARED)
- ENDIF(ISIDL)
-
-
- SET(srcs)
- FOREACH(src ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
- GET_FILENAME_COMPONENT(ext ${src} EXT)
- IF(ext STREQUAL .f)
- IF(src STREQUAL trte.f)
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${src})
- STRING(REPLACE ".f" ".c" src ${src})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${src})
- SET(output ${src})
- ADD_CUSTOM_COMMAND(
- OUTPUT ${output}
- COMMAND f2c ${input}
- MAIN_DEPENDENCY ${input}
- )
- ELSE(src STREQUAL trte.f)
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${src})
- STRING(REPLACE ".f" ".o" src ${src})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${src})
- SET(output ${src})
- IF(WINDOWS)
- SET(F77 g77)
- ELSE(WINDOWS)
- SET(F77 gfortran)
- ENDIF(WINDOWS)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${output}
- COMMAND ${F77} -c -o ${output} ${input}
- MAIN_DEPENDENCY ${input}
- )
- ENDIF(src STREQUAL trte.f)
- ENDIF(ext STREQUAL .f)
- SET(srcs ${srcs} ${src})
- ENDFOREACH(src ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
-
-
- SET(l ${nodist_${amname}_SOURCES} ${UIC_FILES})
- FOREACH(f ${l})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${f})
- SET(srcs ${srcs} ${src})
- ENDFOREACH(f ${l})
-
-
- SET(build_srcs)
- SET(l ${nodist_${amname}_SOURCES} ${BUILT_SOURCES})
- FOREACH(f ${l})
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- ELSE(ext STREQUAL .py)
- SET(build_srcs ${build_srcs} ${CMAKE_CURRENT_BINARY_DIR}/${f})
- ENDIF(ext STREQUAL .py)
- ENDFOREACH(f ${l})
-
-
- ADD_LIBRARY(${name} ${type} ${srcs})
-
-
- SET(var)
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} SalomeIDLKernel)
- SET(targets ${targets} SalomeDS)
- SET(targets ${targets} SALOMEDSTest)
- SET(targets ${targets} SALOMEDS_Client_exe)
- SET(targets ${targets} SalomeIDLGEOM)
- SET(targets ${targets} GEOMEngine)
- SET(targets ${targets} MEDEngine)
- SET(targets ${targets} SMESHEngine)
- SET(targets ${targets} SMESH)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(var ${var} -DNOGDI)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(var ${var} -I${dir})
- SET(var ${var} -DF2C_BUILD)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(var ${var} ${AM_CPPFLAGS})
- SET(var ${var} ${AM_CXXFLAGS})
-
-
- SET(var ${var} ${PLATFORM_CPPFLAGS})
- SET(var ${var} ${PTHREAD_CFLAGS})
- SET(var ${var} ${${amname}_CPPFLAGS})
- SET(var ${var} ${${amname}_CXXFLAGS})
- SET(var ${var} ${${amname}_CFLAGS})
- SET(vars)
- IF(WINDOWS)
- SET(vars ${vars} -include SALOMEconfig.h)
- SET(vars ${vars} -ftemplate-depth-32)
- SET(vars ${vars} -fPIC)
- SET(vars ${vars} -g)
- ENDIF(WINDOWS)
- SET(flags)
- FOREACH(f ${var})
- FOREACH(v ${vars})
- IF(f STREQUAL v)
- SET(f)
- ENDIF(f STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(flags "${flags} ${f}")
- ENDFOREACH(f ${var})
- SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "${flags}")
-
-
- SET_TARGET_PROPERTIES(${name} PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
-
-
- SET(libadd)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(libadd ${libadd} ${dir}/LIBF77.lib)
- SET(libadd ${libadd} ${dir}/LIBI77.lib)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
- FOREACH(lib SALOMEBasics SalomeBatch)
- IF(name STREQUAL lib)
- SET(libs ${libs} ${PTHREAD_LIBS})
- ENDIF(name STREQUAL lib)
- ENDFOREACH(lib SALOMEBasics SalomeBatch)
-
-
- FOREACH(lib ${libs})
- GET_FILENAME_COMPONENT(ext ${lib} EXT)
- IF(ext STREQUAL .la)
- GET_FILENAME_COMPONENT(lib ${lib} NAME_WE)
- STRING(REGEX REPLACE "^lib" "" lib ${lib})
- ENDIF(ext STREQUAL .la)
- SET(vars)
- SET(vars ${vars} -no-undefined)
- SET(vars ${vars} -lvtkWidgets)
- IF(WINDOWS)
- SET(vars ${vars} -module)
- SET(vars ${vars} -Wl,-E)
- SET(vars ${vars} -Xlinker)
- SET(vars ${vars} -export-dynamic)
- SET(vars ${vars} -lm)
- SET(vars ${vars} -lboost_thread)
- SET(vars ${vars} -lboost_signals)
- SET(vars ${vars} -pthread -lpthread -ldl)
- ENDIF(WINDOWS)
- FOREACH(v ${vars})
- IF(lib STREQUAL v)
- SET(lib)
- ENDIF(lib STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(libadd ${libadd} ${lib})
- ENDFOREACH(lib ${libs})
- TARGET_LINK_LIBRARIES(${name} ${libadd})
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- IF(CMAKE_BUILD_TYPE STREQUAL Debug)
- SET_TARGET_PROPERTIES(${name} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(DEST lib/salome)
-
-
- IF(BEGIN_WITH_lib)
- INSTALL(TARGETS ${name} DESTINATION ${DEST})
-
-
- ELSE(BEGIN_WITH_lib)
-
-
- IF(WINDOWS)
- INSTALL(TARGETS ${name} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome)
- IF(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.pyd)
- ELSE(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}_d.pyd)
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
- ELSE(WINDOWS)
- GET_TARGET_PROPERTY(version ${name} VERSION)
- GET_TARGET_PROPERTY(soversion ${name} SOVERSION)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${version})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${soversion})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so)
- ENDIF(WINDOWS)
-
-
- ENDIF(BEGIN_WITH_lib)
-
-
- ENDFOREACH(amname ${lib_LTLIBRARIES})
-
-
- FOREACH(amname ${bin_PROGRAMS} ${check_PROGRAMS})
-
-
- SET(name "${amname}_exe")
- SET(srcs ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
- SET(l ${nodist_${amname}_SOURCES})
- FOREACH(f ${l})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${f})
- SET(srcs ${srcs} ${src})
- ENDFOREACH(f ${l})
- LIST(LENGTH srcs nb)
- IF(nb)
- ADD_EXECUTABLE(${name} ${srcs})
-
-
- SET(var)
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} SalomeIDLKernel)
- SET(targets ${targets} SalomeDS)
- SET(targets ${targets} SALOMEDSTest)
- SET(targets ${targets} SALOMEDS_Client_exe)
- SET(targets ${targets} SalomeIDLGEOM)
- SET(targets ${targets} GEOMEngine)
- SET(targets ${targets} MEDEngine)
- SET(targets ${targets} SMESHEngine)
- SET(targets ${targets} SMESH)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(var ${var} -DNOGDI)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(var ${var} -I${dir})
- SET(var ${var} -DF2C_BUILD)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(var ${var} ${AM_CPPFLAGS})
- SET(var ${var} ${AM_CXXFLAGS})
-
-
- SET(var ${var} ${PLATFORM_CPPFLAGS})
- SET(var ${var} ${PTHREAD_CFLAGS})
- SET(var ${var} ${${amname}_CPPFLAGS})
- SET(var ${var} ${${amname}_CXXFLAGS})
- SET(var ${var} ${${amname}_CFLAGS})
- SET(vars)
- IF(WINDOWS)
- SET(vars ${vars} -include SALOMEconfig.h)
- SET(vars ${vars} -ftemplate-depth-32)
- SET(vars ${vars} -fPIC)
- SET(vars ${vars} -g)
- ENDIF(WINDOWS)
- SET(flags)
- FOREACH(f ${var})
- FOREACH(v ${vars})
- IF(f STREQUAL v)
- SET(f)
- ENDIF(f STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(flags "${flags} ${f}")
- ENDFOREACH(f ${var})
- SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "${flags}")
-
-
- SET(libadd)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(libadd ${libadd} ${dir}/LIBF77.lib)
- SET(libadd ${libadd} ${dir}/LIBI77.lib)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
- FOREACH(lib SALOMEBasics SalomeBatch)
- IF(name STREQUAL lib)
- SET(libs ${libs} ${PTHREAD_LIBS})
- ENDIF(name STREQUAL lib)
- ENDFOREACH(lib SALOMEBasics SalomeBatch)
-
-
- SET(libs ${libs} ${LDADD})
-
-
- FOREACH(lib ${libs})
- GET_FILENAME_COMPONENT(ext ${lib} EXT)
- IF(ext STREQUAL .la)
- GET_FILENAME_COMPONENT(lib ${lib} NAME_WE)
- STRING(REGEX REPLACE "^lib" "" lib ${lib})
- ENDIF(ext STREQUAL .la)
- SET(vars)
- SET(vars ${vars} -no-undefined)
- SET(vars ${vars} -lvtkWidgets)
- IF(WINDOWS)
- SET(vars ${vars} -module)
- SET(vars ${vars} -Wl,-E)
- SET(vars ${vars} -Xlinker)
- SET(vars ${vars} -export-dynamic)
- SET(vars ${vars} -lm)
- SET(vars ${vars} -lboost_thread)
- SET(vars ${vars} -lboost_signals)
- SET(vars ${vars} -pthread -lpthread -ldl)
- ENDIF(WINDOWS)
- FOREACH(v ${vars})
- IF(lib STREQUAL v)
- SET(lib)
- ENDIF(lib STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(libadd ${libadd} ${lib})
- ENDFOREACH(lib ${libs})
- TARGET_LINK_LIBRARIES(${name} ${libadd})
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- IF(CMAKE_BUILD_TYPE STREQUAL Debug)
- SET_TARGET_PROPERTIES(${name} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(DEST bin/salome)
-
-
- IF(WINDOWS)
- INSTALL(TARGETS ${name} DESTINATION ${DEST})
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/${DEST}/${name}.exe DESTINATION ${DEST} RENAME ${amname}.exe)
- INSTALL(CODE "FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${name}.exe)")
- ELSE(WINDOWS)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name} DESTINATION ${DEST} PERMISSIONS ${PERMS} RENAME ${amname})
- ENDIF(WINDOWS)
-
-
- ENDIF(nb)
-
-
- ENDFOREACH(amname ${bin_PROGRAMS} ${check_PROGRAMS})
-
-
- FOREACH(input ${IDL_FILES})
- STRING(REGEX REPLACE ".idl" "" base ${input})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${base}SK.cc)
- SET(outputs ${src})
- SET(dynsrc ${CMAKE_CURRENT_BINARY_DIR}/${base}DynSK.cc)
- SET(outputs ${outputs} ${dynsrc})
- SET(inc ${CMAKE_CURRENT_BINARY_DIR}/${base}.hh)
- SET(outputs ${outputs} ${inc})
- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${input})
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${input})
- ELSE(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${input})
- SET(input ${CMAKE_CURRENT_BINARY_DIR}/${input})
- ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${input})
- SET(flags ${IDLCXXFLAGS} ${OMNIORB_IDLCXXFLAGS})
- STRING(REGEX MATCH "-bcxx" ISBCXX ${flags})
- IF(NOT ISBCXX)
- SET(flags -bcxx ${flags})
- ENDIF(NOT ISBCXX)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${outputs}
- COMMAND ${OMNIORB_IDL} ${flags} ${input}
- MAIN_DEPENDENCY ${input}
- )
- install(FILES ${input} DESTINATION idl/salome)
- SET(IDL_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${base}.hh)
- install(FILES ${IDL_HEADER} DESTINATION include/salome)
- INSTALL(CODE "SET(IDL_FILE ${input})")
- INSTALL(CODE "SET(DIR lib/python${PYTHON_VERSION}/site-packages/salome)")
- INSTALL(CODE "SET(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})")
- INSTALL(CODE "SET(OMNIORB_IDL_PYTHON ${OMNIORB_IDL_PYTHON})")
- # --
- SET(flags)
- FOREACH(f ${IDLPYFLAGS})
- SET(flags "${flags} ${f}")
- ENDFOREACH(f ${IDLPYFLAGS})
- STRING(REGEX MATCH "-bpython" ISBPYTHON ${flags})
- IF(NOT ISBPYTHON)
- SET(flags "-bpython ${flags}")
- ENDIF(NOT ISBPYTHON)
- SET(IDLPYFLAGS ${flags})
- STRING(REPLACE "\\" "/" IDLPYFLAGS ${IDLPYFLAGS})
- INSTALL(CODE "SET(IDLPYFLAGS ${IDLPYFLAGS})")
- # --
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_python_from_idl.cmake)
-
-
- ENDFOREACH(input ${IDL_FILES})
-
+ .idl
+ .hh
+ SK.cc
+ )
+
+SET(srcs)
+FOREACH(f ${BASEIDL_SK_FILES} ${WRAP_SK_FILES})
+ SET(srcs ${srcs} ${CMAKE_CURRENT_BINARY_DIR}/${f})
+ENDFOREACH(f ${BASEIDL_SK_FILES} ${WRAP_SK_FILES})
+
+IF(WINDOWS)
+ADD_LIBRARY(SalomeIDLPARAVIS STATIC ${srcs})
+ELSE(WINDOWS)
+ADD_LIBRARY(SalomeIDLPARAVIS SHARED ${srcs})
+ENDIF(WINDOWS)
+
+SET(flags)
+FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${CORBA_INCLUDES} ${CORBA_CXXFLAGS} ${KERNEL_CXXFLAGS})
+ SET(flags "${flags} ${f}")
+ENDFOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${CORBA_INCLUDES} ${CORBA_CXXFLAGS} ${KERNEL_CXXFLAGS})
+
+SET_TARGET_PROPERTIES(SalomeIDLPARAVIS PROPERTIES COMPILE_FLAGS "${flags}")
+SET_TARGET_PROPERTIES(SalomeIDLPARAVIS PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
+
+TARGET_LINK_LIBRARIES(SalomeIDLPARAVIS ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${CORBA_LIBS})
+INSTALL(TARGETS SalomeIDLPARAVIS DESTINATION lib/salome)
+
+ADD_EXECUTABLE(vtkWrapIDL
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParse.tab.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParsePreprocess.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseHierarchy.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseExtras.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseMain.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrap.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrapText.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/vtkWrapIDL.c)
+
+ADD_DEPENDENCIES(vtkWrapIDL generate_txt)
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/ParaView)
+SET(flags)
+FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${PARAVIEW_INCLUDES} ${VTK_INCLUDES})
+ SET(flags "${flags} ${f}")
+ENDFOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${PARAVIEW_INCLUDES} ${VTK_INCLUDES})
+
+SET_TARGET_PROPERTIES(vtkWrapIDL PROPERTIES COMPILE_FLAGS "${flags}")
+
+TARGET_LINK_LIBRARIES(vtkWrapIDL ${PLATFORM_LDFLAGS} ${PLATFORM_LIBADD})
+SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL)
+IF(WINDOWS)
+ IF(CMAKE_BUILD_TOOL STREQUAL nmake)
+ SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL.exe)
+ ELSE(CMAKE_BUILD_TOOL STREQUAL nmake)
+ SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/vtkWrapIDL.exe)
+ ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake)
+ENDIF(WINDOWS)
+INSTALL(FILES ${vtkWrapIDL_EXEFILE} DESTINATION bin/salome PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+FOREACH(input ${BASEIDL_FILES} ${WRAP_IDL})
+ STRING(REGEX REPLACE ".idl" "" base ${input})
+ SET(src ${CMAKE_CURRENT_BINARY_DIR}/${base}SK.cc)
+ SET(outputs ${src})
+ SET(dynsrc ${CMAKE_CURRENT_BINARY_DIR}/${base}DynSK.cc)
+ SET(outputs ${outputs} ${dynsrc})
+ SET(inc ${CMAKE_CURRENT_BINARY_DIR}/${base}.hh)
+ SET(outputs ${outputs} ${inc})
+ LIST(FIND BASEIDL_FILES ${input} BASE_INDEX)
+ IF(${BASE_INDEX} EQUAL -1)
+ SET(input ${CMAKE_CURRENT_BINARY_DIR}/${input})
+ ELSE(${BASE_INDEX} EQUAL -1)
+ SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${input})
+ ENDIF(${BASE_INDEX} EQUAL -1)
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${outputs}
+ COMMAND ${OMNIORB_IDL} -bcxx ${IDLCXXFLAGS} -I${CMAKE_CURRENT_SOURCE_DIR} -I${KERNEL_ROOT_DIR}/idl/salome ${OMNIORB_IDLCXXFLAGS} ${input}
+ MAIN_DEPENDENCY ${input}
+ )
+ INSTALL(FILES ${input} DESTINATION idl/salome)
+
+ SET(IDL_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${base}.hh)
+ INSTALL(FILES ${IDL_HEADER} DESTINATION include/salome)
+ INSTALL(CODE "SET(IDL_FILE ${input})")
+ INSTALL(CODE "SET(DIR lib/python${PYTHON_VERSION}/site-packages/salome)")
+ INSTALL(CODE "SET(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})")
+ INSTALL(CODE "SET(OMNIORB_IDL_PYTHON ${OMNIORB_IDL_PYTHON})")
+ INSTALL(CODE "SET(IDLPYFLAGS -bpythonIDL -p${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR} -I${KERNEL_ROOT_DIR}/idl/salome)")
+ INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_python_from_idl.cmake)
+
+ENDFOREACH(input ${IDL_FILES})
diff --git a/idl/PARAVIS_Gen.idl b/idl/PARAVIS_Gen.idl
index ed39460b..d9f8bbe9 100644
--- a/idl/PARAVIS_Gen.idl
+++ b/idl/PARAVIS_Gen.idl
@@ -1,27 +1,23 @@
-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2012 CEA/DEN, EDF R&D
//
-// Copyright (C) 2003-2007 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 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.
//
-// 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
//
-// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : PARAVIS_Gen.idl
// Author : Vitaly Smetannikov
-//
/*! \file PARAVIS_Gen.idl This file conatins a set of interfaces of the %PARAVIS module.
* This module provides access to PARAVIEW functionality integrated to %SALOME application.
@@ -58,7 +54,7 @@ module PARAVIS {
* \brief The main interface class for PARAVIS server.
* Instantiation of this class has to be done before access to any other PARAVIS interfaces
*/
- interface PARAVIS_Gen : Engines::Component, SALOMEDS::Driver
+ interface PARAVIS_Gen : Engines::EngineComponent, SALOMEDS::Driver
{
/*!
* \brief Returns IOR of the current object.
@@ -72,6 +68,8 @@ module PARAVIS {
void ImportFile(in string theFileName);
+ void ExecuteScript(in string script);
+
/*!
* Returns trace string if trace is activated for current session.
* Otherwise it returns empty string.
@@ -113,6 +111,15 @@ module PARAVIS {
*/
void ActivateModule();
+
+ /*! Sets a definite study to be current.
+ */
+ void SetCurrentStudy(in SALOMEDS::Study theStudy);
+
+ /*! Gets the current study.
+ */
+ SALOMEDS::Study GetCurrentStudy();
+
};
};
diff --git a/idl/PARAVIS_Gen_Types.idl b/idl/PARAVIS_Gen_Types.idl
index 132fe4f8..4edacdef 100644
--- a/idl/PARAVIS_Gen_Types.idl
+++ b/idl/PARAVIS_Gen_Types.idl
@@ -1,23 +1,20 @@
-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2012 CEA/DEN, EDF R&D
//
-// Copyright (C) 2003-2007 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 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.
//
-// 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
//
-// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : PARAVIS_Gen.idl
// Author : Vladimir Turin
@@ -42,6 +39,7 @@ module PARAVIS {
typedef sequence long_array;
typedef sequence float_array;
typedef sequence double_array;
+ typedef sequence char_array;
};
diff --git a/idl/create_header.py b/idl/create_header.py
new file mode 100755
index 00000000..46573a1e
--- /dev/null
+++ b/idl/create_header.py
@@ -0,0 +1,39 @@
+# Copyright (C) 2010-2012 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
+#
+
+import sys
+import os
+
+ffile = "vtkWrapIDL.h"
+wfile = os.path.join(sys.argv[1], "wrapfiles.txt")
+
+ffile_stream = open(ffile, "w")
+ffile_stream.write('const char* wrapped_classes[] = {')
+ffile_stream.write('\n')
+wfile_stream = open(wfile)
+for line in wfile_stream:
+ ffile_stream.write('"'+line.split()[0]+'",')
+ ffile_stream.write('\n')
+ pass
+wfile_stream.close()
+ffile_stream.write('""')
+ffile_stream.write('\n')
+ffile_stream.write('};')
+ffile_stream.write('\n')
+ffile_stream.close()
diff --git a/idl/create_header.sh b/idl/create_header.sh
index 27e74c2d..954528a7 100755
--- a/idl/create_header.sh
+++ b/idl/create_header.sh
@@ -1,3 +1,22 @@
+# Copyright (C) 2010-2012 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
+#
+
#!/bin/bash
file=vtkWrapIDL.h
diff --git a/idl/create_hints.py b/idl/create_hints.py
new file mode 100755
index 00000000..31addda5
--- /dev/null
+++ b/idl/create_hints.py
@@ -0,0 +1,38 @@
+# Copyright (C) 2010-2012 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
+#
+
+import sys
+import os
+
+CONF_DIR = os.path.dirname(sys.argv[0])
+
+content = ""
+for filename in [
+ os.path.join(sys.argv[1], "hints"),
+ os.path.join(CONF_DIR, "hints_paravis"),
+ ]:
+ stream = open(filename)
+ content += stream.read()
+ stream.close()
+ pass
+
+filename = "hints"
+stream = open(filename, "w")
+stream.write(content)
+stream.close()
diff --git a/idl/create_hints.sh b/idl/create_hints.sh
index c9e65b05..85a8c980 100755
--- a/idl/create_hints.sh
+++ b/idl/create_hints.sh
@@ -1,3 +1,22 @@
+# Copyright (C) 2010-2012 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
+#
+
#!/bin/bash
CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
diff --git a/idl/vtkWrapIDL.c b/idl/vtkWrapIDL.c
index 6e8aa070..11e33cd8 100644
--- a/idl/vtkWrapIDL.c
+++ b/idl/vtkWrapIDL.c
@@ -1,7 +1,6 @@
// PARAVIS : ParaView wrapper SALOME module
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2010-2012 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
@@ -27,7 +26,9 @@
#include
#include
#include "vtkParse.h"
+#include "vtkParseType.h"
#include "vtkWrapIDL.h"
+#include "vtkWrap.h"
char* Copyright[] = {
"// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,",
@@ -51,12 +52,13 @@ char* Copyright[] = {
""
};
-#define bs 8192
+#define bs 12288
int numberOfWrappedFunctions = 0;
FunctionInfo *wrappedFunctions[1000];
extern FunctionInfo *currentFunction;
+
static void add_to_sig(char *sig, const char *add, int *i)
{
strcpy(&sig[*i],add);
@@ -71,7 +73,12 @@ void AddReturnArg(char *Result, int *CurrPos) {
add_to_sig(Result,"virtual ",CurrPos);
}
-void AddNotReturnArg(int Type, char *Result, int *CurrPos) {
+int IsIn(ValueInfo* Type) {
+ return 1;
+ //return ((Type % VTK_PARSE_BASE_TYPE)/0x100 < 1 || (Type % VTK_PARSE_BASE_TYPE)/0x100 > 7);
+}
+
+void AddNotReturnArg(ValueInfo* Type, char *Result, int *CurrPos) {
#if defined(IDL_I_HH) || defined(IDL_I_CC)
;
#else
@@ -82,12 +89,14 @@ void AddNotReturnArg(int Type, char *Result, int *CurrPos) {
#endif
}
-int IsFunction(int Type) {
- return (Type == 0x5000);
+int IsFunction(ValueInfo* Type) {
+ //return (Type == VTK_PARSE_FUNCTION);
+ return vtkWrap_IsFunction(Type);
}
-int IsConst(int Type) {
- return ((Type % 0x2000) >= 0x1000);
+int IsConst(ValueInfo* Type) {
+ //return ((Type % 0x2000) >= 0x1000);
+ return vtkWrap_IsConst(Type);
}
void AddConst(char *Result, int *CurrPos) {
@@ -98,20 +107,29 @@ void AddConst(char *Result, int *CurrPos) {
#endif
}
-int IsPtr(int Type) {
- return ((Type % 0x1000)/0x100 == 0x1);
+
+int IsClass(ValueInfo* theType) {
+ //return ((theType->Type % 0x10) == 0x9);
+ return vtkWrap_IsObject(theType) || vtkWrap_IsVTKObject(theType);
}
-int IsIn(int Type) {
- return 1;
- //return ((Type % 0x1000)/0x100 < 1 || (Type % 0x1000)/0x100 > 7);
+int IsString(ValueInfo* Type) {
+ //return (IsChar(Type) && IsArray(Type));
+ //return (IsChar(Type) && IsPtr(Type));
+ return vtkWrap_IsCharPointer(Type) || vtkWrap_IsString(Type) || (strcmp(Type->Class, "vtkStdString") == 0);
}
-int IsUnknown(int Type) {
- return ((Type % 0x1000)/0x100 == 0x8);
+int IsPtr(ValueInfo* Type) {
+ //return ((Type % VTK_PARSE_BASE_TYPE)/0x100 == 0x1);
+ return vtkWrap_IsPointer(Type) && (!IsString(Type)) && (!IsClass(Type));
}
-void AddAtomArg(int I, int Type, char *TypeIDL, char *TypeCorba, char *Result, int *CurrPos) {
+int IsUnknown(ValueInfo* theType) {
+ //return ((Type % VTK_PARSE_BASE_TYPE)/0x100 == 0x8);
+ return (theType->Type & VTK_PARSE_BASE_TYPE) == VTK_PARSE_UNKNOWN;
+}
+
+void AddAtomArg(int I, ValueInfo* Type, char *TypeIDL, char *TypeCorba, char *Result, int *CurrPos) {
#if defined(IDL_I_HH) || defined(IDL_I_CC)
add_to_sig(Result,"CORBA::",CurrPos);
add_to_sig(Result,TypeCorba,CurrPos);
@@ -124,11 +142,12 @@ void AddAtomArg(int I, int Type, char *TypeIDL, char *TypeCorba, char *Result, i
add_to_sig(Result," ",CurrPos);
}
-int IsArray(int Type) {
- return ((Type % 0x1000)/0x100 == 0x3);
+int IsArray(ValueInfo* Type) {
+ //return ((Type % VTK_PARSE_BASE_TYPE)/0x100 == 0x3);
+ return vtkWrap_IsArray(Type);
}
-void AddArrayArg(int I, int Type, char *TypeIDL, char *Result, int *CurrPos) {
+void AddArrayArg(int I, ValueInfo* Type, char *TypeIDL, char *Result, int *CurrPos) {
#if defined(IDL_I_HH) || defined(IDL_I_CC)
if(!IsReturnArg(I) && !IsConst(Type))
add_to_sig(Result, "const ",CurrPos);
@@ -146,24 +165,27 @@ void AddArrayArg(int I, int Type, char *TypeIDL, char *Result, int *CurrPos) {
add_to_sig(Result, " ",CurrPos);
}
-int IsBoolean(int Type) {
- return ((Type % 0x10) == 0xE);
+int IsBoolean(ValueInfo* Type) {
+ //return ((Type % 0x10) == 0xE);
+ return vtkWrap_IsBool(Type);
}
-void AddBooleanAtomArg(int I, int Type, char *Result, int *CurrPos) {
+void AddBooleanAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddAtomArg(I,Type,"boolean","Boolean",Result,CurrPos);
}
-int IsChar(int Type) {
- return ((Type % 0x10) == 0x3 || (Type % 0x10) == 0xD);
+int IsChar(ValueInfo* theType) {
+ //return ((Type % 0x10) == 0x3 || (Type % 0x10) == 0xD);
+ int aBase = theType->Type & VTK_PARSE_BASE_TYPE;
+ return (aBase == VTK_PARSE_CHAR) || (aBase == VTK_PARSE_UNSIGNED_CHAR) || (aBase == VTK_PARSE_SIGNED_CHAR);
}
-void AddCharAtomArg(int I, int Type, char *Result, int *CurrPos) {
- AddAtomArg(I,Type,"char","Char",Result,CurrPos);
+int IsCharArray(ValueInfo* theType) {
+ return (IsChar(theType) && IsArray(theType));
}
-int IsString(Type) {
- return (IsChar(Type) && IsArray(Type));
+void AddCharAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
+ AddAtomArg(I,Type,"char","Char",Result,CurrPos);
}
void AddStringArg(int I, char *Result, int *CurrPos) {
@@ -174,79 +196,86 @@ void AddStringArg(int I, char *Result, int *CurrPos) {
#endif
}
-int IsFloat(int Type) {
- return ((Type % 0x10) == 0x1);
+int IsFloat(ValueInfo* theType) {
+ //return ((Type % 0x10) == 0x1);
+ return (theType->Type & VTK_PARSE_BASE_TYPE) == VTK_PARSE_FLOAT;
}
-void AddFloatAtomArg(int I, int Type, char *Result, int *CurrPos) {
+void AddFloatAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddAtomArg(I,Type,"float","Float",Result,CurrPos);
}
-int IsFloatArray(int Type) {
- return (IsFloat(Type) && IsArray(Type));
+int IsFloatArray(ValueInfo* theType) {
+ return (IsFloat(theType) && IsArray(theType));
}
-void AddFloatArrayArg(int I, int Type, char *Result, int *CurrPos) {
+void AddFloatArrayArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddArrayArg(I,Type,"float",Result,CurrPos);
}
-int IsDouble(int Type) {
- return ((Type % 0x10) == 0x7);
+int IsDouble(ValueInfo* theType) {
+ //return ((Type % 0x10) == 0x7);
+ return (theType->Type & VTK_PARSE_BASE_TYPE) == VTK_PARSE_DOUBLE;
}
-void AddDoubleAtomArg(int I, int Type, char *Result, int *CurrPos) {
+void AddDoubleAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddAtomArg(I,Type,"double","Double",Result,CurrPos);
}
-int IsDoubleArray(int Type) {
+int IsDoubleArray(ValueInfo* Type) {
return (IsDouble(Type) && IsArray(Type));
}
-void AddDoubleArrayArg(int I, int Type, char *Result, int *CurrPos) {
+void AddDoubleArrayArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddArrayArg(I,Type,"double",Result,CurrPos);
}
-int IsvtkIdType(int Type) {
- return((Type % 0x10) == 0xA);
+int IsvtkIdType(ValueInfo* theType) {
+ //return((Type % 0x10) == 0xA);
+ return (theType->Type & VTK_PARSE_BASE_TYPE) == VTK_PARSE_ID_TYPE;
}
-int IsShort(int Type) {
- return ((Type % 0x10) == 0x4 || (Type % 0x10) == 0x5 || (Type % 0x10) == 0xA);
+int IsShort(ValueInfo* theType) {
+ //return ((Type % 0x10) == 0x4 || (Type % 0x10) == 0x5 || (Type % 0x10) == 0xA);
+ int aVal = theType->Type & VTK_PARSE_BASE_TYPE;
+ return (aVal == VTK_PARSE_SHORT) || (aVal == VTK_PARSE_INT) ||
+ (aVal == VTK_PARSE_ID_TYPE) || (aVal == VTK_PARSE_UNSIGNED_INT) || (aVal == VTK_PARSE_UNSIGNED_SHORT) ||
+ (aVal == VTK_PARSE_SSIZE_T) || (aVal == VTK_PARSE_SIZE_T);
}
-void AddShortAtomArg(int I, int Type, char *Result, int *CurrPos) {
+void AddShortAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddAtomArg(I,Type,"short","Short",Result,CurrPos);
}
-int IsShortArray(int Type) {
+int IsShortArray(ValueInfo* Type) {
return (IsShort(Type) && IsArray(Type));
}
-void AddShortArrayArg(int I, int Type, char *Result, int *CurrPos) {
+void AddShortArrayArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddArrayArg(I,Type,"short",Result,CurrPos);
}
-int IsLong(int Type) {
- return ((Type % 0x10) == 0x6 || (Type % 0x10) == 0xB || (Type % 0x10) == 0xC);
+int IsLong(ValueInfo* theType) {
+ //return ((Type % 0x10) == 0x6 || (Type % 0x10) == 0xB || (Type % 0x10) == 0xC);
+ unsigned int aVal = theType->Type & VTK_PARSE_BASE_TYPE;
+ return (aVal == VTK_PARSE_LONG) || (aVal == VTK_PARSE_UNSIGNED_LONG) ||
+ (aVal == VTK_PARSE___INT64) || (aVal == VTK_PARSE_UNSIGNED___INT64) || (aVal == VTK_PARSE_LONG_LONG) ||
+ (aVal == VTK_PARSE_UNSIGNED_LONG_LONG);
}
-void AddLongAtomArg(int I, int Type, char *Result, int *CurrPos) {
+void AddLongAtomArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddAtomArg(I,Type,"long","Long",Result,CurrPos);
}
-int IsLongArray(int Type) {
+int IsLongArray(ValueInfo* Type) {
return (IsLong(Type) && IsArray(Type));
}
-void AddLongArrayArg(int I, int Type, char *Result, int *CurrPos) {
+void AddLongArrayArg(int I, ValueInfo* Type, char *Result, int *CurrPos) {
AddArrayArg(I,Type,"long",Result,CurrPos);
}
-int IsClass(int Type) {
- return ((Type % 0x10) == 0x9);
-}
-
-void AddClassArg(int I, int Type, char *Class, char *Result, int *CurrPos) {
+void AddClassArg(int I, ValueInfo* Type, const char *Class, char *Result, int *CurrPos) {
#if defined(IDL_I_HH) || defined(IDL_I_CC)
add_to_sig(Result,"PARAVIS_Base",CurrPos);
if(IsReturnArg(I) || IsConst(Type) || IsIn(Type)) {
@@ -260,23 +289,46 @@ void AddClassArg(int I, int Type, char *Class, char *Result, int *CurrPos) {
#endif
}
-int _IsVoid(int Type) {
- return ((Type % 0x10) == 0x2);
+int _IsVoid(ValueInfo* theType) {
+ //return ((Type % 0x10) == 0x2);
+ return (theType->Type & VTK_PARSE_BASE_TYPE) == VTK_PARSE_VOID;
}
-int IsVoid(int Type) {
+int IsVoid(ValueInfo* Type) {
return (_IsVoid(Type) && (!IsPtr(Type)));
}
+int IsUnsigned(ValueInfo* theType) {
+ unsigned int aVal = theType->Type & VTK_PARSE_BASE_TYPE;
+ switch (aVal) {
+ case VTK_PARSE_UNSIGNED_CHAR:
+ case VTK_PARSE_UNSIGNED_INT:
+ case VTK_PARSE_UNSIGNED_SHORT:
+ case VTK_PARSE_UNSIGNED_LONG:
+ case VTK_PARSE_UNSIGNED_ID_TYPE:
+ case VTK_PARSE_UNSIGNED_LONG_LONG:
+ case VTK_PARSE_UNSIGNED___INT64:
+ case VTK_PARSE_UNSIGNED_CHAR_PTR:
+ case VTK_PARSE_UNSIGNED_INT_PTR:
+ case VTK_PARSE_UNSIGNED_SHORT_PTR:
+ case VTK_PARSE_UNSIGNED_LONG_PTR:
+ case VTK_PARSE_UNSIGNED_ID_TYPE_PTR:
+ case VTK_PARSE_UNSIGNED_LONG_LONG_PTR:
+ case VTK_PARSE_UNSIGNED___INT64_PTR:
+ return 1;
+ }
+ return 0;
+}
+
void AddVoid(char *Result, int *CurrPos) {
add_to_sig(Result,"void ",CurrPos);
}
-int IsVoidPtr(int Type) {
+int IsVoidPtr(ValueInfo* Type) {
return (_IsVoid(Type) && (IsPtr(Type) || IsArray(Type)));
}
-void AddVoidArg(int I, char *Result, int *CurrPos, int Type) {
+void AddVoidArg(int I, char *Result, int *CurrPos, ValueInfo* Type) {
#if defined(IDL_I_HH) || defined(IDL_I_CC)
if(!IsReturnArg(I)) {
if(!IsConst(Type))
@@ -290,7 +342,7 @@ void AddVoidArg(int I, char *Result, int *CurrPos, int Type) {
#endif
}
-void AddTypeArray(int Type, char *Result, int *CurrPos) {
+void AddTypeArray(ValueInfo* Type, char *Result, int *CurrPos) {
if(IsShort(Type))
add_to_sig(Result,"short",CurrPos);
if(IsLong(Type))
@@ -299,6 +351,8 @@ void AddTypeArray(int Type, char *Result, int *CurrPos) {
add_to_sig(Result,"float",CurrPos);
if(IsDouble(Type))
add_to_sig(Result,"double",CurrPos);
+ if(IsChar(Type))
+ add_to_sig(Result,"char",CurrPos);
add_to_sig(Result,"_array",CurrPos);
}
@@ -315,8 +369,11 @@ int numberOfReadFunctions = 0;
static int class_has_new = 0;
-void output_type(char* result, int *currPos, int i, int aType, char *Id)
+void output_type(char* result, int *currPos, int i, ValueInfo* aType, const char *Id)
{
+ if (vtkWrap_IsConst(aType))
+ add_to_sig(result,"const ",currPos);
+
if(IsFloat(aType)) {
if(IsArray(aType)) {
add_to_sig(result,"float",currPos);
@@ -335,10 +392,12 @@ void output_type(char* result, int *currPos, int i, int aType, char *Id)
if(IsShort(aType)) {
if(IsArray(aType)) {
+ if (IsUnsigned(aType))
+ add_to_sig(result,"unsigned ",currPos);
if(IsvtkIdType(aType)) {
- add_to_sig(result,"vtkIdType",currPos);
+ add_to_sig(result,"vtkIdType",currPos);
} else {
- add_to_sig(result,"int",currPos);
+ add_to_sig(result,"int",currPos);
}
} else {
add_to_sig(result,"CORBA::Short",currPos);
@@ -347,6 +406,8 @@ void output_type(char* result, int *currPos, int i, int aType, char *Id)
if(IsLong(aType)) {
if(IsArray(aType)) {
+ if (IsUnsigned(aType))
+ add_to_sig(result,"unsigned ",currPos);
add_to_sig(result,"long",currPos);
} else {
add_to_sig(result,"CORBA::Long",currPos);
@@ -356,13 +417,13 @@ void output_type(char* result, int *currPos, int i, int aType, char *Id)
if(IsChar(aType)) {
if(IsString(aType)) {
if(IsReturnArg(i))
- add_to_sig(result,"const ",currPos);
+ add_to_sig(result,"const ",currPos);
add_to_sig(result,"char",currPos);
} else {
add_to_sig(result,"CORBA::Char",currPos);
}
}
-
+
if(IsBoolean(aType)) {
add_to_sig(result,"CORBA::Boolean",currPos);
}
@@ -381,13 +442,13 @@ void output_type(char* result, int *currPos, int i, int aType, char *Id)
}
}
-void output_typedef(char* result, int *currPos, int i, int aType, char *Id)
+void output_typedef(char* result, int *currPos, int i, ValueInfo* aType, const char *Id)
{
add_to_sig(result," typedef ",currPos);
output_type(result,currPos,i,aType,Id);
}
-void output_temp(char* result, int *currPos, int i, int aType, char *Id, int aCount)
+void output_temp(char* result, int *currPos, int i, ValueInfo* aType, const char *Id, int aCount)
{
static char buf[bs];
@@ -456,7 +517,8 @@ void output_temp(char* result, int *currPos, int i, int aType, char *Id, int aCo
} else {
AddCharAtomArg(i,aType,result,currPos);
}
- }
+ } else if (IsString(aType)) //!!! VSV
+ AddStringArg(i,result,currPos);
if(IsBoolean(aType)) {
AddBooleanAtomArg(i,aType,result,currPos);
@@ -480,10 +542,10 @@ void output_temp(char* result, int *currPos, int i, int aType, char *Id, int aCo
}
#if defined(IDL_I_HH) || defined(IDL_I_CC)
if(IsString(aType) && !IsIn(aType) && !IsConst(aType) && !IsReturnArg(i)) {
- add_to_sig(result,"*&",currPos);
+ add_to_sig(result,"*&",currPos);
} else {
if(IsString(aType) || (IsReturnArg(i) && IsVoidPtr(aType))) {
- add_to_sig(result," *",currPos);
+ add_to_sig(result," *",currPos);
}
}
#endif
@@ -501,10 +563,9 @@ void read_class_functions(const char* name, const char* classname, FILE* fp)
{
int len=0;
int curlen=0;
- int i;
- int j;
+ int i, j;
int flen=0;
- int num=0;
+ //int num=0;
int ret_str=0;
FILE *fin;
char buf[bs];
@@ -518,6 +579,7 @@ void read_class_functions(const char* name, const char* classname, FILE* fp)
static int clen=7;
#endif
+
#if defined(IDL_I_HH)
sprintf(buf,"PARAVIS_Gen_%s_i.hh",name);
#elif defined(IDL_I_CC)
@@ -532,10 +594,10 @@ void read_class_functions(const char* name, const char* classname, FILE* fp)
while (fgets(sig,bs-1,fin) != 0) {
#if defined(IDL_I_CC)
if(strncmp("#include \"PARAVIS_Gen_vtk",sig,25)==0) {
- fprintf(fp,sig);
+ fprintf(fp, "%s",sig);
}
if(strncmp("#include 1) {
+ if(fgets(buf,bs-1,fin)!=NULL && strlen(buf) > 1) {
ret_str=0;
#if defined(IDL_I_HH)
strcpy(sig+len,buf);
@@ -644,18 +705,23 @@ void read_class_functions(const char* name, const char* classname, FILE* fp)
return;
}
-void get_signature(const char* num, FileInfo *data)
+void get_signature(const char* num, ClassInfo *data)
{
static char result[bs];
int currPos = 0;
int currPos_sig = 0;
- int argtype;
+ //int argtype;
int i, j;
static char buf[bs];
static char buf1[bs];
int ret = 0;
int found = 0;
int currPos_num = 0;
+ ValueInfo* aRetVal = NULL;
+ ValueInfo* aArgVal = NULL;
+ char *cp;
+
+ aRetVal = currentFunction->ReturnValue;
add_to_sig(result,"\n",&currPos);
if (currentFunction->Signature) {
@@ -666,136 +732,153 @@ void get_signature(const char* num, FileInfo *data)
add_to_sig(result,currentFunction->Signature,&currPos);
add_to_sig(result,"\n",&currPos);
}
-
- if(IsClass(currentFunction->ReturnType) && ret == 0) {
+
+ if(IsClass(aRetVal) && ret == 0) {
found = 0;
for(i = 0; strcmp(wrapped_classes[i],"") != 0 && found == 0; i++) {
- if(strcmp(wrapped_classes[i],currentFunction->ReturnClass) == 0)
- found = 1;
+ if(strcmp(wrapped_classes[i],currentFunction->ReturnValue->Class) == 0)
+ found = 1;
}
if(!found)
ret = 1;
}
-
+
for (j = 0; j < currentFunction->NumberOfArguments; j++) {
- if(IsFunction(currentFunction->ArgTypes[j]))
+ aArgVal = currentFunction->Arguments[j];
+ if(IsFunction(aArgVal))
ret == 1;
- if(IsClass(currentFunction->ArgTypes[j]) && ret == 0) {
+ if(IsClass(aArgVal) && ret == 0) {
found = 0;
for(i = 0; strcmp(wrapped_classes[i],"") != 0 && found == 0; i++) {
- if(strcmp(wrapped_classes[i],currentFunction->ArgClasses[j]) == 0)
- found = 1;
+ if(strcmp(wrapped_classes[i],aArgVal->Class) == 0)
+ found = 1;
}
if(!found)
- ret = 1;
+ ret = 1;
}
}
-
- if (IsArray(currentFunction->ReturnType) && !IsClass(currentFunction->ReturnType) && !IsString(currentFunction->ReturnType) && currentFunction->HintSize == 0) {
+
+ if (IsArray(aRetVal) && !IsClass(aRetVal) && !IsString(aRetVal) && currentFunction->HintSize == 0) {
ret = 1;
}
-
+
if(ret) {
add_to_sig(result,"//\n",&currPos);
- currentFunction->Signature = realloc(currentFunction->Signature,
- (size_t)(currPos+1));
- strcpy(currentFunction->Signature,result);
-
+ /*currentFunction->Signature = (const char*)realloc((void*)currentFunction->Signature,
+ (size_t)(currPos+1));*/
+ //strcpy((char*)currentFunction->Signature,result);
+ cp = (char *)malloc(currPos+1);
+ strcpy(cp, result);
+ currentFunction->Signature = cp;
return;
}
#if defined(IDL_I_CC)
- add_to_sig(result,"struct CreateEventName(",&currPos);
- add_to_sig(result,currentFunction->Name,&currPos);
- if( strlen(num)!=0 ) {
- add_to_sig(result,num,&currPos);
- }
- add_to_sig(result,")",&currPos);
- add_to_sig(result,": public SALOME_Event\n",&currPos);
- add_to_sig(result,"{\n",&currPos);
- if(!IsVoid(currentFunction->ReturnType)) {
- output_typedef(result,&currPos,MAX_ARGS,currentFunction->ReturnType,
- currentFunction->ReturnClass);
- add_to_sig(result," TResult;\n",&currPos);
- add_to_sig(result," TResult myResult;\n",&currPos);
- }
-
- output_typedef(result, &currPos, 0, 0x309,
- data->ClassName);
- add_to_sig(result," TObj;\n",&currPos);
- add_to_sig(result," TObj myObj;\n",&currPos);
-
- for (i = 0; i < currentFunction->NumberOfArguments; i++) {
- output_typedef(result, &currPos, i, currentFunction->ArgTypes[i],
- currentFunction->ArgClasses[i]);
- sprintf(buf," TParam%d;\n",i);
- add_to_sig(result,buf,&currPos);
- sprintf(buf," TParam%d myParam%d;\n",i,i);
- add_to_sig(result,buf,&currPos);
- }
+ add_to_sig(result,"struct CreateEventName(",&currPos);
+ add_to_sig(result,currentFunction->Name,&currPos);
+ if( strlen(num)!=0 ) {
+ add_to_sig(result,num,&currPos);
+ }
+ add_to_sig(result,")",&currPos);
+ add_to_sig(result,": public SALOME_Event\n",&currPos);
+ add_to_sig(result,"{\n",&currPos);
+ if(!IsVoid(aRetVal)) {
+ //output_typedef(result,&currPos,MAX_ARGS,aRetVal, currentFunction->ReturnValue->Class);
+ add_to_sig(result," typedef ",&currPos);
+ if (vtkWrap_IsConst(aRetVal))
+ add_to_sig(result, " const ",&currPos);
+ if (vtkWrap_IsObject(aRetVal))
+ add_to_sig(result, " ::",&currPos);
+ add_to_sig(result, aRetVal->Class,&currPos);
+ if (vtkWrap_IsPointer(aRetVal) || vtkWrap_IsArray(aRetVal))
+ add_to_sig(result, "*",&currPos);
+ add_to_sig(result," TResult;\n",&currPos);
+ add_to_sig(result," TResult myResult;\n",&currPos);
+ }
+
+ //output_typedef(result, &currPos, 0, 0x309, data->Name); //!!??
+ add_to_sig(result," typedef ::",&currPos);
+ add_to_sig(result,data->Name,&currPos);
+ add_to_sig(result,"* TObj;\n",&currPos);
+ add_to_sig(result," TObj myObj;\n",&currPos);
+
+ for (i = 0; i < currentFunction->NumberOfArguments; i++) {
+ aArgVal = currentFunction->Arguments[i];
+ //output_typedef(result, &currPos, i, currentFunction->ArgTypes[i],
+ // currentFunction->ArgClasses[i]);
+ output_typedef(result, &currPos, i, aArgVal, currentFunction->ArgClasses[i]);
+ sprintf(buf," TParam%d;\n",i);
+ add_to_sig(result,buf,&currPos);
+ sprintf(buf," TParam%d myParam%d;\n",i,i);
+ add_to_sig(result,buf,&currPos);
+ }
- add_to_sig(result,"\n",&currPos);
- add_to_sig(result," CreateEventName(",&currPos);
- add_to_sig(result,currentFunction->Name,&currPos);
- if( strlen(num)!=0 ) {
- add_to_sig(result,num,&currPos);
- }
- add_to_sig(result,")",&currPos);
- add_to_sig(result,"(TObj theObj",&currPos);
- for (i = 0; i < currentFunction->NumberOfArguments; i++) {
- sprintf(buf,", TParam%d theParam%d",i,i);
- add_to_sig(result,buf,&currPos);
- }
- add_to_sig(result,"):\n",&currPos);
- add_to_sig(result," myObj(theObj)",&currPos);
- for (i = 0; i < currentFunction->NumberOfArguments; i++) {
- sprintf(buf,", myParam%d(theParam%d)",i,i);
- add_to_sig(result,buf,&currPos);
- }
- add_to_sig(result,"\n",&currPos);
- add_to_sig(result," { }\n",&currPos);
- add_to_sig(result,"\n",&currPos);
- add_to_sig(result," virtual void Execute()\n",&currPos);
- add_to_sig(result," {\n",&currPos);
- add_to_sig(result," ",&currPos);
- if(!IsVoid(currentFunction->ReturnType)/* && !IsString(currentFunction->ReturnType)*/) {
- add_to_sig(result,"myResult = ",&currPos);
+ add_to_sig(result,"\n",&currPos);
+ add_to_sig(result," CreateEventName(",&currPos);
+ add_to_sig(result,currentFunction->Name,&currPos);
+ if( strlen(num)!=0 ) {
+ add_to_sig(result,num,&currPos);
+ }
+ add_to_sig(result,")",&currPos);
+ add_to_sig(result,"(TObj theObj",&currPos);
+ for (i = 0; i < currentFunction->NumberOfArguments; i++) {
+ sprintf(buf,", TParam%d theParam%d",i,i);
+ add_to_sig(result,buf,&currPos);
+ }
+ add_to_sig(result,"):\n",&currPos);
+ add_to_sig(result," myObj(theObj)",&currPos);
+ for (i = 0; i < currentFunction->NumberOfArguments; i++) {
+ sprintf(buf,", myParam%d(theParam%d)",i,i);
+ add_to_sig(result,buf,&currPos);
+ }
+ add_to_sig(result,"\n",&currPos);
+ add_to_sig(result," { }\n",&currPos);
+ add_to_sig(result,"\n",&currPos);
+ add_to_sig(result," virtual void Execute()\n",&currPos);
+ add_to_sig(result," {\n",&currPos);
+ add_to_sig(result," ",&currPos);
+ if(!IsVoid(aRetVal)/* && !IsString(aRetVal)*/) {
+ add_to_sig(result,"myResult = ",&currPos);
+ }
+ //if(IsString(aRetVal)) {
+ //add_to_sig(result,"const char* ret = ",&currPos);
+ //}
+ add_to_sig(result,"myObj->",&currPos);
+ add_to_sig(result,currentFunction->Name,&currPos);
+ add_to_sig(result,"(",&currPos);
+ for (i = 0; i < currentFunction->NumberOfArguments; i++) {
+ aArgVal = currentFunction->Arguments[i];
+ if(i!=0)
+ add_to_sig(result,", ",&currPos);
+ if(IsClass(aArgVal) && IsPtr(aArgVal)) {
+ add_to_sig(result,"*",&currPos);
}
- //if(IsString(currentFunction->ReturnType)) {
- //add_to_sig(result,"const char* ret = ",&currPos);
- //}
- add_to_sig(result,"myObj->",&currPos);
- add_to_sig(result,currentFunction->Name,&currPos);
- add_to_sig(result,"(",&currPos);
- for (i = 0; i < currentFunction->NumberOfArguments; i++) {
- if(i!=0)
- add_to_sig(result,", ",&currPos);
- if(IsClass(currentFunction->ArgTypes[i]) && IsPtr(currentFunction->ArgTypes[i])) {
- add_to_sig(result,"*",&currPos);
- }
+ if (IsString(aArgVal) && IsConst(aArgVal))
+ sprintf(buf,"checkNullStr(myParam%d)",i);
+ else
sprintf(buf,"myParam%d",i);
- add_to_sig(result,buf,&currPos);
- }
- add_to_sig(result,");\n",&currPos);
- //if(IsString(currentFunction->ReturnType)) {
- //add_to_sig(result," myResult = (ret==NULL)?NULL:CORBA::string_dup(\"\");\n",&currPos);
- //}
- add_to_sig(result," }\n",&currPos);
-
- add_to_sig(result,"};\n",&currPos);
- add_to_sig(result,"//\n",&currPos);
+ add_to_sig(result,buf,&currPos);
+ }
+ add_to_sig(result,");\n",&currPos);
+ //if(IsString(aRetVal)) {
+ //add_to_sig(result," myResult = (ret==NULL)?NULL:CORBA::string_dup(\"\");\n",&currPos);
+ //}
+ add_to_sig(result," }\n",&currPos);
+
+ add_to_sig(result,"};\n",&currPos);
+ add_to_sig(result,"//\n",&currPos);
#endif
currPos_sig=currPos;
-
+
#if ! defined(IDL_I_CC)
add_to_sig(result," ",&currPos);
#endif
- output_temp(result,&currPos,MAX_ARGS,currentFunction->ReturnType,
- currentFunction->ReturnClass,0);
+ output_temp(result,&currPos,MAX_ARGS,aRetVal,
+ currentFunction->ReturnValue->Class,0);
#if defined(IDL_I_CC)
- add_to_sig(result,data->ClassName,&currPos);
+ add_to_sig(result,data->Name,&currPos);
add_to_sig(result,"_i::",&currPos);
#endif
#if ! defined(IDL_I_HH) && ! defined(IDL_I_CC)
@@ -813,12 +896,14 @@ void get_signature(const char* num, FileInfo *data)
add_to_sig(result,"(",&currPos);
for (i = 0; i < currentFunction->NumberOfArguments; i++) {
+ aArgVal = currentFunction->Arguments[i];
if( i != 0 ) {
add_to_sig(result,", ",&currPos);
}
- output_temp(result, &currPos, i, currentFunction->ArgTypes[i],
- currentFunction->ArgClasses[i],
- currentFunction->ArgCounts[i]);
+ /* output_temp(result, &currPos, i, currentFunction->ArgTypes[i],
+ (char*)currentFunction->ArgClasses[i],
+ currentFunction->ArgCounts[i]);*/
+ output_temp(result, &currPos, i, aArgVal, aArgVal->Class, currentFunction->NumberOfArguments);
}
add_to_sig(result,")",&currPos);
@@ -826,59 +911,68 @@ void get_signature(const char* num, FileInfo *data)
add_to_sig(result," {\n",&currPos);
add_to_sig(result," try {\n",&currPos);
for (i = 0; i < currentFunction->NumberOfArguments; i++) {
- if(IsClass(currentFunction->ArgTypes[i])) {
+ aArgVal = currentFunction->Arguments[i];
+ if(IsClass(aArgVal)) {
sprintf(buf," PARAVIS_Base_i* i_temp%d = GET_SERVANT(temp%d);\n",i,i);
add_to_sig(result,buf,&currPos);
}
-
- if(
- IsArray(currentFunction->ArgTypes[i])
- && !IsString(currentFunction->ArgTypes[i])
- && !IsClass(currentFunction->ArgTypes[i])
- && !IsVoid(currentFunction->ArgTypes[i])
- ) {
+
+ if(IsArray(aArgVal) && !IsString(aArgVal) && !IsClass(aArgVal) && !IsVoid(aArgVal) ) {
sprintf(buf," CORBA::ULong j_temp%d;\n",i);
add_to_sig(result,buf,&currPos);
sprintf(buf," CORBA::ULong l_temp%d = temp%d.length();\n",i,i);
add_to_sig(result,buf,&currPos);
add_to_sig(result," ",&currPos);
- if(IsFloat(currentFunction->ArgTypes[i]))
- add_to_sig(result,"float",&currPos);
+ if(IsFloat(aArgVal))
+ add_to_sig(result,"float",&currPos);
- if(IsDouble(currentFunction->ArgTypes[i]))
- add_to_sig(result,"double",&currPos);
+ if(IsDouble(aArgVal))
+ add_to_sig(result,"double",&currPos);
- if(IsvtkIdType(currentFunction->ArgTypes[i])) {
- add_to_sig(result,"vtkIdType",&currPos);
+ if(IsvtkIdType(aArgVal)) {
+ if (IsUnsigned(aArgVal))
+ add_to_sig(result,"unsigned ",&currPos);
+ add_to_sig(result,"vtkIdType",&currPos);
} else {
- if(IsShort(currentFunction->ArgTypes[i])) {
- add_to_sig(result,"int",&currPos);
- }
+ if(IsShort(aArgVal)) {
+ if (IsUnsigned(aArgVal))
+ add_to_sig(result,"unsigned ",&currPos);
+ add_to_sig(result,"int",&currPos);
+ }
}
- if(IsLong(currentFunction->ArgTypes[i]))
- add_to_sig(result,"long",&currPos);
-
+ if(IsLong(aArgVal)) {
+ if (IsUnsigned(aArgVal))
+ add_to_sig(result,"unsigned ",&currPos);
+ add_to_sig(result,"long",&currPos);
+ }
sprintf(buf,"* a_temp%d = new ",i);
add_to_sig(result,buf,&currPos);
-
- if(IsFloat(currentFunction->ArgTypes[i]))
- add_to_sig(result,"float",&currPos);
- if(IsDouble(currentFunction->ArgTypes[i]))
- add_to_sig(result,"double",&currPos);
+ if(IsFloat(aArgVal))
+ add_to_sig(result,"float",&currPos);
+
+ if(IsDouble(aArgVal))
+ add_to_sig(result,"double",&currPos);
- if(IsvtkIdType(currentFunction->ArgTypes[i])) {
- add_to_sig(result,"vtkIdType",&currPos);
+ if(IsvtkIdType(aArgVal)) {
+ if (IsUnsigned(aArgVal))
+ add_to_sig(result,"unsigned ",&currPos);
+ add_to_sig(result,"vtkIdType",&currPos);
} else {
- if(IsShort(currentFunction->ArgTypes[i])) {
- add_to_sig(result,"int",&currPos);
- }
+ if(IsShort(aArgVal)) {
+ if (IsUnsigned(aArgVal))
+ add_to_sig(result,"unsigned ",&currPos);
+ add_to_sig(result,"int",&currPos);
+ }
+ }
+
+ if(IsLong(aArgVal)) {
+ if (IsUnsigned(aArgVal))
+ add_to_sig(result,"unsigned ",&currPos);
+ add_to_sig(result,"long",&currPos);
}
-
- if(IsLong(currentFunction->ArgTypes[i]))
- add_to_sig(result,"long",&currPos);
sprintf(buf,"[l_temp%d];\n",i);
add_to_sig(result,buf,&currPos);
@@ -892,12 +986,12 @@ void get_signature(const char* num, FileInfo *data)
add_to_sig(result," }\n",&currPos);
}
- if(IsString(currentFunction->ArgTypes[i])) {
+ if(IsString(aArgVal)) {
sprintf(buf," char *c_temp%d = CORBA::string_dup(temp%d);\n",i,i);
add_to_sig(result,buf,&currPos);
}
- if(IsVoid(currentFunction->ArgTypes[i])) {
+ if(IsVoid(aArgVal)) {
sprintf(buf," long v_temp%d;\n",i);
add_to_sig(result,buf,&currPos);
@@ -907,40 +1001,40 @@ void get_signature(const char* num, FileInfo *data)
}
add_to_sig(result," ",&currPos);
- if(IsArray(currentFunction->ReturnType) && !IsClass(currentFunction->ReturnType) && !IsString(currentFunction->ReturnType)) {
+ if(IsArray(aRetVal) && !IsClass(aRetVal) && !IsString(aRetVal)) {
add_to_sig(result,"CORBA::ULong i_ret;\n",&currPos);
add_to_sig(result," PARAVIS::",&currPos);
- AddTypeArray(currentFunction->ReturnType,result,&currPos);
+ AddTypeArray(aRetVal,result,&currPos);
add_to_sig(result,"_var s_ret = new ",&currPos);
- AddTypeArray(currentFunction->ReturnType,result,&currPos);
+ AddTypeArray(aRetVal,result,&currPos);
add_to_sig(result,"();\n",&currPos);
sprintf(buf," s_ret->length(%d);\n",currentFunction->HintSize);
add_to_sig(result,buf,&currPos);
add_to_sig(result," ",&currPos);
}
- if(IsFloat(currentFunction->ReturnType)) {
- if(IsArray(currentFunction->ReturnType)) {
+ if(IsFloat(aRetVal)) {
+ if(IsArray(aRetVal)) {
add_to_sig(result,"float* a_ret = ",&currPos);
} else {
add_to_sig(result,"CORBA::Float ret = ",&currPos);
}
}
- if(IsDouble(currentFunction->ReturnType)) {
- if(IsArray(currentFunction->ReturnType)) {
+ if(IsDouble(aRetVal)) {
+ if(IsArray(aRetVal)) {
add_to_sig(result,"double* a_ret = ",&currPos);
} else {
add_to_sig(result,"CORBA::Double ret = ",&currPos);
}
}
- if(IsShort(currentFunction->ReturnType)) {
- if(IsArray(currentFunction->ReturnType)) {
- if(IsvtkIdType(currentFunction->ReturnType)) {
- add_to_sig(result,"vtkIdType",&currPos);
+ if(IsShort(aRetVal)) {
+ if(IsArray(aRetVal)) {
+ if(IsvtkIdType(aRetVal)) {
+ add_to_sig(result,"vtkIdType",&currPos);
} else {
- add_to_sig(result,"int",&currPos);
+ add_to_sig(result,"int",&currPos);
}
add_to_sig(result,"* a_ret = ",&currPos);
} else {
@@ -948,39 +1042,39 @@ void get_signature(const char* num, FileInfo *data)
}
}
- if(IsLong(currentFunction->ReturnType)) {
- if(IsArray(currentFunction->ReturnType)) {
+ if(IsLong(aRetVal)) {
+ if(IsArray(aRetVal)) {
add_to_sig(result,"long* a_ret = ",&currPos);
} else {
add_to_sig(result,"CORBA::Long ret = ",&currPos);
}
}
- if(IsChar(currentFunction->ReturnType)) {
- if(IsString(currentFunction->ReturnType)) {
+ //if(IsChar(aRetVal)) {
+ if(IsString(aRetVal)) {
add_to_sig(result,"char * ret = CORBA::string_dup(\"\");\n",&currPos);
add_to_sig(result," const char * cret = ",&currPos);
- } else {
+ } else if (IsChar(aRetVal)) { //!!! vsv
add_to_sig(result,"CORBA::Char ret = ",&currPos);
}
- }
+ //}
- if(IsBoolean(currentFunction->ReturnType)) {
+ if(IsBoolean(aRetVal)) {
add_to_sig(result,"CORBA::Boolean ret = ",&currPos);
}
- if(IsVoidPtr(currentFunction->ReturnType)) {
+ if(IsVoidPtr(aRetVal)) {
add_to_sig(result,"void * v_ret = ",&currPos);
}
- if(IsClass(currentFunction->ReturnType)) {
+ if(IsClass(aRetVal)) {
add_to_sig(result,"::",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
add_to_sig(result,"* a",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
add_to_sig(result," = ",&currPos);
}
- if(IsVoid(currentFunction->ReturnType)) {
+ if(IsVoid(aRetVal)) {
add_to_sig(result,"if(getVTKObject() != NULL) ProcessVoidEvent",&currPos);
} else {
add_to_sig(result,"(getVTKObject() != NULL) ? ProcessEvent",&currPos);
@@ -994,120 +1088,114 @@ void get_signature(const char* num, FileInfo *data)
add_to_sig(result,")",&currPos);
add_to_sig(result,"((::",&currPos);
- add_to_sig(result,data->ClassName,&currPos);
+ add_to_sig(result,data->Name,&currPos);
add_to_sig(result,"*)",&currPos);
add_to_sig(result,"getVTKObject()\n",&currPos);
for (i = 0; i < currentFunction->NumberOfArguments; i++) {
+ aArgVal = currentFunction->Arguments[i];
add_to_sig(result," , ",&currPos);
//if(IsClass(currentFunction->ArgTypes[i]) && IsPtr(currentFunction->ArgTypes[i])) {
//add_to_sig(result,"*(",&currPos);
//}
- if(IsClass(currentFunction->ArgTypes[i])) {
- sprintf(buf,"(i_temp%d != NULL)?dynamic_cast< ::%s*>(i_temp%d->getVTKObject()):NULL",i,currentFunction->ArgClasses[i],i);
+ if(IsClass(aArgVal)) {
+ //sprintf(buf,"(i_temp%d != NULL)?dynamic_cast< ::%s*>(i_temp%d->getVTKObject()):NULL",i,currentFunction->ArgClasses[i],i);
+ sprintf(buf,"(i_temp%d != NULL)?dynamic_cast< ::%s*>(i_temp%d->getVTKObject()):NULL",i,aArgVal->Class,i);
} else {
- if(
- IsArray(currentFunction->ArgTypes[i])
- && !IsString(currentFunction->ArgTypes[i])
- && !IsVoid(currentFunction->ArgTypes[i])
- ) {
- sprintf(buf,"a_temp%d",i);
+ if(IsArray(aArgVal) && !IsString(aArgVal) && !IsVoid(aArgVal)) {
+ sprintf(buf,"a_temp%d",i);
} else {
- if(IsVoidPtr(currentFunction->ArgTypes[i])) {
- sprintf(buf,"(void*)v_temp%d",i);
- } else {
- if(IsString(currentFunction->ArgTypes[i])) {
- sprintf(buf,"c_temp%d",i);
- } else {
- sprintf(buf,"temp%d",i);
- }
- }
+ if(IsVoidPtr(aArgVal)) {
+ sprintf(buf,"(void*)v_temp%d",i);
+ } else {
+ if(IsString(aArgVal)) {
+ sprintf(buf,"c_temp%d",i);
+ } else {
+ sprintf(buf,"temp%d",i);
+ }
+ }
}
}
-
+
add_to_sig(result,buf,&currPos);
//if(IsClass(currentFunction->ArgTypes[i]) && IsPtr(currentFunction->ArgTypes[i])) {
//add_to_sig(result,")",&currPos);
//}
add_to_sig(result,"\n",&currPos);
}
-
+
add_to_sig(result," )\n",&currPos);
add_to_sig(result," )",&currPos);
- if(!IsVoid(currentFunction->ReturnType)) {
+ if(!IsVoid(aRetVal)) {
add_to_sig(result,":",&currPos);
- if(IsClass(currentFunction->ReturnType) || IsString(currentFunction->ReturnType) || IsPtr(currentFunction->ReturnType) || IsArray(currentFunction->ReturnType))
+ if(IsClass(aRetVal) || IsString(aRetVal) || IsPtr(aRetVal) || IsArray(aRetVal))
add_to_sig(result,"NULL",&currPos);
else
add_to_sig(result,"0",&currPos);
}
add_to_sig(result,";\n",&currPos);
- if(IsString(currentFunction->ReturnType)) {
+ if(IsString(aRetVal)) {
add_to_sig(result," if(cret!=NULL) ret=CORBA::string_dup(cret);\n",&currPos);
}
- if(IsClass(currentFunction->ReturnType)) {
+ if(IsClass(aRetVal)) {
add_to_sig(result," if(a",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
add_to_sig(result," == NULL) {\n",&currPos);
add_to_sig(result," return PARAVIS::",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
add_to_sig(result,"::_nil();\n",&currPos);
add_to_sig(result," }\n",&currPos);
add_to_sig(result," ",&currPos);
add_to_sig(result,"PARAVIS_Base_i* aPtr = ::CreateInstance(a",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
add_to_sig(result,", a",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
add_to_sig(result,"->GetClassName());\n",&currPos);
add_to_sig(result," aPtr->Init(a",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
add_to_sig(result,");\n",&currPos);
}
for (i = 0; i < currentFunction->NumberOfArguments; i++) {
- if(
- IsArray(currentFunction->ArgTypes[i])
- && !IsVoid(currentFunction->ArgTypes[i])
- && !IsString(currentFunction->ArgTypes[i])
- && !IsClass(currentFunction->ArgTypes[i])
- ) {
- if (!IsIn(currentFunction->ArgTypes[i])) {
- sprintf(buf," for(j_temp%d=0;j_temp%dArguments[i];
+ if(IsArray(aArgVal) && !IsVoid(aArgVal) && !IsString(aArgVal) && !IsClass(aArgVal)) {
+ if (!IsIn(aArgVal)) {
+ sprintf(buf," for(j_temp%d=0;j_temp%dReturnType) && !IsVoidPtr(currentFunction->ReturnType)) {
+ if (IsVoid(aRetVal) && !IsVoidPtr(aRetVal)) {
add_to_sig(result," return;\n",&currPos);
} else {
- if(IsClass(currentFunction->ReturnType)) {
+ if(IsClass(aRetVal)) {
add_to_sig(result," return aPtr->_this();\n",&currPos);
} else {
- if(IsVoid(currentFunction->ReturnType)) {
- add_to_sig(result," CORBA::Any* ret = new CORBA::Any;\n",&currPos);
- add_to_sig(result," (*ret) <<= v_ret;\n",&currPos);
- add_to_sig(result," return ret;\n",&currPos);
+ if(IsVoid(aRetVal)) {
+ add_to_sig(result," CORBA::Any* ret = new CORBA::Any;\n",&currPos);
+ add_to_sig(result," (*ret) <<= v_ret;\n",&currPos);
+ add_to_sig(result," return ret;\n",&currPos);
} else {
- if(IsArray(currentFunction->ReturnType) && !IsString(currentFunction->ReturnType)) {
- sprintf(buf," for(i_ret=0; i_ret<%d; i_ret++) {\n",currentFunction->HintSize);
- add_to_sig(result,buf,&currPos);
- add_to_sig(result," s_ret[i_ret]=a_ret[i_ret];\n",&currPos);
- add_to_sig(result," }\n",&currPos);
- add_to_sig(result," return s_ret._retn();\n",&currPos);
- } else {
- add_to_sig(result," return ret;\n",&currPos);
- }
+ if(IsArray(aRetVal) && !IsString(aRetVal)) {
+ sprintf(buf," for(i_ret=0; i_ret<%d; i_ret++) {\n",currentFunction->HintSize);
+ add_to_sig(result,buf,&currPos);
+ add_to_sig(result," s_ret[i_ret]=a_ret[i_ret];\n",&currPos);
+ add_to_sig(result," }\n",&currPos);
+ add_to_sig(result," return s_ret._retn();\n",&currPos);
+ } else {
+ add_to_sig(result," return ret;\n",&currPos);
+ }
}
}
}
@@ -1119,29 +1207,29 @@ void get_signature(const char* num, FileInfo *data)
add_to_sig(result,currentFunction->Name,&currPos);
add_to_sig(result," - Unknown exception was occured!!!\");\n",&currPos);
- if (IsVoid(currentFunction->ReturnType)&& !IsVoidPtr(currentFunction->ReturnType)) {
+ if (IsVoid(aRetVal)&& !IsVoidPtr(aRetVal)) {
add_to_sig(result," return;\n",&currPos);
} else{
- if(IsString(currentFunction->ReturnType)) {
+ if(IsString(aRetVal)) {
add_to_sig(result," return CORBA::string_dup(\"\");\n",&currPos);
} else {
- if(IsClass(currentFunction->ReturnType)) {
- add_to_sig(result," return PARAVIS::",&currPos);
- add_to_sig(result,currentFunction->ReturnClass,&currPos);
- add_to_sig(result,"::_nil();\n",&currPos);
+ if(IsClass(aRetVal)) {
+ add_to_sig(result," return PARAVIS::",&currPos);
+ add_to_sig(result,currentFunction->ReturnValue->Class,&currPos);
+ add_to_sig(result,"::_nil();\n",&currPos);
} else {
- if(IsArray(currentFunction->ReturnType) && !IsVoid(currentFunction->ReturnType)) {
- add_to_sig(result," PARAVIS::",&currPos);
- AddTypeArray(currentFunction->ReturnType,result,&currPos);
- add_to_sig(result,"_var s_ret = new ",&currPos);
- AddTypeArray(currentFunction->ReturnType,result,&currPos);
- add_to_sig(result,"();\n",&currPos);
- sprintf(buf," s_ret->length(%d);\n",currentFunction->HintSize);
- add_to_sig(result,buf,&currPos);
- add_to_sig(result," return s_ret._retn();\n",&currPos);
- } else {
- add_to_sig(result," return 0;\n",&currPos);
- }
+ if(IsArray(aRetVal) && !IsVoid(aRetVal)) {
+ add_to_sig(result," PARAVIS::",&currPos);
+ AddTypeArray(aRetVal,result,&currPos);
+ add_to_sig(result,"_var s_ret = new ",&currPos);
+ AddTypeArray(aRetVal,result,&currPos);
+ add_to_sig(result,"();\n",&currPos);
+ sprintf(buf," s_ret->length(%d);\n",currentFunction->HintSize);
+ add_to_sig(result,buf,&currPos);
+ add_to_sig(result," return s_ret._retn();\n",&currPos);
+ } else {
+ add_to_sig(result," return 0;\n",&currPos);
+ }
}
}
}
@@ -1155,9 +1243,12 @@ void get_signature(const char* num, FileInfo *data)
if(ret)
{
result[currPos_sig]='\0';
- currentFunction->Signature = realloc(currentFunction->Signature,
- (size_t)(currPos_sig+1));
- strcpy(currentFunction->Signature,result);
+ /*currentFunction->Signature = (const char*)realloc((void*)currentFunction->Signature,
+ (size_t)(currPos_sig+1));*/
+ cp = (char *)malloc(currPos_sig+1);
+ strcpy(cp, result);
+ currentFunction->Signature = cp;
+ //strcpy((char*)currentFunction->Signature,result);
return;
}
@@ -1175,34 +1266,39 @@ void get_signature(const char* num, FileInfo *data)
buf[j]=0;
buf1[j]=0;
if(strcmp(buf,buf1) == 0) {
- currentFunction->Signature[0]='\0';
- return;
+ ((char*)currentFunction->Signature)[0]='\0';
+ return;
}
}
}
-
- currentFunction->Signature = realloc(currentFunction->Signature,
- (size_t)(currPos+1));
- strcpy(currentFunction->Signature,result);
+ /*currentFunction->Signature = (const char*)realloc((void*)currentFunction->Signature,
+ (size_t)(currPos+1));*/
+ //strcpy((char*)currentFunction->Signature, result);
+ cp = (char *)malloc(currPos+1);
+ strcpy(cp, result);
+ currentFunction->Signature = cp;
}
-void outputFunction2(FILE *fp, FileInfo *data)
+void outputFunction2(FILE *fp, ClassInfo *data)
{
- int i, j, k, is_static, is_vtkobject, fnum, occ, backnum, goto_used;
- int all_legacy;
+ int i, j, k, is_vtkobject, fnum, backnum;//, is_static, occ, goto_used;
+ //int all_legacy;
FunctionInfo *theFunc;
FunctionInfo *backFunc;
- char *theName;
- int theType;
- char *backName;
+ const char *theName;
+ unsigned int theType;
+ const char *backName;
int backType;
char static num[8];
//int isSMObject = 0;
int found = 0;
+ ValueInfo* aArgVal = 0;
+ ValueInfo* aBackArgVal = 0;
+
#if defined(IDL_I_HH)
fprintf(fp,"#include \"SALOMEconfig.h\"\n");
- fprintf(fp,"#include CORBA_SERVER_HEADER(PARAVIS_Gen_%s)\n",data->ClassName);
+ fprintf(fp,"#include CORBA_SERVER_HEADER(PARAVIS_Gen_%s)\n",data->Name);
fprintf(fp,"\n");
fprintf(fp,"#include \"SALOME_GenericObj_i.hh\"\n");
fprintf(fp,"#include \"PARAVIS_Gen_i.hh\"\n");
@@ -1215,14 +1311,14 @@ void outputFunction2(FILE *fp, FileInfo *data)
fprintf(fp,"#include \"PARAVIS_Gen_%s_i.hh\"\n",data->SuperClasses[i]);
}
- fprintf(fp,"\nclass %s;\n",data->ClassName);
+ fprintf(fp,"\nclass %s;\n",data->Name);
fprintf(fp,"\nnamespace PARAVIS\n{\n\n");
#elif defined(IDL_I_CC)
fprintf(fp,"#include \"SALOME_GenericObj_i.hh\"\n");
- fprintf(fp,"#include \"PARAVIS_Gen_%s_i.hh\"\n",data->ClassName);
+ fprintf(fp,"#include \"PARAVIS_Gen_%s_i.hh\"\n",data->Name);
fprintf(fp,"#include \"PV_Tools.h\"\n");
fprintf(fp,"#include \"SALOME_Event.h\"\n");
- fprintf(fp,"#include <%s.h>\n",data->ClassName);
+ fprintf(fp,"#include <%s.h>\n",data->Name);
#else
fprintf(fp,"#include \"PARAVIS_Gen.idl\"\n");
fprintf(fp,"#include \"PARAVIS_Gen_Types.idl\"\n");
@@ -1235,160 +1331,182 @@ void outputFunction2(FILE *fp, FileInfo *data)
fprintf(fp,"\nmodule PARAVIS\n{\n\n");
#endif
- is_vtkobject = ((strcmp(data->ClassName,"vtkObjectBase") == 0) ||
+ is_vtkobject = ((strcmp(data->Name,"vtkObjectBase") == 0) ||
(data->NumberOfSuperClasses != 0));
for(i = 0; i < data->NumberOfSuperClasses; i++) {
- read_class_functions(data->SuperClasses[i],data->ClassName,fp);
+ read_class_functions(data->SuperClasses[i],data->Name,fp);
}
/* create a idl signature for each method */
for (fnum = 0; fnum < numberOfWrappedFunctions; fnum++)
{
-
- theFunc = wrappedFunctions[fnum];
- currentFunction = theFunc;
-
- /* names of idl methods should be unique */
- num[0]='\0';
- j=-1;
- for (i = 0; i < numberOfReadFunctions; i++) {
- if(strcmp(currentFunction->Name,readFunctions[i].Name) == 0)
- j++;
- }
-
- for (i = 0; i < fnum; i++)
- {
- if( strcmp(currentFunction->Name,wrappedFunctions[i]->Name) == 0 )
- j++;
- }
-
- if(j<0) {
- for (i = fnum+1; i < numberOfWrappedFunctions; i++) {
- if( strcmp(currentFunction->Name,wrappedFunctions[i]->Name) == 0 ) {
- j=0;
- break;
- }
+ theFunc = wrappedFunctions[fnum];
+ currentFunction = theFunc;
+ //printf("#### %i)Function %s\n", fnum, theFunc->Name);
+
+ /* names of idl methods should be unique */
+ num[0]='\0';
+ j=-1;
+ for (i = 0; i < numberOfReadFunctions; i++) {
+ if(strcmp(currentFunction->Name,readFunctions[i].Name) == 0)
+ j++;
}
- } else {
- j++;
- }
-
- if(j>=0)
- {
- sprintf(num,"_%d",j);
+ for (i = 0; i < fnum; i++)
+ {
+ if( strcmp(currentFunction->Name,wrappedFunctions[i]->Name) == 0 )
+ j++;
+ }
+
+ if(j<0) {
+ for (i = fnum+1; i < numberOfWrappedFunctions; i++) {
+ if( strcmp(currentFunction->Name,wrappedFunctions[i]->Name) == 0 ) {
+ j=0;
+ break;
+ }
+ }
+ } else {
+ j++;
}
-
- get_signature(num,data);
+
+ if(j>=0)
+ {
+ sprintf(num,"_%d",j);
+ }
+
+ get_signature(num,data);
}
-
/* create external type declarations for all object
return types */
for (fnum = 0; fnum < numberOfWrappedFunctions; fnum++)
{
- theFunc = wrappedFunctions[fnum];
- currentFunction = theFunc;
- theName = NULL;
- theType = 0;
-
- for (i = theFunc->NumberOfArguments; i >= 0; i--)
- {
- if (i==0)/* return type */
- {
- theType = theFunc->ReturnType;
- theName = theFunc->ReturnClass;
- }
- else /* arg type */
- {
- theType = theFunc->ArgTypes[i-1];
- theName = theFunc->ArgClasses[i-1];
- }
- /* check for object types */
- if ((theType % 0x1000 == 0x309)||
- (theType % 0x1000 == 0x109))
- {
- /* check that we haven't done this type (no duplicate declarations) */
- for (backnum = fnum; backnum >= 0; backnum--)
- {
- backFunc = wrappedFunctions[backnum];
- backName = NULL;
- backType = 0;
- if (backnum == fnum)
- k = i+1;
- else
- k = 0;
- for (j = backFunc->NumberOfArguments; j >= k; j--)
- {
- if (j==0) /* return type */
- {
- backType = backFunc->ReturnType;
- backName = backFunc->ReturnClass;
- }
- else /* arg type */
- {
- backType = backFunc->ArgTypes[j-1];
- backName = backFunc->ArgClasses[j-1];
- }
- if (((backType % 0x1000 == 0x309)||
- (backType % 0x1000 == 0x109)))
- {
- if(strcmp(theName,backName) == 0)
- {
- break;
- }
- }
- }
- if (j >= k)
- {
- break;
- }
- }
- if (backnum < 0 && strcmp(data->ClassName,theName) != 0)
- {
- found = 0;
- for(j = 0; strcmp(wrapped_classes[j],"") != 0 && found == 0; j++)
- {
- if(strcmp(wrapped_classes[j],theName) == 0)
- found = 1;
- }
- if(found)
- {
+ theFunc = wrappedFunctions[fnum];
+ currentFunction = theFunc;
+ theName = NULL;
+ theType = 0;
+
+ for (i = theFunc->NumberOfArguments; i >= 0; i--)
+ {
+ if (i==0)/* return type */
+ {
+ aArgVal = theFunc->ReturnValue;
+ //theType = theFunc->ReturnType;
+ //theName = (char*)theFunc->ReturnClass;
+ }
+ else /* arg type */
+ {
+ aArgVal = theFunc->Arguments[i-1];
+ //theType = theFunc->ArgTypes[i-1];
+ //theName = (char*)theFunc->ArgClasses[i-1];
+ }
+ theType = aArgVal->Type & VTK_PARSE_BASE_TYPE;
+ theName = aArgVal->Class;
+ /* check for object types */
+ /*if ((theType & VTK_PARSE_BASE_TYPE == 0x309)||
+ (theType & VTK_PARSE_BASE_TYPE == 0x109))*/
+ if ((theType == VTK_PARSE_OBJECT) || (theType == VTK_PARSE_OBJECT_REF))
+ {
+ /* check that we haven't done this type (no duplicate declarations) */
+ for (backnum = fnum; backnum >= 0; backnum--)
+ {
+ backFunc = wrappedFunctions[backnum];
+ backName = NULL;
+ backType = 0;
+ if (backnum == fnum)
+ k = i+1;
+ else
+ k = 0;
+ for (j = backFunc->NumberOfArguments; j >= k; j--)
+ {
+ if (j==0) /* return type */
+ {
+ aBackArgVal = backFunc->ReturnValue;
+ //backType = backFunc->ReturnType;
+ //backName = (char*)backFunc->ReturnClass;
+ }
+ else /* arg type */
+ {
+ aBackArgVal = backFunc->Arguments[j-1];
+ //backType = backFunc->ArgTypes[j-1];
+ //backName = (char*)backFunc->ArgClasses[j-1];
+ }
+ backType = aBackArgVal->Type & VTK_PARSE_BASE_TYPE;
+ backName = aBackArgVal->Class;
+ /*if (((backType % VTK_PARSE_BASE_TYPE == 0x309)||
+ (backType % VTK_PARSE_BASE_TYPE == 0x109)))*/
+ if ((backType == VTK_PARSE_OBJECT) || (backType == VTK_PARSE_OBJECT_REF))
+ {
+ if(strcmp(theName,backName) == 0)
+ {
+ break;
+ }
+ }
+ }
+ if (j >= k)
+ {
+ break;
+ }
+ }
+ if (backnum < 0 && strcmp(data->Name,theName) != 0)
+ {
+ found = 0;
+ for(j = 0; strcmp(wrapped_classes[j],"") != 0 && found == 0; j++)
+ {
+ if(strcmp(wrapped_classes[j],theName) == 0)
+ found = 1;
+ }
+ if(found)
+ {
#if defined(IDL_I_HH)
- fprintf(fp," class %s_i;\n",theName);
+ fprintf(fp," class %s_i;\n",theName);
#elif defined(IDL_I_CC)
- fprintf(fp,"#include \"PARAVIS_Gen_%s_i.hh\"\n",theName);
- fprintf(fp,"#include <%s.h>\n",theName);
+ fprintf(fp,"#include \"PARAVIS_Gen_%s_i.hh\"\n",theName);
+ fprintf(fp,"#include <%s.h>\n",theName);
#else
- //fprintf(fp,"#include \"PARAVIS_Gen_%s.idl\"\n",theName);
- fprintf(fp," interface %s;\n",theName);
+ //fprintf(fp,"#include \"PARAVIS_Gen_%s.idl\"\n",theName);
+ fprintf(fp," interface %s;\n",theName);
#endif
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
-
+
//fprintf(fp,"\nmodule PARAVIS\n{\n");
#if defined(IDL_I_HH)
- fprintf(fp,"\n class %s_i : public virtual POA_PARAVIS::%s, public virtual PARAVIS::PARAVIS_Base_i",data->ClassName,data->ClassName);
+ fprintf(fp,"\n class %s_i : public virtual POA_PARAVIS::%s, public virtual PARAVIS::PARAVIS_Base_i",data->Name,data->Name);
//for(i = 0; i < data->NumberOfSuperClasses; i++) {
// fprintf(fp,", public virtual %s_i",data->SuperClasses[i]);
//}
//fprintf(fp,", public virtual SALOME::GenericObj_i");
fprintf(fp," {");
fprintf(fp,"\n public:\n");
- fprintf(fp,"\n %s_i();\n",data->ClassName);
+ fprintf(fp,"\n %s_i();\n",data->Name);
+ if(strcmp(data->Name,"vtkSMSessionProxyManager") != 0) {
+ fprintf(fp,"\n ::vtkObjectBase* GetNew();\n");
+ }
+
#elif defined(IDL_I_CC)
fprintf(fp,"extern PARAVIS::PARAVIS_Base_i* CreateInstance(::vtkObjectBase* Inst, const QString&);\n");
fprintf(fp,"\nnamespace PARAVIS\n{\n");
- fprintf(fp,"typedef %s_i current_inderface;\n",data->ClassName);
- fprintf(fp,"#define CreateEventName(Function) Event%s ##Function\n",data->ClassName);
- fprintf(fp,"%s_i::%s_i() {\n",data->ClassName,data->ClassName);
- fprintf(fp," Init(::%s::New());\n",data->ClassName);
+ fprintf(fp,"typedef %s_i current_interface;\n",data->Name);
+ fprintf(fp,"#define CreateEventName(Function) Event%s ##Function\n",data->Name);
+ fprintf(fp,"%s_i::%s_i() {\n",data->Name,data->Name);
+ //fprintf(fp," Init(::%s::New());\n",data->Name);
fprintf(fp,"}\n");
fprintf(fp,"\n");
+
+ if(strcmp(data->Name,"vtkSMSessionProxyManager") != 0) {
+ fprintf(fp,"::vtkObjectBase* %s_i::GetNew() {\n", data->Name);
+ if(strcmp(data->Name,"vtkSMProxyManager") == 0) {
+ fprintf(fp," return ::%s::GetProxyManager();\n",data->Name);
+ } else {
+ fprintf(fp," return ::%s::New();\n",data->Name);
+ }
+ fprintf(fp,"}\n");
+ }
#else
- fprintf(fp,"\n interface %s : PARAVIS_Base",data->ClassName);
+ fprintf(fp,"\n interface %s : PARAVIS_Base",data->Name);
fprintf(fp,"\n {\n");
#endif
@@ -1413,11 +1531,15 @@ void outputFunction2(FILE *fp, FileInfo *data)
return;
}
-void outputFunction(FILE *fp, FileInfo *data)
+void outputFunction(FILE *fp, ClassInfo *data)
{
int i;
- int args_ok = 1;
-
+ //int args_ok = 1;
+ ValueInfo* aRetVal = NULL;//currentFunction->ReturnValue;
+ ValueInfo* aArgVal = NULL;
+ unsigned int aType;
+ unsigned int argtype;
+
fp = fp;
/* some functions will not get wrapped no matter what else,
and some really common functions will appear only in vtkObjectPython */
@@ -1428,133 +1550,217 @@ void outputFunction(FILE *fp, FileInfo *data)
{
return;
}
-
+ //printf("#### Check %s\n", currentFunction->Name);
+
/* check to see if we can handle the args */
for (i = 0; i < currentFunction->NumberOfArguments; i++)
{
- if (currentFunction->ArgTypes[i] % 0x1000 == 9) args_ok = 0;
- if ((currentFunction->ArgTypes[i] % 0x10) == 8) args_ok = 0;
- if (((currentFunction->ArgTypes[i] % 0x1000)/0x100 != 0x3)&&
- (currentFunction->ArgTypes[i] % 0x1000 != 0x109)&&
- ((currentFunction->ArgTypes[i] % 0x1000)/0x100)) args_ok = 0;
- if (currentFunction->ArgTypes[i] % 0x1000 == 0x313) args_ok = 0;
- if (currentFunction->ArgTypes[i] % 0x1000 == 0x314) args_ok = 0;
- if (currentFunction->ArgTypes[i] % 0x1000 == 0x31A) args_ok = 0;
- if (currentFunction->ArgTypes[i] % 0x1000 == 0x31B) args_ok = 0;
- if (currentFunction->ArgTypes[i] % 0x1000 == 0x31C) args_ok = 0;
- if (currentFunction->ArgTypes[i] % 0x1000 == 0x315) args_ok = 0;
- if (currentFunction->ArgTypes[i] % 0x1000 == 0x316) args_ok = 0;
+ aArgVal = currentFunction->Arguments[i];
+ /*printf(" Argument: %s ", vtkWrap_GetTypeName(aArgVal));
+ if (vtkWrap_IsArray(aArgVal)) {
+ printf("!!!! Argument %i is array\n", i);
+ return;
+ }*/
+ if (vtkWrap_IsStream(aArgVal)) {
+ //printf("!!!! Argument %i is stream\n", i);
+ return;
+ }
+ if (IsPtr(aArgVal)) {
+ //printf("!!!! Argument %i is pointer value\n", i);
+ return;
+ }
+ if (IsUnknown(aArgVal)) {
+ //printf("!!!! Argument %i is unknown value\n", i);
+ return;
+ }
+ if (vtkWrap_IsVoidPointer(aArgVal)) {
+ //printf("!!!! Argument %i is void pointer\n", i);
+ return;
+ }
+ if (vtkWrap_IsVoidFunction(aArgVal)) {
+ //printf("!!!! Argument %i is void function\n", i);
+ return;
+ }
+ argtype = (aArgVal->Type & VTK_PARSE_INDIRECT);
+ if (argtype == VTK_PARSE_POINTER_POINTER){
+ //printf("!!!! Argument %i is pointer to pointer\n", i);
+ return;
+ }
+ if (vtkWrap_IsNonConstRef(aArgVal)) {
+ //printf("!!!! Argument %i is non const ref\n", i);
+ return;
+ }
+ if (vtkWrap_IsSpecialObject(aArgVal)) {
+ //printf("!!!! Argument %i is special object\n", i);
+ return;
+ }
+ /*if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 9) args_ok = 0;
+ if ((currentFunction->ArgTypes[i] % 0x10) == 8) args_ok = 0;
+ if (((currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE)/0x100 != 0x3)&&
+ (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE != 0x109)&&
+ ((currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE)/0x100)) args_ok = 0;
+ if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 0x313) args_ok = 0;
+ if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 0x314) args_ok = 0;
+ if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 0x31A) args_ok = 0;
+ if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 0x31B) args_ok = 0;
+ if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 0x31C) args_ok = 0;
+ if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 0x315) args_ok = 0;
+ if (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE == 0x316) args_ok = 0;*/
+ }
+ aRetVal = currentFunction->ReturnValue;
+ if (aRetVal) {
+ //printf("#### Return type: %s\n", vtkWrap_GetTypeName(aRetVal));
+ aType = aRetVal->Type & VTK_PARSE_BASE_TYPE;
+ if (IsPtr(aRetVal)) {
+ //printf("!!!! Return Value is pointer\n");
+ return;
+ }
+ /* eliminate unsigned char * and unsigned short * */
+ argtype = (aRetVal->Type & VTK_PARSE_UNQUALIFIED_TYPE);
+ if ((argtype == VTK_PARSE_UNSIGNED_CHAR_PTR) || (argtype == VTK_PARSE_UNSIGNED_SHORT)) {
+ //printf("!!!! Return Value is unsigned char or short\n");
+ return;
}
- if ((currentFunction->ReturnType % 0x10) == 0x8) args_ok = 0;
- if (currentFunction->ReturnType % 0x1000 == 0x9) args_ok = 0;
- if (((currentFunction->ReturnType % 0x1000)/0x100 != 0x3)&&
- (currentFunction->ReturnType % 0x1000 != 0x109)&&
- ((currentFunction->ReturnType % 0x1000)/0x100)) args_ok = 0;
-
-
- /* eliminate unsigned char * and unsigned short * */
- if (currentFunction->ReturnType % 0x1000 == 0x313) args_ok = 0;
- if (currentFunction->ReturnType % 0x1000 == 0x314) args_ok = 0;
- if (currentFunction->ReturnType % 0x1000 == 0x31A) args_ok = 0;
- if (currentFunction->ReturnType % 0x1000 == 0x31B) args_ok = 0;
- if (currentFunction->ReturnType % 0x1000 == 0x31C) args_ok = 0;
- if (currentFunction->ReturnType % 0x1000 == 0x315) args_ok = 0;
- if (currentFunction->ReturnType % 0x1000 == 0x316) args_ok = 0;
+
+ if ((aType == VTK_PARSE_UNKNOWN)) {
+ //printf("!!!! Return Value is unknown\n");
+ return;
+ }
+ argtype = (aRetVal->Type & VTK_PARSE_INDIRECT);
+ if (argtype == VTK_PARSE_POINTER_POINTER){
+ //printf("!!!! Return value is pointer to pointer\n", i);
+ return;
+ }
+ if (vtkWrap_IsSpecialObject(aRetVal)) {
+ //printf("!!!! Return is special object\n", i);
+ return;
+ }
+ }
+ /*if ((aRetVal % 0x10) == 0x8) args_ok = 0;
+ if (aRetVal % VTK_PARSE_BASE_TYPE == 0x9) args_ok = 0;
+ if (((aRetVal % VTK_PARSE_BASE_TYPE)/0x100 != 0x3)&&
+ (aRetVal % VTK_PARSE_BASE_TYPE != 0x109)&&
+ ((aRetVal % VTK_PARSE_BASE_TYPE)/0x100)) args_ok = 0;
+ */
+
+ /*if (aRetVal % VTK_PARSE_BASE_TYPE == 0x313) args_ok = 0;
+ if (aRetVal % VTK_PARSE_BASE_TYPE == 0x314) args_ok = 0;
+ if (aRetVal % VTK_PARSE_BASE_TYPE == 0x31A) args_ok = 0;
+ if (aRetVal % VTK_PARSE_BASE_TYPE == 0x31B) args_ok = 0;
+ if (aRetVal % VTK_PARSE_BASE_TYPE == 0x31C) args_ok = 0;
+ if (aRetVal % VTK_PARSE_BASE_TYPE == 0x315) args_ok = 0;
+ if (aRetVal % VTK_PARSE_BASE_TYPE == 0x316) args_ok = 0;
+
if (currentFunction->NumberOfArguments &&
(currentFunction->ArgTypes[0] == 0x5000)
- &&(currentFunction->NumberOfArguments != 0x1)) args_ok = 0;
+ &&(currentFunction->NumberOfArguments != 0x1)) args_ok = 0;*/
/* make sure we have all the info we need for array arguments in */
- for (i = 0; i < currentFunction->NumberOfArguments; i++)
+ /*for (i = 0; i < currentFunction->NumberOfArguments; i++)
{
- if (((currentFunction->ArgTypes[i] % 0x1000)/0x100 == 0x3)&&
+ if (((currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE)/0x100 == 0x3)&&
(currentFunction->ArgCounts[i] <= 0)&&
- (currentFunction->ArgTypes[i] % 0x1000 != 0x309)&&
- (currentFunction->ArgTypes[i] % 0x1000 != 0x303)&&
- (currentFunction->ArgTypes[i] % 0x1000 != 0x302)) args_ok = 0;
- }
+ (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE != 0x309)&&
+ (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE != 0x303)&&
+ (currentFunction->ArgTypes[i] % VTK_PARSE_BASE_TYPE != 0x302)) args_ok = 0;
+ }*/
/* if we need a return type hint make sure we have one */
- switch (currentFunction->ReturnType % 0x1000)
+ //switch (aRetVal % VTK_PARSE_BASE_TYPE)
+ /*switch (aRetVal->Type % VTK_PARSE_BASE_TYPE)
{
case 0x301: case 0x307: case 0x30A: case 0x30B: case 0x30C: case 0x30D: case 0x30E:
case 0x304: case 0x305: case 0x306:
args_ok = currentFunction->HaveHint;
break;
- }
+ }*/
/* make sure it isn't a Delete or New function */
if (!strcmp("Delete",currentFunction->Name) ||
!strcmp("New",currentFunction->Name))
{
- args_ok = 0;
+ return;
}
+
+ if (vtkWrap_IsDestructor(data, currentFunction) || vtkWrap_IsConstructor(data, currentFunction)) {
+ //printf("!!!! Return Value is constructor or destructor\n");
+ return;
+ }
/* check for New() function */
- if (!strcmp("New",currentFunction->Name) &&
- currentFunction->NumberOfArguments == 0)
+ if (!strcmp("New",currentFunction->Name) && currentFunction->NumberOfArguments == 0)
{
- class_has_new = 1;
+ class_has_new = 1;
}
- if (currentFunction->IsPublic && args_ok &&
- strcmp(data->ClassName,currentFunction->Name) &&
- strcmp(data->ClassName, currentFunction->Name + 1))
+ if (currentFunction->IsPublic && //args_ok &&
+ strcmp(data->Name,currentFunction->Name) &&
+ strcmp(data->Name, currentFunction->Name + 1))
{
- wrappedFunctions[numberOfWrappedFunctions] = currentFunction;
- numberOfWrappedFunctions++;
+ //printf("#### %i Function %s\n", numberOfWrappedFunctions, currentFunction->Name);
+ wrappedFunctions[numberOfWrappedFunctions] = currentFunction;
+ numberOfWrappedFunctions++;
}
-
+
return;
}
/* print the parsed structures */
-void vtkParseOutput(FILE *fp, FileInfo *data)
+void vtkParseOutput(FILE *fp, FileInfo *file_info)
{
int i;
+ ClassInfo *data;
+
+ /* get the main class */
+ data = file_info->MainClass;
+
+ // Do not wrap this class
+ // if (strcmp(data->Name, "vtkVariant") == 0)
+ // return;
#if defined(IDL_I_HH)
- fprintf(fp, "// idl wrapper interface for %s object implementation\n//\n", data->ClassName);
+ fprintf(fp, "// idl wrapper interface for %s object implementation\n//\n", data->Name);
#elif defined(IDL_I_CC)
- fprintf(fp, "// idl wrapper implementation for %s object\n//\n", data->ClassName);
+ fprintf(fp, "// idl wrapper implementation for %s object\n//\n", data->Name);
#else
- fprintf(fp, "// idl wrapper for %s object\n//\n", data->ClassName);
+ fprintf(fp, "// idl wrapper for %s object\n//\n", data->Name);
#endif
for (i = 0;1;i++)
{
if(strlen(Copyright[i]) != 0)
- {
- fprintf(fp,"%s\n",Copyright[i]);
- }
+ {
+ fprintf(fp,"%s\n",Copyright[i]);
+ }
else
- {
- break;
- }
+ {
+ break;
+ }
}
fprintf(fp,"\n");
#if defined(IDL_I_HH)
- fprintf(fp,"#ifndef PARAVIS_Gen_%s_i_HeaderFile\n",data->ClassName);
- fprintf(fp,"#define PARAVIS_Gen_%s_i_HeaderFile\n",data->ClassName);
+ fprintf(fp,"#ifndef PARAVIS_Gen_%s_i_HeaderFile\n",data->Name);
+ fprintf(fp,"#define PARAVIS_Gen_%s_i_HeaderFile\n",data->Name);
fprintf(fp,"\n");
#elif defined(IDL_I_CC)
#else
- fprintf(fp,"#ifndef __PARAVIS_Gen_%s__\n",data->ClassName);
- fprintf(fp,"#define __PARAVIS_Gen_%s__\n",data->ClassName);
+ fprintf(fp,"#ifndef __PARAVIS_Gen_%s__\n",data->Name);
+ fprintf(fp,"#define __PARAVIS_Gen_%s__\n",data->Name);
fprintf(fp,"\n");
#endif
/* insert function handling code here */
for (i = 0; i < data->NumberOfFunctions; i++)
{
- currentFunction = data->Functions + i;
+ currentFunction = data->Functions[i];
outputFunction(fp, data);
}
-
- if (data->NumberOfSuperClasses || !data->IsAbstract)
- {
- outputFunction2(fp, data);
- }
+ //printf("#### NbFunctions %i\n", numberOfWrappedFunctions);
+ //if (data->NumberOfSuperClasses || (!data->IsAbstract))
+ //if (numberOfWrappedFunctions)
+ // {
+ outputFunction2(fp, data);
+ // }
#if defined(IDL_I_HH)
fprintf(fp,"\n#endif\n");
diff --git a/idl/wrap.cmake b/idl/wrap.cmake
index b21aab7f..39b6b578 100755
--- a/idl/wrap.cmake
+++ b/idl/wrap.cmake
@@ -1,17 +1,31 @@
+# Copyright (C) 2010-2012 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
+#
+
ADD_CUSTOM_COMMAND(
OUTPUT vtkWrapIDL.h
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create_header.sh ${CMAKE_BINARY_DIR}
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_header.py ${CMAKE_BINARY_DIR}
DEPENDS ${CMAKE_BINARY_DIR}/wrapfiles.txt
)
-ADD_CUSTOM_COMMAND(
- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/vtkWrapIDL.c
- DEPENDS vtkWrapIDL.h
-)
-
ADD_CUSTOM_COMMAND(
OUTPUT hints
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create_hints.sh ${PARAVIEW_LIBRARY_DIRS}
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_hints.py ${PARAVIEW_LIBRARY_DIRS}
DEPENDS ${PARAVIEW_LIBRARY_DIRS}/hints ${CMAKE_CURRENT_SOURCE_DIR}/hints_paravis
)
@@ -20,7 +34,7 @@ SET(WRAP_SK_FILES)
IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt)
EXECUTE_PROCESS(
- COMMAND cat ${CMAKE_BINARY_DIR}/wrapfiles.txt
+ COMMAND ${PYTHON_EXECUTABLE} -c "f = open('${CMAKE_BINARY_DIR}/wrapfiles.txt') ; print f.read(), ; f.close()"
OUTPUT_VARIABLE WRAP_LIST_FULL
)
@@ -45,13 +59,22 @@ IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt)
SET(WRAP_IDL ${WRAP_IDL} PARAVIS_Gen_${VAL}.idl)
SET(WRAP_SK_FILES ${WRAP_SK_FILES} PARAVIS_Gen_${VAL}SK.cc)
+ SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL)
+ IF(WINDOWS)
+ IF(CMAKE_BUILD_TOOL STREQUAL nmake)
+ SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL.exe)
+ ELSE(CMAKE_BUILD_TOOL STREQUAL nmake)
+ SET(vtkWrapIDL_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/vtkWrapIDL.exe)
+ ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake)
+ ENDIF(WINDOWS)
ADD_CUSTOM_COMMAND(
OUTPUT PARAVIS_Gen_${VAL}.idl
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_exe ${PARAVIEW_INCLUDE_DIRS}/${VAL}.h hints 0 PARAVIS_Gen_${VAL}.idl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_exe ${PARAVIEW_INCLUDE_DIRS}/${VAL}.h hints ${DEP}
+ COMMAND ${vtkWrapIDL_EXEFILE} ${PARAVIEW_INCLUDE_DIRS}/${VAL}.h hints 0 PARAVIS_Gen_${VAL}.idl
+ DEPENDS vtkWrapIDL ${PARAVIEW_INCLUDE_DIRS}/${VAL}.h hints ${DEP}
)
ENDFOREACH(STR ${WRAP_LIST_REG})
ENDIF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt)
-ADD_CUSTOM_TARGET(generate_idl ALL DEPENDS ${CMAKE_BINARY_DIR}/wrapfiles.txt vtkWrapIDL.h ${CMAKE_CURRENT_SOURCE_DIR}/vtkWrapIDL.c hints ${WRAP_IDL})
+ADD_CUSTOM_TARGET(generate_txt DEPENDS ${CMAKE_BINARY_DIR}/wrapfiles.txt vtkWrapIDL.h hints)
+ADD_CUSTOM_TARGET(generate_idl ALL DEPENDS ${CMAKE_BINARY_DIR}/wrapfiles.txt vtkWrapIDL.h hints ${WRAP_IDL})
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index f25e07f4..6b2f87b8 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,220 +1,47 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2010-2012 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 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.
+# 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
+# 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
-# Modified by : Alexander BORODIN (OCN) - autotools usage
-
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
SET(dist_salomeres_DATA
- LightApp.xml
- SalomeApp.xml
- pqAppIcon22.png
- pqAppIcon16.png
- ParaViewFilters.xml
- ParaViewReaders.xml
- ParaViewSources.xml
- ParaViewWriters.xml
- SalomeApp.xml
-)
-
-SET(nodist_salomeres_SCRIPTS
- PARAVISCatalog.xml
-)
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/PARAVISCatalog.xml.in)
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/PARAVISCatalog.xml)
-
-
- MESSAGE(STATUS "Creation of ${output}")
- CONFIGURE_FILE(${input} ${output})
-
-
- #SET(input ${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in)
-
-
- #SET(output ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml)
-
-
- #MESSAGE(STATUS "Creation of ${output}")
- #CONFIGURE_FILE(${input} ${output})
-
+ pqAppIcon22.png
+ pqAppIcon16.png
+ ParaViewFilters.xml
+ ParaViewReaders.xml
+ ParaViewSources.xml
+ ParaViewWriters.xml
+ )
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-FOREACH(f ${nodist_salomeres_SCRIPTS})
+SET(input ${CMAKE_CURRENT_SOURCE_DIR}/PARAVISCatalog.xml.in)
+SET(output ${CMAKE_CURRENT_BINARY_DIR}/PARAVISCatalog.xml)
- SET(DEST share/salome/resources/paravis)
-
+MESSAGE(STATUS "Creation of ${output}")
+CONFIGURE_FILE(${input} ${output})
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
+INSTALL(FILES ${output} DESTINATION share/salome/resources/paravis)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
+SET(input ${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in)
+SET(output ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml)
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
+MESSAGE(STATUS "Creation of ${output}")
+CONFIGURE_FILE(${input} ${output})
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
+INSTALL(FILES ${output} DESTINATION share/salome/resources/paravis)
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
-
- ENDIF(ext STREQUAL .py)
-
-ENDFOREACH(f ${nodist_salomeres_SCRIPTS})
FOREACH(f ${dist_salomeres_DATA})
-
- SET(DEST share/salome/resources/paravis)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
-
- ENDIF(ext STREQUAL .py)
-
+ INSTALL(FILES ${f} DESTINATION share/salome/resources/paravis)
ENDFOREACH(f ${dist_salomeres_DATA})
diff --git a/resources/LightApp.xml b/resources/LightApp.xml
deleted file mode 100644
index 02f36852..00000000
--- a/resources/LightApp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/resources/PARAVISCatalog.xml.in b/resources/PARAVISCatalog.xml.in
index bd35b2b6..253b903a 100644
--- a/resources/PARAVISCatalog.xml.in
+++ b/resources/PARAVISCatalog.xml.in
@@ -1,9 +1,6 @@
@@ -25,12 +25,15 @@
-
+
+
+
+
@@ -40,10 +43,14 @@
+
-
-
+
+
+
+
+
@@ -56,4 +63,8 @@
+
+
+
+
diff --git a/resources/ParaViewWriters.xml b/resources/ParaViewWriters.xml
index 7e02ed21..92e8dc4a 100755
--- a/resources/ParaViewWriters.xml
+++ b/resources/ParaViewWriters.xml
@@ -1,5 +1,6 @@
+
@@ -18,7 +19,7 @@
-
+
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644
index cc032ab1..00000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644
index 00000000..498ce10b
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f41d7c4b..188fc882 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,62 +1,36 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# 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
+# Copyright (C) 2010-2012 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
-# Author : (CEA)
-# Modified by : Alexander BORODIN (OCN) - autotools usage
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
+SET(SUBDIRS
+ ENGINE
+ PVGUI
+ PV_SWIG
+ Macro
+ )
IF(BUILD_PLUGINS)
SET(SUBDIRS
- ENGINE
- PVGUI
- PV_SWIG
- Plugins
- )
-ELSE(BUILD_PLUGINS)
- SET(SUBDIRS
- ENGINE
- PVGUI
- PV_SWIG
- )
+ ${SUBDIRS}
+ Plugins
+ )
ENDIF(BUILD_PLUGINS)
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
+FOREACH(dir ${SUBDIRS})
+ ADD_SUBDIRECTORY(${dir})
+ENDFOREACH(dir ${SUBDIRS})
diff --git a/src/ENGINE/CMakeLists.txt b/src/ENGINE/CMakeLists.txt
index 07e1e5fd..918e68af 100644
--- a/src/ENGINE/CMakeLists.txt
+++ b/src/ENGINE/CMakeLists.txt
@@ -1,398 +1,39 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2010-2012 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 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.
+# 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
+# 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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# File : Makefile.in
-# Author : Vitaly Smetannikov
-# Module : PARAVIS
-# $Header:
-#
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SET(lib_LTLIBRARIES
- libPARAVISEngine.la
-)
-
-SET(salomeinclude_HEADERS
- PARAVIS_Engine_i.hh
-)
-
-SET(dist_libPARAVISEngine_la_SOURCES
- PARAVIS_Engine_i.cc
-)
-
-SET(libPARAVISEngine_la_CPPFLAGS
- ${KERNEL_CXXFLAGS}
- ${CORBA_CXXFLAGS}
- ${CORBA_INCLUDES}
- -I${CMAKE_BINARY_DIR}/salome_adm/unix
- -I${CMAKE_BINARY_DIR}/idl
-)
-
-SET(libPARAVISEngine_la_LDFLAGS
- ${KERNEL_LDFLAGS}
- ${SalomeIDLKernel}
- ${SalomeNS}
- ${SalomeContainer}
- ${CORBA_LIBS}
- ${CMAKE_BINARY_DIR}/idl/libSalomeIDLPARAVIS.la
-)
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-
- FOREACH(amname ${lib_LTLIBRARIES})
-
-
- STRING(REPLACE .la _la amname ${amname})
-
-
- STRING(LENGTH ${amname} len)
- MATH(EXPR newlen "${len}-3")
- STRING(SUBSTRING ${amname} 0 ${newlen} name)
-
-
- STRING(REGEX MATCH "^lib" BEGIN_WITH_lib ${name})
- IF(BEGIN_WITH_lib)
- STRING(LENGTH ${name} len)
- MATH(EXPR newlen "${len}-3")
- STRING(SUBSTRING ${name} 3 ${newlen} name)
- ENDIF(BEGIN_WITH_lib)
-
-
- STRING(REGEX MATCH "IDL" ISIDL ${name})
-
-
- IF(ISIDL)
- IF(WINDOWS)
- SET(type STATIC)
- ELSE(WINDOWS)
- SET(type SHARED)
- ENDIF(WINDOWS)
- ELSE(ISIDL)
- SET(type SHARED)
- ENDIF(ISIDL)
-
-
- SET(srcs)
- FOREACH(src ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
- GET_FILENAME_COMPONENT(ext ${src} EXT)
- IF(ext STREQUAL .f)
- IF(src STREQUAL trte.f)
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${src})
- STRING(REPLACE ".f" ".c" src ${src})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${src})
- SET(output ${src})
- ADD_CUSTOM_COMMAND(
- OUTPUT ${output}
- COMMAND f2c ${input}
- MAIN_DEPENDENCY ${input}
- )
- ELSE(src STREQUAL trte.f)
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${src})
- STRING(REPLACE ".f" ".o" src ${src})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${src})
- SET(output ${src})
- IF(WINDOWS)
- SET(F77 g77)
- ELSE(WINDOWS)
- SET(F77 gfortran)
- ENDIF(WINDOWS)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${output}
- COMMAND ${F77} -c -o ${output} ${input}
- MAIN_DEPENDENCY ${input}
- )
- ENDIF(src STREQUAL trte.f)
- ENDIF(ext STREQUAL .f)
- SET(srcs ${srcs} ${src})
- ENDFOREACH(src ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
-
-
- SET(l ${nodist_${amname}_SOURCES} ${UIC_FILES})
- FOREACH(f ${l})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${f})
- SET(srcs ${srcs} ${src})
- ENDFOREACH(f ${l})
-
-
- SET(build_srcs)
- SET(l ${nodist_${amname}_SOURCES} ${BUILT_SOURCES})
- FOREACH(f ${l})
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- ELSE(ext STREQUAL .py)
- SET(build_srcs ${build_srcs} ${CMAKE_CURRENT_BINARY_DIR}/${f})
- ENDIF(ext STREQUAL .py)
- ENDFOREACH(f ${l})
-
-
- ADD_LIBRARY(${name} ${type} ${srcs})
-
-
- SET(var)
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} SalomeIDLKernel)
- SET(targets ${targets} SalomeDS)
- SET(targets ${targets} SALOMEDSTest)
- SET(targets ${targets} SALOMEDS_Client_exe)
- SET(targets ${targets} SalomeIDLGEOM)
- SET(targets ${targets} GEOMEngine)
- SET(targets ${targets} MEDEngine)
- SET(targets ${targets} SMESHEngine)
- SET(targets ${targets} SMESH)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(var ${var} -DNOGDI)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(var ${var} -I${dir})
- SET(var ${var} -DF2C_BUILD)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(var ${var} ${AM_CPPFLAGS})
- SET(var ${var} ${AM_CXXFLAGS})
-
-
- SET(var ${var} ${PLATFORM_CPPFLAGS})
- SET(var ${var} ${PTHREAD_CFLAGS})
- SET(var ${var} ${${amname}_CPPFLAGS})
- SET(var ${var} ${${amname}_CXXFLAGS})
- SET(var ${var} ${${amname}_CFLAGS})
- SET(vars)
- IF(WINDOWS)
- SET(vars ${vars} -include SALOMEconfig.h)
- SET(vars ${vars} -ftemplate-depth-32)
- SET(vars ${vars} -fPIC)
- SET(vars ${vars} -g)
- ENDIF(WINDOWS)
- SET(flags)
- FOREACH(f ${var})
- FOREACH(v ${vars})
- IF(f STREQUAL v)
- SET(f)
- ENDIF(f STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(flags "${flags} ${f}")
- ENDFOREACH(f ${var})
- SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "${flags}")
-
-
- SET_TARGET_PROPERTIES(${name} PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
-
-
- SET(libadd)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(libadd ${libadd} ${dir}/LIBF77.lib)
- SET(libadd ${libadd} ${dir}/LIBI77.lib)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
- FOREACH(lib SALOMEBasics SalomeBatch)
- IF(name STREQUAL lib)
- SET(libs ${libs} ${PTHREAD_LIBS})
- ENDIF(name STREQUAL lib)
- ENDFOREACH(lib SALOMEBasics SalomeBatch)
-
-
- FOREACH(lib ${libs})
- GET_FILENAME_COMPONENT(ext ${lib} EXT)
- IF(ext STREQUAL .la)
- GET_FILENAME_COMPONENT(lib ${lib} NAME_WE)
- STRING(REGEX REPLACE "^lib" "" lib ${lib})
- ENDIF(ext STREQUAL .la)
- SET(vars)
- SET(vars ${vars} -no-undefined)
- SET(vars ${vars} -lvtkWidgets)
- IF(WINDOWS)
- SET(vars ${vars} -module)
- SET(vars ${vars} -Wl,-E)
- SET(vars ${vars} -Xlinker)
- SET(vars ${vars} -export-dynamic)
- SET(vars ${vars} -lm)
- SET(vars ${vars} -lboost_thread)
- SET(vars ${vars} -lboost_signals)
- SET(vars ${vars} -pthread -lpthread -ldl)
- ENDIF(WINDOWS)
- FOREACH(v ${vars})
- IF(lib STREQUAL v)
- SET(lib)
- ENDIF(lib STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(libadd ${libadd} ${lib})
- ENDFOREACH(lib ${libs})
- TARGET_LINK_LIBRARIES(${name} ${libadd})
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- IF(CMAKE_BUILD_TYPE STREQUAL Debug)
- SET_TARGET_PROPERTIES(${name} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(DEST lib/salome)
-
-
- IF(BEGIN_WITH_lib)
- INSTALL(TARGETS ${name} DESTINATION ${DEST})
-
-
- ELSE(BEGIN_WITH_lib)
-
-
- IF(WINDOWS)
- INSTALL(TARGETS ${name} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome)
- IF(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.pyd)
- ELSE(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}_d.pyd)
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
- ELSE(WINDOWS)
- GET_TARGET_PROPERTY(version ${name} VERSION)
- GET_TARGET_PROPERTY(soversion ${name} SOVERSION)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${version})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${soversion})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so)
- ENDIF(WINDOWS)
-
-
- ENDIF(BEGIN_WITH_lib)
-
-
- ENDFOREACH(amname ${lib_LTLIBRARIES})
-
-FOREACH(f ${salomeinclude_HEADERS})
-
- SET(DEST include/salome)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
+SET(VERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINTENANCE})
+SET(SOVERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR})
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
+ADD_DEFINITIONS(-DHAVE_SALOME_CONFIG)
+INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR}/idl)
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
+ADD_LIBRARY(PARAVISEngine SHARED PARAVIS_Engine_i.cc)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
+SET(flags)
+FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${KERNEL_CXXFLAGS} ${CORBA_CXXFLAGS} ${CORBA_INCLUDES})
+ SET(flags "${flags} ${f}")
+ENDFOREACH(f ${var})
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
+SET_TARGET_PROPERTIES(PARAVISEngine PROPERTIES COMPILE_FLAGS "${flags}")
+SET_TARGET_PROPERTIES(PARAVISEngine PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
- ENDIF(ext STREQUAL .py)
-
-ENDFOREACH(f ${salomeinclude_HEADERS})
+TARGET_LINK_LIBRARIES(PARAVISEngine ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${KERNEL_LDFLAGS} ${SalomeIDLKernel} ${SalomeNS} ${SalomeContainer} ${SALOMELocalTrace} ${CORBA_LIBS} SalomeIDLPARAVIS)
+INSTALL(TARGETS PARAVISEngine DESTINATION lib/salome)
+
+INSTALL(FILES PARAVIS_Engine_i.hh DESTINATION include/salome)
diff --git a/src/ENGINE/PARAVIS_Engine_i.cc b/src/ENGINE/PARAVIS_Engine_i.cc
index 3b050c31..8bb302df 100644
--- a/src/ENGINE/PARAVIS_Engine_i.cc
+++ b/src/ENGINE/PARAVIS_Engine_i.cc
@@ -1,24 +1,22 @@
-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2012 CEA/DEN, EDF R&D
//
-// Copyright (C) 2003-2007 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 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.
//
-// 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
//
-// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include "PARAVIS_Engine_i.hh"
#include "utilities.h"
@@ -85,9 +83,9 @@ namespace PARAVIS {
_thisObj = this ;
_id = _poa->activate_object(_thisObj);
#ifndef WIN32
- Engines::Component_var aComponent = session->GetComponent("libPARAVIS.so");
+ Engines::EngineComponent_var aComponent = session->GetComponent("libPARAVIS.so");
#else
- Engines::Component_var aComponent = session->GetComponent("PARAVIS.dll");
+ Engines::EngineComponent_var aComponent = session->GetComponent("PARAVIS.dll");
#endif
if (CORBA::is_nil(aComponent)) {
MESSAGE("Component PARAVIS is null");
@@ -172,6 +170,15 @@ namespace PARAVIS {
myParaVisGen->ImportFile(theFileName);
}
+ void PARAVIS_Gen_i::ExecuteScript(const char* script)
+ {
+ if (CORBA::is_nil(myParaVisGen)) {
+ MESSAGE("PARAVIS_Gen_i is null");
+ return;
+ }
+ myParaVisGen->ExecuteScript(script);
+ }
+
//===========================================================================
char* PARAVIS_Gen_i::GetTrace()
{
@@ -276,4 +283,15 @@ namespace PARAVIS {
{
myParaVisGen->ActivateModule();
}
+
+ //===========================================================================
+ void PARAVIS_Gen_i::SetCurrentStudy(SALOMEDS::Study_ptr theStudy){
+ myParaVisGen->SetCurrentStudy(theStudy);
+ }
+
+
+ //===========================================================================
+ SALOMEDS::Study_ptr PARAVIS_Gen_i::GetCurrentStudy(){
+ return myParaVisGen->GetCurrentStudy();
+ }
}
diff --git a/src/ENGINE/PARAVIS_Engine_i.hh b/src/ENGINE/PARAVIS_Engine_i.hh
index b0feb89a..6ea77ba3 100644
--- a/src/ENGINE/PARAVIS_Engine_i.hh
+++ b/src/ENGINE/PARAVIS_Engine_i.hh
@@ -1,23 +1,20 @@
-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2012 CEA/DEN, EDF R&D
//
-// Copyright (C) 2003-2007 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 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.
//
-// 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
//
-// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef __PARAVIS_ENGINE_I_H__
#define __PARAVIS_ENGINE_I_H__
@@ -60,6 +57,8 @@ namespace PARAVIS
virtual char* GetIOR();
virtual void ImportFile(const char* theFileName);
+
+ virtual void ExecuteScript(const char* script);
virtual char* GetTrace();
@@ -114,6 +113,9 @@ namespace PARAVIS
virtual void ActivateModule();
+
+ virtual void SetCurrentStudy(SALOMEDS::Study_ptr theStudy);
+ virtual SALOMEDS::Study_ptr GetCurrentStudy();
};
};
#endif
diff --git a/src/Macro/CMakeLists.txt b/src/Macro/CMakeLists.txt
new file mode 100644
index 00000000..c7471bb8
--- /dev/null
+++ b/src/Macro/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Copyright (C) 2010-2012 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(GLOB copy_FILES "*py")
+#INSTALL(FILES ${copy_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/salome/Macros)
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/Macro
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/salome
+ FILES_MATCHING PATTERN "*.py"
+ PATTERN "CVS" EXCLUDE
+ )
diff --git a/src/Macro/modes.py b/src/Macro/modes.py
new file mode 100644
index 00000000..db4b623b
--- /dev/null
+++ b/src/Macro/modes.py
@@ -0,0 +1,93 @@
+# Copyright (C) 2010-2012 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
+#
+
+try: paraview.simple
+except: from paraview.simple import *
+paraview.simple._DisableFirstRenderCameraReset()
+
+source = GetActiveSource()
+representation = GetDisplayProperties(source)
+representation.Visibility = 0
+
+if source.SMProxy.GetVTKClassName() == 'vtkMedReader' :
+ source.AnimationMode = 'Modes'
+
+ExtractSurface1 = ExtractSurface()
+ScaleVector1 = ScaleVector()
+WarpByVector1 = WarpByVector()
+
+# first, find the first point-centered vector array.
+ExtractSurface1.UpdatePipeline()
+info = ExtractSurface1.GetDataInformation()
+pinfo = info.DataInformation.GetPointDataInformation()
+arrayinfo = None
+vectorname = None
+rootname = None
+for arrayid in range(0, pinfo.GetNumberOfArrays()) :
+ arrayinfo = pinfo.GetArrayInformation(arrayid)
+ if arrayinfo.GetNumberOfComponents() == 3 :
+ vectorname = arrayinfo.GetName()
+ rootpos = vectorname.rfind("[")
+ if rootpos == -1 :
+ rootname = vectorname
+ else :
+ rootname = vectorname[0:rootpos-1]
+ ScaleVector1.VectorField = ['POINTS', vectorname]
+ WarpByVector1.Vectors = ['POINTS', rootname]
+ break
+
+ScaleVector1.ScaleFactor = 0
+ScaleVector1.UpdatePipeline()
+bounds = info.DataInformation.GetBounds()
+side = [bounds[1] - bounds[0], bounds[3] - bounds[2], bounds[5] - bounds[4]]
+length = side[0]
+if side[1] > length : length = side[1]
+if side[2] > length : length = side[2]
+
+scale = length / 20
+if vectorname != None :
+ arrayrange = arrayinfo.GetComponentRange(-1)
+ if arrayrange[1] > 0 :
+ scale = scale / arrayrange[1]
+
+WarpByVector1.ScaleFactor = scale
+
+AnimationScene1 = GetAnimationScene()
+
+TimeAnimationCue1 = GetTimeTrack()
+TimeAnimationCue1.Enabled = 0
+
+KeyFrameAnimationCue1 = GetAnimationTrack( ScaleVector1.GetProperty('ScaleFactor'))
+KeyFrame0 = CompositeKeyFrame( KeyValues=[1.0], Interpolation='Sinusoid' )
+KeyFrame1 = CompositeKeyFrame( KeyTime=1.000000001, KeyValues=[1.0] )
+
+KeyFrameAnimationCue1.KeyFrames = [ KeyFrame0, KeyFrame1 ]
+
+AnimationScene1.Cues.append(KeyFrameAnimationCue1)
+AnimationScene1.Loop = 1
+AnimationScene1.PlayMode = 'Sequence'
+AnimationScene1.NumberOfFrames = 21
+
+WarpByVectorDataRepresentation = Show(WarpByVector1)
+if rootname != None :
+ pvLookupTable = GetLookupTableForArray( rootname, 3, VectorMode='Magnitude' )
+ WarpByVectorDataRepresentation.ColorArrayName = rootname
+ WarpByVectorDataRepresentation.LookupTable = pvLookupTable
+
+AnimationScene1.Play()
diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt
index 67914b45..4f259991 100644
--- a/src/PVGUI/CMakeLists.txt
+++ b/src/PVGUI/CMakeLists.txt
@@ -1,723 +1,221 @@
-
- SET(VERSION_INFO 0.0.0)
- SET(SOVERSION_INFO 0)
- SET(SUBDIRS)
- SET(AM_CPPFLAGS)
- SET(AM_CXXFLAGS)
- SET(LDADD)
-
-
- SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
- SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${KERNEL_ROOT_DIR}/include/salome -include SALOMEconfig.h)
-
-# PARAVIS : ParaView wrapper SALOME module
-#
-# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2010-2012 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 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.
+# 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
+# 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
#
-# Author : Julia DOROVSKIKH
-# Date : 01/06/2005
-# Modified by : Alexander BORODIN (OCN) - autotools usage
-# include $(top_srcdir)/adm_local/unix/make_common_starter.am
+SET(VERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINTENANCE})
+SET(SOVERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR})
+
+ADD_DEFINITIONS(-DHAVE_SALOME_CONFIG)
+INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../ParaView ${CMAKE_BINARY_DIR}/idl ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
IF(WITH_VISU)
- SET(VISU_PARAVIS_LIBS
- -lSalomeIDLVISU
- )
- SET(VISU_PARAVIS_DEFINES
- -DWITH_VISU
- )
+ SET(VISU_PARAVIS_LIBS
+ ${SalomeIDLVISU}
+ )
+
+ ADD_DEFINITIONS(-DWITH_VISU)
ENDIF(WITH_VISU)
#Executable
SET(bin_PROGRAMS
- vtkWrapIDL_HH
- vtkWrapIDL_CC
-)
-
-SET(dist_vtkWrapIDL_HH_SOURCES
- ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParse.tab.c
- ${CMAKE_SOURCE_DIR}/idl/vtkWrapIDL.c
-)
-SET(dist_vtkWrapIDL_CC_SOURCES
- ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParse.tab.c
- ${CMAKE_SOURCE_DIR}/idl/vtkWrapIDL.c
-)
+ vtkWrapIDL_HH
+ vtkWrapIDL_CC
+ )
SET(vtkWrapIDL_HH_CPPFLAGS
- -DIDL_I_HH
- -I${CMAKE_CURRENT_SOURCE_DIR}/../ParaView
- -I${CMAKE_BINARY_DIR}/idl
- ${PARAVIEW_INCLUDES}
- ${VTK_INCLUDES}
-)
+ -DIDL_I_HH
+ )
SET(vtkWrapIDL_CC_CPPFLAGS
- -DIDL_I_CC
- -I${CMAKE_CURRENT_SOURCE_DIR}/../ParaView
- -I${CMAKE_BINARY_DIR}/idl
- ${PARAVIEW_INCLUDES}
- ${VTK_INCLUDES}
-)
-
-# $(srcdir)/wrap.am: $(top_srcdir)/wrapfiles.txt
-# @cd $(srcdir) && $(srcdir)/create_wrap.sh
+ -DIDL_I_CC
+ )
-# include $(srcdir)/wrap.am
INCLUDE(wrap.cmake)
-# PARAVIS_CreateClass.cxx: $(top_srcdir)/wrapfiles.txt $(WRAP_IDL_I_HH)
-# @$(srcdir)/create_class.sh $(top_srcdir)
-
-# Library target
-SET(lib_LTLIBRARIES
- libPARAVIS.la
-)
-
# Library sources
SET(dist_libPARAVIS_la_SOURCES
- PVGUI_Module.h
- PVGUI_Module_impl.h
- PVGUI_Module.cxx
- PVGUI_Module_actions.cxx
- PVGUI_Module_widgets.cxx
- PVGUI_ViewManager.h
- PVGUI_ViewManager.cxx
- PVGUI_ViewModel.h
- PVGUI_ViewModel.cxx
- PVGUI_ViewWindow.h
- PVGUI_ViewWindow.cxx
- PVGUI_OutputWindowAdapter.h
- PVGUI_OutputWindowAdapter.cxx
- PVGUI_Tools.h
- PVGUI_Tools.cxx
- PV_I.h
- PARAVIS_Gen_i.hh
- PV_Events.h
- PV_Tools.h
- PARAVIS_Gen_i.cc
- PV_Tools.cxx
- ${WRAP_IDL_I_HH}
- ${WRAP_IDL_I_CC}
- PARAVIS_CreateClass.cxx
-)
+ PVGUI_Module.h
+ PVGUI_Module.cxx
+ PVGUI_Module_actions.cxx
+ PVGUI_Module_widgets.cxx
+ PVGUI_ViewManager.h
+ PVGUI_ViewManager.cxx
+ PVGUI_ViewModel.h
+ PVGUI_ViewModel.cxx
+ PVGUI_ViewWindow.h
+ PVGUI_ViewWindow.cxx
+ PVGUI_OutputWindowAdapter.h
+ PVGUI_OutputWindowAdapter.cxx
+ PVGUI_Tools.h
+ PVGUI_Tools.cxx
+ PVGUI_ParaViewSettingsPane.h
+ PVGUI_ParaViewSettingsPane.cxx
+ PV_I.h
+ PARAVIS_Gen_i.hh
+ PV_Events.h
+ PV_Tools.h
+ PARAVIS_Gen_i.cc
+ PV_Tools.cxx
+ ${WRAP_IDL_I_HH}
+ ${WRAP_IDL_I_CC}
+ PARAVIS_CreateClass.cxx
+ )
+
+# Check ParaView documentation file existence
+# if it exists add it to the resources (compile into binary form)
+# otherwise print warning message
+SET(PV_DOC_FILE ${ParaView_INSTALL_PREFIX}/share/doc/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}/paraview.qch)
+IF (EXISTS ${PV_DOC_FILE})
+ SET(RC_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/PVGUI.qrc.in)
+ SET(RC_GENERATED ${CMAKE_CURRENT_BINARY_DIR}/PVGUI.qrc)
+ MESSAGE(STATUS "Creation of ${RC_GENERATED}")
+ CONFIGURE_FILE(${RC_SOURCE} ${RC_GENERATED})
+ QT4_ADD_RESOURCES(RCS_SOURCES ${RC_GENERATED})
+ SET(dist_libPARAVIS_la_SOURCES ${dist_libPARAVIS_la_SOURCES} ${RCS_SOURCES})
+ ADD_DEFINITIONS(-DHAS_PV_DOC)
+ELSE (EXISTS ${PV_DOC_FILE})
+ MESSAGE(WARNING "Help file for ParaView has not been found! ParaView documentation will not be available.")
+ENDIF (EXISTS ${PV_DOC_FILE})
# MOC pre-processing
SET(MOC_FILES
- PVGUI_Module_moc.cxx
- PVGUI_ViewManager_moc.cxx
- PVGUI_ViewModel_moc.cxx
- PVGUI_ViewWindow_moc.cxx
-)
-
-SET(nodist_libPARAVIS_la_SOURCES
- ${MOC_FILES}
-)
+ PVGUI_Module_moc.cxx
+ PVGUI_ViewManager_moc.cxx
+ PVGUI_ViewModel_moc.cxx
+ PVGUI_ViewWindow_moc.cxx
+ PVGUI_ParaViewSettingsPane_moc.cxx
+ )
# additionnal compilation flags
# Note that ParaView uses HDF5
SET(libPARAVIS_la_CPPFLAGS
- -ftemplate-depth-32
- ${HDF5_INCLUDES}
- ${QT_INCLUDES}
- ${QT_ASSISTANT_INCLUDES}
- ${PARAVIEW_INCLUDES}
- ${VTK_INCLUDES}
- ${CAS_CPPFLAGS}
- ${PYTHON_INCLUDES}
- ${CAS_CPPFLAGS}
- ${CAS_CXXFLAGS}
- ${KERNEL_CXXFLAGS}
- ${CORBA_CXXFLAGS}
- ${CORBA_INCLUDES}
- ${GUI_CXXFLAGS}
- ${VISU_CXXFLAGS}
- ${MED_CXXFLAGS}
- -I${CMAKE_CURRENT_SOURCE_DIR}
- -I${CMAKE_BINARY_DIR}/idl
- -I${CMAKE_CURRENT_SOURCE_DIR}/../../idl
- -I${CMAKE_BINARY_DIR}/salome_adm/unix
- ${VISU_PARAVIS_DEFINES}
-)
-
-# additionnal linkage flags
-# Note that ParaView uses HDF5
-SET(libPARAVIS_la_LDFLAGS
- ${PYTHON_LIBS}
- ${QT_MT_LIBS}
- ${HDF5_LIBS}
- ${QT_ASSISTANT_LIBS}
- ${PARAVIEW_LIBS}
- ${CMAKE_BINARY_DIR}/idl/libSalomeIDLPARAVIS.la
- ${KERNEL_LDFLAGS}
- ${SalomeNS}
- ${SalomeDSClient}
- ${SalomeContainer}
- ${SalomeLifeCycleCORBA}
- ${GUI_LDFLAGS}
- ${SalomeApp}
- ${LightApp}
- ${VISU_LDFLAGS}
- ${VISU_PARAVIS_LIBS}
-)
-
-SET(libPARAVIS_la_LIBADD
- ${SalomeIDLKernel}
- ${SalomeHDFPersist}
- ${SalomeGenericObj}
- ${SalomeContainer}
- ${SalomeCommunication}
- ${SalomeNS}
- ${TOOLSDS}
- ${OpUtil}
- ${SalomeLifeCycleCORBA}
- ${Event}
- ${SalomeApp}
- ${SalomeSession}
- ${qtx}
- ${LightApp}
-)
+ -ftemplate-depth-32
+ ${QT_INCLUDES}
+ ${QT_ASSISTANT_INCLUDES}
+ ${PYTHON_INCLUDES}
+ ${CAS_CPPFLAGS}
+ ${CAS_CXXFLAGS}
+ ${KERNEL_CXXFLAGS}
+ ${CORBA_CXXFLAGS}
+ ${CORBA_INCLUDES}
+ ${BOOST_CPPFLAGS}
+ ${GUI_CXXFLAGS}
+ ${MED_CXXFLAGS}
+ ${VISU_CXXFLAGS}
+ ${VISU_PARAVIS_DEFINES}
+ )
+
+# remove deprecation warnings from Paraview
+IF(WINDOWS)
+ELSE(WINDOWS)
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+ENDIF(WINDOWS)
-#
# resources files
SET(nodist_salomeres_DATA
- PARAVIS_images.qm
- PARAVIS_msg_en.qm
+ PARAVIS_images.qm
+ PARAVIS_msg_en.qm
+ PARAVIS_msg_fr.qm
+ )
+
+SET(srcs)
+FOREACH(src ${dist_libPARAVIS_la_SOURCES})
+ SET(srcs ${srcs} ${src})
+ENDFOREACH(src ${dist_libPARAVIS_la_SOURCES})
+
+FOREACH(f ${MOC_FILES})
+ SET(srcs ${srcs} ${CMAKE_CURRENT_BINARY_DIR}/${f})
+ENDFOREACH(f ${MOC_FILES})
+
+ADD_LIBRARY(PARAVIS SHARED ${srcs})
+
+SET(flags)
+FOREACH(f ${PARAVIEW_INCLUDES} ${VTK_INCLUDES} ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${libPARAVIS_la_CPPFLAGS})
+ SET(flags "${flags} ${f}")
+ENDFOREACH(f ${PARAVIEW_INCLUDES} ${VTK_INCLUDES} ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${libPARAVIS_la_CPPFLAGS})
+
+SET_TARGET_PROPERTIES(PARAVIS PROPERTIES COMPILE_FLAGS "${flags}")
+SET_TARGET_PROPERTIES(PARAVIS PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
+
+TARGET_LINK_LIBRARIES(PARAVIS
+ ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS}
+ ${CORBA_LIBS}
+ ${QT_LIBS}
+ ${CAS_KERNEL}
+ ${VTK_LIBS}
+ ${PYTHON_LIBS}
+ ${KERNEL_LDFLAGS} ${SalomeDS} ${SALOMELocalTrace} ${SalomeIDLKernel} ${SalomeNS} ${SalomeLifeCycleCORBA} ${SalomeContainer} ${TOOLSDS}
+ ${GUI_LDFLAGS} ${SalomeApp} ${LightApp} ${CAM} ${qtx} ${suit} ${Event} ${PyInterp} ${SalomeObject}
+ ${MED_LDFLAGS} ${SalomeIDLMED}
+ ${VISU_LDFLAGS}
+ ${VISU_PARAVIS_LIBS}
+ ${PARAVIEW_LIBS}
+ SalomeIDLPARAVIS
)
-
-# mostlyclean-local: clean-wrap
-
-# clean-wrap:
-# -rm -f *.hh *.cc PARAVIS_CreateClass.cxx
-
-
- FOREACH(dir ${SUBDIRS})
- IF(NOT dir STREQUAL .)
- ADD_SUBDIRECTORY(${dir})
- ENDIF(NOT dir STREQUAL .)
- ENDFOREACH(dir ${SUBDIRS})
-
-
- FOREACH(amname ${lib_LTLIBRARIES})
-
-
- STRING(REPLACE .la _la amname ${amname})
-
-
- STRING(LENGTH ${amname} len)
- MATH(EXPR newlen "${len}-3")
- STRING(SUBSTRING ${amname} 0 ${newlen} name)
-
-
- STRING(REGEX MATCH "^lib" BEGIN_WITH_lib ${name})
- IF(BEGIN_WITH_lib)
- STRING(LENGTH ${name} len)
- MATH(EXPR newlen "${len}-3")
- STRING(SUBSTRING ${name} 3 ${newlen} name)
- ENDIF(BEGIN_WITH_lib)
-
-
- STRING(REGEX MATCH "IDL" ISIDL ${name})
-
-
- IF(ISIDL)
- IF(WINDOWS)
- SET(type STATIC)
- ELSE(WINDOWS)
- SET(type SHARED)
- ENDIF(WINDOWS)
- ELSE(ISIDL)
- SET(type SHARED)
- ENDIF(ISIDL)
-
-
- SET(srcs)
- FOREACH(src ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
- GET_FILENAME_COMPONENT(ext ${src} EXT)
- IF(ext STREQUAL .f)
- IF(src STREQUAL trte.f)
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${src})
- STRING(REPLACE ".f" ".c" src ${src})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${src})
- SET(output ${src})
- ADD_CUSTOM_COMMAND(
- OUTPUT ${output}
- COMMAND f2c ${input}
- MAIN_DEPENDENCY ${input}
- )
- ELSE(src STREQUAL trte.f)
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${src})
- STRING(REPLACE ".f" ".o" src ${src})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${src})
- SET(output ${src})
- IF(WINDOWS)
- SET(F77 g77)
- ELSE(WINDOWS)
- SET(F77 gfortran)
- ENDIF(WINDOWS)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${output}
- COMMAND ${F77} -c -o ${output} ${input}
- MAIN_DEPENDENCY ${input}
- )
- ENDIF(src STREQUAL trte.f)
- ENDIF(ext STREQUAL .f)
- SET(srcs ${srcs} ${src})
- ENDFOREACH(src ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
-
-
- SET(l ${nodist_${amname}_SOURCES} ${UIC_FILES})
- FOREACH(f ${l})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${f})
- SET(srcs ${srcs} ${src})
- ENDFOREACH(f ${l})
-
-
- SET(build_srcs)
- SET(l ${nodist_${amname}_SOURCES} ${BUILT_SOURCES})
- FOREACH(f ${l})
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- ELSE(ext STREQUAL .py)
- SET(build_srcs ${build_srcs} ${CMAKE_CURRENT_BINARY_DIR}/${f})
- ENDIF(ext STREQUAL .py)
- ENDFOREACH(f ${l})
-
-
- ADD_LIBRARY(${name} ${type} ${srcs})
-
-
- SET(var)
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} SalomeIDLKernel)
- SET(targets ${targets} SalomeDS)
- SET(targets ${targets} SALOMEDSTest)
- SET(targets ${targets} SALOMEDS_Client_exe)
- SET(targets ${targets} SalomeIDLGEOM)
- SET(targets ${targets} GEOMEngine)
- SET(targets ${targets} MEDEngine)
- SET(targets ${targets} SMESHEngine)
- SET(targets ${targets} SMESH)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(var ${var} -DNOGDI)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(var ${var} -I${dir})
- SET(var ${var} -DF2C_BUILD)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(var ${var} ${AM_CPPFLAGS})
- SET(var ${var} ${AM_CXXFLAGS})
-
-
- SET(var ${var} ${PLATFORM_CPPFLAGS})
- SET(var ${var} ${PTHREAD_CFLAGS})
- SET(var ${var} ${${amname}_CPPFLAGS})
- SET(var ${var} ${${amname}_CXXFLAGS})
- SET(var ${var} ${${amname}_CFLAGS})
- SET(vars)
- IF(WINDOWS)
- SET(vars ${vars} -include SALOMEconfig.h)
- SET(vars ${vars} -ftemplate-depth-32)
- SET(vars ${vars} -fPIC)
- SET(vars ${vars} -g)
- ENDIF(WINDOWS)
- SET(flags)
- FOREACH(f ${var})
- FOREACH(v ${vars})
- IF(f STREQUAL v)
- SET(f)
- ENDIF(f STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(flags "${flags} ${f}")
- ENDFOREACH(f ${var})
- SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "${flags}")
-
-
- SET_TARGET_PROPERTIES(${name} PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
-
-
- SET(libadd)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(libadd ${libadd} ${dir}/LIBF77.lib)
- SET(libadd ${libadd} ${dir}/LIBI77.lib)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
- FOREACH(lib SALOMEBasics SalomeBatch)
- IF(name STREQUAL lib)
- SET(libs ${libs} ${PTHREAD_LIBS})
- ENDIF(name STREQUAL lib)
- ENDFOREACH(lib SALOMEBasics SalomeBatch)
-
-
- FOREACH(lib ${libs})
- GET_FILENAME_COMPONENT(ext ${lib} EXT)
- IF(ext STREQUAL .la)
- GET_FILENAME_COMPONENT(lib ${lib} NAME_WE)
- STRING(REGEX REPLACE "^lib" "" lib ${lib})
- ENDIF(ext STREQUAL .la)
- SET(vars)
- SET(vars ${vars} -no-undefined)
- SET(vars ${vars} -lvtkWidgets)
- IF(WINDOWS)
- SET(vars ${vars} -module)
- SET(vars ${vars} -Wl,-E)
- SET(vars ${vars} -Xlinker)
- SET(vars ${vars} -export-dynamic)
- SET(vars ${vars} -lm)
- SET(vars ${vars} -lboost_thread)
- SET(vars ${vars} -lboost_signals)
- SET(vars ${vars} -pthread -lpthread -ldl)
- ENDIF(WINDOWS)
- FOREACH(v ${vars})
- IF(lib STREQUAL v)
- SET(lib)
- ENDIF(lib STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(libadd ${libadd} ${lib})
- ENDFOREACH(lib ${libs})
- TARGET_LINK_LIBRARIES(${name} ${libadd})
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- IF(CMAKE_BUILD_TYPE STREQUAL Debug)
- SET_TARGET_PROPERTIES(${name} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(DEST lib/salome)
-
-
- IF(BEGIN_WITH_lib)
- INSTALL(TARGETS ${name} DESTINATION ${DEST})
-
-
- ELSE(BEGIN_WITH_lib)
-
-
- IF(WINDOWS)
- INSTALL(TARGETS ${name} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome)
- IF(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.pyd)
- ELSE(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}_d.pyd)
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
- ELSE(WINDOWS)
- GET_TARGET_PROPERTY(version ${name} VERSION)
- GET_TARGET_PROPERTY(soversion ${name} SOVERSION)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${version})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${soversion})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so)
- ENDIF(WINDOWS)
-
-
- ENDIF(BEGIN_WITH_lib)
-
-
- ENDFOREACH(amname ${lib_LTLIBRARIES})
-
-
- FOREACH(amname ${bin_PROGRAMS} ${check_PROGRAMS})
-
-
- SET(name "${amname}_exe")
- SET(srcs ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
- SET(l ${nodist_${amname}_SOURCES})
- FOREACH(f ${l})
- SET(src ${CMAKE_CURRENT_BINARY_DIR}/${f})
- SET(srcs ${srcs} ${src})
- ENDFOREACH(f ${l})
- LIST(LENGTH srcs nb)
- IF(nb)
- ADD_EXECUTABLE(${name} ${srcs})
-
-
- SET(var)
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} SalomeIDLKernel)
- SET(targets ${targets} SalomeDS)
- SET(targets ${targets} SALOMEDSTest)
- SET(targets ${targets} SALOMEDS_Client_exe)
- SET(targets ${targets} SalomeIDLGEOM)
- SET(targets ${targets} GEOMEngine)
- SET(targets ${targets} MEDEngine)
- SET(targets ${targets} SMESHEngine)
- SET(targets ${targets} SMESH)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(var ${var} -DNOGDI)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(var ${var} -I${dir})
- SET(var ${var} -DF2C_BUILD)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(var ${var} ${AM_CPPFLAGS})
- SET(var ${var} ${AM_CXXFLAGS})
-
-
- SET(var ${var} ${PLATFORM_CPPFLAGS})
- SET(var ${var} ${PTHREAD_CFLAGS})
- SET(var ${var} ${${amname}_CPPFLAGS})
- SET(var ${var} ${${amname}_CXXFLAGS})
- SET(var ${var} ${${amname}_CFLAGS})
- SET(vars)
- IF(WINDOWS)
- SET(vars ${vars} -include SALOMEconfig.h)
- SET(vars ${vars} -ftemplate-depth-32)
- SET(vars ${vars} -fPIC)
- SET(vars ${vars} -g)
- ENDIF(WINDOWS)
- SET(flags)
- FOREACH(f ${var})
- FOREACH(v ${vars})
- IF(f STREQUAL v)
- SET(f)
- ENDIF(f STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(flags "${flags} ${f}")
- ENDFOREACH(f ${var})
- SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "${flags}")
-
-
- SET(libadd)
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- SET(dir $ENV{F2CHOME})
- STRING(REPLACE "\\\\" "/" dir ${dir})
- SET(libadd ${libadd} ${dir}/LIBF77.lib)
- SET(libadd ${libadd} ${dir}/LIBI77.lib)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
- FOREACH(lib SALOMEBasics SalomeBatch)
- IF(name STREQUAL lib)
- SET(libs ${libs} ${PTHREAD_LIBS})
- ENDIF(name STREQUAL lib)
- ENDFOREACH(lib SALOMEBasics SalomeBatch)
-
-
- SET(libs ${libs} ${LDADD})
-
-
- FOREACH(lib ${libs})
- GET_FILENAME_COMPONENT(ext ${lib} EXT)
- IF(ext STREQUAL .la)
- GET_FILENAME_COMPONENT(lib ${lib} NAME_WE)
- STRING(REGEX REPLACE "^lib" "" lib ${lib})
- ENDIF(ext STREQUAL .la)
- SET(vars)
- SET(vars ${vars} -no-undefined)
- SET(vars ${vars} -lvtkWidgets)
- IF(WINDOWS)
- SET(vars ${vars} -module)
- SET(vars ${vars} -Wl,-E)
- SET(vars ${vars} -Xlinker)
- SET(vars ${vars} -export-dynamic)
- SET(vars ${vars} -lm)
- SET(vars ${vars} -lboost_thread)
- SET(vars ${vars} -lboost_signals)
- SET(vars ${vars} -pthread -lpthread -ldl)
- ENDIF(WINDOWS)
- FOREACH(v ${vars})
- IF(lib STREQUAL v)
- SET(lib)
- ENDIF(lib STREQUAL v)
- ENDFOREACH(v ${vars})
- SET(libadd ${libadd} ${lib})
- ENDFOREACH(lib ${libs})
- TARGET_LINK_LIBRARIES(${name} ${libadd})
-
-
- IF(WINDOWS)
- SET(targets)
- SET(targets ${targets} MEFISTO2D)
- FOREACH(target ${targets})
- IF(name STREQUAL ${target})
- IF(CMAKE_BUILD_TYPE STREQUAL Debug)
- SET_TARGET_PROPERTIES(${name} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
- ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
- ENDIF(name STREQUAL ${target})
- ENDFOREACH(target ${targets})
- ENDIF(WINDOWS)
-
-
- SET(DEST bin/salome)
-
-
- IF(WINDOWS)
- INSTALL(TARGETS ${name} DESTINATION ${DEST})
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/${DEST}/${name}.exe DESTINATION ${DEST} RENAME ${amname}.exe)
- INSTALL(CODE "FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${name}.exe)")
- ELSE(WINDOWS)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name} DESTINATION ${DEST} PERMISSIONS ${PERMS} RENAME ${amname})
- ENDIF(WINDOWS)
-
-
- ENDIF(nb)
-
-
- ENDFOREACH(amname ${bin_PROGRAMS} ${check_PROGRAMS})
-
-
- FOREACH(output ${MOC_FILES})
-
-
- STRING(REGEX REPLACE _moc.cxx .h input ${output})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${input})
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${output})
- ADD_CUSTOM_COMMAND(
- OUTPUT ${output}
- COMMAND ${QT_MOC_EXECUTABLE} ${MOC_FLAGS} ${input} -o ${output}
- MAIN_DEPENDENCY ${input}
- )
- ENDFOREACH(output ${MOC_FILES})
+INSTALL(TARGETS PARAVIS DESTINATION lib/salome)
+
+FOREACH(name ${bin_PROGRAMS})
+ ADD_EXECUTABLE(${name}
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParse.tab.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParsePreprocess.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseHierarchy.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseMain.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseExtras.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrap.c
+ ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrapText.c
+ ${CMAKE_SOURCE_DIR}/idl/vtkWrapIDL.c)
+ ADD_DEPENDENCIES(${name} generate_txt)
+
+ SET(flags)
+ FOREACH(f ${PARAVIEW_INCLUDES} ${VTK_INCLUDES} ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${${name}_CPPFLAGS})
+ SET(flags "${flags} ${f}")
+ ENDFOREACH(f ${PARAVIEW_INCLUDES} ${VTK_INCLUDES} ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${${name}_CPPFLAGS})
+
+ SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "${flags}")
+ TARGET_LINK_LIBRARIES(${name} ${PLATFORM_LIBADD})
+
+ SET(${name}_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${name})
+ IF(WINDOWS)
+ IF(CMAKE_BUILD_TOOL STREQUAL nmake)
+ SET(${name}_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${name}.exe)
+ ELSE(CMAKE_BUILD_TOOL STREQUAL nmake)
+ SET(${name}_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${name}.exe)
+ ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake)
+ ENDIF(WINDOWS)
+ INSTALL(FILES ${${name}_EXEFILE} DESTINATION bin/salome PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ENDFOREACH(name ${bin_PROGRAMS})
+
+FOREACH(output ${MOC_FILES})
+ STRING(REGEX REPLACE _moc.cxx .h input ${output})
+
+ SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${input})
+ SET(output ${CMAKE_CURRENT_BINARY_DIR}/${output})
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${output}
+ COMMAND ${QT_MOC_EXECUTABLE} ${MOC_FLAGS} ${input} -o ${output}
+ MAIN_DEPENDENCY ${input}
+ )
+ENDFOREACH(output ${MOC_FILES})
FOREACH(f ${nodist_salomeres_DATA})
-
- SET(DEST share/salome/resources/paravis)
-
-
- STRING(COMPARE EQUAL ${f} SALOMEconfig.h.in test_SALOMEconfig.h.in)
- IF(test_SALOMEconfig.h.in)
- INSTALL(FILES SALOMEconfig.ref.in DESTINATION ${DEST} RENAME SALOMEconfig.h.in)
- ELSE(test_SALOMEconfig.h.in)
- SET(dummy dummy-NOTFOUND)
- MARK_AS_ADVANCED(dummy)
- # FILE(REMOVE ${CMAKE_INSTALL_PREFIX}/${DEST}/${f})
- FIND_FILE(dummy ${f} PATHS ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH)
- IF(dummy)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- IF(DEST STREQUAL bin/salome)
- SET(PERMS)
- SET(PERMS ${PERMS} OWNER_READ OWNER_WRITE OWNER_EXECUTE)
- SET(PERMS ${PERMS} GROUP_READ GROUP_EXECUTE)
- SET(PERMS ${PERMS} WORLD_READ WORLD_EXECUTE)
- INSTALL(FILES ${f} DESTINATION ${DEST} PERMISSIONS ${PERMS})
- ELSE(DEST STREQUAL bin/salome)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(DEST STREQUAL bin/salome)
- ELSE(ext STREQUAL .py)
- INSTALL(FILES ${f} DESTINATION ${DEST})
- ENDIF(ext STREQUAL .py)
-
-
- ELSE(dummy)
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .qm)
- STRING(REGEX REPLACE .qm .ts input ${f})
-
-
- SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
-
-
- SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
- # ADD_CUSTOM_COMMAND(
- # OUTPUT ${output}
- # COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output}
- # MAIN_DEPENDENCY ${input}
- # )
- EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
- ENDIF(ext STREQUAL .qm)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${DEST})
- ENDIF(dummy)
- ENDIF(test_SALOMEconfig.h.in)
-
-
- GET_FILENAME_COMPONENT(ext ${f} EXT)
- IF(ext STREQUAL .py)
- INSTALL(CODE "SET(PYTHON_FILE ${f})")
- INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
- INSTALL(CODE "SET(DEST ${DEST})")
- INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-
-
- STRING(REPLACE "\\" "/" KERNEL_ROOT_DIR ${KERNEL_ROOT_DIR})
- INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
-
-
- ENDIF(ext STREQUAL .py)
-
+ STRING(REGEX REPLACE .qm .ts input ${f})
+ SET(input ${CMAKE_CURRENT_SOURCE_DIR}/resources/${input})
+ SET(output ${CMAKE_CURRENT_BINARY_DIR}/${f})
+ EXECUTE_PROCESS(COMMAND ${QT_LRELEASE_EXECUTABLE} ${input} -qm ${output})
+ INSTALL(FILES ${output} DESTINATION share/salome/resources/paravis)
ENDFOREACH(f ${nodist_salomeres_DATA})
diff --git a/src/PVGUI/PARAVIS_Gen_i.cc b/src/PVGUI/PARAVIS_Gen_i.cc
index 70ac58e1..e31a4f52 100644
--- a/src/PVGUI/PARAVIS_Gen_i.cc
+++ b/src/PVGUI/PARAVIS_Gen_i.cc
@@ -1,25 +1,21 @@
-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2012 CEA/DEN, EDF R&D
//
-// Copyright (C) 2003-2007 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 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.
//
-// 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
//
-// 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
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-// PARAVIS OBJECT : interactive object for PARAVIS entities implementation
// File : PARAVIS_Gen_i.cc
// Author : Vitaly Smetannikov
// Module : PARAVIS
@@ -85,6 +81,30 @@ PARAVIS_I_EXPORT PARAVIS::PARAVIS_Gen_ptr GetImpl(CORBA::ORB_ptr theORB,
namespace PARAVIS
{
+
+ const char* checkNullStr(const char* theStr)
+ {
+ if (strcmp(theStr, "NULL") == 0)
+ return NULL;
+ else
+ return theStr;
+ }
+
+ std::string tabify( const std::string& source, bool isTabify )
+ {
+ std::string result = source;
+ if ( isTabify && !result.empty() ) {
+ std::string caret = "\n";
+ int idx = result.rfind( caret );
+ while ( idx != std::string::npos ) {
+ result.replace( idx, caret.size(), "\n\t" );
+ idx = result.rfind( caret, idx-1 );
+ }
+ result.insert(0, "\t" );
+ }
+ return result;
+ }
+
PARAVIS_Base_i::~PARAVIS_Base_i() {
if(mySmartPointer != NULL) mySmartPointer->Delete();
}
@@ -179,6 +199,12 @@ namespace PARAVIS
ProcessVoidEvent(new TImportFile(mySalomeApp, theFileName));
}
+ void PARAVIS_Gen_i::ExecuteScript(const char* script)
+ {
+ if(MYDEBUG) MESSAGE("PARAVIS_Gen_i::ExecuteScript: " <