Merge from V6_main_20120808 08Aug12

[plugins/hexoticplugin.git] / resources / HexoticPLUGIN.xml

diff --git a/resources/HexoticPLUGIN.xml b/resources/HexoticPLUGIN.xml
index 7600da0bb4dbc958814cbc2fc12d563566ee2f88..fe30c321f40fd485451f7e188f1c5a37d92f00ae 100644 (file)
--- a/resources/HexoticPLUGIN.xml
+++ b/resources/HexoticPLUGIN.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D
+  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
@@ -26,24 +26,30 @@
 <meshers>
 
 <meshers-group name="Hexotic"
-               resources="HexoticPlugin"
+               resources="HexoticPLUGIN"
                server-lib="HexoticEngine"
                gui-lib="HexoticPluginGUI">
   <hypotheses>
     <hypothesis type="Hexotic_Parameters"
-               label-id="Hexotic Parameters"
-               icon-id="mesh_hypo_Hexotic.png"
-               need-geom="false"
-               dim="3"/>
+    label-id="Hexotic Parameters"
+    icon-id="mesh_hypo_Hexotic.png"
+    dim="3"/>
   </hypotheses>
   <algorithms>
+
     <algorithm type="Hexotic_3D"
-               label-id="Hexotic"
+               label-id="Hexahedron (Hexotic)"
                icon-id="mesh_algo_Hexotic.png"
                hypos="Hexotic_Parameters"
                input="TRIA,QUAD"
-              need-geom="false"
-               dim="3"/>
+               need-geom="false"
+               dim="3">
+      <python-wrap>
+        <algo>Hexotic_3D=Hexahedron(algo=smesh.Hexotic)</algo>
+        <hypo>Hexotic_Parameters=MinMaxQuad(SetHexesMinLevel(),SetHexesMaxLevel(),SetHexoticQuadrangles())</hypo>
+      </python-wrap>
+    </algorithm>
+
   </algorithms>
 </meshers-group>