]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Merge branch 'origin/akl/22379'
authormpa <mpa@opencascade.com>
Tue, 24 Jun 2014 09:03:03 +0000 (13:03 +0400)
committermpa <mpa@opencascade.com>
Tue, 24 Jun 2014 09:03:03 +0000 (13:03 +0400)
doc/salome/gui/GEOM/images/dialog.png
doc/salome/gui/GEOM/images/ob_popup_menu.png
doc/salome/gui/GEOM/images/reduce_study_dialog.png [new file with mode: 0644]
doc/salome/gui/GEOM/images/tree_popup_menu.png [deleted file]
doc/salome/gui/GEOM/images/tree_popup_menu1.png [new file with mode: 0644]
doc/salome/gui/GEOM/input/dependency_tree.doc
doc/salome/gui/GEOM/input/reduce_study.doc [new file with mode: 0644]
doc/salome/gui/GEOM/input/viewing_geom_obj.doc
src/GEOMGUI/GeometryGUI.cxx
src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx

index 7fa63d1524c9677b3740d74f2ed5f3857bff0175..8d7e48a96f02b331d5f117775eabd0d8da121d6e 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/dialog.png and b/doc/salome/gui/GEOM/images/dialog.png differ
index 1f5435a7ab4fd3238f9b4e77e6c00586b3a72445..3aafa729e0713201df48031ad2aa28e9584dad14 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/ob_popup_menu.png and b/doc/salome/gui/GEOM/images/ob_popup_menu.png differ
diff --git a/doc/salome/gui/GEOM/images/reduce_study_dialog.png b/doc/salome/gui/GEOM/images/reduce_study_dialog.png
new file mode 100644 (file)
index 0000000..8f53d7a
Binary files /dev/null and b/doc/salome/gui/GEOM/images/reduce_study_dialog.png differ
diff --git a/doc/salome/gui/GEOM/images/tree_popup_menu.png b/doc/salome/gui/GEOM/images/tree_popup_menu.png
deleted file mode 100644 (file)
index 771ac85..0000000
Binary files a/doc/salome/gui/GEOM/images/tree_popup_menu.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/tree_popup_menu1.png b/doc/salome/gui/GEOM/images/tree_popup_menu1.png
new file mode 100644 (file)
index 0000000..bfc90ac
Binary files /dev/null and b/doc/salome/gui/GEOM/images/tree_popup_menu1.png differ
index cf474d785226cba2607b3f0c4c63541409962e41..12d0387e26d7c8ca5a9c70ee7a6e2dcd936143bb 100644 (file)
@@ -175,7 +175,7 @@ user can select it with left mouse click to change its presentation
 parameters and get access to other useful options by right-clicking on 
 the selected object.
 
-\image html tree_popup_menu.png
+\image html tree_popup_menu1.png
 
 <ul>
 <li>\b Show - allows to show selected object(s) in OCC 3D Viewer;</li>
@@ -183,6 +183,7 @@ the selected object.
 in OCC 3D Viewer;</li>
 <li><b> Rebuild the tree</b> - allows to rebuild the dependency tree 
 for selected object(s);</li>
+<li>\ref reduce_study_page "Reduce study" - allows to reduce study.</li>
 </ul>
 
 Some functionalities are available through right-clicking on 
