Skip to content

Commit f2cb701

Browse files
committed
0626
1 parent 7a2e9b8 commit f2cb701

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

computer.pro.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 3.4.1, 2015-06-25T17:13:24. -->
3+
<!-- Written by QtCreator 3.4.1, 2015-06-26T16:55:35. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>

utility.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ bool inToPost(QString &infixexp , QVector<QString> &postfixexp)
2323
{
2424
if(infixexp.at(var)>='0' && infixexp.at(var)<='9'){
2525
number->append(infixexp.at(var));
26+
//qDebug() << *number;
2627
}else if('(' == infixexp.at(var)) {
2728
stack.push_back(infixexp.at(var));
2829
}else if (')' == infixexp.at(var)) {
@@ -45,6 +46,14 @@ bool inToPost(QString &infixexp , QVector<QString> &postfixexp)
4546
return false;
4647
}
4748
}
49+
50+
if(!number->isEmpty())
51+
postfixexp.push_back(*number);
52+
53+
while (!stack.isEmpty()) {
54+
QChar element= stack.pop();
55+
postfixexp.push_back(element);
56+
}
4857
return true;
4958
}
5059

@@ -95,10 +104,11 @@ bool isoperator(QChar oper)
95104

96105
void printQVector(QVector<QString> & vec)
97106
{
98-
QVector<QString>::const_iterator it_string = vec.begin();
99-
qDebug() << vec.size();
107+
QVector<QString>::iterator it_string = vec.begin();
108+
qDebug() << QString("postfixexpression size:") << vec.size();
100109
while(it_string != vec.end()){
101110
qDebug() << *it_string;
111+
it_string++;
102112
}
103113

104114
}

widget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void Widget::getComputeResult()
109109
QVector<QString> vec;
110110
if(!ui->digitinput->toPlainText().isEmpty())
111111
appendSequenceExpression(ui->digitinput->toPlainText());
112-
qDebug() << getSequenceExpression();
112+
qDebug() << "irginal expression:" <<getSequenceExpression();
113113
inToPost(getSequenceExpression() , vec);
114114
printQVector(vec);
115115
}

0 commit comments

Comments
 (0)