From fd47c39529d5a6f5c3901aa9a5a8478efe00071b Mon Sep 17 00:00:00 2001 From: dmv Date: Tue, 18 May 2010 11:10:35 +0000 Subject: [PATCH] 0020864: EDF 1409 SMESH: Suppression of algorithms causes Salome to crash Additional minor changes: fix problems with Object browser icons --- resources/Makefile.am | 4 ++++ resources/SalomeApp.xml | 2 +- resources/mesh_tree_algo_0D.png | Bin 0 -> 253 bytes resources/mesh_tree_algo_existing_2D.png | Bin 0 -> 270 bytes resources/mesh_tree_algo_prism.png | Bin 0 -> 314 bytes .../mesh_tree_algo_radial_quadrangle_1D2D.png | Bin 0 -> 338 bytes src/StdMeshersGUI/StdMeshers_images.ts | 18 +++++++++++++++++- 7 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 resources/mesh_tree_algo_0D.png create mode 100644 resources/mesh_tree_algo_existing_2D.png create mode 100644 resources/mesh_tree_algo_prism.png create mode 100644 resources/mesh_tree_algo_radial_quadrangle_1D2D.png 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 @@ - + diff --git a/resources/mesh_tree_algo_0D.png b/resources/mesh_tree_algo_0D.png new file mode 100644 index 0000000000000000000000000000000000000000..5725a17d485ee586acef350023ea2d54a0113153 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9G6>p_??PHLhIP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hS|d%8G=RNPAX^Z&m+vnqo^!wd-x76wL_jf@z?ktXk^i4z6oY!A#xI*r3*c5g%i31sKUcy2S41qEo7@83VvN3FF=acrCH}5addInEdKbLh*2~7YV Cia-hg literal 0 HcmV?d00001 diff --git a/resources/mesh_tree_algo_existing_2D.png b/resources/mesh_tree_algo_existing_2D.png new file mode 100644 index 0000000000000000000000000000000000000000..db0de789a571c9d3d418eb314af6fe47f5496634 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9G6>p_??PHLhIP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hU;c)B=-RNPAX^Z&m+vnqo^!wd-x76wL_jf_Cz0)v~I+nzcW4h1!*S&a>X^A$ld z;tWh3ofFA|^bwaeX)!=!B02(F^0YUp0!2FJOetg) tu@h%x5l~)Q$*9nv;l~cM0b~su!`h7ovQv*Xeh0dT!PC{xWt~$(699Q=NKya* literal 0 HcmV?d00001 diff --git a/resources/mesh_tree_algo_prism.png b/resources/mesh_tree_algo_prism.png new file mode 100644 index 0000000000000000000000000000000000000000..0025d48b8a5b0eba2e9b330763a49266d916e718 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9G6>p_??PHLhIP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hU0@N{tuskoK&=l_3uW>p4-hKK@B10$m(Q^^cPWg~eIKa*!x9gp+pT|U}8h7Al! zif+n!XB8L(9DGj9+0YukQH!P1GDQDi7J~yrVg+N$iB%Q3i`}=EL5dteHQZG~s%D&rfkqi7o%VUr_TUl^69eNB jkIXz44uvkDsRtOsPZ%EF@}g!5(CrMKu6{1-oD!M<5%5|a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..234ed3055b0f5a70e2bf695c933a375c6c4301ac GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9G6>p_??PHLhIP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?CjL0RzLU1O^7H84L{K`IF+0 zx&hUm@N{tuskoK&=l_3uW>p4-h6o21Wo6|qO$TSmPE!y+f#-f-Z-HY9Gp8h*fP>Es z7RR=OJS>uJ@0?N?1RQi)=5*u;m|bUJ5fIkvovr;Ra1U!zaxtd^gP~$JL!#3%Pge=q=rAAT}6yMExvgjhzP?jL{nk{9phx>?Y`pd`WlqOp^YfvJOYc2Y#c zqe~q!GZ+|;w48REk(Q#Lzzk$NtqCqeIlGw8X@knMHyjCMClC U(r51ICON_SMESH_TREE_ALGO_CompositeSegment_1D mesh_tree_algo_regular.png + + ICON_SMESH_TREE_ALGO_UseExisting_2D + mesh_tree_algo_existing_2D.png + + + ICON_SMESH_TREE_ALGO_UseExisting_1D + mesh_tree_algo_regular.png + ICON_SMESH_TREE_ALGO_Hexa_3D mesh_tree_algo_hexa.png @@ -129,6 +137,14 @@ ICON_SMESH_TREE_ALGO_Quadrangle_2D mesh_tree_algo_quad.png + + ICON_SMESH_TREE_ALGO_RadialQuadrangle_1D2D + mesh_tree_algo_radial_quadrangle_1D2D.png + + + ICON_SMESH_TREE_ALGO_Prism_3D + mesh_tree_algo_prism.png + ICON_SMESH_TREE_ALGO_RadialPrism_3D mesh_tree_algo_radial_prism.png @@ -139,7 +155,7 @@ ICON_SMESH_TREE_ALGO_SegmentAroundVertex_0D - mesh_tree_algo_regular.png + mesh_tree_algo_0D.png ICON_SMESH_TREE_HYPO_Arithmetic1D -- 2.30.2