Merge lp:~rpadovani/ubuntu-calculator-app/improvePushFunction141209 into lp:ubuntu-calculator-app

[Riccardo Padovani]

Improved checks when push a new digit

Refactored how the calculator checks if a digit is valid: not use anymore vars, but parse all the formula and checks all requisites are valid

[Bartosz Kosiorek (gang65)]

One small comment

review: Needs Information

[Bartosz Kosiorek (gang65)]

Delete is not working there, but it was already resolved in lp:~rpadovani/ubuntu-calculator-app/improveDeleteFunction141209
branch.

review: Approve

=== modified file 'app/engine/formula.js'
--- app/engine/formula.js	2014-12-09 13:10:50 +0000
+++ app/engine/formula.js	2014-12-09 13:10:51 +0000
@@ -88,3 +88,97 @@
 
     return engineFormulaToDisplay;
 }
+
+/**
+ * Function to check if an operator could be added to the formula
+ *
+ * @param char operatorToAdd: the operator that will be added to the formula
+ * @param string longFormula: the actual formula
+ * @return bool: true if the operator could be added, false otherwise
+ */
+function couldAddOperator(operatorToAdd, longFormula) {
+    // No two operators one after other
+    if (isOperator(longFormula.slice(-1))) {
+        // But a minus after a * or a / is allowed
+        if (!(operatorToAdd === "-" && (longFormula.slice(-1) === "*" ||
+                                        longFormula.slice(-1) === "/"))) {
+            return false;
+        }
+    }
+
+    // No operator after a dot
+    if (longFormula.slice(-1) === ".") {
+        return false;
+    }
+
+    // No operator after an open brackets, but minus
+    if (longFormula.slice(-1) === "(" && operatorToAdd !== "-") {
+        return false;
+    }
+
+    // No operator at beginning (but minus)
+    if (longFormula === "" && operatorToAdd !== "-") {
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * Function to check if could be add a dot at the end of a formula
+ *
+ * @param string longFormula: the formula where we have to add the dot
+ * @return bool: true if the dot could be added, false otherwhise
+ */
+function couldAddDot(longFormula) {
+    // A dot could be only after a number
+    if (isNaN(longFormula.slice(-1))) {
+        return false;
+    }
+
+    // If is after a number and it's the first dot of the calc it could be added
+    if (longFormula.indexOf('.') === -1) {
+        return true;
+    }
+
+    // If there is already a dot we have to check if it isn't in the same operation
+    // So we take all the string since the last occurence of dot to the end
+    var lastOperation = longFormula.substring(longFormula.lastIndexOf('.') + 1);
+
+    // If there isn't something different from a number we can't add a dot
+    if (!isNaN(lastOperation)) {
+        return false;
+    }
+
+    // If the only thing different from a number is a pi we cannot add a dot
+    if (lastOperation.indexOf('pi') !== -1) {
+        if (!isNaN(lastOperation.replace('pi', ''))) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * Function to check if could be add a close bracket at the end of a formula
+ *
+ * @param string longFormula: the formula where we have to add the close bracket
+ * @return bool: true if the close bracket could be added, false otherwhise
+ */
+function couldAddCloseBracket(longFormula) {
+    // Don't close a bracket just after opened it
+    if (longFormula.slice(-1) === "(") {
+        return false;
+    }
+
+    // Calculate how many brackets are opened
+    numberOfOpenedBrackets = (longFormula.match(/\(/g) || []).length -
+                             (longFormula.match(/\)/g) || []).length;
+
+    if (numberOfOpenedBrackets < 1) {
+        return false;
+    }
+
+    return true;
+}

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2014-12-09 13:10:50 +0000
+++ app/ubuntu-calculator-app.qml	2014-12-09 13:10:51 +0000
@@ -58,11 +58,6 @@
     // Becomes true after an user presses the "="
     property bool isLastCalculate: false;
 
-    property int numberOfOpenedBrackets: 0;
-
-    // Property needed to
-    property bool isAllowedToAddDot: true;
-
     property var decimalPoint: Qt.locale().decimalPoint
 
     /**
@@ -70,10 +65,6 @@
      * place the result in right vars
      */
     function deleteLastFormulaElement() {
-        if (longFormula[longFormula.length - 1] === ".") {
-            isAllowedToAddDot = true;
-        }
-
         longFormula = Formula.deleteLastFormulaElement(isLastCalculate, longFormula);
         shortFormula = longFormula;
         displayedInputText = returnFormulaToDisplay(longFormula);
@@ -81,40 +72,17 @@
 
     function validateStringForAddingToFormula(stringToAddToFormula) {
         if (Formula.isOperator(stringToAddToFormula)) {
-            if ((longFormula === '') && (stringToAddToFormula !== '-')) {
-                // Do not add operator at beginning
-                return false;
-            }
-
-            if ((Formula.isOperator(previousVisual) && previousVisual !== ")")) {
-                // Not two operator one after otQt.locale().decimalPointher
-                return false;
-            }
-        }
-
-        if (isNaN(stringToAddToFormula)) {
-            if (stringToAddToFormula !== ".") {
-                isAllowedToAddDot = true
-            }
-        }
-
-        if (stringToAddToFormula[stringToAddToFormula.length - 1] === "(") {
-            numberOfOpenedBrackets = numberOfOpenedBrackets + 1
-        } else if (stringToAddToFormula === ")") {
-            // Do not allow closing brackets after opening bracket
-            // and do not allow adding too much closing brackets
-            if ((previousVisual === "(") || (numberOfOpenedBrackets < 1)) {
-                return false;
-            }
-            numberOfOpenedBrackets = numberOfOpenedBrackets - 1
-        } else if (stringToAddToFormula === ".") {
-            //Do not allow to have two decimal separators in the same number
-            if (isAllowedToAddDot === false) {
-                return false;
-            }
-
-            isAllowedToAddDot = false;
-        }
+            return Formula.couldAddOperator(stringToAddToFormula, longFormula);
+        }
+
+        if (stringToAddToFormula === ".") {
+            return Formula.couldAddDot(longFormula);
+        }
+
+        if (stringToAddToFormula === ")") {
+            return Formula.couldAddCloseBracket(longFormula);
+        }
+
         return true;
     }
 
@@ -197,12 +165,6 @@
         calculationHistory.addCalculationToDatabase(longFormula, result);
         longFormula = result;
         shortFormula = result;
-        numberOfOpenedBrackets = 0;
-        if (result % 1 != 0) {
-            isAllowedToAddDot = false;
-        } else {
-            isAllowedToAddDot = true;
-        }
     }
 
     CalculationHistory {