From: rnv <rnv@opencascade.com>
Date: Wed, 22 Apr 2015 13:08:31 +0000 (+0300)
Subject: Porting of the ParaVis plugins on the ParaView-4.3.1 API.
X-Git-Tag: V7_6_0rc1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=264766ecf465771fa33beb19a5e2e32e80fd247a;p=modules%2Fparavis.git

Porting of the ParaVis plugins on the ParaView-4.3.1 API.
---

diff --git a/src/Plugins/DifferenceTimesteps/CMakeLists.txt b/src/Plugins/DifferenceTimesteps/CMakeLists.txt
index 65a4b17d..aac97497 100644
--- a/src/Plugins/DifferenceTimesteps/CMakeLists.txt
+++ b/src/Plugins/DifferenceTimesteps/CMakeLists.txt
@@ -29,7 +29,6 @@ ADD_PARAVIEW_PLUGIN(DifferenceTimesteps "1.0"
   SERVER_MANAGER_XML DifferenceTimesteps.xml
   SERVER_MANAGER_SOURCES vtkDifferenceTimestepsFilter.cxx
   GUI_RESOURCES pqDifferenceTimesteps.qrc
-  GUI_RESOURCE_FILES DifferenceTimestepsGUI.xml
   )
 
 INSTALL(TARGETS DifferenceTimesteps
diff --git a/src/Plugins/DifferenceTimesteps/DifferenceTimesteps.xml b/src/Plugins/DifferenceTimesteps/DifferenceTimesteps.xml
index e62195db..ecdba0c5 100644
--- a/src/Plugins/DifferenceTimesteps/DifferenceTimesteps.xml
+++ b/src/Plugins/DifferenceTimesteps/DifferenceTimesteps.xml
@@ -129,6 +129,7 @@
       </PropertyGroup>
       <Hints>
         <Visibility replace_input="0" />
+        <ShowInMenu category="Temporal" icon=":/DifferenceTimestepsIcons/resources/timesteps-icon.png" />
       </Hints>
 
     </SourceProxy>
diff --git a/src/Plugins/DifferenceTimesteps/DifferenceTimestepsGUI.xml b/src/Plugins/DifferenceTimesteps/DifferenceTimestepsGUI.xml
deleted file mode 100644
index e2a04550..00000000
--- a/src/Plugins/DifferenceTimesteps/DifferenceTimestepsGUI.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ParaViewFilters>
-    <Category name="Temporal" menu_label="&amp;Temporal">
-        <Proxy group="filters" name="DifferenceTimesteps" icon=":/DifferenceTimestepsIcons/resources/timesteps-icon.png" omit_from_toolbar="1"/>
-    </Category>
-</ParaViewFilters>
diff --git a/src/Plugins/ElevationSurface/CMakeLists.txt b/src/Plugins/ElevationSurface/CMakeLists.txt
index b0b09aca..a94aebd9 100644
--- a/src/Plugins/ElevationSurface/CMakeLists.txt
+++ b/src/Plugins/ElevationSurface/CMakeLists.txt
@@ -31,7 +31,6 @@ SET(SRCS
 
 ADD_PARAVIEW_PLUGIN(ElevationSurface "1.0"
 	SERVER_MANAGER_XML ElevationSurface.xml
-	GUI_RESOURCE_FILES ElevationSurfaceClient.xml
 	SERVER_MANAGER_SOURCES ${SRCS})
 
 install(TARGETS ${PROJECT_NAME} 
diff --git a/src/Plugins/ElevationSurface/ElevationSurface.xml b/src/Plugins/ElevationSurface/ElevationSurface.xml
index 37ed8442..ab36cca4 100644
--- a/src/Plugins/ElevationSurface/ElevationSurface.xml
+++ b/src/Plugins/ElevationSurface/ElevationSurface.xml
@@ -85,7 +85,9 @@
         default_values="1">
         <BooleanDomain name="bool"/>
       </IntVectorProperty>
-
+      <Hints>
+       <ShowInMenu category="Neutronics"/>
+      </Hints>
     </SourceProxy>
 
   </ProxyGroup>
diff --git a/src/Plugins/ElevationSurface/ElevationSurfaceClient.xml b/src/Plugins/ElevationSurface/ElevationSurfaceClient.xml
deleted file mode 100644
index 07204cbc..00000000
--- a/src/Plugins/ElevationSurface/ElevationSurfaceClient.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ParaViewFilters>
-  <Category name="Neutronics" menu_label="&amp;Neutronics" preserve_order="1">
-    <Filter name="ElevationSurface"/>
-  </Category>
-</ParaViewFilters>
diff --git a/src/Plugins/EllipseBuilder/CMakeLists.txt b/src/Plugins/EllipseBuilder/CMakeLists.txt
index 42bfdf45..60289075 100644
--- a/src/Plugins/EllipseBuilder/CMakeLists.txt
+++ b/src/Plugins/EllipseBuilder/CMakeLists.txt
@@ -28,7 +28,6 @@ ADD_PARAVIEW_PLUGIN(EllipseBuilderFilter "1.0"
     SERVER_MANAGER_XML EllipseBuilderFilter.xml 
     SERVER_MANAGER_SOURCES vtkEllipseBuilderFilter.cxx
     GUI_RESOURCES pqEllipseBuilder.qrc
-    GUI_RESOURCE_FILES EllipseBuilderGUI.xml
     )
 
 INSTALL(
diff --git a/src/Plugins/EllipseBuilder/EllipseBuilderFilter.xml b/src/Plugins/EllipseBuilder/EllipseBuilderFilter.xml
index e1f31ae6..1bd5f0c1 100644
--- a/src/Plugins/EllipseBuilder/EllipseBuilderFilter.xml
+++ b/src/Plugins/EllipseBuilder/EllipseBuilderFilter.xml
@@ -110,6 +110,9 @@
 		This property sets the end angle for every ellipse.
 	      </Documentation>
             </DoubleVectorProperty>
+        <Hints>
+          <ShowInMenu category="DataAnalysis" icon=":/EllipseBuilderIcons/resources/ellipse-icon.png" />
+        </Hints>
         </SourceProxy>
     </ProxyGroup>
 </ServerManagerConfiguration>
diff --git a/src/Plugins/EllipseBuilder/EllipseBuilderGUI.xml b/src/Plugins/EllipseBuilder/EllipseBuilderGUI.xml
deleted file mode 100644
index bb2f35b1..00000000
--- a/src/Plugins/EllipseBuilder/EllipseBuilderGUI.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ParaViewFilters>
-    <Category name="DataAnalysis" menu_label="&amp;Data Analysis">
-      <Proxy group="filters" name="EllipseBuilderFilter" icon=":/EllipseBuilderIcons/resources/ellipse-icon.png" />
-    </Category>
-</ParaViewFilters>
\ No newline at end of file
diff --git a/src/Plugins/ParaGEOMCorba/CMakeLists.txt b/src/Plugins/ParaGEOMCorba/CMakeLists.txt
index fe7b8670..849e9c45 100644
--- a/src/Plugins/ParaGEOMCorba/CMakeLists.txt
+++ b/src/Plugins/ParaGEOMCorba/CMakeLists.txt
@@ -27,8 +27,6 @@ PROJECT( ParaGEOMCorba )
   )
   ADD_PARAVIEW_PLUGIN( ParaGEOMCorbaPlugin "1.0"
     SERVER_MANAGER_XML ParaGEOMCorbaServerManager.xml
-    GUI_RESOURCE_FILES
-    ParaGEOMCorbaUserInterfaceSources.xml
     SERVER_MANAGER_SOURCES ${PARA_GEOM_CORBA_SRCS} )
     
   INCLUDE_DIRECTORIES(
diff --git a/src/Plugins/ParaGEOMCorba/ParaGEOMCorbaUserInterfaceSources.xml b/src/Plugins/ParaGEOMCorba/ParaGEOMCorbaUserInterfaceSources.xml
deleted file mode 100644
index d465f286..00000000
--- a/src/Plugins/ParaGEOMCorba/ParaGEOMCorbaUserInterfaceSources.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ParaViewSources>
-  <Proxy group="sources" name="ParaGEOMCorbaSource" />
-</ParaViewSources>
diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 6c29945d..534e4103 100644
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -46,8 +46,6 @@ PROJECT( ParaMEDCorba )
     
     ADD_PARAVIEW_PLUGIN( ParaMEDCorbaPlugin "1.0"
       SERVER_MANAGER_XML ParaMEDCorbaServerManager.xml
-      GUI_RESOURCE_FILES
-      ParaMEDCorbaUserInterfaceSources.xml
       SERVER_MANAGER_SOURCES ${PARACORBAPLUG_SRCS} )
     
     INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${MED_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
diff --git a/src/Plugins/ParaMEDCorba/ParaMEDCorbaUserInterfaceSources.xml b/src/Plugins/ParaMEDCorba/ParaMEDCorbaUserInterfaceSources.xml
deleted file mode 100644
index 8b4992c8..00000000
--- a/src/Plugins/ParaMEDCorba/ParaMEDCorbaUserInterfaceSources.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ParaViewSources>
-  <Proxy group="sources" name="ParaMEDCorbaSource" />
-</ParaViewSources>
diff --git a/src/Plugins/ParaSMESHCorba/CMakeLists.txt b/src/Plugins/ParaSMESHCorba/CMakeLists.txt
index 443757e2..83e2a450 100644
--- a/src/Plugins/ParaSMESHCorba/CMakeLists.txt
+++ b/src/Plugins/ParaSMESHCorba/CMakeLists.txt
@@ -29,8 +29,6 @@
 
  ADD_PARAVIEW_PLUGIN( ParaSMESHCorbaPlugin "1.0"
       SERVER_MANAGER_XML ParaSMESHCorbaServerManager.xml
-      GUI_RESOURCE_FILES
-      ParaSMESHCorbaUserInterfaceSources.xml
       SERVER_MANAGER_SOURCES ${PARA_SMESH_CORBA_SRC} )
 
  INCLUDE_DIRECTORIES(
diff --git a/src/Plugins/ParaSMESHCorba/ParaSMESHCorbaUserInterfaceSources.xml b/src/Plugins/ParaSMESHCorba/ParaSMESHCorbaUserInterfaceSources.xml
deleted file mode 100644
index c28f1a06..00000000
--- a/src/Plugins/ParaSMESHCorba/ParaSMESHCorbaUserInterfaceSources.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ParaViewSources>
-  <Proxy group="sources" name="ParaSMESHCorbaSource" />
-</ParaViewSources>
diff --git a/src/Plugins/ScaleVector/CMakeLists.txt b/src/Plugins/ScaleVector/CMakeLists.txt
index abf961fc..77e75c19 100644
--- a/src/Plugins/ScaleVector/CMakeLists.txt
+++ b/src/Plugins/ScaleVector/CMakeLists.txt
@@ -31,7 +31,6 @@ SET(SRCS
 
 ADD_PARAVIEW_PLUGIN(ScaleVector "1.0"
 	SERVER_MANAGER_XML ScaleVector.xml
-	GUI_RESOURCE_FILES ScaleVectorClient.xml
 	SERVER_MANAGER_SOURCES ${SRCS})
 
 install(TARGETS ${PROJECT_NAME} 
diff --git a/src/Plugins/ScaleVector/ScaleVectorClient.xml b/src/Plugins/ScaleVector/ScaleVectorClient.xml
deleted file mode 100644
index 526ecbde..00000000
--- a/src/Plugins/ScaleVector/ScaleVectorClient.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ParaViewFilters>
-    <Filter name="ScaleVector"/>
-</ParaViewFilters>