From: dmv <dmv@opencascade.com>
Date: Tue, 18 May 2010 11:10:35 +0000 (+0000)
Subject: 0020864: EDF 1409 SMESH: Suppression of algorithms causes Salome to crash
X-Git-Tag: V5_1_4~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fd47c39529d5a6f5c3901aa9a5a8478efe00071b;p=modules%2Fsmesh.git

0020864: EDF 1409 SMESH: Suppression of algorithms causes Salome to crash
Additional minor changes: fix problems with Object browser icons
---

diff --git a/resources/Makefile.am b/resources/Makefile.am
index ca671b982..97f2c3b6f 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -80,6 +80,7 @@ dist_salomeres_DATA = \
 	mesh_tree_algo_hexa.png \
 	mesh_tree_algo_mefisto.png \
 	mesh_tree_algo.png \
+	mesh_tree_algo_0D.png \
 	mesh_tree_algo_quad.png \
 	mesh_tree_algo_regular.png \
 	mesh_tree_algo_tetra.png \
@@ -149,6 +150,9 @@ dist_salomeres_DATA = \
 	mesh_conv_to_quad.png \
 	mesh_tree_hypo_layers_distribution.png \
 	mesh_tree_algo_radial_prism.png \
+	mesh_tree_algo_radial_quadrangle_1D2D.png \
+	mesh_tree_algo_existing_2D.png \
+	mesh_tree_algo_prism.png \
 	mesh_tree_algo_projection_2d.png \
 	mesh_hypo_source_edge.png \
 	mesh_hypo_source_3d.png \
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 173cbd077..e4ddfa738 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -99,7 +99,7 @@
     <parameter name="NETGENPlugin" value="${NETGENPlugin_ROOT_DIR}/share/salome/resources/netgenplugin"/>
     <parameter name="GHS3DPlugin"  value="${GHS3DPlugin_ROOT_DIR}/share/salome/resources/ghs3dplugin"/>
     <parameter name="BLSURFPlugin" value="${BLSURFPlugin_ROOT_DIR}/share/salome/resources"/>
-    <parameter name="HexoticPLUGIN" value="${HexoticPlugin_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="HexoticPlugin" value="${HexoticPLUGIN_ROOT_DIR}/share/salome/resources/hexoticplugin"/>
     <parameter name="GHS3DPRLPlugin" value="${GHS3DPRLPLUGIN_ROOT_DIR}/share/salome/resources"/>
   </section>
 </document>
diff --git a/resources/mesh_tree_algo_0D.png b/resources/mesh_tree_algo_0D.png
new file mode 100644
index 000000000..5725a17d4
Binary files /dev/null and b/resources/mesh_tree_algo_0D.png differ
diff --git a/resources/mesh_tree_algo_existing_2D.png b/resources/mesh_tree_algo_existing_2D.png
new file mode 100644
index 000000000..db0de789a
Binary files /dev/null and b/resources/mesh_tree_algo_existing_2D.png differ
diff --git a/resources/mesh_tree_algo_prism.png b/resources/mesh_tree_algo_prism.png
new file mode 100644
index 000000000..0025d48b8
Binary files /dev/null and b/resources/mesh_tree_algo_prism.png differ
diff --git a/resources/mesh_tree_algo_radial_quadrangle_1D2D.png b/resources/mesh_tree_algo_radial_quadrangle_1D2D.png
new file mode 100644
index 000000000..234ed3055
Binary files /dev/null and b/resources/mesh_tree_algo_radial_quadrangle_1D2D.png differ
diff --git a/src/StdMeshersGUI/StdMeshers_images.ts b/src/StdMeshersGUI/StdMeshers_images.ts
index fa4ca5767..da9130846 100644
--- a/src/StdMeshersGUI/StdMeshers_images.ts
+++ b/src/StdMeshersGUI/StdMeshers_images.ts
@@ -105,6 +105,14 @@
             <source>ICON_SMESH_TREE_ALGO_CompositeSegment_1D</source>
             <translation>mesh_tree_algo_regular.png</translation>
         </message>
+	<message>
+            <source>ICON_SMESH_TREE_ALGO_UseExisting_2D</source>
+            <translation>mesh_tree_algo_existing_2D.png</translation>
+        </message>
+	<message>
+            <source>ICON_SMESH_TREE_ALGO_UseExisting_1D</source>
+            <translation>mesh_tree_algo_regular.png</translation>
+        </message>
         <message>
             <source>ICON_SMESH_TREE_ALGO_Hexa_3D</source>
             <translation>mesh_tree_algo_hexa.png</translation>
@@ -129,6 +137,14 @@
             <source>ICON_SMESH_TREE_ALGO_Quadrangle_2D</source>
             <translation>mesh_tree_algo_quad.png</translation>
         </message>
+	<message>
+            <source>ICON_SMESH_TREE_ALGO_RadialQuadrangle_1D2D</source>
+            <translation>mesh_tree_algo_radial_quadrangle_1D2D.png</translation>
+        </message>
+	<message>
+            <source>ICON_SMESH_TREE_ALGO_Prism_3D</source>
+            <translation>mesh_tree_algo_prism.png</translation>
+        </message>
         <message>
             <source>ICON_SMESH_TREE_ALGO_RadialPrism_3D</source>
             <translation>mesh_tree_algo_radial_prism.png</translation>
@@ -139,7 +155,7 @@
         </message>
         <message>
             <source>ICON_SMESH_TREE_ALGO_SegmentAroundVertex_0D</source>
-            <translation>mesh_tree_algo_regular.png</translation>
+            <translation>mesh_tree_algo_0D.png</translation>
         </message>
         <message>
             <source>ICON_SMESH_TREE_HYPO_Arithmetic1D</source>