best warning on qlineedit for double value

diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
index 9b729c52d74dd2ac513787296a0f0af653680ef5..6511268a8243fafc594de24c204aee4ed261e953 100644 (file)
--- a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
+++ b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
@@ -78,24 +78,28 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
     #v1.setTop(10000.)
     v1.setDecimals(4)
     self.SP_MinHoleSize.setValidator(v1)
     #v1.setTop(10000.)
     v1.setDecimals(4)
     self.SP_MinHoleSize.setValidator(v1)

+    self.SP_MinHoleSize.titleForWarning="MinHoleSize"

 
     v2=QDoubleValidator(self)
     v2.setBottom(0.)
     #v2.setTop(10000.)
     v2.setDecimals(4)
     self.SP_ToleranceDisplacement.setValidator(v2)
 
     v2=QDoubleValidator(self)
     v2.setBottom(0.)
     #v2.setTop(10000.)
     v2.setDecimals(4)
     self.SP_ToleranceDisplacement.setValidator(v2)

+    self.SP_ToleranceDisplacement.titleForWarning="ToleranceDisplacement"

 
     v3=QDoubleValidator(self)
     v3.setBottom(0.)
     #v3.setTop(10000.)
     v3.setDecimals(4)
     self.SP_ResolutionLength.setValidator(v3)
 
     v3=QDoubleValidator(self)
     v3.setBottom(0.)
     #v3.setTop(10000.)
     v3.setDecimals(4)
     self.SP_ResolutionLength.setValidator(v3)

+    self.SP_ResolutionLength.titleForWarning="ResolutionLength"

     
     v4=QDoubleValidator(self)
     v4.setBottom(0.)
     #v4.setTop(10000.)
     v4.setDecimals(4)
     self.SP_OverlapDistance.setValidator(v4)
     
     v4=QDoubleValidator(self)
     v4.setBottom(0.)
     #v4.setTop(10000.)
     v4.setDecimals(4)
     self.SP_OverlapDistance.setValidator(v4)

+    self.SP_OverlapDistance.titleForWarning="OverlapDistance"

     
     self.resize(800, 500)
     self.clean()
     
     self.resize(800, 500)
     self.clean()


@@ -253,12 +257,30 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
     """
   
   def SP_toStr(self, widget):
     """
   
   def SP_toStr(self, widget):

+    """only for a QLineEdit widget"""

     #cr, pos=widget.validator().validate(res, 0) #n.b. "1,3" is acceptable !locale!
     try:
     #cr, pos=widget.validator().validate(res, 0) #n.b. "1,3" is acceptable !locale!
     try:

-      return str(float(widget.text()))
+      val=float(widget.text())

     except:
     except:

-      widget.setProperty("text", "0.0")
-      return "0.0"
+      QMessageBox.warning(self, widget.titleForWarning, "float value is incorrect: '"+widget.text()+"'")
+      res=str(widget.validator().bottom())
+      widget.setProperty("text", res)
+      return res
+    valtest=widget.validator().bottom()
+    if valtest!=None:
+      if val<valtest:
+        QMessageBox.warning(self, widget.titleForWarning, "float value is under minimum: "+str(val)+" < "+str(valtest))
+        res=str(valtest)
+        widget.setProperty("text", res)
+        return res
+    valtest=widget.validator().top()
+    if valtest!=None:
+      if val>valtest:
+        QMessageBox.warning(self, widget.titleForWarning, "float value is over maximum: "+str(val)+" > "+str(valtest))
+        res=str(valtest)
+        widget.setProperty("text", res)
+        return res    
+    return str(val)

 
   def getResumeData(self, separator="\n"):
     text=""
 
   def getResumeData(self, separator="\n"):
     text=""

diff --git a/src/Tools/MGCleanerPlug/MGCleanerPlugDialog.ui b/src/Tools/MGCleanerPlug/MGCleanerPlugDialog.ui
index 6c0925a7ffcf5fda1fac3cfcae80c3a3cde2ce38..5e3ddbfbaeadd839ae4539e26b2774383574f060 100644 (file)
--- a/src/Tools/MGCleanerPlug/MGCleanerPlugDialog.ui
+++ b/src/Tools/MGCleanerPlug/MGCleanerPlugDialog.ui
@@ -558,13 +558,13 @@ Default is computed from model.</string>
          </rect>
         </property>
         <property name="maximum">
          </rect>
         </property>
         <property name="maximum">

-         <double>360</double>
+         <double>90</double>

         </property>
         <property name="minimum">
          <double>0</double>
         </property>
         <property name="singleStep">
         </property>
         <property name="minimum">
          <double>0</double>
         </property>
         <property name="singleStep">

-         <double>0.01</double>
+         <double>1</double>

         </property>
         <property name="value">
          <double>15</double>
         </property>
         <property name="value">
          <double>15</double>


@@ -652,7 +652,7 @@ Default is computed from model.</string>
          </rect>
         </property>
         <property name="maximum">
          </rect>
         </property>
         <property name="maximum">

-         <double>360</double>
+         <double>90</double>

         </property>
         <property name="minimum">
          <double>0</double>
         </property>
         <property name="minimum">
          <double>0</double>