From 34e6af4c39d288717d36e2d147fcf1bc727911e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Wed, 13 Jun 2018 11:16:44 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@401
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/graphic/qpicalculator/mainwindow.cpp | 4 +++-
 qad/graphic/qpicalculator/mainwindow.h   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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<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");
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: