Merge pull request #8 from eviforscht/implement_mathematical_perfect_…

…parabola

Implement mathematical perfect parabola

.gitignore

@@ -8,7 +8,6 @@
 *.la
 *.lai
 *.so
-*.dll
 *.dylib
 
 # Qt-es

Desktop/Fallturm/Fallturm.pro

@@ -29,7 +29,6 @@ SOURCES += \
     fallturmexception.cpp \
     settingsdialog.cpp \
     plot.cpp \
-    funktion.cpp \
     parabola.cpp \
     mainwindow.cpp
 
@@ -41,7 +40,6 @@ HEADERS += \
     fallturmexception.h \
     settingsdialog.h \
     plot.h \
-    funktion.h \
     parabola.h
 
 FORMS += \

Desktop/Fallturm/innosetup.iss

@@ -1,6 +1,3 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
 #define MyAppName "Fallturm"
 #define MyAppVersion "1.0"
 #define MyAppPublisher "Evangelische Schule Neuruppin"
@@ -35,9 +32,9 @@ Name: "german"; MessagesFile: "compiler:Languages\German.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "release\Fallturm.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "release\Fallturm.exe"; DestDir: "{app}";
 Source: "release\vc_redist.x64.exe";  DestDir: "{app}"; Flags: ignoreversion; AfterInstall: installRuntime
-Source: "release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "release\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Code]

Desktop/Fallturm/parabola.cpp

@@ -1,4 +1,5 @@
 #include "parabola.h"
+namespace  FallturmMath {
 
 bool Point::compare_double(const double a, const double b, const double eps)
 {
@@ -30,6 +31,36 @@ double Parabola::f(const double x) const
     return a*x*x + b*x + c;
 }
 
+double Parabola::getA() const
+{
+    return a;
+}
+
+void Parabola::setA(double value)
+{
+    a = value;
+}
+
+double Parabola::getB() const
+{
+    return b;
+}
+
+void Parabola::setB(double value)
+{
+    b = value;
+}
+
+double Parabola::getC() const
+{
+    return c;
+}
+
+void Parabola::setC(double value)
+{
+    c = value;
+}
+
 Parabola::Parabola(const QVector<Point> points)
 {
     //solve Ax=b for x
@@ -108,3 +139,4 @@ void Parabola::setCoefficients(double new_a, double new_b, double new_c)
     b = new_b;
     c = new_c;
 }
+}