Issue 0021055: EDF 1602 STUDY: Object browser reactualisation when creating an object

diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
index 122f7aebeb8b32cc219e80c7fdef9e55a0cf16f1..20dc02312e6ed1de6da1363d993078b5322121bd 100644 (file)
--- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
+++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
@@ -570,6 +570,7 @@ void AdvancedGUI_PipeTShapeDlg::SetDoubleSpinBoxStep(double step) {
 // purpose  :
 //=================================================================================
 void AdvancedGUI_PipeTShapeDlg::ClickOnOk() {
+  setIsApplyAndClose( true );
        if (ClickOnApply())
                ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx
index 48be784b5345823f93fd2a94dcebd79d391b6b8d..43e7767567fd01bd3afa0dbb84bd4f7552f3624d 100644 (file)
--- a/src/BasicGUI/BasicGUI_ArcDlg.cxx
+++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx
@@ -204,6 +204,7 @@ void BasicGUI_ArcDlg::Init()
 //=================================================================================
 void BasicGUI_ArcDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx
index 9ca955c7183ead8c0dba6183e2a1bbcc9f94cb22..a3ff226a082b29eec7abc398a70fad86bdf9b529 100644 (file)
--- a/src/BasicGUI/BasicGUI_CircleDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx
@@ -298,6 +298,7 @@ void BasicGUI_CircleDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void BasicGUI_CircleDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx
index 0b0fb67a8c215c70501e567feffe1b20738fe928..d7af0b9b00ecf8c0c7773259f0b0fe98e89088a7 100644 (file)
--- a/src/BasicGUI/BasicGUI_CurveDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx
@@ -208,6 +208,7 @@ void BasicGUI_CurveDlg::CheckButtonToggled()
 //=================================================================================
 void BasicGUI_CurveDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
index 464a02a73bc5675fc9633ed555c182221a0a093b..c1895da94b19d9e6b6ebd6c9f3f6258f9d8d787b 100644 (file)
--- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
@@ -179,6 +179,7 @@ void BasicGUI_EllipseDlg::SetDoubleSpinBoxStep( double step )
 //=================================================================================
 void BasicGUI_EllipseDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx
index fd63aa81a76fc56b311b60924890e495cf335c24..04db82bc5d23c40a557a477f508f27f6931673f0 100644 (file)
--- a/src/BasicGUI/BasicGUI_LineDlg.cxx
+++ b/src/BasicGUI/BasicGUI_LineDlg.cxx
@@ -156,6 +156,7 @@ void BasicGUI_LineDlg::Init()
 //=================================================================================
 void BasicGUI_LineDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
index 57115a86a93e4d9001487b8d89e96b44da13a13b..aa7650d0439ed81118b501a6e42354807e3a0b79 100644 (file)
--- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
@@ -301,6 +301,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void BasicGUI_MarkerDlg::onOk()
 {
+  setIsApplyAndClose( true );
   if ( onApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
index 3fb367fc6523529ce54e48433ca9890873b92a78..fbbceba9c2f23888362c6bde44566334e6042a16 100644 (file)
--- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
@@ -387,6 +387,7 @@ void BasicGUI_PlaneDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void BasicGUI_PlaneDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx
index 8e0be796337e80d58633adcf91e2ed848b7e4cae..2b364705c604c17c51f68a2b3847d5b65b782f63 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PointDlg.cxx
@@ -449,6 +449,7 @@ void BasicGUI_PointDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void BasicGUI_PointDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( onAccept() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx
index b011ae1e1fe3c92a71d3d86cf7c192cadc52987f..9b3af6710b880e881b6b12d7f7da4dbe86b1d744 100644 (file)
--- a/src/BasicGUI/BasicGUI_VectorDlg.cxx
+++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx
@@ -240,6 +240,7 @@ void BasicGUI_VectorDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void BasicGUI_VectorDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
index 08c9925b78959ff28c3314e62771c3f1457ba962..387d784248449e821d100f172d5908d453bab180 100644 (file)
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
@@ -264,6 +264,7 @@ void BasicGUI_WorkingPlaneDlg::GroupClicked( int groupId )
 //=================================================================================
 void BasicGUI_WorkingPlaneDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
index 43c351dca5f93acada155326f0d523e0f5f2bd8f..a5dffa228d92b47897cc7aead9b71ed086559f7a 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
@@ -208,6 +208,7 @@ void BlocksGUI_BlockDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void BlocksGUI_BlockDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
index b58524ac68d23fc73eec6a101b71872b110af1d7..0565ef7304715bf448ca8ac432c42ab4b719457a 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
@@ -163,6 +163,7 @@ void BlocksGUI_ExplodeDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void BlocksGUI_ExplodeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
index dff963899d6ebe502e95c673df9dd9e35eb05c6b..5743cc473d899c272d9dcd4d35ac9906e7e196b0 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
@@ -117,6 +117,7 @@ void BlocksGUI_PropagateDlg::Init()
 //=================================================================================
 void BlocksGUI_PropagateDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
index 40e47c62e3413a4dbdb8ac02f77ea2b17fd240e1..8da7a6e8b83dd090eac86a64dabed71128119e9f 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
@@ -193,6 +193,7 @@ void BlocksGUI_QuadFaceDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void BlocksGUI_QuadFaceDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
index 0b9547a11116ae0d5650a201da807f0ecf626211..6260d5fdfa3cb1864cb66537b4186035928d8f29 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
@@ -195,6 +195,7 @@ void BlocksGUI_TrsfDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void BlocksGUI_TrsfDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx
index 5ccde57fdfcee774cf8eb04c12a38c5f6e1783ce..a1001e7d6ab02970d36b888f5ce8f57fa4d3234b 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_Dialog.cxx
+++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx
@@ -169,6 +169,7 @@ void BooleanGUI_Dialog::Init()
 //=================================================================================
 void BooleanGUI_Dialog::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
index 431c4317fcd04b59b8ad0ab1021502f2dc3b3257..f821509e2b6ee680f7baf70d64a834d93757917a 100644 (file)
--- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
@@ -124,6 +124,7 @@ void BuildGUI_CompoundDlg::Init()
 //=================================================================================
 void BuildGUI_CompoundDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
index 72aa73a6b45208316b1dbd382448a1f1fdd9b778..5e332f9574433ff8646fd07188a04080aad9f3f3 100644 (file)
--- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
@@ -154,6 +154,7 @@ void BuildGUI_EdgeDlg::Init()
 //=================================================================================
 void BuildGUI_EdgeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx
index 09d682fe2b670e0377b2d7332eb6c63f62fb86f1..b1ad76c1562716d6b0999295660f2520224c99db 100644 (file)
--- a/src/BuildGUI/BuildGUI_FaceDlg.cxx
+++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx
@@ -127,6 +127,7 @@ void BuildGUI_FaceDlg::Init()
 //=================================================================================
 void BuildGUI_FaceDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BuildGUI/BuildGUI_ShellDlg.cxx b/src/BuildGUI/BuildGUI_ShellDlg.cxx
index 1a6b23f432e5b03f74235db2ecf846dffd162d76..d4930797565315e744d04dd6181db237c016d077 100644 (file)
--- a/src/BuildGUI/BuildGUI_ShellDlg.cxx
+++ b/src/BuildGUI/BuildGUI_ShellDlg.cxx
@@ -132,6 +132,7 @@ void BuildGUI_ShellDlg::Init()
 //=================================================================================
 void BuildGUI_ShellDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx
index 5c6ffb6706d72709f922709bc7b223a085f88593..c619ee15b53369d4084b17b2df7d2ab6111a2034 100644 (file)
--- a/src/BuildGUI/BuildGUI_SolidDlg.cxx
+++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx
@@ -127,6 +127,7 @@ void BuildGUI_SolidDlg::Init()
 //=================================================================================
 void BuildGUI_SolidDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/BuildGUI/BuildGUI_WireDlg.cxx b/src/BuildGUI/BuildGUI_WireDlg.cxx
index bb161e4bcedf4498047d2ea6b78439438dc0be96..9a4d44a41f740e498039380d6f8f530412f0b470 100644 (file)
--- a/src/BuildGUI/BuildGUI_WireDlg.cxx
+++ b/src/BuildGUI/BuildGUI_WireDlg.cxx
@@ -147,6 +147,7 @@ void BuildGUI_WireDlg::Init()
 //=================================================================================
 void BuildGUI_WireDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
index 9122a7d74b97453202841afdcdac064a5a616779..c8fe70499b96964d42b8f54a94ae5f24c3a90c38 100644 (file)
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
@@ -83,6 +83,8 @@ EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg( GeometryGUI* theGeometryGUI, QWidg
   layout->addWidget( GroupPoints );
   /***************************************************************/
 
+  setIsOptimizedBrowsing( true );
+
   setHelpFileName( "create_explode_page.html" );
 
   mainFrame()->GroupBoxName->hide();
@@ -154,6 +156,7 @@ void EntityGUI_SubShapeDlg::Init()
 //=================================================================================
 void EntityGUI_SubShapeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 07e96b59d09305b43bf7f21a93106496c4a20932..0efbf7239f8c133393d142482167f26bad46e5ad 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -87,7 +87,8 @@ GEOM::GEOM_Gen_ptr GEOMBase_Helper::getGeomEngine()
 // Purpose  :
 //================================================================
 GEOMBase_Helper::GEOMBase_Helper( SUIT_Desktop* desktop )
-  : myDesktop( desktop ), myViewWindow( 0 ), myDisplayer( 0 ), myCommand( 0 ), isPreview( false )
+  : myDesktop( desktop ), myViewWindow( 0 ), myDisplayer( 0 ), myCommand( 0 ), isPreview( false ),
+    myIsApplyAndClose( false ), myIsOptimizedBrowsing( false )
 {
 }
 
@@ -523,14 +524,14 @@ void GEOMBase_Helper::globalSelection( const TColStd_MapOfInteger& theModes,
 // Function : addInStudy
 // Purpose  : Add object in study
 //================================================================
-void GEOMBase_Helper::addInStudy( GEOM::GEOM_Object_ptr theObj, const char* theName )
+QString GEOMBase_Helper::addInStudy( GEOM::GEOM_Object_ptr theObj, const char* theName )
 {
   if ( !hasCommand() )
-    return;
+    return QString();
 
   _PTR(Study) aStudy = getStudy()->studyDS();
   if ( !aStudy || theObj->_is_nil() )
-    return;
+    return QString();
 
   SALOMEDS::Study_var aStudyDS = GeometryGUI::ClientStudyToStudy(aStudy);
 
@@ -539,10 +540,16 @@ void GEOMBase_Helper::addInStudy( GEOM::GEOM_Object_ptr theObj, const char* theN
   SALOMEDS::SObject_var aSO =
     getGeomEngine()->AddInStudy(aStudyDS, theObj, theName, aFatherObj);
 
+  QString anEntry;
+  if ( !aSO->_is_nil() )
+    anEntry = aSO->GetID();
+
   // Each dialog is responsible for this method implementation,
   // default implementation does nothing
   restoreSubShapes(aStudyDS, aSO);
   aSO->UnRegister();
+
+  return anEntry;
 }
 
 //================================================================
@@ -824,6 +831,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
       else {
         addSubshapesToStudy(); // add Subshapes if local selection
         const int nbObjs = objects.size();
+        QStringList anEntryList;
         int aNumber = 1;
         for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) {
           GEOM::GEOM_Object_var obj=*it;
@@ -844,7 +852,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
               if ( aName.isEmpty() )
                 aName = GEOMBase::GetDefaultName( getPrefix( obj ) );
             }
-            addInStudy( obj, aName.toLatin1().constData() );
+            anEntryList << addInStudy( obj, aName.toLatin1().constData() );
             // updateView=false
             display( obj, false );
 #ifdef WITHGENERICOBJ
@@ -866,7 +874,11 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
         if ( nbObjs ) {
           commitCommand();
           updateObjBrowser();
-          SUIT_Session::session()->activeApplication()->putInfo( QObject::tr("GEOM_PRP_DONE") );
+          if( SUIT_Application* anApp = SUIT_Session::session()->activeApplication() ) {
+            if( LightApp_Application* aLightApp = dynamic_cast<LightApp_Application*>( anApp ) )
+              aLightApp->browseObjects( anEntryList, isApplyAndClose(), isOptimizedBrowsing() );
+            anApp->putInfo( QObject::tr("GEOM_PRP_DONE") );
+          }
           result = true;
         }
         else
@@ -1293,3 +1305,45 @@ QList<GEOM::GeomObjPtr> GEOMBase_Helper::getSelected( const QList<TopAbs_ShapeEn
   }
   return result;
 }
+
+//================================================================
+// Function : setIsApplyAndClose
+// Purpose  : Set value of the flag indicating that the dialog is
+//            accepted by Apply & Close button
+//================================================================
+void GEOMBase_Helper::setIsApplyAndClose( const bool theFlag )
+{
+  myIsApplyAndClose = theFlag;
+}
+
+//================================================================
+// Function : isApplyAndClose
+// Purpose  : Get value of the flag indicating that the dialog is
+//            accepted by Apply & Close button
+//================================================================
+bool GEOMBase_Helper::isApplyAndClose() const
+{
+  return myIsApplyAndClose;
+}
+
+//================================================================
+// Function : setIsOptimizedBrowsing
+// Purpose  : Set value of the flag switching to optimized
+//            browsing mode (to select the first published
+//            object only)
+//================================================================
+void GEOMBase_Helper::setIsOptimizedBrowsing( const bool theFlag )
+{
+  myIsOptimizedBrowsing = theFlag;
+}
+
+//================================================================
+// Function : isOptimizedBrowsing
+// Purpose  : Get value of the flag switching to optimized
+//            browsing mode (to select the first published
+//            object only)
+//================================================================
+bool GEOMBase_Helper::isOptimizedBrowsing() const
+{
+  return myIsOptimizedBrowsing;
+}

diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h
index 7da492021ce7f2aa2b7f40240a5ec2b99c48942d..bf3e1aa7069513e01932bab1abcb3c50a0975aa0 100755 (executable)
--- a/src/GEOMBase/GEOMBase_Helper.h
+++ b/src/GEOMBase/GEOMBase_Helper.h
@@ -105,7 +105,7 @@ protected:
   void prepareSelection( const ObjectList&, const int );
   void prepareSelection( GEOM::GEOM_Object_ptr, const int );
 
-  void addInStudy      ( GEOM::GEOM_Object_ptr, const char* theName ); 
+  QString addInStudy   ( GEOM::GEOM_Object_ptr, const char* theName ); 
 
   bool openCommand     ();
   bool abortCommand    ();
@@ -182,6 +182,12 @@ protected:
   GEOM_Displayer*             getDisplayer();
   SUIT_Desktop*               getDesktop() const;
 
+  virtual void                setIsApplyAndClose( const bool theFlag );
+  virtual bool                isApplyAndClose() const;
+
+  virtual void                setIsOptimizedBrowsing( const bool theFlag );
+  virtual bool                isOptimizedBrowsing() const;
+
 private:
   QString                     getEntry( GEOM::GEOM_Object_ptr ) const;
   void                        clearShapeBuffer( GEOM::GEOM_Object_ptr );
@@ -198,6 +204,8 @@ private:
   bool                        isPreview;
   SALOME_ListIO               mySelected;
   SUIT_Desktop*               myDesktop;
+  bool                        myIsApplyAndClose;
+  bool                        myIsOptimizedBrowsing;
 
 };
 

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index 494e5b3cac8f66631ee6188f02fdf069801c2010..b53b5a5386e9a8ee55216dc7e1ec8e321b834405 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -587,7 +587,8 @@ bool GEOMToolsGUI::Import()
 
   QList< GEOM::GEOM_Object_var > objsForDisplay;
 
-  
+  QStringList anEntryList;
+
   // iterate through all selected files
 
   SUIT_MessageBox::StandardButton igesAnswer = SUIT_MessageBox::NoButton;
@@ -688,10 +689,12 @@ bool GEOMToolsGUI::Import()
           GEOMBase::GetDefaultName( SUIT_Tools::file( fileName, /*withExten=*/true ) );
         
         SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy );
-        GeometryGUI::GetGeomGen()->PublishInStudy( aDSStudy,
-                                                   SALOMEDS::SObject::_nil(),
-                                                   anObj,
-                                                   aPublishObjName.toLatin1().constData() );
+        SALOMEDS::SObject_var aSO = GeometryGUI::GetGeomGen()->PublishInStudy( aDSStudy,
+                                                                               SALOMEDS::SObject::_nil(),
+                                                                               anObj,
+                                                                               aPublishObjName.toLatin1().constData() );
+        if( ( !aSO->_is_nil() ) )
+          anEntryList.append( aSO->GetID() );
         
         objsForDisplay.append( anObj );
         
@@ -716,6 +719,9 @@ bool GEOMToolsGUI::Import()
   // update object browser
   getGeometryGUI()->updateObjBrowser( true );
 
+  // browse published objects
+  app->browseObjects( anEntryList );
+
   // display imported model (if only one file is selected)
   if ( objsForDisplay.count() == 1 )
     GEOM_Displayer( stud ).Display( objsForDisplay[0].in() );

diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
index 66f1320500b9926ee16ad79945dce49fdb6d485d..f640715e84e376bb8f7edae74f6c26832cdee7fc 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
@@ -172,6 +172,7 @@ void GenerationGUI_FillingDlg::SetDoubleSpinBoxStep( double step )
 //=================================================================================
 void GenerationGUI_FillingDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
index e8cee7957bad8d5c6a494203b6a08cbd4ab452d8..e59717ec00e24e0a10ba11709125f67f4d512282 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
@@ -206,6 +206,7 @@ void GenerationGUI_PipeDlg::SelectionTypeButtonClicked()
 //=================================================================================
 void GenerationGUI_PipeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
index db3db9acdd9fb359d882ee202558d39fae584b9f..6932c215f8fb62cb217753d39330766f9274c42f 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
@@ -301,6 +301,7 @@ void GenerationGUI_PrismDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void GenerationGUI_PrismDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
index d92ab0d5f0898428a77e2901a64659588f057f9e..32e2d4c169cc923f4e0ab14f3c55be277f26a966 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
@@ -160,6 +160,7 @@ void GenerationGUI_RevolDlg::SetDoubleSpinBoxStep (double step)
 //=================================================================================
 void GenerationGUI_RevolDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 9fb10fccc7a465566352fa6ddd1e8c4a6625f833..fc31bb34c213d763c50201544f31f2552b825b4d 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -287,6 +287,7 @@ void GroupGUI_GroupDlg::closeEvent(QCloseEvent* e)
 //=================================================================================
 void GroupGUI_GroupDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
index 9ba48d1353c2399a1460486a055c13c955fe3aa0..54ac038099b6ccdb414640ffe4b8cbadcce379b2 100644 (file)
--- a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
@@ -161,6 +161,7 @@ void OperationGUI_ArchimedeDlg::SetDoubleSpinBoxStep( double step )
 //=================================================================================
 void OperationGUI_ArchimedeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
index 2b6a1a1f5821880b056c0456088d3d54493104e7..9b8cf72c125102ca37b06bf1453144d0908236ca 100644 (file)
--- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
@@ -370,6 +370,7 @@ void OperationGUI_ChamferDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void OperationGUI_ChamferDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.cxx b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
index 18e02c2b4418f7275e08987a819b2e50e1fdc68d..16e089bb6052ffd05238a67754c6672c48ae76da 100644 (file)
--- a/src/OperationGUI/OperationGUI_ClippingDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
@@ -249,6 +249,7 @@ bool OperationGUI_ClippingDlg::ClickOnApply()
 //=================================================================================
 void OperationGUI_ClippingDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
index f9407e815da805574b531cac4af30a5b051e41f9..c7295e95dd22d9cbf403ccd4977853369770d52c 100644 (file)
--- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
+++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
@@ -149,6 +149,7 @@ void OperationGUI_Fillet1d2dDlg::Init()
 //=================================================================================
 void OperationGUI_Fillet1d2dDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx
index 8a464ef4e4d37887a63f7716d87656d318c9c2be..84ea1c08aa6d8e6bf4099e49ae520d80e7b9a2e1 100644 (file)
--- a/src/OperationGUI/OperationGUI_FilletDlg.cxx
+++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx
@@ -308,6 +308,7 @@ void OperationGUI_FilletDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void OperationGUI_FilletDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
index b5637bd9724f46210ca6163f56a0370f4676ced4..e9e7f4cb3b15a9961b17c59712f2247d000c71ac 100644 (file)
--- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
@@ -153,6 +153,7 @@ void OperationGUI_GetShapesOnShapeDlg::Init()
 //=================================================================================
 void OperationGUI_GetShapesOnShapeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
index de210bd5d290cb49e1ff0acc45007880bd6b88b8..b2fa7b6bf304a72d83ab9645e968761c2030ed8c 100644 (file)
--- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
@@ -171,6 +171,7 @@ void OperationGUI_GetSharedShapesDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void OperationGUI_GetSharedShapesDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
index fcf94afc648a189d4da33cd3a0ca12d0ff9508e3..8f3848b3810f8bca2edd546e5d6f37bbaec4381f 100644 (file)
--- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx
+++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
@@ -226,6 +226,7 @@ void OperationGUI_PartitionDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void OperationGUI_PartitionDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
index e68df444a1372b7408390ed668d5fbaa79c50fdf..96896cba24ea08400152bea779cc7f54a64a0fbc 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
@@ -203,6 +203,7 @@ void PrimitiveGUI_BoxDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void PrimitiveGUI_BoxDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
index 6f145edb51caa78838777c002a9ab3547ef422fc..7ea6073f7dab7cc31a421be2f8decc473aa09afb 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
@@ -219,6 +219,7 @@ void PrimitiveGUI_ConeDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void PrimitiveGUI_ConeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
index 22b3ceb626e43b2b80cb6e714d46f92f2b82413a..a4e539119ea95426a5e0e7de0c55a89229eefe1b 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
@@ -211,6 +211,7 @@ void PrimitiveGUI_CylinderDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void PrimitiveGUI_CylinderDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
index 7f08ac07315e723e60e8956a4d6263890859c843..b70f3c234402e41f2d78b28f7ea9331bcb4ebb99 100755 (executable)
--- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
@@ -260,6 +260,7 @@ void PrimitiveGUI_DiskDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void PrimitiveGUI_DiskDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
index 88d10af0447087881071a599b27b88944f3a76f2..452a2795a1c43d519faa0fe016741f437910b70c 100755 (executable)
--- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
@@ -244,6 +244,7 @@ void PrimitiveGUI_FaceDlg::TypeButtonClicked()
 //=================================================================================
 void PrimitiveGUI_FaceDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
index 84230fdc63e8b5340eb5c5027e15f93d61e852c2..26d73ca7610ed9aa0f3975374d03eddcb746eaac 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
@@ -204,6 +204,7 @@ void PrimitiveGUI_SphereDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void PrimitiveGUI_SphereDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
index 22f51aa04a46e51198bd5ccc57d13fc45fdcc96f..dc6c4a5821411a84ddee750fb215856ed9f92270 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
@@ -209,6 +209,7 @@ void PrimitiveGUI_TorusDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void PrimitiveGUI_TorusDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
index fd8c6be0cbcb960e83281c292e54b94e05273b9f..a2e50f8af0a8bc54869c98c68ba9b836fefb19eb 100644 (file)
--- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
@@ -128,6 +128,7 @@ void RepairGUI_ChangeOrientationDlg::Init()
 //=================================================================================
 void RepairGUI_ChangeOrientationDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
index 565c9e5618979ba5005e994d411ba6cbe722117e..07deccc97b814a6df10dbbfddf468dd519acbc79 100644 (file)
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
@@ -143,6 +143,7 @@ void RepairGUI_CloseContourDlg::Init()
 //=================================================================================
 void RepairGUI_CloseContourDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 4e67a04b032f31a5afe60e818b7bcfe6d54c7847..9c8c0b01005ae9236c918026536cab1d9c113ed3 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -199,6 +199,7 @@ void RepairGUI_DivideEdgeDlg::displayPreview()
 //=================================================================================
 void RepairGUI_DivideEdgeDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index 1dd8f39cd54314c672206cb5b109923fa2f423b6..d79190e2332b51f05489bac1b8e0480b00bae783 100644 (file)
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -252,6 +252,7 @@ void RepairGUI_GlueDlg::ConstructorsClicked( int constructorId )
 //=================================================================================
 void RepairGUI_GlueDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
index b3038b1cae930f10c54703f6ead94b55b255d1b7..129b9d037b4cefea365c98ffdde1f4b8d7b6a410 100644 (file)
--- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
+++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx
@@ -177,6 +177,7 @@ void RepairGUI_LimitToleranceDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void RepairGUI_LimitToleranceDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
index 13d07ad43ef94681a0aba287536cf42a9e1d2280..67ff1087b2d213b13be671275eba8d6f36ae2d95 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
@@ -132,6 +132,7 @@ void RepairGUI_RemoveExtraEdgesDlg::Init()
 //=================================================================================
 void RepairGUI_RemoveExtraEdgesDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
index 8c4335c29814df6f064673eabbef2d41a59afdd0..4c9a25a82fbf0d87d995f9fd86e35db732a5325b 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
@@ -144,6 +144,7 @@ void RepairGUI_RemoveHolesDlg::Init()
 //=================================================================================
 void RepairGUI_RemoveHolesDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
index 97807e44929d4fcca2dcc00220dae534172cc70a..6bfdbb1ff7a524c3f607776a6829c57c91c8aec8 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
@@ -132,6 +132,7 @@ void RepairGUI_RemoveIntWiresDlg::Init()
 //=================================================================================
 void RepairGUI_RemoveIntWiresDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx
index 1ce88ae297bc0535a41f9b731bbba0e08f66dc54..85cff05001644f0646025710fde9ee74dd22ca87 100644 (file)
--- a/src/RepairGUI/RepairGUI_SewingDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx
@@ -147,6 +147,7 @@ void RepairGUI_SewingDlg::Init()
 //=================================================================================
 void RepairGUI_SewingDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index 7d8449d33aa26e3258a6d2caa88fbfdcd7237451..2530da85262f439dbdab2a95c3e24197d613a5bd 100755 (executable)
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -331,6 +331,7 @@ void RepairGUI_ShapeProcessDlg::init()
 //=================================================================================
 void RepairGUI_ShapeProcessDlg::onOk()
 {
+  setIsApplyAndClose( true );
   if ( onApply() )
     ClickOnCancel();
 }

diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
index d68177af1170599db2e2d2b00d14fd64a1ed7b99..33b0c6712495f9dfa44457ab336211370997edb9 100644 (file)
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
@@ -138,6 +138,7 @@ void RepairGUI_SuppressFacesDlg::Init()
 //=================================================================================
 void RepairGUI_SuppressFacesDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
index 7911cc99ed1ead1b0a178d430517d212b45e2d40..986a2ab9616b64fbbb070835d72f9a6bf4e5ceab 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
@@ -181,6 +181,7 @@ void TransformationGUI_MirrorDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void TransformationGUI_MirrorDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }
@@ -196,13 +197,10 @@ bool TransformationGUI_MirrorDlg::ClickOnApply()
 
   initName();
 
-  myObjects.clear();
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  myGeomGUI->getApp()->selectionMgr()->clearSelected();
-
   // activate selection and connect selection manager
   ConstructorsClicked(getConstructorId());
+  SelectionIntoArgument();
+
   return true;
 }
 

diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
index 11c78050c230be09d5bf0ab0d5ef92b693c21812..c39ab687d2e8cc152c04ac7ffef7accbcc04a75f 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
@@ -262,6 +262,7 @@ void TransformationGUI_MultiRotationDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void TransformationGUI_MultiRotationDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
index b98a8602384aee37b1d4e3819532dd61c4f2166e..feae096d901551faf328b6420e3fa8207a958499 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
@@ -292,6 +292,7 @@ void TransformationGUI_MultiTranslationDlg::ConstructorsClicked (int constructor
 //=================================================================================
 void TransformationGUI_MultiTranslationDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }

diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
index 5f7717806cf2bc5cf52c6f3c08edc228a6528040..7f9456ee295907aaa77ea0d73017f67832c35cdd 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
@@ -142,6 +142,7 @@ void TransformationGUI_OffsetDlg::Init()
 //=================================================================================
 void TransformationGUI_OffsetDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }

diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
index 65fa99e154d6c1b298fbe5594605e8d59eb69ef3..9c58fa8bdc5a1b659c23f01b158b48702b855880 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
@@ -283,6 +283,7 @@ void TransformationGUI_PositionDlg::ValueChangedInSpinBox()
 //=================================================================================
 void TransformationGUI_PositionDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }
@@ -298,13 +299,10 @@ bool TransformationGUI_PositionDlg::ClickOnApply()
 
   initName();
 
-  myObjects.clear();
-  myEditCurrentArgument = Group1->LineEdit1;
-  myEditCurrentArgument->setText("");
-  myGeomGUI->getApp()->selectionMgr()->clearSelected();
-
   // activate selection and connect selection manager
   ConstructorsClicked(getConstructorId());
+  SelectionIntoArgument();
+
   return true;
 }
 

diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
index b17cd3ecf25e1286f7677c0d245f636cc2fb5895..db82955157aeada3853f5353847d1639d2097ddd 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
@@ -225,6 +225,7 @@ void TransformationGUI_RotationDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void TransformationGUI_RotationDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }
@@ -240,13 +241,10 @@ bool TransformationGUI_RotationDlg::ClickOnApply()
 
   initName();
 
-  myObjects.clear();
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  myGeomGUI->getApp()->selectionMgr()->clearSelected();
-
   // activate selection and connect selection manager
   ConstructorsClicked(getConstructorId());
+  SelectionIntoArgument();
+
   return true;
 }
 

diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
index 522435363a3471e9ceeda04c90bd69f317215624..32263ff82ae3733f02ee3b0d54c137d657acdc7c 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
@@ -245,6 +245,7 @@ void TransformationGUI_ScaleDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void TransformationGUI_ScaleDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }
@@ -260,13 +261,10 @@ bool TransformationGUI_ScaleDlg::ClickOnApply()
 
   initName(tr("GEOM_SCALE"));
 
-  myObjects.clear();
-  myEditCurrentArgument = LineEdit1;
-  myEditCurrentArgument->setText("");
-  myGeomGUI->getApp()->selectionMgr()->clearSelected();
-
   // activate selection and connect selection manager
   ConstructorsClicked(getConstructorId());
+  SelectionIntoArgument();
+
   return true;
 }
 

diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
index 61da5756bf14390ca132981fb49da729fadd6d74..01f643ca21c7bd9e1b903fac040f722287685113 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
@@ -271,6 +271,7 @@ void TransformationGUI_TranslationDlg::ConstructorsClicked (int constructorId)
 //=================================================================================
 void TransformationGUI_TranslationDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if (ClickOnApply())
     ClickOnCancel();
 }
@@ -286,13 +287,10 @@ bool TransformationGUI_TranslationDlg::ClickOnApply()
 
   initName();
 
-  myObjects.clear();
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  myEditCurrentArgument->setText("");
-  myGeomGUI->getApp()->selectionMgr()->clearSelected();
-
   // activate selection and connect selection manager
   ConstructorsClicked(getConstructorId());
+  SelectionIntoArgument();
+
   return true;
 }