logic now reject micmac step values and spatial resolution which don't follow the accepted numeric format

Author: lp-rep

sourceCode/application/logic/model/core/ComputationCore_structures.cpp

@@ -229,7 +229,22 @@ bool S_CorrelationScoreMapParameters::fromQJson(const QJsonObject qjsonObj) {
         return(false);
     }    
 
-    _thresholdRejection._f_rejectIfBelowValue = static_cast<float>(df_rejectIfBelow);
+    if (  (df_rejectIfBelow < .0)
+        ||(df_rejectIfBelow > 999.999)) {
+        return(false);
+    }
+
+    bool bIsNotStringNumericZeroValue = false;
+    if (!isConformToFormatPrecision_zeroValueIsAccepted(df_rejectIfBelow, 3, 5, bIsNotStringNumericZeroValue)) {
+        return(false);
+    }
+
+    if (bIsNotStringNumericZeroValue) {
+        _thresholdRejection._f_rejectIfBelowValue = static_cast<float>(df_rejectIfBelow);
+    } else {
+        //to avoid to have -0 if this is the json double value
+        _thresholdRejection._f_rejectIfBelowValue = .0;
+    }
 
     QString strKey_weighting {"option_weighting"};
     if (!qjsonObj.contains(strKey_weighting)) {

sourceCode/application/logic/toolbox/toolbox_conversion.cpp

@@ -193,6 +193,7 @@ bool string_isNotStringNumericZeroValue_and_totalCharIsEqualOrUnder(const QStrin
                                                                     bool &bTotalCharIsEqualOrUnder) {
 
     qDebug()  << __FUNCTION__<< "return: str =" << str;
+    qDebug()  << __FUNCTION__<< "totalCharIsEqualOrUnder to check:" << totalCharIsEqualOrUnder;
 
     bIsNotStringNumericZeroValue = false;
     bTotalCharIsEqualOrUnder = false;
@@ -221,6 +222,10 @@ bool string_isNotStringNumericZeroValue_and_totalCharIsEqualOrUnder(const QStrin
 
 bool stringNumericValue_isComplianWithMaxBeforeDottMaxAfterDot(const QString& str, int maxBeforeDot, int maxAfterDot) {
 
+    qDebug() << __FUNCTION__ << "str = " << str;
+    qDebug() << __FUNCTION__ << "maxBeforeDot = " << maxBeforeDot;
+    qDebug() << __FUNCTION__ << "maxAfterDot = " << maxAfterDot;
+
     int textSize = str.size();
     if (!textSize) {
         return(false);
@@ -241,13 +246,59 @@ bool stringNumericValue_isComplianWithMaxBeforeDottMaxAfterDot(const QString& st
 }
 
 bool isConformToFormatPrecision(double dValue, int maximumDecimalForStringConversion, int maxCharCountInString) {
-    //convert using maximum decimal as maximumDecimalForStringConversion
-    QString strOf_dValue = doubleToQStringPrecision_f_amountOfDecimal(dValue, maximumDecimalForStringConversion);
+    //convert using maximum decimal with more than maximumDecimalForStringConversion
+    QString strOf_dValue = doubleToQStringPrecision_f_amountOfDecimal(dValue, maximumDecimalForStringConversion+4);
+    qDebug() << __FUNCTION__ << "#1 strOf_dValue = " << strOf_dValue;
+
     //remove useless zero
     strOf_dValue = removeUselessZerosInNumericValueString_withoutSign_and_oneDecimalDotMaximum(strOf_dValue);
+    qDebug() << __FUNCTION__ << "#2 strOf_dValue = " << strOf_dValue;
+
+    bool bCompliant = stringNumericValue_isComplianWithMaxBeforeDottMaxAfterDot(strOf_dValue,
+                                                                                maxCharCountInString,
+                                                                                maximumDecimalForStringConversion);
+    qDebug() << __FUNCTION__ << "bCompliant: " << bCompliant;
+    if (!bCompliant) {
+        return(false);
+    }
+
     return(string_isNotStringNumericZeroValue_and_totalCharIsEqualOrUnder(strOf_dValue, maxCharCountInString));
 }
 
+bool isConformToFormatPrecision_zeroValueIsAccepted(double dValue, int maximumDecimalForStringConversion, int maxCharCountInString,
+                                                    bool& bIsNotStringNumericZeroValue) {
+    //convert using maximum decimal with more than maximumDecimalForStringConversion
+    QString strOf_dValue = doubleToQStringPrecision_f_amountOfDecimal(dValue, maximumDecimalForStringConversion+4);
+    qDebug() << __FUNCTION__ << "#1 strOf_dValue = " << strOf_dValue;
+
+    //remove useless zero
+    strOf_dValue = removeUselessZerosInNumericValueString_withoutSign_and_oneDecimalDotMaximum(strOf_dValue);
+    qDebug() << __FUNCTION__ << "#2 strOf_dValue = " << strOf_dValue;
+
+    bool bCompliant = stringNumericValue_isComplianWithMaxBeforeDottMaxAfterDot(strOf_dValue,
+                                                                                maxCharCountInString,
+                                                                                maximumDecimalForStringConversion);
+    qDebug() << __FUNCTION__ << "bCompliant: " << bCompliant;
+    if (!bCompliant) {        
+        return(false);
+    }
+
+    /*bool*/ bIsNotStringNumericZeroValue = false;
+    bool bTotalCharIsEqualOrUnder = false;
+    /*bool bReport = */string_isNotStringNumericZeroValue_and_totalCharIsEqualOrUnder(strOf_dValue, maxCharCountInString,
+                                                                                      bIsNotStringNumericZeroValue,
+                                                                                      bTotalCharIsEqualOrUnder);
+    if (!bTotalCharIsEqualOrUnder) {
+        return(false);
+    }
+    //here if bTotalCharIsEqualOrUnder is true
+
+    //bIsNotStringNumericZeroValue true of false, it's ok
+    return(true);
+}
+
+
+
 bool floatToDoubleWithReducedPrecision(double dValue, int precision, double& dValueOut) {
 
     qDebug() << __FUNCTION__ << "#0 strOf_dValue = " << dValue;

sourceCode/application/logic/toolbox/toolbox_conversion.h

@@ -35,6 +35,10 @@ bool string_isNotStringNumericZeroValue_and_totalCharIsEqualOrUnder(const QStrin
 bool stringNumericValue_isComplianWithMaxBeforeDottMaxAfterDot(const QString& str, int maxBeforeDot, int maxAfterDot);
 
 bool isConformToFormatPrecision(double dValue, int maximumDecimalForStringConversion, int maxCharCountInString);
+bool isConformToFormatPrecision_zeroValueIsAccepted(double dValue, int maximumDecimalForStringConversion, int maxCharCountInString,
+                                                    bool& bIsNotStringNumericZeroValue);
+
+
 bool floatToDoubleWithReducedPrecision(double dValue, int precision, double& dValueOut);
 
 /*