Correct multiply connection of signals on activate this dialogs.

diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx
index 024d9d8e0dd96178850f87c551f9c36320f861a7..d3309fad868c3f21cb6c5753270e176cbe21cc75 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_Dialog.cxx
+++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx
@@ -281,8 +281,9 @@ void BooleanGUI_Dialog::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  // reinit, because some selected objects could be removed
-  Init();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+  displayPreview();
 }
 
 //=================================================================================

diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
index 12cd0786ab65b898d84541c83b7a6f10b16fcfd7..16a027d5764170cbfde69a22d35b90b83b3c736c 100644 (file)
--- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
@@ -253,8 +253,10 @@ void BuildGUI_EdgeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  // reinit, because some selected objects could be removed
-  Init();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  displayPreview();
 }
 
 //=================================================================================

diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
index b168cc19e20b122c2d732d789689bb33ec1f9c58..81c7347beef88323287e6bdcc329452907b168fa 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
@@ -574,8 +574,10 @@ void GenerationGUI_PrismDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  // reinit, because some selected objects could be removed
-  Init();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
index f8ceba68a3320824d3523524860ef4a00c65baeb..16c2d9d0abe10c682ff2f139656856e45299f1c2 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
@@ -343,9 +343,10 @@ void GenerationGUI_RevolDlg::LineEditReturnPressed()
 void GenerationGUI_RevolDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  displayPreview();
 }
 
 //=================================================================================

diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
index 033beb9bd143585084feb39794476be6b8f5fc76..f1428280fa08a498d9074aa64d4a7429000af2c0 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
@@ -313,9 +313,10 @@ void MeasureGUI_NormaleDlg::LineEditReturnPressed()
 void MeasureGUI_NormaleDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  displayPreview();
 }
 
 //=================================================================================

diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
index c634ea7f690e2e44c84a53188c65b993bc27a2ac..fc4facff5f2fa556c5f451f56377041f9b3f3301 100644 (file)
--- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
@@ -582,9 +582,10 @@ void OperationGUI_ChamferDlg::LineEditReturnPressed()
 void OperationGUI_ChamferDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx
index 447374237cbfbcf81af7e771924a6f9b282372d1..6c1182ee9b90495740516b0a12416124cec3c191 100644 (file)
--- a/src/OperationGUI/OperationGUI_FilletDlg.cxx
+++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx
@@ -494,9 +494,10 @@ void OperationGUI_FilletDlg::LineEditReturnPressed()
 void OperationGUI_FilletDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
index 3f5f95e4a6ea4fca0a53eb1112965ec54de43102..754630a178385160a13eb13edecae90bcbdf8513 100644 (file)
--- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
@@ -264,9 +264,9 @@ void OperationGUI_GetShapesOnShapeDlg::LineEditReturnPressed()
 void OperationGUI_GetShapesOnShapeDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-
-  // reinit, because some selected objects could be removed
-  Init();
+  globalSelection(GEOM_ALLSHAPES);
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 }
 
 //=================================================================================

diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
index 14104b1f46b528d7260348459a98a64134cc5741..caadbcee25e4d9f59be937538d2c6021f6868f71 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
@@ -382,15 +382,12 @@ void PrimitiveGUI_BoxDlg::LineEditReturnPressed()
 void PrimitiveGUI_BoxDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  //if (getConstructorId() == 0) {
-  //  localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
-  //  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
-  //          this, SLOT(SelectionIntoArgument()));
-  //}
-  //displayPreview();
-
-  // reinit, because some selected objects could be removed
-  Init();
+  if (getConstructorId() == 0) {
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+    connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+            this, SLOT(SelectionIntoArgument()));
+  }
+  displayPreview();
 }
 
 //=================================================================================

diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
index 6900955d066e95a10c21e760298a0d2f6c3b3428..835cd5be08267d8c0759da939341bced6f57ca86 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
@@ -396,8 +396,10 @@ void PrimitiveGUI_CylinderDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  // reinit, because some selected objects could be removed
-  Init();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
index 7260f90c807da1f63854b40c35d31762828209cd..3477dd36bf87efe9228b89847d57cfecc15d13b9 100755 (executable)
--- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
@@ -495,9 +495,10 @@ QLineEdit* send = (QLineEdit*)sender();
 void PrimitiveGUI_DiskDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
index a76f569ce178cdd7ea3e5f9d0995f206486b7b8a..1045d004e1e2f3591a6f74bdc0526e8c0c64bb07 100644 (file)
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
@@ -393,8 +393,10 @@ void PrimitiveGUI_TorusDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
 