diff --git a/doc/salome/gui/GEOM/input/reduce_study.doc b/doc/salome/gui/GEOM/input/reduce_study.doc
new file mode 100644 (file)
index 0000000..8a4f039
--- /dev/null
@@ -0,0 +1,56 @@
+/*!
+
+\page reduce_study_page Reduce Study
+
+The user sometimes needs to keep in the study only some objects that 
+present the final result(s) of the design operations and to delete all 
+other objects which do not contribute to these results.
+
+The feature is especially useful when the user designs the whole model 
+through the GUI and wants to generate simplified "clean" Python dump only 
+at the end of the model construction with no "useless" objects in the 
+%GEOM module.
+
+User can open dialog box by selecting desirable object(s) in Object 
+Browser or OCC Viewer and calling "Reduce study" popup item.
+
+\image html reduce_study_dialog.png
+
+<ul>
+
+<li><b> Objects to be kept</b> - objects will be kept in the study after 
+applying operation of reduce study. The list of objects being selected by 
+the user are highlighted in bold font.
+\n Moreover user can show and hide object(s) in current OCC Viewer using 
+"eye" icons near each item of tree. It's possible to click on "eye" icon 
+in the head of tree in order to show/hide all objects.</li>
+
+<li><b> Objects to be removed</b> - objects will be deleted by the 
+function if it is applied.</li>
+
+<li><b> Intermediate objects</b> - allows to choose future action with
+the objects, being in the operations chains to produce final objects:
+<ul>
+<li>Keep - object(s) will be kept in the study;</li>
+<li>Unpublish - object(s) will be automatically unpublished (hidden) 
+from the study;</li>
+<li>Remove - object(s) will be removed from the study. Since using of 
+this option can lead to the broken Dump Python, the warning message 
+will be shown to the user.</li>
+</ul>
+</li>
+
+<li><b> Sub-objects</b> - allows to choose the same operations for 
+sub-objects of selected item(s): keep, unpublish or remove.</li>
+
+<li><b> Remove empty folders</b> - if this option is checked, all folders, 
+which will become empty after removal of the unused objects from the 
+study, will be also removed; otherwise, empty folders will be kept.</li>
+
+<li><b> Soft removal</b> - if this option is checked, operation will just 
+unpublish the redundant objects from the study instead of their hard removal.  
+\n Soft removal would keep all the data in the study to give the user 
+chance to rollback this operation using "Publish Objects" dialog box.</li>
+
+</ul>
+*/
index 56b74c0934756c73b6261fc08d64344afbc138ae..d5bd74feaa0672a671ed9e45f946877a06e68d9c 100644 (file)
@@ -66,6 +66,7 @@ geometrical object. TUI Command: <em>sg.DisplayOnly(ID)</em></li>
 <li><b>Hide all dimensions</b> - hides all of the persistent dimensions created for the selected geometrical object.</li>
 <li>\subpage dependency_tree_page "Show dependency tree" - shows dependency tree of selected objects
 in new 2D View Window.</li>
+<li>\subpage reduce_study_page "Reduce study" - allows to reduce study.</li>
 <li><b>Dump view</b> - exports an object from the viewer in bmp, png,
 jpg or jpeg image format.</li>
 <li><b>Change background</b> - allows to redefine the background
index da06a52d7d7fa56f2668b31dd5b849d918c1f296..6ad612b2a2443027b484da334d3c896a814e84e8 100644 (file)
@@ -1630,6 +1630,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   mgr->insert( action(  GEOMOp::OpShowDependencyTree ), -1, -1 ); // Show dependency tree
   mgr->setRule( action( GEOMOp::OpShowDependencyTree ), clientOCCorVTKorOB + " and selcount>0 and ($component={'GEOM'}) and type='Shape'", QtxPopupMgr::VisibleRule );
 
+  mgr->insert( separator(), -1, -1 );     // -----------
   mgr->insert( action(  GEOMOp::OpReduceStudy ), -1, -1 ); // Reduce Study
   mgr->setRule( action( GEOMOp::OpReduceStudy ), clientOCCorVTKorOB + " and selcount>0 and ($component={'GEOM'}) and type='Shape'", QtxPopupMgr::VisibleRule );
 
index 4bd464a78dac41e4e8b2d45def5de9a2eb6f7d0f..272d63d654aa3f0609f7532a9acf67e637f98456 100644 (file)
@@ -688,10 +688,11 @@ void GEOMToolsGUI_ReduceStudyDlg::clickOnOk()
 
 //=================================================================================
 // function : clickOnHelp()
-// purpose  : called when Help button was clicked
+// purpose  : called when Help button was clicked to open a help page
 //=================================================================================
 void GEOMToolsGUI_ReduceStudyDlg::clickOnHelp()
 {
+  myApp->onHelpContextModule( "GEOM", "reduce_study_page.html" );
 }
 
 GEOMToolsGUI_TreeWidgetItem::GEOMToolsGUI_TreeWidgetItem( QTreeWidget* view, const QStringList &strings,