Updated files

Author: janakarana

src/app/calc/utilities.cpp

@@ -21,27 +21,21 @@ void utilities::Delay()
 }
 
 //Intensity calculation (Amplitude^2)
-double utilities::ComplexAbsSquared(std::complex<double> a)
+double utilities::ComplexAbsSquared(std::complex<double> c)
 {
-    return (a.real()*a.real() + a.imag()*a.imag());
+    return (c.real()*c.real() + c.imag()*c.imag());
 }
 
 //Absolute value (amplitude) calculation
-double utilities::ComplexAbs(std::complex<double> a)
+double utilities::ComplexAbs(std::complex<double> c)
 {
-    return sqrt(ComplexAbsSquared(a));
+    return sqrt(ComplexAbsSquared(c));
 }
 
 //Simpson's 1/3 rule
 double utilities::SimpsonsWeight (unsigned int i, unsigned int n)
 {
-    double weight = 1.0;
-    if ((i!=0) && (i!=n-1))
-    {
-        if ((i+1)%2==0)
-            weight = 4.0;
-        else
-            weight = 2.0;
-    }
-    return weight /3.0;
+    if (i == 0 || i == n - 1)  return 1.0 / 3.0;
+    if (i % 2 != 0)   return 4.0 / 3.0;
+    return 2.0 / 3.0;
 }

src/app/calc/utilities.h

@@ -12,8 +12,8 @@ class utilities
     ~utilities();
 
     void Delay();
-    double ComplexAbs(std::complex<double> a);
-    double ComplexAbsSquared(std::complex<double> a);
+    double ComplexAbs(std::complex<double> c);
+    double ComplexAbsSquared(std::complex<double> c);
     double SimpsonsWeight (unsigned int i, unsigned int n);
 };
 

src/app/dialog/mainwindow.cpp

@@ -87,7 +87,9 @@ void MainWindow::on_pushButton_RunSimulation_clicked()
     else
     {
 
-        if (!support.CheckInputParameters(ui,mPara))    //sanity check
+        if (!mPara->CheckCommonParameters(ui->radioButton_MonoDisperse,
+                                          ui->radioButton_NumDen,
+                                          ui->radioButton_VolFrac))
         {
             //Disable widgets
             support.DisableWidgetsDuringSimulation(ui, mPara, true);
@@ -111,7 +113,7 @@ void MainWindow::on_pushButton_RunSimulation_clicked()
             //Poly disperse
             if (ui->radioButton_PolyDisperse->isChecked())
             {
-                if (!support.CheckDistribution(ui,mPara))   //sanity check
+                if (!mPara->CheckDistributionParameters(ui->comboBox_Distribution))   //sanity check
                 {
                     support.ProcessDistribution(ui, mPara, static_cast<unsigned int>(ui->comboBox_Distribution->currentIndex()));
                     support.ProcessPolyDisperse(ui,mPara);
@@ -160,9 +162,11 @@ void MainWindow::on_pushButton_ShowDistributionAndCustom_clicked()
     else
     {
         support.LoadInputData(ui, mPara);
-        if (!support.CheckInputParameters(ui,mPara))    //sanity check
+        if (!mPara->CheckCommonParameters(ui->radioButton_MonoDisperse,
+                                          ui->radioButton_NumDen,
+                                          ui->radioButton_VolFrac))    //sanity check
         {
-            if (!support.CheckDistribution(ui,mPara))   //sanity check
+            if (!mPara->CheckDistributionParameters(ui->comboBox_Distribution))   //sanity check
             {
                 support.SetWidgets(ui);
                 support.ProcessDistribution(ui, mPara, static_cast<unsigned int>(ui->comboBox_Distribution->currentIndex()));