ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-03 21:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Correct multiply connection of signals on activate this dialogs.

Browse Source
This commit is contained in:
dmv 2008-11-19 08:35:08 +00:00
parent bb33e4b989
commit 8558f56ffb
22 changed files with 95 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BooleanGUI/BooleanGUI_Dialog.cxx
View File

@ -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();
}
//=================================================================================

6
src/BuildGUI/BuildGUI_EdgeDlg.cxx
View File

@ -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();
}
//=================================================================================

6
src/GenerationGUI/GenerationGUI_PrismDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/GenerationGUI/GenerationGUI_RevolDlg.cxx
View File

@ -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();
}
//=================================================================================

5
src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
View File

@ -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();
}
//=================================================================================

5
src/OperationGUI/OperationGUI_ChamferDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/OperationGUI/OperationGUI_FilletDlg.cxx
View File

@ -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() );
}
//=================================================================================

6
src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
View File

@ -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() ) );
}
//=================================================================================

15
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
View File

@ -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();
}
//=================================================================================

6
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
View File

@ -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() );
}
//=================================================================================

6
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
View File

@ -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() );
}
//=================================================================================

11
src/RepairGUI/RepairGUI_CloseContourDlg.cxx
View File

@ -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();
}
//=================================================================================

14
src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
View File

@ -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();
}
//=================================================================================

12
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
View File

@ -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();
}
//=================================================================================

5
src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/TransformationGUI/TransformationGUI_PositionDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/TransformationGUI/TransformationGUI_RotationDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
View File

@ -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() );
}
//=================================================================================

5
src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
View File

@ -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() );
}
//=================================================================================