diff --git a/qad/graphic/qpicalculator/mainwindow.cpp b/qad/graphic/qpicalculator/mainwindow.cpp index c7ad2a3..3ebdf57 100644 --- a/qad/graphic/qpicalculator/mainwindow.cpp +++ b/qad/graphic/qpicalculator/mainwindow.cpp @@ -21,6 +21,7 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow() session.addEntry(lineInput); session.addEntry(tabWidget); session.load(); + ans = evaluator.setVariable("ans"); on_lineInput_returnPressed(); } @@ -122,7 +123,7 @@ void MainWindow::saving(QPIConfig & conf) { vars << ti->text(0) << ti->text(1); } conf.setValue("variables", vars); - + QVector g; vc = treeGraphics->topLevelItemCount(); for (int i = 0; i < vc; ++i) { @@ -153,6 +154,7 @@ void MainWindow::on_lineInput_returnPressed() { labelError->setText(evaluator.error()); if (!ret) return; complexd val = evaluator.evaluate(); + evaluator.setVariable(ans, val); if (val.imag() == 0) labelResult->setText(QString::number(val.real())); else { if (val.real() == 0) labelResult->setText(QString::number(val.imag()) + "i"); diff --git a/qad/graphic/qpicalculator/mainwindow.h b/qad/graphic/qpicalculator/mainwindow.h index 601c2c9..efb44b9 100644 --- a/qad/graphic/qpicalculator/mainwindow.h +++ b/qad/graphic/qpicalculator/mainwindow.h @@ -25,10 +25,11 @@ protected: private: void updateGraphics(); void redrawGraphics(); - + QPIEvaluator evaluator; QPalette npal, epal; SessionManager session; + int ans; bool active_; private slots: