From: rnv <rnv@opencascade.com>
Date: Tue, 13 Sep 2011 09:03:12 +0000 (+0000)
Subject: Implementation of the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About' dialog... 
X-Git-Tag: V6_4_0a1~77
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9d3b3bf2586e1e2a1a1cb27b373ccb879ffb86db;p=modules%2Fsmesh.git

Implementation of the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About' dialog box" issue.
---

diff --git a/configure.ac b/configure.ac
index 6a8498e43..b1de4d2f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,6 +522,7 @@ AC_OUTPUT([ \
   src/Tools/MeshCut/Makefile \
   resources/Makefile \
   resources/SMESHCatalog.xml \
+  resources/SalomeApp.xml \
   idl/Makefile \
   Makefile
 ])
diff --git a/resources/Makefile.am b/resources/Makefile.am
index 3f949cfb4..f4f556208 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -148,7 +148,7 @@ dist_salomeres_DATA = \
 	mesh_merge_elements.png \
 	select1.png \
 	StdMeshers.xml \
-	SalomeApp.xml \
+	$(top_builddir)/resources/SalomeApp.xml \
 	mesh_pattern.png \
 	pattern_sample_2d.png \
 	pattern_sample_3D.png \
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644
index a0958857e..000000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--
-  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
-
-  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
-<document>
-  <section name="SMESH">
-    <!-- Major module parameters -->
-    <parameter name="name" value="Mesh"/>
-    <parameter name="icon" value="ModuleMesh.png"/>
-    <!-- Other module preferences -->
-    <parameter name="node_color"                   value="255, 0,   0"/>
-    <parameter name="fill_color"                   value="0, 170, 255"/>
-    <parameter name="outline_color"                value="0, 170, 255"/>
-    <parameter name="backface_color"               value="0, 0,   255"/>
-    <parameter name="elem0d_color"                 value="0, 255,   0"/>
-    <parameter name="highlight_color"              value="0, 255, 255"/>
-    <parameter name="group_name_color"             value="255, 255, 255"/>
-    <parameter name="type_of_marker"               value="1"  />
-    <parameter name="marker_scale"                 value="9"  />
-    <parameter name="elem0d_size"                  value="5" />
-    <parameter name="element_width"                value="1" />
-    <parameter name="shrink_coeff"                 value="75"/>
-    <parameter name="orientation_color"            value="255, 255, 255"/>
-    <parameter name="orientation_scale"            value="0.1"/>
-    <parameter name="orientation_3d_vectors"       value="false"/>
-    <parameter name="selection_element_color"      value="255, 255,   0"/>
-    <parameter name="selection_object_color"       value="255, 255, 255"/>
-    <parameter name="selection_precision_element"  value="0.005"/>
-    <parameter name="selection_precision_node"     value="0.005"/>
-    <parameter name="selection_precision_object"   value="0.005"/>
-    <parameter name="selection_width"              value="5"/>
-    <parameter name="highlight_width"              value="5"/>
-    <parameter name="controls_precision"           value="0"/>
-    <parameter name="scalar_bar_horizontal_height" value="0.08"/>
-    <parameter name="scalar_bar_horizontal_width"  value="0.8" />
-    <parameter name="scalar_bar_horizontal_x"      value="0.1"/>
-    <parameter name="scalar_bar_horizontal_y"      value="0.01"/>
-    <parameter name="scalar_bar_label_color"       value="255, 255, 255"/>
-    <parameter name="scalar_bar_label_font"        value="Arial,12"     />
-    <parameter name="scalar_bar_num_colors"        value="64"/>
-    <parameter name="scalar_bar_num_labels"        value="5" />
-    <parameter name="scalar_bar_orientation"       value="1" />
-    <parameter name="scalar_bar_title_color"       value="255, 255, 255"/>
-    <parameter name="scalar_bar_title_font"        value="Arial,12"     />
-    <parameter name="scalar_bar_vertical_height"   value="0.8"  />
-    <parameter name="scalar_bar_vertical_width"    value="0.08" />
-    <parameter name="scalar_bar_vertical_x"        value="0.01" />
-    <parameter name="scalar_bar_vertical_y"        value="0.1" />
-    <parameter name="distribution_visibility"      value="false" />
-    <parameter name="distribution_coloring_type"   value="0" />
-    <parameter name="distribution_color"           value="0, 85, 0" />
-    <parameter name="DisplayMode"                  value="true" />
-    <parameter name="auto_update"                  value="true" />
-    <parameter name="update_limit"                 value="500000" />
-    <parameter name="display_mode"                 value="1"    />
-    <parameter name="auto_groups"                  value="false"/>
-    <parameter name="show_result_notification"     value="2"/>
-    <parameter name="mesh_elem_info"               value="1"/>
-    <parameter name="segmentation"                 value="10"/>
-    <parameter name="nb_segments_per_edge"         value="15"/>
-    <parameter name="quadratic_mode"               value="0"/>
-    <parameter name="max_angle"                    value="2"/>
-    <parameter name="documentation"                value="smesh_help"/>
-    <parameter name="preview_actor_chunk_size"     value="100" />
-    <!-- Input field precisions -->
-    <parameter name="def_precision"                value="3"  />
-    <parameter name="length_precision"             value="-6"  />
-    <parameter name="angle_precision"              value="-3"  />
-    <parameter name="len_tol_precision"            value="-7"  />
-    <parameter name="parametric_precision"         value="-6"  />
-    <parameter name="area_precision"               value="-6"  />
-    <parameter name="vol_precision"                value="-6"  />
-  </section>
-  <section name="smesh_help" >
-    <parameter name="sub_menu"          value="%1 module"/>
-    <parameter name="User's Guide"      value="${SMESH_ROOT_DIR}/share/doc/salome/gui/SMESH/index.html"/>
-    <parameter name="Developer's Guide" value="${SMESH_ROOT_DIR}/share/doc/salome/tui/SMESH/index.html"/>
-  </section>
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
-    <parameter name="StdMeshers"   value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
-    <!-- NETGENPlugin and GHS3DPlugin -->
-    <!-- Here the environment variables are used as case-sensitive, -->
-    <!-- In GUI/src/SalomeApp/resources/SalomeApp.xml upper-case notation is used. -->
-    <!-- As a result, both variants are acceptable. -->
-    <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/hexoticplugin"/>
-    <parameter name="GHS3DPRLPlugin" value="${GHS3DPRLPLUGIN_ROOT_DIR}/share/salome/resources"/>
-  </section>
-</document>
diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644
index 000000000..133192ed8
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,113 @@
+<!--
+  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+
+  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+-->
+<document>
+  <section name="SMESH">
+    <!-- Major module parameters -->
+    <parameter name="name" value="Mesh"/>
+    <parameter name="icon" value="ModuleMesh.png"/>
+    <parameter name="SMESH_VERSION" value="@VERSION@"/>
+    <!-- Other module preferences -->
+    <parameter name="node_color"                   value="255, 0,   0"/>
+    <parameter name="fill_color"                   value="0, 170, 255"/>
+    <parameter name="outline_color"                value="0, 170, 255"/>
+    <parameter name="backface_color"               value="0, 0,   255"/>
+    <parameter name="elem0d_color"                 value="0, 255,   0"/>
+    <parameter name="highlight_color"              value="0, 255, 255"/>
+    <parameter name="group_name_color"             value="255, 255, 255"/>
+    <parameter name="type_of_marker"               value="1"  />
+    <parameter name="marker_scale"                 value="9"  />
+    <parameter name="elem0d_size"                  value="5" />
+    <parameter name="element_width"                value="1" />
+    <parameter name="shrink_coeff"                 value="75"/>
+    <parameter name="orientation_color"            value="255, 255, 255"/>
+    <parameter name="orientation_scale"            value="0.1"/>
+    <parameter name="orientation_3d_vectors"       value="false"/>
+    <parameter name="selection_element_color"      value="255, 255,   0"/>
+    <parameter name="selection_object_color"       value="255, 255, 255"/>
+    <parameter name="selection_precision_element"  value="0.005"/>
+    <parameter name="selection_precision_node"     value="0.005"/>
+    <parameter name="selection_precision_object"   value="0.005"/>
+    <parameter name="selection_width"              value="5"/>
+    <parameter name="highlight_width"              value="5"/>
+    <parameter name="controls_precision"           value="0"/>
+    <parameter name="scalar_bar_horizontal_height" value="0.08"/>
+    <parameter name="scalar_bar_horizontal_width"  value="0.8" />
+    <parameter name="scalar_bar_horizontal_x"      value="0.1"/>
+    <parameter name="scalar_bar_horizontal_y"      value="0.01"/>
+    <parameter name="scalar_bar_label_color"       value="255, 255, 255"/>
+    <parameter name="scalar_bar_label_font"        value="Arial,12"     />
+    <parameter name="scalar_bar_num_colors"        value="64"/>
+    <parameter name="scalar_bar_num_labels"        value="5" />
+    <parameter name="scalar_bar_orientation"       value="1" />
+    <parameter name="scalar_bar_title_color"       value="255, 255, 255"/>
+    <parameter name="scalar_bar_title_font"        value="Arial,12"     />
+    <parameter name="scalar_bar_vertical_height"   value="0.8"  />
+    <parameter name="scalar_bar_vertical_width"    value="0.08" />
+    <parameter name="scalar_bar_vertical_x"        value="0.01" />
+    <parameter name="scalar_bar_vertical_y"        value="0.1" />
+    <parameter name="distribution_visibility"      value="false" />
+    <parameter name="distribution_coloring_type"   value="0" />
+    <parameter name="distribution_color"           value="0, 85, 0" />
+    <parameter name="DisplayMode"                  value="true" />
+    <parameter name="auto_update"                  value="true" />
+    <parameter name="update_limit"                 value="500000" />
+    <parameter name="display_mode"                 value="1"    />
+    <parameter name="auto_groups"                  value="false"/>
+    <parameter name="show_result_notification"     value="2"/>
+    <parameter name="mesh_elem_info"               value="1"/>
+    <parameter name="segmentation"                 value="10"/>
+    <parameter name="nb_segments_per_edge"         value="15"/>
+    <parameter name="quadratic_mode"               value="0"/>
+    <parameter name="max_angle"                    value="2"/>
+    <parameter name="documentation"                value="smesh_help"/>
+    <parameter name="preview_actor_chunk_size"     value="100" />
+    <!-- Input field precisions -->
+    <parameter name="def_precision"                value="3"  />
+    <parameter name="length_precision"             value="-6"  />
+    <parameter name="angle_precision"              value="-3"  />
+    <parameter name="len_tol_precision"            value="-7"  />
+    <parameter name="parametric_precision"         value="-6"  />
+    <parameter name="area_precision"               value="-6"  />
+    <parameter name="vol_precision"                value="-6"  />
+  </section>
+  <section name="smesh_help" >
+    <parameter name="sub_menu"          value="%1 module"/>
+    <parameter name="User's Guide"      value="${SMESH_ROOT_DIR}/share/doc/salome/gui/SMESH/index.html"/>
+    <parameter name="Developer's Guide" value="${SMESH_ROOT_DIR}/share/doc/salome/tui/SMESH/index.html"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <parameter name="StdMeshers"   value="${SMESH_ROOT_DIR}/share/salome/resources/smesh"/>
+    <!-- NETGENPlugin and GHS3DPlugin -->
+    <!-- Here the environment variables are used as case-sensitive, -->
+    <!-- In GUI/src/SalomeApp/resources/SalomeApp.xml upper-case notation is used. -->
+    <!-- As a result, both variants are acceptable. -->
+    <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/hexoticplugin"/>
+    <parameter name="GHS3DPRLPlugin" value="${GHS3DPRLPLUGIN_ROOT_DIR}/share/salome/resources"/>
+  </section>
+</document>
diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am
index f65fd7528..c0d478066 100644
--- a/src/SMESHGUI/Makefile.am
+++ b/src/SMESHGUI/Makefile.am
@@ -260,6 +260,7 @@ libSMESH_la_CPPFLAGS = \
 	-I$(srcdir)/../SMESH_I \
 	-I$(srcdir)/../Controls \
 	-I$(srcdir)/../SMESHClient \
+	-I$(top_builddir) \
 	-I$(top_builddir)/idl
 
 libSMESH_la_LDFLAGS  = \
diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index bfb3d2d30..94f893e5e 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -85,6 +85,8 @@
 #include "SMESHGUI_VTKUtils.h"
 #include "SMESHGUI_HypothesesUtils.h"
 
+#include <SMESH_version.h>
+
 #include <SMESH_Client.hxx>
 #include <SMESH_Actor.h>
 #include <SMESH_ScalarBarActor.h>
@@ -1589,6 +1591,10 @@ extern "C" {
   {
     return new SMESHGUI();
   }
+
+  SMESHGUI_EXPORT  char* getModuleVersion() {
+    return SMESH_VERSION_STR;
+  }
 }
 
 SMESH::SMESH_Gen_var SMESHGUI::myComponentSMESH = SMESH::SMESH_Gen::_nil();