Implementation of "EDF 1702 GEOM: Displaying of GEOM object in 3D viewer while editin...

diff --git a/doc/salome/gui/GEOM/images/editgroup.png b/doc/salome/gui/GEOM/images/editgroup.png
index 935fabeac80ad4201510f9c22f61d0e5450e47b7..d0a3c314b7cc10e2d0579a82beb39457e11a1d95 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/editgroup.png and b/doc/salome/gui/GEOM/images/editgroup.png differ

diff --git a/doc/salome/gui/GEOM/images/pref15.png b/doc/salome/gui/GEOM/images/pref15.png
index d93bd2f040f06dd35c05ed4430bd9f433a6718ee..f58d7309121558b538a94d5292b5d65b4a6186bc 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/pref15.png and b/doc/salome/gui/GEOM/images/pref15.png differ

diff --git a/doc/salome/gui/GEOM/input/geometry_preferences.doc b/doc/salome/gui/GEOM/input/geometry_preferences.doc
index 00301daf92604023422b5fdbb6253ea7af19a8ff..d0c94768de8ad02c0a6fa21e5ea4e78aa6be7adb 100644 (file)
--- a/doc/salome/gui/GEOM/input/geometry_preferences.doc
+++ b/doc/salome/gui/GEOM/input/geometry_preferences.doc
@@ -36,8 +36,10 @@ of values set in spin boxes.</li>
 <li><b>Deflection coefficient</b> - allows to define default deflection
 coefficient for lines and surfaces. A smaller coefficient provides
 better quality of a shape in the viewer.</li>
-<li><b>Default front material</b> - allows to define default front face material.</li>
-<li><b>Default back material</b> - allows to define default back face material.</li>
+<li><b>Show predefined materials in popup menu</b> - allows to customize the displaying of popup menu with list of 
+predefined materials.</li>
+<li><b>Default material</b> - allows to define default material.</li>
+<li><b>Subshapes color for editing a group</b> - allows to select default color for subshapes in a group.</li>
 <li><b>Edges width</b> - allows to define default width of the edges.</li>
 <li><b>Isolines width</b> - allows to define default width of the isolines.</li>
 <li><b>Preview edges width</b> - allows to define width of the edges for preview.</li>

diff --git a/doc/salome/gui/GEOM/input/working_with_groups.doc b/doc/salome/gui/GEOM/input/working_with_groups.doc
index 99b98bac92b173235add8f6d0be62cd064efc6f6..6b9d85c1c408e1678c452618abfd8ec0f9363998 100644 (file)
--- a/doc/salome/gui/GEOM/input/working_with_groups.doc
+++ b/doc/salome/gui/GEOM/input/working_with_groups.doc
@@ -103,10 +103,19 @@ To \b Edit an existing group in the main menu select <b>New entity >
 Group > Edit</b>. This menu is designed in the same way as the
 <b>Create a group</b> menu.
 
-\n <b>Dialog Box:</b> 
+\n When a GEOM group is edited, the main shape appears in the 3D viewer in the same mode 
+as it is displayed in the viewer. If the main shape was not displayed in the viewer, then 
+the default mode defined in the preferences will be used. 
+
+\n <b>Working with Dialog Box:</b> 
 
 \image html editgroup.png
 
+\n The subshapes already in the group are displayed in the 3D viewer with a specific color, 
+defined via preferences. The IDs of the subshapes already in the group also are displayed in 
+a specific color in the dialog box. When user adds some subshapes, the new IDs are 
+displayed in the other color.
+
 \n The \b Result of the operation will be a \b GEOM_Object.
 
 \n <b>TUI Command:</b>

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 13ae02f2d6fe8a329fb0d6affbd2eeb37380fa15..8cd1ae6a7f99574d8473741db9b89e1adab5f17e 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -190,12 +190,12 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg (Mode mode, GeometryGUI* theGeometryGUI, QW
 
 GroupGUI_GroupDlg::~GroupGUI_GroupDlg()
 {
+  GEOM_Displayer* aDisplayer = getDisplayer();
   if (myIsHiddenMain) {
-    GEOM_Displayer* aDisplayer = getDisplayer();
     aDisplayer->Display(myMainObj);
-    aDisplayer->Display(myGroup);
     myIsHiddenMain = false;
   }
+  aDisplayer->Display(myGroup);
   myDmMode = -1;
 }