suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PartDesign/ViewProviderDatum: minor enhancements

Browse Source 
- added defaultSize constant
 - fixed typo in margin{g,}Factor function name
This commit is contained in:
Alexander Golubev 2015-09-09 09:56:27 +03:00 committed by Stefan Tröger
parent d4c67c0366
commit fa29bfa667
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
View File

@ -78,6 +78,9 @@ using namespace PartDesignGui;
PROPERTY_SOURCE(PartDesignGui::ViewProviderDatum,Gui::ViewProviderGeometryObject)
// static data
const double ViewProviderDatum::defaultSize = Gui::ViewProviderOrigin::defaultSize ();
ViewProviderDatum::ViewProviderDatum()
{
pShapeSep = new SoSeparator();
@ -382,6 +385,6 @@ SbBox3f ViewProviderDatum::getRelevantBoundBox (
}
SbBox3f ViewProviderDatum::defaultBoundBox () {
double defSz = Gui::ViewProviderOrigin::defaultSize ();
return SbBox3f ( -defSz, -defSz, -defSz, defSz, defSz, defSz );
return SbBox3f ( -defaultSize, -defaultSize, -defaultSize,
defaultSize, defaultSize, defaultSize );
}

5
src/Mod/PartDesign/Gui/ViewProviderDatum.h
View File

@ -87,11 +87,14 @@ public:
SoGetBoundingBoxAction &bboxAction,
const std::vector <App::DocumentObject *> &objs);
/// Default size used to produce the default bbox
static const double defaultSize;
// Returnd default bounding box if relevant is can't be used for some reason
static SbBox3f defaultBoundBox ();
// Returns a default marging factor (part of size )
static double margingFactor () { return 0.1; };
static double marginFactor () { return 0.1; };
protected:
virtual bool setEdit(int ModNum);

2
src/Mod/PartDesign/Gui/ViewProviderDatumLine.cpp
View File

@ -87,7 +87,7 @@ void ViewProviderDatumLine::setExtents (Base::BoundBox3d bbox) {
// Add origin of the line to the box if it's not
bbox.Add ( Base::Vector3d (0, 0, 0) );
double marging = bbox.LengthZ () * margingFactor ();
double marging = bbox.LengthZ () * marginFactor ();
// Display the line
pCoords->point.setNum (2);

2
src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp
View File

@ -109,7 +109,7 @@ void ViewProviderDatumPlane::setExtents (Base::BoundBox3d bbox) {
// Add origin of the plane to the box if it's not
bbox.Add ( Base::Vector3d (0, 0, 0) );
double marging = sqrt(bbox.LengthX ()*bbox.LengthY ()) * margingFactor ();
double marging = sqrt(bbox.LengthX ()*bbox.LengthY ()) * marginFactor ();
// Change the coordinates of the line
pCoords->point.setNum (4);