0021711: [CEA 579] Simplify Properties dialog accordingly to dimension of mesh

diff --git a/doc/salome/gui/SMESH/images/colors_size.png b/doc/salome/gui/SMESH/images/colors_size.png
index 44998267511854fcd503bb5eeb47def189715298..213652e79922998e425c972ce5a860a7d4f36edd 100755 (executable)
Binary files a/doc/salome/gui/SMESH/images/colors_size.png and b/doc/salome/gui/SMESH/images/colors_size.png differ

diff --git a/doc/salome/gui/SMESH/images/point_marker_widget1.png b/doc/salome/gui/SMESH/images/point_marker_widget1.png
index 13b8e6dab33764fef3c125991f07fe5234819bc7..3d788cd96016dfad57a445ad28016ee9955b6ea9 100755 (executable)
Binary files a/doc/salome/gui/SMESH/images/point_marker_widget1.png and b/doc/salome/gui/SMESH/images/point_marker_widget1.png differ

diff --git a/doc/salome/gui/SMESH/images/point_marker_widget2.png b/doc/salome/gui/SMESH/images/point_marker_widget2.png
index dbb81b40e5c958d24445a250c540fc82b959a277..d44f3888fb2b59a0d422598a2ef2a0abb3d481f7 100755 (executable)
Binary files a/doc/salome/gui/SMESH/images/point_marker_widget2.png and b/doc/salome/gui/SMESH/images/point_marker_widget2.png differ

diff --git a/doc/salome/gui/SMESH/input/colors_size.doc b/doc/salome/gui/SMESH/input/colors_size.doc
index 16626ce13adb65f67d2cf2c5f4ab363c1aa294c4..c0953ff09d6aed9961a6bb52ca5acda29b338541 100644 (file)
--- a/doc/salome/gui/SMESH/input/colors_size.doc
+++ b/doc/salome/gui/SMESH/input/colors_size.doc
@@ -4,36 +4,48 @@
 
 \image html colors_size.png
 
-Using this dialog you can define the following set of mesh visualization
-parameters:
-<ul>
-<li><b>Elements</b></li>
-<ul>
-<li><b>Surface color</b> - surface color of elements (seen in Shading mode).</li>
-<li><b>Back surface color</b> - interior surface color of elements. Use slider to select this color 
-generated on base of the <b>Surface color</b> by changing its brightness and saturation.</li>
-<li><b>Outline color</b> - color of element borders.</li>
-<li><b>Wireframe color</b> - color of element borders in wireframe mode.</li>
-<li><b>0D elements</b> - color of 0D elements.</li>
-<li><b>Size of 0D elements</b> - size of 0D elements.</li>
-<li><b>Ball elements</b> - color of MED_BALL elements.</li>
-<li><b>Size of Ball elements</b> - size of MED_BALL elements.</li>
-<li><b>Line width</b> - width of lines (edges and borders of elements).</li>
-<li><b>Shrink coef.</b> - relative space of elements compared to gaps between
-       them in shrink mode.</li>
-</ul>
-<li><b>Nodes</b></li>
-<ul>
-<li><b>Color</b> - color of nodes.</li>
-<li><b>Marker</b> - group of options allowing to change the representation of
-       points (see \subpage point_marker_page "Point Marker" page).</li>
-</ul>
-<li><b>Orientation of faces</b></li>
-<ul>
-<li><b>Color</b> - color of orientation vertors.</li>
-<li><b>Scale</b> - size of orientation vectors.</li>
-<li><b>3D vectors</b> - allows to choose between 2D planar and 3D vectors.</li>
-</ul>
-</ul>
+Using this dialog you can customize different properties of the mesh visualization
+parameters.
+
+The GUI elements in the "Properties" dialog box are grouped according
+to the entity types of mesh data. If some data entities are not
+present in the mesh object, the corresponding GUI elements are not
+shown.
+
+- \b Nodes:
+  - \b Color - color of nodes.
+  - \b Type and \b Scale - these options allow changing of the nodes
+    representation (see \subpage point_marker_page "Point Marker" page
+    for more details).
+- <b>Edges / wireframe</b>:
+  - \b Color - color of element borders in wireframe mode.
+  - \b Width - width of lines (edges and borders of elements
+    in wireframe mode).
+- \b Faces:
+  - \b Front - surface color of face elements (seen in shading mode).
+  - \b Back - backside surface color of face elements. Use slider to
+    select this color generated on base of the \b Face color by
+    changing its brightness and saturation. 
+- \b Volumes:
+  - \b Normal - surface color of normal volume elements (seen in shading mode).
+  - \b Reversed - surface color of volume elements. Use slider to
+    select this color generated on base of the \b Normal color by
+    changing its brightness and saturation. 
+- \b Outlines:
+  - \b Color - color of element borders in shading mode.
+  - \b Width - width of outlines (borders of elements
+    in shading mode).
+- <b>0D elements</b>:
+  - \b Color - color of 0D elements.
+  - \b Size - size of 0D elements.
+- \b Balls:
+  - \b Color - color of discrete ball elements.
+  - \b Size - size of discrete ball elements.
+- <b>Orientation vectors</b>:
+  - \b Color - color of orientation vectors.
+  - \b Scale - size of orientation vectors.
+  - <b>3D vectors</b> - allows to choose between 2D planar and 3D vectors.
+- <b>Shrink coef.</b> - relative space of elements compared to gaps between
+  them in shrink mode.
 
 */

