diff --git a/doc/salome/gui/SMESH/images/image56.jpg b/doc/salome/gui/SMESH/images/image56.jpg index 5fba91a2f..6f1997073 100755 Binary files a/doc/salome/gui/SMESH/images/image56.jpg and b/doc/salome/gui/SMESH/images/image56.jpg differ diff --git a/doc/salome/gui/SMESH/images/image58.gif b/doc/salome/gui/SMESH/images/image58.gif deleted file mode 100755 index 45e28568e..000000000 Binary files a/doc/salome/gui/SMESH/images/image58.gif and /dev/null differ diff --git a/doc/salome/gui/SMESH/images/image58.png b/doc/salome/gui/SMESH/images/image58.png new file mode 100644 index 000000000..a496170a0 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image58.png differ diff --git a/doc/salome/gui/SMESH/images/image59.png b/doc/salome/gui/SMESH/images/image59.png new file mode 100644 index 000000000..5b8106eb2 Binary files /dev/null and b/doc/salome/gui/SMESH/images/image59.png differ diff --git a/doc/salome/gui/SMESH/images/pref21.png b/doc/salome/gui/SMESH/images/pref21.png index ddacc6332..7fb82e4d0 100755 Binary files a/doc/salome/gui/SMESH/images/pref21.png and b/doc/salome/gui/SMESH/images/pref21.png differ diff --git a/doc/salome/gui/SMESH/images/pref22.png b/doc/salome/gui/SMESH/images/pref22.png index d557d2515..cf086214e 100755 Binary files a/doc/salome/gui/SMESH/images/pref22.png and b/doc/salome/gui/SMESH/images/pref22.png differ diff --git a/doc/salome/gui/SMESH/images/pref23.png b/doc/salome/gui/SMESH/images/pref23.png index c715ee482..23d804b8d 100755 Binary files a/doc/salome/gui/SMESH/images/pref23.png and b/doc/salome/gui/SMESH/images/pref23.png differ diff --git a/doc/salome/gui/SMESH/images/pref24.png b/doc/salome/gui/SMESH/images/pref24.png index 167cc0bf0..9a7a5a8f0 100755 Binary files a/doc/salome/gui/SMESH/images/pref24.png and b/doc/salome/gui/SMESH/images/pref24.png differ diff --git a/doc/salome/gui/SMESH/input/display_entity.doc b/doc/salome/gui/SMESH/input/display_entity.doc index 23efe86cc..13b11c38e 100644 --- a/doc/salome/gui/SMESH/input/display_entity.doc +++ b/doc/salome/gui/SMESH/input/display_entity.doc @@ -7,7 +7,9 @@ edges or combine them. \image html image56.jpg Only Faces -\image html image58.gif Only Edges +\image html image58.png Only Edges + +\image html image59.png Edges + Faces If the mesh contains a lot of elements, select Choose... item, diff --git a/doc/salome/gui/SMESH/input/mesh_preferences.doc b/doc/salome/gui/SMESH/input/mesh_preferences.doc index e0374fd4c..7c47c1fa2 100644 --- a/doc/salome/gui/SMESH/input/mesh_preferences.doc +++ b/doc/salome/gui/SMESH/input/mesh_preferences.doc @@ -2,8 +2,8 @@ \page mesh_preferences_page Mesh preferences -In the Mesh module you can set mesh preferences, which can be used in -later sessions with this module. +In the Mesh module you can set mesh preferences, which can be used right now +or in later sessions with this module according to the preferences.

General Preferences

