fucked hack

Author: AnotherStudent

Core/EquationThread.cpp

@@ -16,13 +16,16 @@ void EquationThread::run()
     double ans;
 
     switch (mode) {
-    case ModeEqDich:
-        ans = HalfDiv(QStrToCStr(func), a, b, e, &iterations);
-        break;
-    case ModeEqChord:
-        ans = Chord(QStrToCStr(func), a, b, e, &iterations);
-        break;
-    default:;
+        case ModeEqHalfDiv:
+            ans = EqHalfDiv(QStrToCStr(func), a, b, e, &iterations);
+            break;
+
+        case ModeEqChord:
+            ans = EqChord(QStrToCStr(func), a, b, e, &iterations);
+            break;
+
+        default:
+            ans = 0;
     }
 
     if(IsErrorCalc())

Core/EquationThread.h

@@ -3,8 +3,8 @@
 
 #include "XCore.h"
 
-#define ModeEqDich      0
-#define ModeEqChord     1
+#define ModeEqHalfDiv 1
+#define ModeEqChord 2
 
 typedef int ModeEq;
 

Frames/integralConstStepFrame.cpp

@@ -6,7 +6,7 @@
 IntegralConstStepFrame::IntegralConstStepFrame(QWidget *parent) : FrameThreadHelper(parent), ui(new Ui::IntegralConstStepFrame)
 {
     ui->setupUi(this);
-    change();
+    //change();
 }
 
 IntegralConstStepFrame::~IntegralConstStepFrame()

Frames/integralFloatingStepFrame.cpp

@@ -8,7 +8,7 @@ IntegralFloatingStepFrame::IntegralFloatingStepFrame(QWidget *parent) : FrameThr
     ui->setupUi(this);
     validatorSetup();
     setTimeOutUse(true);
-    change();
+    //change();
 }
 
 IntegralFloatingStepFrame::~IntegralFloatingStepFrame()

Frames/integralMultipleFrame.cpp

@@ -9,7 +9,7 @@ IntegralMultipleFrame::IntegralMultipleFrame(QWidget *parent) :
 {
     ui->setupUi(this);
     setTimeOutUse(true);
-    change();
+    //change();
 }
 
 IntegralMultipleFrame::~IntegralMultipleFrame()

Frames/nonlinearEquationsFrame.cpp

@@ -11,7 +11,7 @@ NonlinearEquationsFrame::NonlinearEquationsFrame(QWidget *parent, ModeEq mode) :
     this->mode = mode;
     validatorSetup();
     setTimeOutUse(true);
-    change();
+    //change();
 }
 
 NonlinearEquationsFrame::~NonlinearEquationsFrame()
@@ -26,44 +26,44 @@ void NonlinearEquationsFrame::change()
 
     cancel();
 
-//    a = Expression(QStrToCStr(ui->limitAEdit->text()));
-//    if(IsNan(a))
-//    {
-//        showAnswer("Неверный параметр a");
-//        return;
-//    }
+    a = Expression(QStrToCStr(ui->limitAEdit->text()));
+    if(IsNan(a))
+    {
+        showAnswer("Неверный параметр a");
+        return;
+    }
 
-//    b = Expression(QStrToCStr(ui->limitBEdit->text()));
-//    if(IsNan(b))
-//    {
-//        showAnswer("Неверный параметр b");
-//        return;
-//    }
+    b = Expression(QStrToCStr(ui->limitBEdit->text()));
+    if(IsNan(b))
+    {
+        showAnswer("Неверный параметр b");
+        return;
+    }
 
-//    if(a >= b)
-//    {
-//        showAnswer("b должн быть больше a");
-//        return;
-//    }
+    if(a >= b)
+    {
+        showAnswer("b должн быть больше a");
+        return;
+    }
 
-//    e = ui->epsilonEdit->text().toDouble();
+    e = ui->epsilonEdit->text().toDouble();
 
