Changeset 561 for trunk/examples/script/calculator/calculator.js

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• examples/script/calculator/calculator.js (modified) (15 diffs)

trunk/examples/script/calculator/calculator.js

@@ +1 @@
+
+
+
+
+
+
+
+
+
 //! [0]
 function Calculator(ui)
@@ -4 +13 @@
     this.ui = ui;
 
-    this.pendingAdditiveOperator = "";
-    this.pendingMultiplicativeOperator = "";
+    this.pendingAdditiveOperator = ;
+    this.pendingMultiplicativeOperator = ;
     this.sumInMemory = 0;
     this.sumSoFar = 0;
@@ -14 +23 @@
         display.text = "0";
 
-        zeroButton.clicked.connect(this, this.digitClicked);
-        oneButton.clicked.connect(this, "digitClicked");
-        twoButton.clicked.connect(this, "digitClicked");
-        threeButton.clicked.connect(this, "digitClicked");
-        fourButton.clicked.connect(this, "digitClicked");
-        fiveButton.clicked.connect(this, "digitClicked");
-        sixButton.clicked.connect(this, "digitClicked");
-        sevenButton.clicked.connect(this, "digitClicked");
-        eightButton.clicked.connect(this, "digitClicked");
-        nineButton.clicked.connect(this, "digitClicked");
+        zeroButton.clicked.connect(this);
+        oneButton.clicked.connect(this);
+        twoButton.clicked.connect(this);
+        threeButton.clicked.connect(this);
+        fourButton.clicked.connect(this);
+        fiveButton.clicked.connect(this);
+        sixButton.clicked.connect(this);
+        sevenButton.clicked.connect(this);
+        eightButton.clicked.connect(this);
+        nineButton.clicked.connect(this);
 
         pointButton.clicked.connect(this, "pointClicked");
@@ -37 +46 @@
         addToMemoryButton.clicked.connect(this, "addToMemory");
   
-        divisionButton.clicked.connect(this, "multiplicativeOperatorClicked");
-        timesButton.clicked.connect(this, "multiplicativeOperatorClicked");
-        minusButton.clicked.connect(this, "additiveOperatorClicked");
-        plusButton.clicked.connect(this, "additiveOperatorClicked");
-
-        squareRootButton.clicked.connect(this, "unaryOperatorClicked");
-        powerButton.clicked.connect(this, "unaryOperatorClicked");
-        reciprocalButton.clicked.connect(this, "unaryOperatorClicked");
+        divisionButton.clicked.connect(this);
+        timesButton.clicked.connect(this);
+        minusButton.clicked.connect(this);
+        plusButton.clicked.connect(this);
+
+        squareRootButton.clicked.connect(this);
+        powerButton.clicked.connect(this);
+        reciprocalButton.clicked.connect(this);
         equalButton.clicked.connect(this, "equalClicked");
     }
 }
 //! [0]
+
+
+
+
+
+
+
+
+
 
 Calculator.prototype.abortOperation = function()
@@ -58 +76 @@
 Calculator.prototype.calculate = function(rightOperand, pendingOperator)
 {
-    if (pendingOperator == "+") {
+    if (pendingOperator == ) {
         this.sumSoFar += rightOperand;
-    } else if (pendingOperator == "-") {
+    } else if (pendingOperator == ) {
         this.sumSoFar -= rightOperand;
-    } else if (pendingOperator == "*") {
+    } else if (pendingOperator == ) {
         this.factorSoFar *= rightOperand;
-    } else if (pendingOperator == "/") {
+    } else if (pendingOperator == ) {
         if (rightOperand == 0)
-        return false;
+        return false;
         this.factorSoFar /= rightOperand;
     }
@@ -73 +91 @@
 
 //! [1]
-Calculator.prototype.digitClicked = function()
-{
-    var digitValue = __qt_sender__.text - 0;
+Calculator.prototype.digitClicked = function(digitValue)
+{
     if ((digitValue == 0) && (this.ui.display.text == "0"))
         return;
@@ -86 +103 @@
 //! [1]
 
-Calculator.prototype.unaryOperatorClicked = function()
+Calculator.prototype.unaryOperatorClicked = function()
 {
     var operand = this.ui.display.text - 0;
     var result = 0;
-    if (__qt_sender__.text == "Sqrt") {
+    if () {
         if (operand < 0) {
             this.abortOperation();
@@ -96 +113 @@
         }
         result = Math.sqrt(operand);
-    } else if (__qt_sender__.text == "x^2") {
+    } else if () {
         result = Math.pow(operand, 2);
-    } else if (__qt_sender__.text == "1/x") {
+    } else if () {
         if (operand == 0.0) {
             this.abortOperation();
@@ -109 +126 @@
 }
 
-Calculator.prototype.additiveOperatorClicked = function()
-{
-    var operand = this.ui.display.text - 0;
-
-    if (this.pendingMultiplicativeOperator.length != 0) {
+Calculator.prototype.additiveOperatorClicked = function()
+{
+    var operand = this.ui.display.text - 0;
+
+    if (this.pendingMultiplicativeOperator) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
@@ -121 +138 @@
         operand = this.factorSoFar;
         this.factorSoFar = 0;
-        this.pendingMultiplicativeOperator = "";
-    }
-
-    if (this.pendingAdditiveOperator.length != 0) {
+        this.pendingMultiplicativeOperator = ;
+    }
+
+    if (this.pendingAdditiveOperator) {
         if (!this.calculate(operand, this.pendingAdditiveOperator)) {
             this.abortOperation();
@@ -134 +151 @@
     }
 
-    this.pendingAdditiveOperator = __qt_sender__.text;
-    this.waitingForOperand = true;
-}
-
-Calculator.prototype.multiplicativeOperatorClicked = function()
-{
-    var operand = this.ui.display.text - 0;
-
-    if (this.pendingMultiplicativeOperator.length != 0) {
+    this.pendingAdditiveOperator = ;
+    this.waitingForOperand = true;
+}
+
+Calculator.prototype.multiplicativeOperatorClicked = function()
+{
+    var operand = this.ui.display.text - 0;
+
+    if (this.pendingMultiplicativeOperator) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
@@ -152 +169 @@
     }
 
-    this.pendingMultiplicativeOperator = __qt_sender__.text;
+    this.pendingMultiplicativeOperator = ;
     this.waitingForOperand = true;
 }
@@ -160 +177 @@
     var operand = this.ui.display.text - 0;
 
-    if (this.pendingMultiplicativeOperator.length != 0) {
+    if (this.pendingMultiplicativeOperator) {
         if (!this.calculate(operand, this.pendingMultiplicativeOperator)) {
             this.abortOperation();
@@ -167 +184 @@
         operand = this.factorSoFar;
         this.factorSoFar = 0.0;
-        this.pendingMultiplicativeOperator = "";
-    }
-    if (this.pendingAdditiveOperator.length != 0) {
+        this.pendingMultiplicativeOperator = ;
+    }
+    if (this.pendingAdditiveOperator) {
         if (!this.calculate(operand, this.pendingAdditiveOperator)) {
             this.abortOperation();
             return;
         }
-        this.pendingAdditiveOperator = "";
+        this.pendingAdditiveOperator = ;
     } else {
         this.sumSoFar = operand;
@@ -235 +252 @@
     this.sumSoFar = 0.0;
     this.factorSoFar = 0.0;
-    this.pendingAdditiveOperator = "";
-    this.pendingMultiplicativeOperator = "";
+    this.pendingAdditiveOperator = ;
+    this.pendingMultiplicativeOperator = ;
     this.ui.display.text = "0";
     this.waitingForOperand = true;