@@ -39,12 +39,13 @@ later sessions with this module. mesh nodes, at which they are considered coincident by Double nodes quality control. -- Display mode - allows to set Wireframe, Shading, Nodes or Shrink +- Display mode + - Default display mode - allows to set Wireframe, Shading, Nodes or Shrink presentation mode as default. - Representation of the 2D quadratic elements - - Representation of the 2D quadratic elements combobox - allows - to select lines or arcs for representation of quadratic elements. + - Default mode of the 2D quadratic elements combobox - allows + to select lines or arcs for representation of quadratic elements as default. - Maximum Angle - maximum deviation angle used by the application to build arcs. @@ -130,13 +131,17 @@ later sessions with this module. \image html pref22.png -- Nodes +- Nodes allows to define default parameters for nodes, which will be applied + for a new created mesh only. Customization of already created meshes can be done using + \ref colors_size_page "Properties dialog box" that is called by click on popup menu of mesh. - Color - allows to select the color of nodes. Click on the colored line to access to the Select Color dialog box. - Type of marker - allows to define the shape of nodes. - Scale of marker - allows to define the size of nodes. -- Elements +- Elements allows to define default parameters for different elements, which will be applied + for a new created mesh only. Customization of already created meshes can be done using + \ref colors_size_page "Properties dialog box" that is called by click on popup menu of mesh. - Surface color - allows to select the surface color of 2D elements (seen in Shading mode). Click on the colored line to access to the Select Color dialog box. @@ -149,8 +154,8 @@ later sessions with this module. - Reversed volume color - allows to select the surface color of reversed 3D elements. Use the slider to select the color generated basing on the Volume color by changing its brightness and saturation. - - 0D elements - allows to choose color of 0D mesh elements. - - Balls - allows to choose color of discrete mesh elements (balls). + - 0D element color - allows to choose color of 0D mesh elements. + - Ball color - allows to choose color of discrete mesh elements (balls). - Outline color - allows to select the color of element borders. - Wireframe color - allows to select the color of borders of @@ -167,10 +172,11 @@ later sessions with this module. - Shrink coef. - allows to define relative space of elements compared to gaps between them in shrink mode. -- Groups allows to define groups default properties: +- Groups - Names color - specifies color of group names to be used in 3D viewer. - - Default color - specifies default group color. + - Default color - specifies default group color, which is used + when creating new mesh group (see \ref creating_groups_page "Create Group dialog box"). - Numbering allows to define properties of numbering functionality: - Nodes - specifies text properties of nodes numbering @@ -178,7 +184,9 @@ later sessions with this module. - Elements - same for elements. - Orientation of Faces - allows to define the behavior of - Orientation of faces functionality: + Orientation of faces functionality, which will be applied + for a new created mesh only. Customization of already created meshes can be done using + \ref colors_size_page "Properties dialog box" that is called by click on popup menu of mesh. - \b Color - allows to define the color of orientation vertors; - \b Scale - allows to define the size of orientation vectors; - 3D Vector checkbox allows to choose between 2D planar @@ -191,7 +199,7 @@ later sessions with this module. - Selection - performed with mouse-indexing (preselection) and left-clicking on an object, whose appearance changes as defined in the Preferences. - - Object Color - allows to select the color of mesh (edges and + - Object color - allows to select the color of mesh (edges and borders of meshes) of the selected entity. Click on the colored line to access to the Select Color dialog box. - Element color - allows to select the color of surface of selected @@ -200,7 +208,7 @@ later sessions with this module. - Preselection - performed with mouse-indexing on an object, whose appearance changes as defined in the Preferences. - - Highlight Color - allows to select the color of mesh (edges and + - Highlight color - allows to select the color of mesh (edges and borders of meshes) of the entity . Click on the colored line to access to the Select Color dialog box. @@ -211,6 +219,11 @@ later sessions with this module. \image html pref24.png +\note The following settings are default and will be applied for +a new created mesh only. Customization of already created meshes +can be done using local \ref scalar_bar_dlg "Scalar Bar Properties dialog box" +that is called by click on popup menu of mesh. + - Font - in this menu you can set type, face and color for the font of Title and Labels. diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index c504b359c..9eb0ab0da 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -4930,7 +4930,7 @@ void SMESHGUI::createPreferences() setPreferenceProperty( doubleNodesTol, "max", 1000000.0 ); setPreferenceProperty( doubleNodesTol, "step", 0.0000001 ); - int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab ); + int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE_GROUP" ), genTab ); setPreferenceProperty( dispgroup, "columns", 2 ); int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" ); QStringList modes; @@ -4946,7 +4946,7 @@ void SMESHGUI::createPreferences() setPreferenceProperty( dispmode, "strings", modes ); setPreferenceProperty( dispmode, "indexes", indices ); - int arcgroup = addPreference( tr( "QUADRATIC_REPRESENT_MODE" ), genTab ); + int arcgroup = addPreference( tr( "QUADRATIC_REPRESENT_MODE_GROUP" ), genTab ); setPreferenceProperty( arcgroup, "columns", 2 ); int quadraticmode = addPreference( tr( "QUADRATIC_REPRESENT_MODE" ), arcgroup, LightApp_Preferences::Selector, "SMESH", "quadratic_mode" ); QStringList quadraticModes; diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index 28c62a0fe..08bb2e205 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -2318,7 +2318,7 @@ Check algorithm documentation for supported geometry PREF_NUMBERING_ELEM - Edges: Color + Elements: Color PREF_NUMBERING_FONT @@ -4354,17 +4354,25 @@ Please, create VTK viewer and try again Display entity - QUADRATIC_REPRESENT_MODE + QUADRATIC_REPRESENT_MODE_GROUP Representation of the 2D quadratic elements + + QUADRATIC_REPRESENT_MODE + Default mode of the 2D quadratic elements + MAX_ARC_ANGLE Maximum angle - PREF_DISPLAY_MODE + PREF_DISPLAY_MODE_GROUP Display mode + + PREF_DISPLAY_MODE + Default display mode + PREF_ELEMENTS Elements @@ -4575,7 +4583,7 @@ Please, create VTK viewer and try again PREF_COLOR_0D - 0D elements + 0D element color PREF_SIZE_0D @@ -4583,7 +4591,7 @@ Please, create VTK viewer and try again PREF_BALL_COLOR - Balls + Ball color PREF_BALL_SIZE diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts index 24ae38d99..47ef037d8 100755 --- a/src/SMESHGUI/SMESH_msg_fr.ts +++ b/src/SMESHGUI/SMESH_msg_fr.ts @@ -2314,7 +2314,7 @@ Référez-vous à la documentation sur l'algorithme et la géométrie suppo PREF_NUMBERING_ELEM - Arêtes: couleur + Éléments: couleur PREF_NUMBERING_FONT @@ -4350,6 +4350,10 @@ Ouvrez une fenêtre VTK et essayez de nouveau PREF_DISPLAY_ENTITY Eléments à visualiser + + QUADRATIC_REPRESENT_MODE_GROUP + Mode des éléments quadratiques 2D par défaut + QUADRATIC_REPRESENT_MODE Représentation des éléments quadratiques 2D @@ -4359,9 +4363,13 @@ Ouvrez une fenêtre VTK et essayez de nouveau Angle maximal - PREF_DISPLAY_MODE + PREF_DISPLAY_MODE_GROUP Mode de visualisation + + PREF_DISPLAY_MODE + Mode de visualisation par défaut + PREF_ELEMENTS Eléments @@ -4572,7 +4580,7 @@ Ouvrez une fenêtre VTK et essayez de nouveau PREF_COLOR_0D - Eléments 0D + Couleur d'elément 0D PREF_SIZE_0D @@ -4580,7 +4588,7 @@ Ouvrez une fenêtre VTK et essayez de nouveau PREF_BALL_COLOR - Particulaires + Couleur des particulaires PREF_BALL_SIZE diff --git a/src/SMESHGUI/SMESH_msg_ja.ts b/src/SMESHGUI/SMESH_msg_ja.ts index 0c544fbc9..f909eba82 100644 --- a/src/SMESHGUI/SMESH_msg_ja.ts +++ b/src/SMESHGUI/SMESH_msg_ja.ts @@ -4300,6 +4300,10 @@ PREF_DISPLAY_ENTITY 表示する項目 + + QUADRATIC_REPRESENT_MODE_GROUP + 2 D の 2 次要素の表現 + QUADRATIC_REPRESENT_MODE 2 D の 2 次要素の表現 @@ -4309,9 +4313,13 @@ 最大角度 - PREF_DISPLAY_MODE + PREF_DISPLAY_MODE_GROUP 表示モード + + PREF_DISPLAY_MODE + 既定の表示モード + PREF_ELEMENTS 要素