Skip to content

Commit

Permalink
+ set range for quantity boxes
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Feb 29, 2016
1 parent bcd0ec8 commit 5574419
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 23 deletions.
2 changes: 2 additions & 0 deletions src/Mod/Inspection/Gui/VisualInspection.cpp
View file
Expand Up @@ -91,7 +91,9 @@ VisualInspection::VisualInspection(QWidget* parent, Qt::WindowFlags fl)
ui->textLabel2->hide();
ui->thickness->hide();
ui->searchRadius->setUnit(Base::Unit::Length);
ui->searchRadius->setRange(0, DBL_MAX);
ui->thickness->setUnit(Base::Unit::Length);
ui->thickness->setRange(0, DBL_MAX);

App::Document* doc = App::GetApplication().getActiveDocument();
// disable Ok button and enable of at least one item in each view is on
Expand Down
15 changes: 15 additions & 0 deletions src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
View file
Expand Up @@ -60,29 +60,44 @@ MeshGui::DlgRegularSolidImp::DlgRegularSolidImp(QWidget* parent, Qt::WindowFlags
// set limits
// Box
boxLength->setMaximum(DBL_MAX);
boxLength->setMinimum(0);
boxWidth->setMaximum(DBL_MAX);
boxWidth->setMinimum(0);
boxHeight->setMaximum(DBL_MAX);
boxHeight->setMinimum(0);
// Cylinder
cylinderRadius->setMaximum(DBL_MAX);
cylinderRadius->setMinimum(0);
cylinderLength->setMaximum(DBL_MAX);
cylinderLength->setMinimum(0);
cylinderEdgeLength->setMaximum(DBL_MAX);
cylinderEdgeLength->setMinimum(0);
cylinderCount->setMaximum(1000);
// Cone
coneRadius1->setMaximum(DBL_MAX);
coneRadius1->setMinimum(0);
coneRadius2->setMaximum(DBL_MAX);
coneRadius2->setMinimum(0);
coneLength->setMaximum(DBL_MAX);
coneLength->setMinimum(0);
coneEdgeLength->setMaximum(DBL_MAX);
coneEdgeLength->setMinimum(0);
coneCount->setMaximum(1000);
// Sphere
sphereRadius->setMaximum(DBL_MAX);
sphereRadius->setMinimum(0);
sphereCount->setMaximum(1000);
// Ellipsoid
ellipsoidRadius1->setMaximum(DBL_MAX);
ellipsoidRadius1->setMinimum(0);
ellipsoidRadius2->setMaximum(DBL_MAX);
ellipsoidRadius2->setMinimum(0);
ellipsoidCount->setMaximum(1000);
// Torus
toroidRadius1->setMaximum(DBL_MAX);
toroidRadius1->setMinimum(0);
toroidRadius2->setMaximum(DBL_MAX);
toroidRadius2->setMinimum(0);
toroidCount->setMaximum(1000);
}

Expand Down
2 changes: 2 additions & 0 deletions src/Mod/Mesh/Gui/Segmentation.cpp
View file
Expand Up @@ -48,8 +48,10 @@ Segmentation::Segmentation(Mesh::Feature* mesh, QWidget* parent, Qt::WindowFlags
ui->setupUi(this);
ui->numPln->setRange(1, INT_MAX);
ui->numPln->setValue(100);
ui->radCyl->setRange(0, INT_MAX);
ui->numCyl->setRange(1, INT_MAX);
ui->numCyl->setValue(100);
ui->radSph->setRange(0, INT_MAX);
ui->numSph->setRange(1, INT_MAX);
ui->numSph->setValue(100);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/MeshPart/Gui/Tessellation.cpp
View file
Expand Up @@ -59,7 +59,7 @@ Tessellation::Tessellation(QWidget* parent)
this, SLOT(meshingMethod(int)));

ui->spinSurfaceDeviation->setMaximum(INT_MAX);
ui->spinMaximumEdgeLength->setMaximum(INT_MAX);
ui->spinMaximumEdgeLength->setRange(0, INT_MAX);

