git-svn-id: svn://db.shs.com.ru/libs@401 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2018-06-13 11:16:44 +00:00
parent ed4ba15d2a
commit 34e6af4c39
2 changed files with 5 additions and 2 deletions

View File

@@ -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<GraphicType> 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");

View File

@@ -25,10 +25,11 @@ protected:
private:
void updateGraphics();
void redrawGraphics();
QPIEvaluator evaluator;
QPalette npal, epal;
SessionManager session;
int ans;
bool active_;
private slots: