From a1eef544515dd2a0064960db057643a09649fab7 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 1 Mar 2016 18:24:39 +0100 Subject: [PATCH] + do not allow to set negative grid size in property editor --- src/Mod/Part/Gui/ViewProvider2DObject.cpp | 5 ++++- src/Mod/Part/Gui/ViewProvider2DObject.h | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp index 52c51915c..910f9c61e 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp +++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp @@ -32,6 +32,7 @@ # include # include # include +# include #endif /// Here the FreeCAD includes sorted by Base,App,Gui...... @@ -52,6 +53,7 @@ using namespace std; // Construction/Destruction const char* ViewProvider2DObject::GridStyleEnums[]= {"Dashed","Light",NULL}; +App::PropertyQuantityConstraint::Constraints ViewProvider2DObject::GridSizeRange = {0.001,DBL_MAX,1.0}; PROPERTY_SOURCE(PartGui::ViewProvider2DObject, PartGui::ViewProviderPart) @@ -68,9 +70,10 @@ ViewProvider2DObject::ViewProvider2DObject() MinX = MinY = -100; MaxX = MaxY = 100; GridStyle.setEnums(GridStyleEnums); + GridSize.setConstraints(&GridSizeRange); pcRoot->addChild(GridRoot); - + sPixmap = "PartFeatureImport"; } diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h index 48bec2f18..4811be35d 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.h +++ b/src/Mod/Part/Gui/ViewProvider2DObject.h @@ -49,7 +49,7 @@ public: /// Property to switch the grid on and off App::PropertyBool ShowGrid; - App::PropertyDistance GridSize; + App::PropertyLength GridSize; App::PropertyEnumeration GridStyle; App::PropertyBool TightGrid; App::PropertyBool GridSnap; @@ -75,6 +75,7 @@ protected: float MinY; float MaxY; static const char* GridStyleEnums[]; + static App::PropertyQuantityConstraint::Constraints GridSizeRange; }; typedef Gui::ViewProviderPythonFeatureT ViewProvider2DObjectPython;