From d9317d184047d992e3d3938dde98fcf986320e28 Mon Sep 17 00:00:00 2001 From: Julia Leonova Date: Tue, 4 Jan 2022 16:42:45 +0300 Subject: [PATCH] Finish --- C_Lab_2/EngineeringCalc.cpp | 334 ++++++++++----------- C_Lab_2/EngineeringCalc.h | 52 ++-- C_Lab_2/SimpleCalc.cpp | 584 ++++++++++++++++++------------------ C_Lab_2/SimpleCalc.h | 103 ++++--- C_Lab_2/main.cpp | 9 +- C_Lab_2/mainwindow.cpp | 347 +++++++++++++++++---- C_Lab_2/mainwindow.h | 100 +++--- 7 files changed, 892 insertions(+), 637 deletions(-) diff --git a/C_Lab_2/EngineeringCalc.cpp b/C_Lab_2/EngineeringCalc.cpp index 033446c..95bb9bb 100644 --- a/C_Lab_2/EngineeringCalc.cpp +++ b/C_Lab_2/EngineeringCalc.cpp @@ -1,168 +1,168 @@ -#include "EngineeringCalc.h" - -#include -#include - -EngineeringCalculator::EngineeringCalculator(QWidget *parent) - : SimpleCalculator(parent) -{ - - connect(simpleCalc,SIGNAL(toggled(bool)),this,SLOT(mode_usual(bool))); - connect(engineeringCalc,SIGNAL(toggled(bool)),this,SLOT(mode_engineering(bool))); -// switch(mode_engineering) -// case 0: - engineeringCalc->setChecked(true); - - Button *sinhButton = createButton(tr("sinh"), SLOT(unaryOperatorClickedEng())); - Button *coshAllButton = createButton(tr("cosh"), SLOT(unaryOperatorClickedEng())); - Button *tanhButton = createButton(tr("tanh"), SLOT(unaryOperatorClickedEng())); - /* - Button *sinButton = createButton(tr("sin"), SLOT(unaryOperatorClickedEng())); - Button *cosButton = createButton(tr("cos"), SLOT(unaryOperatorClickedEng())); - Button *tanButton = createButton(tr("tan"), SLOT(unaryOperatorClickedEng())); - Button *piButton = createButton(QString::fromUtf8("\u03C0"), SLOT(unaryOperatorClickedEng())); - Button *factButton = createButton(tr("n!"), SLOT(unaryOperatorClickedEng())); - Button *expButton = createButton(QString::fromUtf8("e\u207F"), SLOT(unaryOperatorClickedEng())); - Button *lnButton = createButton(tr("ln"), SLOT(unaryOperatorClickedEng())); - Button *logButton = createButton(tr("log"), SLOT(unaryOperatorClickedEng())); - Button *kubsqrtButton = createButton(QString::fromUtf8("\u00B3\u221A"), SLOT(unaryOperatorClickedEng())); - Button *to2Button = createButton(QString::fromUtf8("x\u00B2"), SLOT(unaryOperatorClickedEng())); - Button *to3Button = createButton(QString::fromUtf8("x\u00B3"), SLOT(unaryOperatorClickedEng())); - Button *toyButton = createButton(QString::fromUtf8("x\u207F"), SLOT(unaryOperatorClickedEng())); - Button *ysqrtButton = createButton(QString::fromUtf8("\u207F\u221A"), SLOT(unaryOperatorClickedEng())); - - //delete simpleCalcLayout; - - EngCalcLayout = new QGridLayout(this); - //EngCalcLayout->addLayout(simpleCalcLayout); - EngCalcLayout->setSpacing(0); - EngCalcLayout->setContentsMargins(0, 0, 0, 0); - - EngCalcLayout->addWidget(sinhButton, 1, 0, 1, 1); - EngCalcLayout->addWidget(coshAllButton, 2, 0, 1, 1); - EngCalcLayout->addWidget(tanhButton, 3, 0, 1, 1); - - - setLayout(EngCalcLayout); -*/ - simpleCalcLayout->removeWidget(display); - simpleCalcLayout->addWidget(display, 0, 0, 1, 9); - - simpleCalcLayout->addWidget(sinhButton, 1, 0, 1, 1); - simpleCalcLayout->addWidget(coshAllButton, 2, 0, 1, 1); - simpleCalcLayout->addWidget(tanhButton, 3, 0, 1, 1); -} - - -double fact (double A) -{ - if (A == 0) { - return 1; - } - return A*fact(A-1); -} - -void EngineeringCalculator::unaryOperatorClickedEng() -{ - Button *clickedButton = qobject_cast