-//    if(e >= 1 || e <= 1e-99)
-//    {
-//        showAnswer("Точность должна быть в пределах (1..1e-99)");
-//        return;
-//    }
+    if(e >= 1 || e <= 1e-99)
+    {
+        showAnswer("Точность должна быть в пределах (1..1e-99)");
+        return;
+    }
 
-//    func = ui->equationEdit->text();
+    func = ui->equationEdit->text();
 
-//    setThread(new EquationThread(func, a, b, e, mode));
+    setThread(new EquationThread(func, a, b, e, mode));
 
-//    connect(getThread(), SIGNAL(sendResultSignal(double, int)), SLOT(onResult(double,int)));
-//    connect(getThread(), SIGNAL(sendErrorSignal(int)), SLOT(onError(int)));
+    connect(getThread(), SIGNAL(sendResultSignal(double, int)), SLOT(onResult(double,int)));
+    connect(getThread(), SIGNAL(sendErrorSignal(int)), SLOT(onError(int)));
 
-//    start();
+    start();
 
-//    showAnswer(sCalculating);
+    showAnswer(sCalculating);
 }
 
 void NonlinearEquationsFrame::showAnswer(QString ans)

Frames/nonlinearEquationsFrame.h

@@ -18,7 +18,7 @@ class NonlinearEquationsFrame : public FrameThreadHelper
     void validatorSetup();
 
 public:
-    explicit NonlinearEquationsFrame(QWidget *parent = 0, ModeEq mode = ModeEqDich);
+    explicit NonlinearEquationsFrame(QWidget *parent, ModeEq mode);
     ~NonlinearEquationsFrame();
 
 private slots:

MathCore/Algorithms/Equation.c

@@ -2,7 +2,7 @@
 #include "../MathParser.h"
 #include "../MathUtils.h"
 
-int Sign(double v)
+static int Sign(double v)
 {
     if(v < 0)
         return -1;
@@ -11,7 +11,7 @@ int Sign(double v)
     else return 0;
 }
 
-double HalfDiv(char* func, double a, double b, double epsilon, int* countRef)
+double EqHalfDiv(char* func, double a, double b, double epsilon, int* countRef)
 {
     double c = 0;
     int count;
@@ -53,7 +53,7 @@ double HalfDiv(char* func, double a, double b, double epsilon, int* countRef)
     return c;
 }
 
-double Chord(char* func, double a, double b, double epsilon, int* countRef)
+double EqChord(char* func, double a, double b, double epsilon, int* countRef)
 {
     double t, aOld;
     int count;

MathCore/Algorithms/Equation.h

@@ -1,7 +1,7 @@
 #ifndef equation_h
 #define equation_h
 
-double HalfDiv(char* func, double a, double b, double epsilon, int* countRef);
-double Chord(char* func, double a, double b, double epsilon, int* countRef);
+double EqHalfDiv(char* func, double a, double b, double epsilon, int* countRef);
+double EqChord(char* func, double a, double b, double epsilon, int* countRef);
 
 #endif /* equation_h */

mainwindow.cpp

@@ -2,6 +2,7 @@
 #include "ui_mainwindow.h"
 #include "QLabel"
 #include "QTreeWidget"
+#include "Core/CalcThread.h"
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
 {
@@ -41,7 +42,7 @@ void MainWindow::createMenu()
     const int nolinearItemsCount = 2;
     TMember nolinearItems[nolinearItemsCount] =
     {
-        {"Метод Дихотомии", new NonlinearEquationsFrame(this, ModeEqDich)},
+        {"Метод Дихотомии", new NonlinearEquationsFrame(this, ModeEqHalfDiv)},
         {"Метод хорд",      new NonlinearEquationsFrame(this, ModeEqChord)}
     };
 
@@ -143,6 +144,7 @@ void MainWindow::on_menu_itemClicked(QTreeWidgetItem *item, int column)
     {
         ui->stackedWidget->setCurrentWidget(currentWidgetIterator.value());
         ui->frameName->setText(item->parent()->text(0) + ": " + item->text(0));
+        static_cast<FrameThreadHelper*>(currentWidgetIterator.value())->change();
     }
 }