SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
qad/graphic/qpicalculator/mainwindow.cpp
View File

@@ -21,6 +21,7 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
session.addEntry(lineInput); session.addEntry(lineInput);
session.addEntry(tabWidget); session.addEntry(tabWidget);
session.load(); session.load();
ans = evaluator.setVariable("ans");
on_lineInput_returnPressed(); on_lineInput_returnPressed();
} }
@@ -122,7 +123,7 @@ void MainWindow::saving(QPIConfig & conf) {
vars << ti->text(0) << ti->text(1); vars << ti->text(0) << ti->text(1);
} }
conf.setValue("variables", vars); conf.setValue("variables", vars);
QVector<GraphicType> g; QVector<GraphicType> g;
vc = treeGraphics->topLevelItemCount(); vc = treeGraphics->topLevelItemCount();
for (int i = 0; i < vc; ++i) { for (int i = 0; i < vc; ++i) {
@@ -153,6 +154,7 @@ void MainWindow::on_lineInput_returnPressed() {
labelError->setText(evaluator.error()); labelError->setText(evaluator.error());
if (!ret) return; if (!ret) return;
complexd val = evaluator.evaluate(); complexd val = evaluator.evaluate();
evaluator.setVariable(ans, val);
if (val.imag() == 0) labelResult->setText(QString::number(val.real())); if (val.imag() == 0) labelResult->setText(QString::number(val.real()));
else { else {
if (val.real() == 0) labelResult->setText(QString::number(val.imag()) + "i"); if (val.real() == 0) labelResult->setText(QString::number(val.imag()) + "i");

3
qad/graphic/qpicalculator/mainwindow.h
View File

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