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

Merge fixes from V6_1_0

Browse Source
This commit is contained in:
vsr 2010-10-08 12:11:39 +00:00
parent 53ee70f9ba
commit 47b96b4565
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BasicGUI/BasicGUI_PointDlg.cxx
View File

@ -76,7 +76,8 @@
//=================================================================================
BasicGUI_PointDlg::BasicGUI_PointDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
bool modal, Qt::WindowFlags fl )
: GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
: GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl ),
myBusy ( false )
{
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT") ) );
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POINT_EDGE" ) ) );
@ -531,6 +532,8 @@ void BasicGUI_PointDlg::SelectionIntoArgument()
if ( aShape.IsNull() || aShape.ShapeType() != myNeedType)
return;
myBusy = true;
if ( id == GEOM_POINT_XYZ ) {
gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
GroupXYZ->SpinBox_DX->setValue( aPnt.X() );
@ -571,6 +574,7 @@ void BasicGUI_PointDlg::SelectionIntoArgument()
myFace = aSelectedObject;
GroupOnSurface->LineEdit1->setText( aName );
}
myBusy = false;
}
}
@ -637,6 +641,10 @@ void BasicGUI_PointDlg::SetEditCurrentArgument()
GroupLineIntersection->LineEdit2->setEnabled(true);
}
send->setDown(true);
if ( ( send == GroupLineIntersection->PushButton1 ||
send == GroupLineIntersection->PushButton2 ) && !myBusy )
SelectionIntoArgument();
}

2
src/BasicGUI/BasicGUI_PointDlg.h
View File

@ -82,6 +82,8 @@ private:
GEOM::GEOM_Object_var myLine1;
GEOM::GEOM_Object_var myLine2;
bool myBusy;
DlgRef_3Spin* GroupXYZ;
DlgRef_1Sel3Spin* GroupRefPoint;
DlgRef_1Sel1Spin* GroupOnCurve;

4
src/GEOMImpl/GEOMImpl_PointDriver.cxx
View File

@ -190,6 +190,10 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
Standard_TypeMismatch::Raise
("Creation Point On Lines Intersection Aborted : Line shape is not an edge or wire");
}
if (aRefShape1.IsSame(aRefShape2))
Standard_ConstructionError::Raise("The lines to make intersection must be different");
//Calculate Lines Intersection Point
BRepExtrema_DistShapeShape dst (aRefShape1, aRefShape2);
if (dst.IsDone()) {