diff --git a/doc/salome/gui/SMESH/input/point_marker.doc b/doc/salome/gui/SMESH/input/point_marker.doc
index 40c2b932bb79df041cb3bce4acb0da74ad0aaa5d..0a7b88e3bc05320f163dfb5e37e17c9c3b05fa5b 100644 (file)
--- a/doc/salome/gui/SMESH/input/point_marker.doc
+++ b/doc/salome/gui/SMESH/input/point_marker.doc
@@ -33,14 +33,14 @@ lines in the file. Note that missing symbols are replaced by "0".
 Here is a texture file sample:
 
 <pre>
-00111100
-00111100
 11111111
+10000001
+10011001
+10111101
+10111101
+10011001
+10000001
 11111111
-11111111
-11111111
-00111100
-00111100
 </pre>
 
 \image html point_marker_widget2.png

diff --git a/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx b/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx
index 419169d8ff8845df5c9fa0f40bf3e632c5360cc0..1e9874b086c3fc7e31850c782d3469be331f2415 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx
@@ -35,6 +35,8 @@
 #include <QtxColorButton.h>
 #include <QtxIntSpinBox.h>
 #include <VTKViewer_MarkerWidget.h>
+#include <SUIT_Session.h>
+#include <LightApp_Application.h>
 
 const int MARGIN  = 9;
 const int SPACING = 6;
@@ -247,6 +249,8 @@ SMESHGUI_PropertiesDlg::SMESHGUI_PropertiesDlg( const VTK::MarkerMap& customMark
   myOrientationSize->setRange( 5, 100 );
 
   button( OK )->setText( tr( "SMESH_BUT_OK" ) );
+
+  connect( this, SIGNAL( dlgHelp() ), this, SLOT( onHelp() ) );
 }
 
 /*
@@ -634,3 +638,12 @@ void SMESHGUI_PropertiesDlg::showControls( int elements, bool nodes )
   // shrink factor is shown if there are edges and/or faces and/or volumes
   myExtraGrp->setVisible( elements & ( SMESH_Actor::eEdges | SMESH_Actor::eFaces | SMESH_Actor::eVolumes ) );
 }
+
+/*!
+  \brief Show online help on dialog box
+*/
+void SMESHGUI_PropertiesDlg::onHelp()
+{
+  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
+  app->onHelpContextModule( "SMESH", "colors_size_page.html" );
+}

diff --git a/src/SMESHGUI/SMESHGUI_PropertiesDlg.h b/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
index 4ff5c2ad5f6d2a26387c5c85b92c36c9da5138d7..bcdcc72877e9390ac3281e937d94241d1ec7dbad 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
+++ b/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
@@ -98,6 +98,9 @@ public:
 
   void              showControls( int, bool );
 
+private slots:
+  void              onHelp();
+
 private:
   // group boxes
   QGroupBox*              myNodeGrp;