From 5574419293d3de7db91110d2efed231bd15dbc1e Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 29 Feb 2016 12:29:02 +0100 Subject: [PATCH] + set range for quantity boxes --- src/Mod/Inspection/Gui/VisualInspection.cpp | 2 + src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp | 15 +++++ src/Mod/Mesh/Gui/Segmentation.cpp | 2 + src/Mod/MeshPart/Gui/Tessellation.cpp | 2 +- src/Mod/Part/Gui/CrossSections.cpp | 2 +- src/Mod/Part/Gui/DlgFilletEdges.cpp | 5 +- src/Mod/Part/Gui/DlgPrimitives.cpp | 63 ++++++++++++++------- 7 files changed, 68 insertions(+), 23 deletions(-) diff --git a/src/Mod/Inspection/Gui/VisualInspection.cpp b/src/Mod/Inspection/Gui/VisualInspection.cpp index d5b353eb7..66850e314 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.cpp +++ b/src/Mod/Inspection/Gui/VisualInspection.cpp @@ -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 diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp index c3be7265d..70fced9c8 100644 --- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp +++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp @@ -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); } diff --git a/src/Mod/Mesh/Gui/Segmentation.cpp b/src/Mod/Mesh/Gui/Segmentation.cpp index d9e8a15b6..497202ebc 100644 --- a/src/Mod/Mesh/Gui/Segmentation.cpp +++ b/src/Mod/Mesh/Gui/Segmentation.cpp @@ -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); } diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp index b614d3bbb..a579861a8 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.cpp +++ b/src/Mod/MeshPart/Gui/Tessellation.cpp @@ -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); diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index d34b0151f..7445ae279 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -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(); diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index e8b2bb468..7ab9d8184 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -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; diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index decb6e6dd..622856a0a 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -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); @@ -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); @@ -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); } /*