From: eap <eap@opencascade.com>
Date: Mon, 3 Oct 2016 15:00:03 +0000 (+0300)
Subject: 23352: [CEA] Order and naming of meshing algorithms
X-Git-Tag: V8_2_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=880fcb3a889a5cb7a9f11369a0971c256f7dc593;p=plugins%2Fhybridplugin.git

23352: [CEA] Order and naming of meshing algorithms
---

diff --git a/resources/HYBRIDPlugin.xml b/resources/HYBRIDPlugin.xml
index 7a642e9..2da42e3 100644
--- a/resources/HYBRIDPlugin.xml
+++ b/resources/HYBRIDPlugin.xml
@@ -25,16 +25,16 @@
 
 <meshers>
 
-<meshers-group name="HYBRID"
-               resources="HYBRIDPlugin"
+<meshers-group name      ="HYBRID"
+               resources ="HYBRIDPlugin"
                idl-module="HYBRIDPlugin"
                server-lib="HYBRIDEngine"
-               gui-lib="HYBRIDPluginGUI">
+               gui-lib   ="HYBRIDPluginGUI">
   <hypotheses>
-    <hypothesis type="HYBRID_Parameters"
-		label-id="HYBRID Parameters"
-		icon-id="mesh_hypo_hybrid.png"
-		dim="3">
+    <hypothesis type    ="HYBRID_Parameters"
+		label-id="MG-Hybrid Parameters"
+		icon-id ="mesh_hypo_hybrid.png"
+		dim     ="3">
       <python-wrap>
         <accumulative-methods>
           SetEnforcedVertex,
@@ -54,13 +54,15 @@
   </hypotheses>
 
   <algorithms>
-    <algorithm type="HYBRID_3D"
-               label-id="Tetrahedron etc... (HYBRID)"
-               icon-id="mesh_tree_hypo_hybrid.png"
-               input="TRIA,QUAD"
+    <algorithm type     ="HYBRID_3D"
+               label-id ="MG-Hybrid"
+               icon-id  ="mesh_tree_hypo_hybrid.png"
+               group-id ="2"
+               priority ="40"
+               input    ="TRIA,QUAD"
 	       need-geom="false"
                opt-hypos="HYBRID_Parameters"
-               dim="3">
+               dim      ="3">
       <python-wrap>
         <algo>HYBRID_3D=Tetrahedron(algo=smeshBuilder.HYBRID)</algo>
         <hypo>HYBRID_Parameters=Parameters()</hypo>
diff --git a/src/HYBRIDPlugin/HYBRIDPluginBuilder.py b/src/HYBRIDPlugin/HYBRIDPluginBuilder.py
index 1d859f5..7a66586 100644
--- a/src/HYBRIDPlugin/HYBRIDPluginBuilder.py
+++ b/src/HYBRIDPlugin/HYBRIDPluginBuilder.py
@@ -53,9 +53,10 @@ Generation_Tetra_Dominant, Generation_Hexa_Dominant = 0,1
 #----------------------------
 
 ## Algorithm type: HYBRID tetra-hexahedron 3D algorithm, see HYBRID_Algorithm
-HYBRID = "HYBRID_3D"
+MG_Hybrid = "HYBRID_3D"
+HYBRID = MG_Hybrid
 
-## Tetrahedron HYBRID 3D algorithm
+## MG-Hybrid 3D algorithm
 #  
 #  It can be created by calling smeshBuilder.Mesh.Tetrahedron( smeshBuilder.HYBRID, geom=0 )
 class HYBRID_Algorithm(Mesh_Algorithm):
@@ -65,7 +66,7 @@ class HYBRID_Algorithm(Mesh_Algorithm):
     meshMethod = "Tetrahedron"
     ## type of algorithm used with helper function in smeshBuilder.Mesh class
     #  @internal
-    algoType   = HYBRID
+    algoType   = MG_Hybrid
     ## doc string of the method in smeshBuilder.Mesh class
     #  @internal
     docHelper  = "Creates tetrahedron 3D algorithm for volumes"