-  // reinit, because some selected objects could be removed
-  Init();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
+  
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
index c532a6b3026fcc5845f5e3727f1dd584c189fff7..ac348383c556d53087ababdaa9d4b12fc14bffbe 100644 (file)
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
@@ -270,9 +270,16 @@ void RepairGUI_CloseContourDlg::LineEditReturnPressed()
 void RepairGUI_CloseContourDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  myEditCurrentArgument = GroupPoints->LineEdit1;
+  myEditCurrentArgument->setText( "" );
+  GroupPoints->LineEdit2->setText( "" );
+  myObject = GEOM::GEOM_Object::_nil();
+  myWiresInd->length( 0 );
+
+  initSelection();
 }
 
 //=================================================================================

diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
index 5ac6a2d3e606765efeb891c215ecee8d2b0e5d5b..cbf6fcb64aeceb3455acbda9fd2e3a1be8b8d1c8 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
@@ -271,9 +271,19 @@ void RepairGUI_RemoveHolesDlg::LineEditReturnPressed()
 void RepairGUI_RemoveHolesDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  myEditCurrentArgument = GroupPoints->LineEdit1;
+  myEditCurrentArgument->setText( "" );
+  GroupPoints->LineEdit2->setText( "" );
+  myObject = GEOM::GEOM_Object::_nil();
+  myWiresInd->length( 0 );
+
+  myClosed = -1;
+  myOpen = -1;
+
+  initSelection();
 }
 
 //=================================================================================

diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
index aaf5de0d13a6b6bcaadbc4690128ab2af66b4f31..dd0dbcd0a7599c446ab3fc07c7ad0f757699655d 100644 (file)
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
@@ -258,9 +258,17 @@ void RepairGUI_RemoveIntWiresDlg::LineEditReturnPressed()
 void RepairGUI_RemoveIntWiresDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  myEditCurrentArgument = GroupPoints->LineEdit1;
+  myEditCurrentArgument->setText( "" );
+  GroupPoints->LineEdit2->setText( "" );
+  myObject = GEOM::GEOM_Object::_nil();
+  myWiresInd->length( 0 );
+
+  //myGeomGUI->SetState( 0 );
+  initSelection();
 }
 
 //=================================================================================

diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
index 8195e4bbf096a1275e1c66eb9799ebfed7ff2186..4da6e745f6d911498a34d8de1a7c29891809d6db 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
@@ -365,9 +365,10 @@ void TransformationGUI_MirrorDlg::LineEditReturnPressed()
 void TransformationGUI_MirrorDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
index 439a147535719b856c251f4b42b8b3a8a175913a..04124c3a5445c72f3eff38650e463a3b4b72e18e 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
@@ -445,9 +445,10 @@ void TransformationGUI_MultiRotationDlg::LineEditReturnPressed()
 void TransformationGUI_MultiRotationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
index c3d4b216e8764943d9fde867a27483b203e2ec42..7ad4a872deb28ec14fd57d25250a8a323e71fdb7 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
@@ -490,9 +490,10 @@ void TransformationGUI_MultiTranslationDlg::LineEditReturnPressed()
 void TransformationGUI_MultiTranslationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
index 7fcac82a4f95d6c0e62486616f59a0ead57c6599..4451aebed271d3e3b2148ea33da0a58c10713bda 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
@@ -371,9 +371,10 @@ void TransformationGUI_PositionDlg::LineEditReturnPressed()
 void TransformationGUI_PositionDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
index eb4d0703c0b2b52aee8ab3e1670935bd03f7d246..5b51ac4196d9c07d7ca9c949dbbbf07aad1dcf84 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
@@ -449,9 +449,10 @@ void TransformationGUI_RotationDlg::LineEditReturnPressed()
 void TransformationGUI_RotationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
index f9c28818be1be9a868f290cd467e3bb8d50582fc..c479b6445d0cab835d79f026e9243fa0b58df62c 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
@@ -410,9 +410,10 @@ void TransformationGUI_ScaleDlg::LineEditReturnPressed()
 void TransformationGUI_ScaleDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================

diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
index f47bb590da460e87078b1fab7b5080cdb01791b6..1ce1d3874c3ee7578c0766a105f5dfae975a1ffd 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
@@ -479,9 +479,10 @@ void TransformationGUI_TranslationDlg::LineEditReturnPressed()
 void TransformationGUI_TranslationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+          this, SLOT( SelectionIntoArgument() ) );
 
-  // reinit, because some selected objects could be removed
-  Init();
+  ConstructorsClicked( getConstructorId() );
 }
 
 //=================================================================================