// set the standard method
ui->radioButtonStandard->setChecked(true);
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/CrossSections.cpp
View file
Expand Up @@ -126,7 +126,7 @@ CrossSections::CrossSections(const Base::BoundBox3d& bb, QWidget* parent, Qt::Wi
ui->setupUi(this);
ui->position->setRange(-DBL_MAX, DBL_MAX);
ui->position->setUnit(Base::Unit::Length);
ui->distance->setMaximum(DBL_MAX);
ui->distance->setRange(0, DBL_MAX);
ui->distance->setUnit(Base::Unit::Length);
vp = new ViewProviderCrossSections();

Expand Down
5 changes: 4 additions & 1 deletion src/Mod/Part/Gui/DlgFilletEdges.cpp
View file
Expand Up @@ -234,8 +234,11 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge
{
ui->setupUi(this);
ui->filletStartRadius->setMaximum(INT_MAX);
ui->filletEndRadius->setMaximum(INT_MAX);
ui->filletStartRadius->setMinimum(0);
ui->filletStartRadius->setUnit(Base::Unit::Length);

ui->filletEndRadius->setMaximum(INT_MAX);
ui->filletEndRadius->setMinimum(0);
ui->filletEndRadius->setUnit(Base::Unit::Length);

d->object = 0;
Expand Down
63 changes: 43 additions & 20 deletions src/Mod/Part/Gui/DlgPrimitives.cpp
View file
Expand Up @@ -191,28 +191,42 @@ DlgPrimitives::DlgPrimitives(QWidget* parent)
// set limits
//
// plane
ui.planeLength->setMaximum(INT_MAX);
ui.planeWidth->setMaximum(INT_MAX);
ui.planeLength->setRange(0, INT_MAX);
ui.planeWidth->setRange(0, INT_MAX);
// box
ui.boxLength->setMaximum(INT_MAX);
ui.boxWidth->setMaximum(INT_MAX);
ui.boxHeight->setMaximum(INT_MAX);
ui.boxLength->setRange(0, INT_MAX);
ui.boxWidth->setRange(0, INT_MAX);
ui.boxHeight->setRange(0, INT_MAX);
// cylinder
ui.cylinderRadius->setMaximum(INT_MAX);
ui.cylinderHeight->setMaximum(INT_MAX);
ui.cylinderRadius->setRange(0, INT_MAX);
ui.cylinderHeight->setRange(0, INT_MAX);
ui.cylinderAngle->setRange(0, 360);
// cone
ui.coneRadius1->setMaximum(INT_MAX);
ui.coneRadius2->setMaximum(INT_MAX);
ui.coneHeight->setMaximum(INT_MAX);
ui.coneRadius1->setRange(0, INT_MAX);
ui.coneRadius2->setRange(0, INT_MAX);
ui.coneHeight->setRange(0, INT_MAX);
ui.coneAngle->setRange(0, 360);
// sphere
ui.sphereRadius->setMaximum(INT_MAX);
ui.sphereRadius->setRange(0, INT_MAX);
ui.sphereAngle1->setRange(-90, 90);
ui.sphereAngle2->setRange(-90, 90);
ui.sphereAngle3->setRange(0, 360);
// ellipsoid
ui.ellipsoidRadius1->setMaximum(INT_MAX);
ui.ellipsoidRadius2->setMaximum(INT_MAX);
ui.ellipsoidRadius3->setMaximum(INT_MAX);
ui.ellipsoidRadius1->setRange(0, INT_MAX);
ui.ellipsoidRadius2->setRange(0, INT_MAX);
ui.ellipsoidRadius3->setRange(0, INT_MAX);
ui.ellipsoidAngle1->setRange(-90, 90);
ui.ellipsoidAngle2->setRange(-90, 90);
ui.ellipsoidAngle3->setRange(0, 360);
// torus
ui.torusRadius1->setMaximum(INT_MAX);
ui.torusRadius2->setMaximum(INT_MAX);
ui.torusRadius1->setRange(0, INT_MAX);
ui.torusRadius2->setRange(0, INT_MAX);
ui.torusAngle1->setRange(-180, 180);
ui.torusAngle2->setRange(-180, 180);
ui.torusAngle3->setRange(0, 360);
// prism
ui.prismCircumradius->setRange(0, INT_MAX);
ui.prismHeight->setRange(0, INT_MAX);
// wedge
ui.wedgeXmin->setMinimum(INT_MIN);
ui.wedgeXmin->setMaximum(INT_MAX);
Expand All @@ -235,11 +249,19 @@ DlgPrimitives::DlgPrimitives(QWidget* parent)
ui.wedgeZ2max->setMinimum(INT_MIN);
ui.wedgeZ2max->setMaximum(INT_MAX);
// helix
ui.helixPitch->setMaximum(INT_MAX);
ui.helixHeight->setMaximum(INT_MAX);
ui.helixRadius->setMaximum(INT_MAX);
ui.helixPitch->setRange(0, INT_MAX);
ui.helixHeight->setRange(0, INT_MAX);
ui.helixRadius->setRange(0, INT_MAX);
ui.helixAngle->setRange(0, 90);
// circle
ui.circleRadius->setMaximum(INT_MAX);
ui.circleRadius->setRange(0, INT_MAX);
ui.circleAngle0->setRange(0, 360);
ui.circleAngle1->setRange(0, 360);
// ellipse
ui.ellipseMajorRadius->setRange(0, INT_MAX);
ui.ellipseMinorRadius->setRange(0, INT_MAX);
ui.ellipseAngle0->setRange(0, 360);
ui.ellipseAngle1->setRange(0, 360);
// vertex
ui.vertexX->setMaximum(INT_MAX);
ui.vertexY->setMaximum(INT_MAX);
Expand All @@ -261,6 +283,7 @@ DlgPrimitives::DlgPrimitives(QWidget* parent)
ui.edgeZ2->setMaximum(INT_MAX);
ui.edgeZ2->setMinimum(INT_MIN);
// RegularPolygon
ui.regularPolygonCircumradius->setRange(0, INT_MAX);
}

/*
Expand Down

1 comment on commit 5574419

@bblacey
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit broke the Travis-CI OS X build - DBL_MAX is defined in cfloat.h. The following patch to include cfloat.h fixed the compilation issue on OS X but not fully up to speed not the FreeCAD import/include conventions, there may be a better place to include cfloat.h

diff --git a/src/Mod/Inspection/Gui/VisualInspection.cpp b/src/Mod/Inspection/Gui/VisualInspection.cpp
index 66850e3..d0a0a61 100644
--- a/src/Mod/Inspection/Gui/VisualInspection.cpp
+++ b/src/Mod/Inspection/Gui/VisualInspection.cpp
@@ -35,6 +35,8 @@
 #include <Gui/MainWindow.h>
 #include <Gui/PrefWidgets.h>

+#include <cfloat>
+
 using namespace InspectionGui;

 namespace InspectionGui {

Please sign in to comment.