0021672: [CEA 565] Dump Study from script

[modules/geom.git] / src / GEOMBase / GEOMBase_Helper.cxx

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index d62615d87fb9a8223118230ecbfe68a4fe5d4439..8fea8899a1412835239205a225a7c55a3a3b4c19 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -37,6 +37,7 @@
 #include <SUIT_ViewModel.h>
 #include <SUIT_MessageBox.h>
 #include <SUIT_OverrideCursor.h>
+#include <SUIT_ResourceMgr.h>
 
 #include <SalomeApp_Module.h>
 #include <SalomeApp_Application.h>
@@ -88,7 +89,8 @@ GEOM::GEOM_Gen_ptr GEOMBase_Helper::getGeomEngine()
 //================================================================
 GEOMBase_Helper::GEOMBase_Helper( SUIT_Desktop* desktop )
   : myDesktop( desktop ), myViewWindow( 0 ), myDisplayer( 0 ), myCommand( 0 ), isPreview( false ),
-    myIsApplyAndClose( false ), myIsOptimizedBrowsing( false )
+    myIsApplyAndClose( false ), myIsOptimizedBrowsing( false ), myIsWaitCursorEnabled( true ),
+    myIsDisableBrowsing(false)
 {
 }
 
@@ -142,8 +144,10 @@ void GEOMBase_Helper::display( GEOM::GEOM_Object_ptr object, const bool updateVi
 {
   // Unset color of shape ( this color may be set during preview displaying )
   // Default color will be used
-  getDisplayer()->UnsetColor();
+//   getDisplayer()->UnsetColor();
   getDisplayer()->UnsetWidth();
+  
+  MESSAGE("GEOMBase_Helper::display myTexture = "<<getDisplayer()->GetTexture())
 
   // Enable activisation of selection
   getDisplayer()->SetToActivate( true );
@@ -250,7 +254,7 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
 // Purpose  : Method for displaying preview based on execute() results
 //================================================================
 void GEOMBase_Helper::displayPreview( const bool   display,
-                                     const bool   activate,
+                                      const bool   activate,
                                       const bool   update,
                                       const bool   toRemoveFromEngine,
                                       const double lineWidth,
@@ -276,6 +280,10 @@ void GEOMBase_Helper::displayPreview( const bool   display,
   try {
     SUIT_OverrideCursor wc;
     ObjectList objects;
+ 
+    if ( !isWaitCursorEnabled() )
+      wc.suspend();
+    
     if ( !execute( objects ) || !getOperation()->IsDone() ) {
       wc.suspend();
     }
@@ -315,7 +323,12 @@ void GEOMBase_Helper::displayPreview( GEOM::GEOM_Object_ptr object,
   getDisplayer()->SetColor( color == -1 ? Quantity_NOC_VIOLET : color );
 
   // set width of displayed shape
-  getDisplayer()->SetWidth( lineWidth );
+  int lw = lineWidth;
+  if(lw == -1) {
+    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();    
+    lw = resMgr->integerValue("Geometry", "preview_edge_width", -1);
+  }
+  getDisplayer()->SetWidth( lw );
 
   // set display mode of displayed shape
   int aPrevDispMode = getDisplayer()->SetDisplayMode( displayMode );
@@ -359,7 +372,7 @@ void GEOMBase_Helper::displayPreview( const SALOME_Prs* prs,
 
   if ( myViewWindow == 0 )
     return;
-
+  
   // Display prs
   SUIT_ViewManager* aViewManager = myViewWindow->getViewManager();
   if ( aViewManager->getType() == OCCViewer_Viewer::Type() ||
@@ -446,7 +459,7 @@ void GEOMBase_Helper::activate( const int theType )
 
 //================================================================
 // Function : localSelection
-// Purpose  : Activate selection of subshapes in accordance with mode
+// Purpose  : Activate selection of sub-shapes in accordance with mode
 //            theMode is from TopAbs_ShapeEnum
 //================================================================
 void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const int theMode )
@@ -470,7 +483,7 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const int theMo
 
 //================================================================
 // Function : localSelection
-// Purpose  : Activate selection of subshapes in accordance with mode
+// Purpose  : Activate selection of sub-shapes in accordance with mode
 //            theMode is from TopAbs_ShapeEnum
 //================================================================
 void GEOMBase_Helper::localSelection( GEOM::GEOM_Object_ptr obj, const int mode )
@@ -489,7 +502,7 @@ void GEOMBase_Helper::localSelection( GEOM::GEOM_Object_ptr obj, const int mode
 
 //================================================================
 // Function : globalSelection
-// Purpose  : Activate selection of subshapes. Set selection filters
+// Purpose  : Activate selection of sub-shapes. Set selection filters
 //            in accordance with mode. theMode is from GEOMImpl_Types
 //================================================================
 void GEOMBase_Helper::globalSelection( const int theMode, const bool update )
@@ -499,7 +512,7 @@ void GEOMBase_Helper::globalSelection( const int theMode, const bool update )
 
 //================================================================
 // Function : globalSelection
-// Purpose  : Activate selection of subshapes. Set selection filters
+// Purpose  : Activate selection of sub-shapes. Set selection filters
 //            in accordance with mode. theMode is from GEOMImpl_Types
 //================================================================
 void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes,
@@ -510,7 +523,7 @@ void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes,
 
 //================================================================
 // Function : globalSelection
-// Purpose  : Activate selection of subshapes. Set selection filters
+// Purpose  : Activate selection of sub-shapes. Set selection filters
 //            in accordance with mode. theMode is from GEOMImpl_Types
 //================================================================
 void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes,
@@ -700,7 +713,10 @@ bool GEOMBase_Helper::openCommand()
 {
   bool res = false;
   if ( !getStudy() || hasCommand() )
+  {
+    MESSAGE("Getting out from openCommand()")
     return res;
+  }
 
   GEOM::GEOM_IOperations_var anOp = GEOM::GEOM_IOperations::_narrow( getOperation() );
   if ( !anOp->_is_nil() ) {
@@ -708,6 +724,10 @@ bool GEOMBase_Helper::openCommand()
     myCommand->start();
     res = true;
   }
+  else
+  {
+    MESSAGE("anOp->_is_nil() = true")
+  }
 
   return res;
 }
@@ -750,6 +770,7 @@ bool GEOMBase_Helper::commitCommand( const char* )
 //================================================================
 bool GEOMBase_Helper::hasCommand() const
 {
+  bool res = (bool) myCommand;
   return (bool)myCommand;
 }
 
@@ -792,10 +813,14 @@ bool GEOMBase_Helper::checkViewWindow()
 //            It perfroms user input validation, then it
 //            performs a proper operation and manages transactions, etc.
 //================================================================
-bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
+bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, bool erasePreviewFlag )
 {
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
-  if ( !appStudy ) return false;
+  if ( !appStudy ) 
+  {
+    MESSAGE("appStudy is empty")
+    return false;
+  }
   _PTR(Study) aStudy = appStudy->studyDS();
 
   bool aLocked = (_PTR(AttributeStudyProperties) (aStudy->GetProperties()))->IsLocked();
@@ -813,8 +838,9 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
     showError( msg );
     return false;
   }
-
-  erasePreview( false );
+  
+  if(erasePreviewFlag)
+    erasePreview( false );
 
   bool result = false;
 
@@ -829,7 +855,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
         showError();
       }
       else {
-        addSubshapesToStudy(); // add Subshapes if local selection
+        addSubshapesToStudy(); // add Sub-shapes if local selection
         const int nbObjs = objects.size();
         QStringList anEntryList;
         int aNumber = 1;
@@ -875,7 +901,8 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
           commitCommand();
           updateObjBrowser();
           if( SUIT_Application* anApp = SUIT_Session::session()->activeApplication() ) {
-            if( LightApp_Application* aLightApp = dynamic_cast<LightApp_Application*>( anApp ) )
+            LightApp_Application* aLightApp = dynamic_cast<LightApp_Application*>( anApp );
+            if(aLightApp && !isDisableBrowsing() )
               aLightApp->browseObjects( anEntryList, isApplyAndClose(), isOptimizedBrowsing() );
             anApp->putInfo( QObject::tr("GEOM_PRP_DONE") );
           }
@@ -889,10 +916,12 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
   catch( const SALOME::SALOME_Exception& e ) {
     SalomeApp_Tools::QtCatchCorbaException( e );
     abortCommand();
+    MESSAGE("Exception catched")
   }
 
   updateViewer();
 
+  MESSAGE("result ="<<result)
   return result;
 }
 
@@ -1128,7 +1157,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather( GEOM::GEOM_Object_ptr
 
 //================================================================
 // Function : addSubshapesToStudy
-// Purpose  : Virtual method to add subshapes if needs
+// Purpose  : Virtual method to add sub-shapes if needs
 //================================================================
 void GEOMBase_Helper::addSubshapesToStudy()
 {