1
=== modified file 'formula.js'
2
--- formula.js	2013-08-13 18:43:23 +0000
3
+++ formula.js	2013-08-27 14:02:01 +0000
4
@@ -23,12 +23,20 @@
5
23
function Formula() {
23
function Formula() {
6
24
    var previous = new Token(0, T_NUMBER);
24
    var previous = new Token(0, T_NUMBER);
7
25
    var formula = '';
25
    var formula = '';
8
26
    var results = [];
9
27
    var lookupTbl = {
26
    var lookupTbl = {
10
28
        '-': '−',
27
        '-': '−',
11
29
        '/': '÷',
28
        '/': '÷',
12
30
        '*': '×'
29
        '*': '×'
13
31
    };
30
    };
14
31
    var table = {
15
32
        "65" : "+",
16
33
        "66" : "-",
17
34
        "67" : "*",
18
35
        "68" : "/"
19
36
    }
20
37
21
38
    var isLastResult = false;   // This var becames true if the last button pressed by user is equal
22
39
    var isChangeSign = false;   // This var becames true if user want to change the sign of a result
23
32
40
24
33
    var _calculate = function(func){
41
    var _calculate = function(func){
25
34
        try{
42
        try{
26
@@ -48,25 +56,40 @@
27
48
    }
56
    }
28
49
57
29
50
    this.push = function(digit){
58
    this.push = function(digit){
30
51
        if(results.length > 0) throw new SyntaxError("cannot push");
31
52
        var last = (new Scanner(previous.value.toString()+digit, context)).tokens.pop();
59
        var last = (new Scanner(previous.value.toString()+digit, context)).tokens.pop();
32
60
33
61
        if (!isNaN(digit) && isLastResult) return;  // After a calc you have to add a sign before add a number
34
62
35
53
        switch(last.type){
63
        switch(last.type){
36
54
        case T_PLUS:
64
        case T_PLUS:
37
55
        case T_MINUS:
65
        case T_MINUS:
38
56
        case T_DIV:
66
        case T_DIV:
39
57
        case T_TIMES:
67
        case T_TIMES:
41
58
            if(previous.type & T_OPERATOR) return;
68
            if (previous.type & T_OPERATOR) return; // Not two operator below
42
59
            break;
69
            break;
43
60
        case T_UNARY_PLUS:
70
        case T_UNARY_PLUS:
44
61
        case T_UNARY_MINUS:
71
        case T_UNARY_MINUS:
45
62
            if(previous.type === T_UNARY_MINUS || previous.type === T_UNARY_PLUS ) return;
72
            if(previous.type === T_UNARY_MINUS || previous.type === T_UNARY_PLUS ) return;
46
63
            break;
73
            break;
47
64
        }
74
        }
48
75
49
76
        formulaView.headerItem.state = "newPush"; // This is to change "AC" to "C" when user continue a calc
50
77
51
78
        /* After user press equal the operation we have to forget the math order
52
79
         * and restart the operation from the result, 
53
80
         * but set formula = result is impossible, 
54
81
         * because we lost a lot of precious information
55
82
         */
56
83
        if (isLastResult)
57
84
            formula = "(" + formula + ")";
58
85
59
65
        formula += digit;
86
        formula += digit;
60
87
        isLastResult = false;
61
66
        previous = last;
88
        previous = last;
62
67
        var ret = {value: '', type: last.type};
89
        var ret = {value: '', type: last.type};
63
68
        //formula Shouldn't start with operators.
90
        //formula Shouldn't start with operators.
65
69
        if(isNaN(formula.substring(0,1))){ // First letter should be digit
91
        var firstChar = formula.substring(0,1);
66
92
        if(isNaN(firstChar) && firstChar !== "(" && firstChar !== "-"){ // First letter should be digit or open bracket or minus
67
70
            ret.type = T_OPERATOR // Return
93
            ret.type = T_OPERATOR // Return
68
71
            formula = ""; // Make formula var empty
94
            formula = ""; // Make formula var empty
69
72
        }
95
        }
70
@@ -79,10 +102,6 @@
71
79
    };
102
    };
72
80
103
73
81
    this.pop = function(){
104
    this.pop = function(){
74
82
        if(results.length > 0){
75
83
            results.pop();
76
84
            return;
77
85
        }
78
86
        var scannedFormula = new Scanner(formula, context);
105
        var scannedFormula = new Scanner(formula, context);
79
87
        var last = {type:T_NUMBER};
106
        var last = {type:T_NUMBER};
80
88
        var removeSize = 0;
107
        var removeSize = 0;
81
@@ -99,42 +118,48 @@
82
99
        var previousSize = previous.value.toString().length;
118
        var previousSize = previous.value.toString().length;
83
100
        if(formula.length <= previousSize) return;
119
        if(formula.length <= previousSize) return;
84
101
        var scannedFormula = new Scanner(formula, context);
120
        var scannedFormula = new Scanner(formula, context);
85
121
86
122
        // Last and secondLast are one a number and the other an operator. Both can be both, it depends on user input
87
102
        var last = scannedFormula.tokens.pop();
123
        var last = scannedFormula.tokens.pop();
111
103
        if(results.length > 0){
124
        var secondLast = scannedFormula.tokens.pop();
112
104
            var newFormula = last.value.toString();
125
113
105
            while(last.type !== T_PLUS &&
126
        // In this case user press equal twice E.G. 2*2=4=8
114
106
                  last.type !== T_MINUS &&
127
        if (isLastResult && !isChangeSign && table[secondLast.type] !== undefined)
115
107
                  last.type !== T_DIV &&
128
            formula = '(' + formula + ')' + table[secondLast.type] + last.value.toString();
116
108
                  last.type !== T_TIMES ){
129
        // In this case user press a number, and operator (or only an operator, if it isn't the first calc), and then equal
117
109
                last = scannedFormula.tokens.pop();
130
        else if (last.type & T_OPERATOR)
118
110
                newFormula = last.value.toString() + newFormula;
131
            formula = formula + secondLast.value.toString();
119
111
            }
132
120
112
            result = _calculate(results[results.length-1]+newFormula);
133
        result = _calculate(formula);
121
113
        } else{
134
122
114
            // check previous input
135
        // If user want to change sign to the result
123
115
            if(last.type === T_PLUS ||
136
        if (isLastResult && isChangeSign) {
124
116
                    last.type === T_MINUS ||
137
            // TO-DO: check if the user has change the sign yet, and remove old *-1
125
117
                    last.type === T_DIV ||
138
            result = -result;   // Change the sign
126
118
                    last.type === T_TIMES){
139
            formula = '(' + formula + ')*-1'; // Remember the change of the sign for the future
104
119
                // getting the first value
105
120
                var firstVal = scannedFormula.tokens.pop();
106
121
                // adding the first value to formula
107
122
                formula = formula + firstVal.value.toString()
108
123
            }
109
124
            result = _calculate(formula);
110
125
127
126
        }
140
        }
129
127
        results.push(result.toString());
141
130
142
        isLastResult = true;
131
128
        return result;
143
        return result;
132
129
    }
144
    }
133
130
145
134
131
    this.changeSign = function(){
146
    this.changeSign = function(){
136
132
        if(results.length > 0) throw new SyntaxError("cannot edit formula");
147
137
148
        // If user want to change the sign of the result
138
149
        if (isLastResult) {
139
150
            isChangeSign = true;
140
151
            screenFormula.pop(); // Delete last result from the screen
141
152
            calculate();
142
153
            isChangeSign = false;
143
154
            return;
144
155
        }
145
156
146
133
        switch(previous.type){
157
        switch(previous.type){
147
134
        case T_PLUS:
158
        case T_PLUS:
148
135
        case T_MINUS:
159
        case T_MINUS:
149
136
        case T_DIV:
160
        case T_DIV:
150
137
        case T_TIMES:
161
        case T_TIMES:
151
162
            // After a sign, push minus
152
138
            formulaPush("-");
163
            formulaPush("-");
153
139
            break;
164
            break;
154
140
        default:
165
        default:
155
@@ -142,6 +167,8 @@
156
142
            var last = {type: undefined};
167
            var last = {type: undefined};
157
143
            var toAdd = [];
168
            var toAdd = [];
158
144
            var addMinus = true;
169
            var addMinus = true;
159
170
160
171
            // Create a queue with all element to re-add to var formula
161
145
            while(scannedFormula.tokens.length > 0 && last.type !== T_PLUS &&
172
            while(scannedFormula.tokens.length > 0 && last.type !== T_PLUS &&
162
146
                  last.type !== T_MINUS &&
173
                  last.type !== T_MINUS &&
163
147
                  last.type !== T_DIV &&
174
                  last.type !== T_DIV &&
164
@@ -154,7 +181,9 @@
165
154
                        addMinus = false;
181
                        addMinus = false;
166
155
                }
182
                }
167
156
            }
183
            }
168
184
169
157
            formulaPop();
185
            formulaPop();
170
186
171
158
            while(toAdd.length > 0){
187
            while(toAdd.length > 0){
172
159
                var el = toAdd.pop()
188
                var el = toAdd.pop()
173
160
                formulaPush(el.value.toString());
189
                formulaPush(el.value.toString());
174
161
190
175
=== modified file 'tests/autopilot/ubuntu_calculator_app/emulators.py'
176
--- tests/autopilot/ubuntu_calculator_app/emulators.py	2013-08-22 14:51:26 +0000
177
+++ tests/autopilot/ubuntu_calculator_app/emulators.py	2013-08-27 14:02:01 +0000
178
@@ -193,7 +193,12 @@
179
193
        return result_label.numbers
193
        return result_label.numbers
180
194
194
181
195
    def get_result_label(self):
195
    def get_result_label(self):
183
196
        return self.select_single('CalcLabel', objectName='result')
196
        results = self.select_many('CalcLabel', objectName='result')
184
197
        count = len(results)
185
198
        if count > 0:
186
199
            return results[count - 1]
187
200
        else:
188
201
            return None
189
197
202
190
198
    def get_operand_by_index(self, index):
203
    def get_operand_by_index(self, index):
191
199
        """Return an operand of a calculation entered."""
204
        """Return an operand of a calculation entered."""
192
200
205
193
=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
194
--- tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-08-23 17:48:47 +0000
195
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-08-27 14:02:01 +0000
196
@@ -216,3 +216,12 @@
197
216
    #    self.main_view.calculate_operation("*3")
216
    #    self.main_view.calculate_operation("*3")
198
217
    #
217
    #
199
218
    #    self._assert_result("")
218
    #    self._assert_result("")
200
219
201
220
    def test_continue_calculation(self):
202
221
        self.main_view.calculate_operation("59+1")
203
222
204
223
        calc_keyboard = self.main_view.get_calc_keyboard()
205
224
        calc_keyboard.enter_operation("+5")
206
225
        calc_keyboard.click_equals()
207
226
208
227
        self._assert_result("65")
Reviewer	Review Type	Status
Gustavo Pichorim Boiko (community)		Approve on 2013-08-27
Ubuntu Phone Apps Jenkins Bot	continuous-integration	Approve on 2013-08-27
Riccardo Padovani		Approve on 2013-08-20
Review via email: mp+181010@code.launchpad.net