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

EDF 1337 : Sketcher 3D improvement

Browse Source 
Truncate displayed length and angles to a number of significant digits
This commit is contained in:
rnc 2012-08-01 15:18:17 +00:00
parent d7f0b174d9
commit 35a548b486
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
View File

@ -153,8 +153,9 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg( GeometryGUI* theGeometryGUI, Q
GroupAngles->checkBox->setText( tr( "Angle 2" ) ); //TODO translation GroupAngles->checkBox->setText( tr( "Angle 2" ) ); //TODO translation
GroupControls = new EntityGUI_Controls( centralWidget() ); GroupControls = new EntityGUI_Controls( centralWidget() );
GroupControls->GroupBox1->setTitle(tr("GEOM_CONTROLS"));
GroupControls->CheckBox1->setText( tr( "Show length dimensions" ) ); //TODO translation GroupControls->CheckBox1->setText( tr( "Show length dimensions" ) ); //TODO translation
GroupControls->CheckBox2->setText( tr( "Show angle dimensions" ) ); //TODO translation GroupControls->CheckBox2->setText( tr( "Show angle dimensions" ) ); //TODO translation
buttonOk()->setText( tr( "GEOM_BUT_END_SKETCH" ) ); buttonOk()->setText( tr( "GEOM_BUT_END_SKETCH" ) );
buttonApply()->setText( tr( "GEOM_BUT_CLOSE_SKETCH" ) ); buttonApply()->setText( tr( "GEOM_BUT_CLOSE_SKETCH" ) );
@ -1063,8 +1064,8 @@ void EntityGUI_3DSketcherDlg::displayAngle(double theAngle1, double theAngle2, d
Handle(Geom_Plane) aPlane = new Geom_Plane(gce_MP.Value()); Handle(Geom_Plane) aPlane = new Geom_Plane(gce_MP.Value());
// Covert angles to string // Covert angles to string
std::string Angle1_str = boost::lexical_cast<std::string>(theAngle1); std::string Angle1_str = doubleToString(theAngle1);
std::string Angle2_str = boost::lexical_cast<std::string>(theAngle2); std::string Angle2_str = doubleToString(theAngle2);
Handle(AIS_AngleDimension) anAngleIO = new AIS_AngleDimension(anEdge1, anEdge2, aPlane, theAngle1 * M_PI / 180., Handle(AIS_AngleDimension) anAngleIO = new AIS_AngleDimension(anEdge1, anEdge2, aPlane, theAngle1 * M_PI / 180.,
TCollection_ExtendedString(Angle1_str.c_str())); TCollection_ExtendedString(Angle1_str.c_str()));
@ -1156,7 +1157,7 @@ void EntityGUI_3DSketcherDlg::displayLength(double theLength, bool store)
TopoDS_Vertex aVert2 = BRepBuilderAPI_MakeVertex(P2); TopoDS_Vertex aVert2 = BRepBuilderAPI_MakeVertex(P2);
// Convert length to string // Convert length to string
std::string aLength_str = boost::lexical_cast<std::string>(aLength); std::string aLength_str = doubleToString(aLength);
// Plane for the presentation // Plane for the presentation
if ( Abs(Vec1.CrossMagnitude(Vec2)) < Precision::Confusion() ) // Check colinearity if ( Abs(Vec1.CrossMagnitude(Vec2)) < Precision::Confusion() ) // Check colinearity
@ -1306,3 +1307,16 @@ bool EntityGUI_3DSketcherDlg::createShapes( GEOM::GEOM_Object_ptr /*theObject*/,
return true; return true;
} }
//================================================================
// Function : doubleToString
// Purpose : converts double to string
//================================================================
std::string EntityGUI_3DSketcherDlg::doubleToString(double num)
{
// truncate num
int digNum = 5;
char format = 'g'; // truncated to a number of significant digits
return QString::number( num, format, digNum).toStdString();
}

2
src/EntityGUI/EntityGUI_3DSketcherDlg.h
View File

@ -94,6 +94,8 @@ private:
XYZ getLastPoint() const; XYZ getLastPoint() const;
XYZ getPenultimatePoint() const; XYZ getPenultimatePoint() const;
XYZ getCurrentPoint() const; XYZ getCurrentPoint() const;
std::string doubleToString( double );
private: private:
XYZList myPointsList; XYZList myPointsList;