ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

corrections for 0020669

Browse Source
This commit is contained in:
dmv 2010-02-17 09:42:24 +00:00
parent af9f05e2cf
commit 78882bc8cf
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -460,6 +460,7 @@ bool BasicGUI_PointDlg::ClickOnApply()
//================================================================================= //=================================================================================
void BasicGUI_PointDlg::SelectionIntoArgument() void BasicGUI_PointDlg::SelectionIntoArgument()
{ {
erasePreview();
const int id = getConstructorId(); const int id = getConstructorId();
if ( ( id == GEOM_POINT_REF || id == GEOM_POINT_EDGE || id == GEOM_POINT_SURF ) && myEditCurrentArgument != 0 ) if ( ( id == GEOM_POINT_REF || id == GEOM_POINT_EDGE || id == GEOM_POINT_SURF ) && myEditCurrentArgument != 0 )
@ -469,6 +470,12 @@ void BasicGUI_PointDlg::SelectionIntoArgument()
myY->setText( "" ); myY->setText( "" );
myZ->setText( "" ); myZ->setText( "" );
myRefPoint = myEdge = myFace = GEOM::GEOM_Object::_nil(); myRefPoint = myEdge = myFace = GEOM::GEOM_Object::_nil();
} else if ( id == GEOM_POINT_INTINT ) {
myEditCurrentArgument->setText( "" );
if ( myEditCurrentArgument == GroupLineIntersection->LineEdit1 )
myLine1 = GEOM::GEOM_Object::_nil();
else if ( myEditCurrentArgument == GroupLineIntersection->LineEdit2 )
myLine2 = GEOM::GEOM_Object::_nil();
} }
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr(); LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
@ -851,6 +858,13 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects )
} }
case GEOM_POINT_INTINT : case GEOM_POINT_INTINT :
anObj = anOper->MakePointOnLinesIntersection( myLine1, myLine2 ); anObj = anOper->MakePointOnLinesIntersection( myLine1, myLine2 );
if ( !anObj->_is_nil() ) {
QString aName = getNewObjectName();
if ( anObj->GetShapeType() == GEOM::COMPOUND && aName.startsWith("Vertex") )
initName( tr( "GEOM_COMPOUND" ) );
else if ( anObj->GetShapeType() == GEOM::VERTEX && aName.startsWith("Compound"))
initName( tr( "GEOM_VERTEX" ) );
}
res = true; res = true;
break; break;
case GEOM_POINT_SURF : case GEOM_POINT_SURF :