Merge branch 'master' of http://github.com/jackycoder/ComputerByQt

Conflicts:
	computer.pro.user

Author: jackycoder

computer.pro.user

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
+<<<<<<< HEAD
 <!-- Written by QtCreator 3.4.1, 2015-06-25T00:54:30. -->
+=======
+<!-- Written by QtCreator 3.4.1, 2015-06-25T17:13:24. -->
+>>>>>>> 7a2e9b8a3a528b40a431977f5e0f735425bbde72
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{64a7b332-4bd0-4e67-b1ce-01f1d3e482dd}</value>
+  <value type="QByteArray">{df87cc51-22e0-4c70-9073-e8dea8d2ba15}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -228,7 +232,7 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">computer</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">computer2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/coding/qt/ComputerByQt/computer.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/github/ComputerByQt/computer.pro</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">computer.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>

utility.cpp

@@ -14,11 +14,11 @@
 * 5）当中序表达式的符号序列全部读入后，若栈内仍有元素，把它们依次弹出并放到后序表达式序列尾部。
 *   若弹出的元素遇到空括号，则说明不匹配，发生错误，并进行相关处理
 **/
-bool inToPost(QString &infixexp , vector<QString> &postfixexp)
+bool inToPost(QString &infixexp , QVector<QString> &postfixexp)
  {
-    if(infixexp.isNull()) return ;
+    if(infixexp.isNull()) return false;
     QString *number = new QString();
-    QStack<char> stack;
+    QStack<QChar> stack;
     for(int var = 0; var < infixexp.size(); ++var)
     {
         if(infixexp.at(var)>='0' && infixexp.at(var)<='9'){
@@ -27,19 +27,19 @@ bool inToPost(QString &infixexp , vector<QString> &postfixexp)
             stack.push_back(infixexp.at(var));
         }else if (')' == infixexp.at(var)) {
             if(stack.isEmpty()) return false;
-            char oper;
+            QChar oper;
             while(!stack.isEmpty()){
                 oper = stack.pop();
                 if(oper != '(')
                     postfixexp.push_back(oper);
             }
         }else if (isoperator(infixexp.at(var))){
             if(!number->isEmpty()){
-                postfixexp.push(*number);
+                postfixexp.push_back(*number);
                 number->clear();
             }
             //operator handle
-
+            handleOperator(infixexp.at(var),stack,postfixexp);
         }else{
             //Invalid input
             return false;
@@ -49,10 +49,56 @@ bool inToPost(QString &infixexp , vector<QString> &postfixexp)
  }
 
 
-bool handleOperator(char oper, QStack<char> & stack , vector<Qstring> & postfixexp)
+bool handleOperator(QChar oper, QStack<QChar> & stack , QVector<QString> &postfixexp)
 {
+    QChar topElement;
     while(!stack.isEmpty())
     {
+        //popElement = stack.pop();
+        topElement=stack.top();
+        if(topElement == '(' || !isHigherPriority(oper , topElement)){
+            postfixexp.push_back(stack.pop());
+        }else{
+            break;
+        }
+    }
+    stack.push_back(oper);
+    return true;
+}
+
+
+bool isHigherPriority(const QChar oper1, const QChar oper2)
+{
+    QChar higerOperator[3] = {'*' , '/' , '%'};
+    QChar lowerOperator[2] = {'+' , 'c'};
+    for (int var = 0; var < 3; ++var) {
+        if(oper1 == higerOperator[var]){
+            for (int i = 0; i < 2; ++i) {
+                if(oper2 == lowerOperator[i]){
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
 
+bool isoperator(QChar oper)
+{
+    QChar operatorList[5] = {'+','-','*','/','%'};
+    for (int var = 0; var < 5; ++var) {
+         if(oper == operatorList[var])
+             return true;
     }
+    return false;
 }
+
+ void printQVector(QVector<QString> & vec)
+ {
+     QVector<QString>::const_iterator it_string = vec.begin();
+     qDebug() << vec.size();
+     while(it_string != vec.end()){
+         qDebug() << *it_string;
+     }
+
+ }

utility.h

@@ -2,6 +2,8 @@
 #define UTILITY
 #include <QString>
 #include <QStack>
+#include <QVector>
+#include <QDebug>
 
 
 const int DEFAULT_MODE = 1;
@@ -13,9 +15,30 @@ const int DELETE_MODE = 5;
   * @param infixexp
   * @return
   */
- bool inToPost(QString &infixexp, vector<QString> &postfixexp);
+ bool inToPost(QString &infixexp, QVector<QString> &postfixexp);
 
- bool handleOperator(char oper, QStack<char> & stack , vector<Qstring> & postfixexp);
+ /**
+  * @brief handleOperator
+  * @param oper
+  * @param stack
+  * @param postfixexp
+  * @return
+  */
+ bool handleOperator(QChar oper, QStack<QChar> & stack , QVector<QString> & postfixexp);
+
+ /**
+  * @brief isHigherPriority: Only support + - * / %
+  * @param oper1
+  * @param oper2
+  * @return
+  */
+ bool isHigherPriority(const QChar oper1, const QChar oper2);
+
+
+ bool isoperator(QChar oper);
+
+
+ void printQVector(QVector<QString> & vec);
 
 
 #endif // UTILITY

widget.cpp

@@ -30,6 +30,8 @@ Widget::Widget(QWidget *parent) :
 
     //connect(ui->operatorbuttonsqrt , SIGNAL(clicked()) , this, SLOT(getOperatorInput()));
 
+    connect(ui->operatorbuttonequal , SIGNAL(clicked()) , this , SLOT(getComputeResult()));
+
 }
 
 Widget::~Widget()
@@ -101,3 +103,13 @@ void Widget::updateSequenceExpression(const QString &exp)
     sequenceExp.clear();
     sequenceExp = exp;
 }
+
+void Widget::getComputeResult()
+{
+    QVector<QString> vec;
+    if(!ui->digitinput->toPlainText().isEmpty())
+        appendSequenceExpression(ui->digitinput->toPlainText());
+    qDebug() << getSequenceExpression();
+    inToPost(getSequenceExpression() , vec);
+    printQVector(vec);
+}

widget.h

@@ -27,6 +27,7 @@ private slots:
     void getDigitInput();
     void getOperatorInput();
     void deleteDigitInput();
+    void getComputeResult();
 
 private:
     void setReadOnlyForButton();