From: vsr Date: Wed, 3 Oct 2012 14:25:24 +0000 (+0000) Subject: 0021711: [CEA 579] Simplify Properties dialog accordingly to dimension of mesh X-Git-Tag: V6_6_0a1~64 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1e6fde845002aa992f85c7517aaa0644e8f513cc;p=modules%2Fsmesh.git 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 449982675..213652e79 100755 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 13b8e6dab..3d788cd96 100755 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 dbb81b40e..d44f3888f 100755 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 16626ce13..c0953ff09 100644 --- 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: - +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). +- Edges / wireframe: + - \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). +- 0D elements: + - \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. +- Orientation vectors: + - \b Color - color of orientation vectors. + - \b Scale - size of orientation vectors. + - 3D vectors - allows to choose between 2D planar and 3D vectors. +- Shrink coef. - 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 40c2b932b..0a7b88e3b 100644 --- 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: 
-00111100
-00111100
 11111111
+10000001
+10011001
+10111101
+10111101
+10011001
+10000001
 11111111
-11111111
-11111111
-00111100
-00111100
\image html point_marker_widget2.png diff --git a/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx b/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx index 419169d8f..1e9874b08 100644 --- a/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_PropertiesDlg.cxx @@ -35,6 +35,8 @@ #include #include #include +#include +#include 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 4ff5c2ad5..bcdcc7287 100644 --- 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;