ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-21 10:09:40 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems with Rotation dialog box (internal 21148)

Browse Source
This commit is contained in:
vsr 2009-06-03 11:44:53 +00:00
parent 85595cc3bf
commit 090f4cc227
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/TransformationGUI/TransformationGUI_RotationDlg.cxx
View File

@ -263,6 +263,7 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr(); LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
SALOME_ListIO aSelList; SALOME_ListIO aSelList;
aSelMgr->selectedObjects(aSelList); aSelMgr->selectedObjects(aSelList);
GEOM::GEOM_Object_var aSelectedObject;
QString aName; QString aName;
@ -274,8 +275,6 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects); GEOMBase::ConvertListOfIOInListOfGO(aSelList, myObjects);
if (!myObjects.length()) if (!myObjects.length())
return; return;
else
myEditCurrentArgument->setText(aName);
} }
else { else {
if (aSelList.Extent() != 1) if (aSelList.Extent() != 1)
@ -283,7 +282,7 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
// nbSel == 1 // nbSel == 1
Standard_Boolean testResult = Standard_False; Standard_Boolean testResult = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult); aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
if (!testResult || CORBA::is_nil(aSelectedObject)) if (!testResult || CORBA::is_nil(aSelectedObject))
return; return;
@ -328,10 +327,17 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
} }
} }
} }
}
myEditCurrentArgument->setText(aName); myEditCurrentArgument->setText(aName);
if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0) { if (myEditCurrentArgument == GroupPoints->LineEdit1) {
if (myObjects.length()) {
if (getConstructorId() == 0 && myAxis->_is_nil() || getConstructorId() == 1 && myCentPoint->_is_nil() )
GroupPoints->PushButton2->click();
}
}
else if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0) {
myAxis = aSelectedObject; myAxis = aSelectedObject;
if (!myAxis->_is_nil() && !myObjects.length()) if (!myAxis->_is_nil() && !myObjects.length())
GroupPoints->PushButton1->click(); GroupPoints->PushButton1->click();
@ -351,7 +357,6 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
if (!myPoint2->_is_nil() && !myObjects.length()) if (!myPoint2->_is_nil() && !myObjects.length())
GroupPoints->PushButton1->click(); GroupPoints->PushButton1->click();
} }
}
// clear selection // clear selection
disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
@ -377,7 +382,11 @@ void TransformationGUI_RotationDlg::SetEditCurrentArgument()
myEditCurrentArgument = GroupPoints->LineEdit1; myEditCurrentArgument = GroupPoints->LineEdit1;
GroupPoints->PushButton2->setDown(false); GroupPoints->PushButton2->setDown(false);
GroupPoints->PushButton4->setDown(false);
GroupPoints->PushButton5->setDown(false);
GroupPoints->LineEdit2->setEnabled(false); GroupPoints->LineEdit2->setEnabled(false);
GroupPoints->LineEdit4->setEnabled(false);
GroupPoints->LineEdit5->setEnabled(false);
} }
else if (send == GroupPoints->PushButton2) { else if (send == GroupPoints->PushButton2) {
myEditCurrentArgument = GroupPoints->LineEdit2; myEditCurrentArgument = GroupPoints->LineEdit2;