GUI improvements, compatibility fixes

README.rst

@@ -137,7 +137,7 @@ The following software needs to be installed on your computer in order for OpenF
 #. For generating the documentation: DOxygen and Sphinx
 #. Boost; the specific packages are iostreams, serialization, system, thread, filesystem, regex, signals, program_options
 #. FLEX (for Dakota)
-#. Python Packages: SciPy, NumPy, ipython, Sphinx, evtk, vtk, mayavi
+#. Python Packages: SciPy, NumPy, ipython, Sphinx, evtk, vtk, matplotlib, mayavi
 #. libconfig-devel and libconfig++-devel
 #. patch
 

src/examples/conf.py

@@ -36,7 +36,7 @@
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.mathjax',
-    'sphinx.ext.pngmath',
+    #'sphinx.ext.pngmath',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',    
     'matplotlib.sphinxext.only_directives',

src/fcst/GUI/include/main_window.h

@@ -178,9 +178,9 @@ private slots:
      */
     void createSpinBoxWindow();
     /**
-     * Sets the amount of CPU's for running the simulation
+     * Sets the amount of CPU cores for running the simulation
      */
-    void setCpuAmount();
+    void setCoreNumber();
     /**
      * Calls function to open a project.
      */
@@ -246,31 +246,31 @@ private slots:
      */
     void closeProject();
     /**
-     * Sets the 2D or 3D Demensionen Type
+     * Sets the dimension: 2D or 3D
      */
-    void setDemensionenType(bool isTriggered);
+    void setDimension(bool isTriggered);
     /**
-     * starts a new instance of FCST
+     * Starts a new instance of FCST
      */
     void newInstance();
     /**
-     * This slot calls the convertion function from prm to xml 
+     * This slot calls the conversion function from prm to xml 
      * by pressing the button
      */
     void convert_prm_xml_slot();
-	/**
-     * This slot calls the convertion function from xml to prm
+    /**
+     * This slot calls the conversion function from xml to prm
      * by pressing the button
      */
     void convert_xml_prm_slot();
 
 private:    
     /**
-     * Starts converting user selected file from .prm to .xml
+     * Starts converting user-selected file from .xml to .prm
      */
     void convert_xml_prm(QString FilePath);
     /**
-     * Starts converting user selected file from .prm to .xml
+     * Starts converting user-selected file from .prm to .xml
      */
     void convert_prm_xml(QString FilePath);
     /**
@@ -434,9 +434,9 @@ private slots:
      * Dynamic sizers for managing the size and position of visual elements.
      */
     QPointer<QHBoxLayout> hBox ;
-	QPointer<QHBoxLayout> buttonBox;
+    QPointer<QHBoxLayout> buttonBox;
     QPointer<QVBoxLayout> vBoxLeft;
-	QPointer<QVBoxLayout> vBoxRight;
+    QPointer<QVBoxLayout> vBoxRight;
     QPointer<QTabWidget> tabWidget;
     /**
      * Enumeration describing states of project creation/simulation execution.
@@ -458,7 +458,7 @@ private slots:
     QPointer<QFileSystemWatcher> fileWatcher;
     QFont  font;
     QPointer<QLabel>  fileLabel;
-	QPointer<QLabel>FCSToutputLabel;
+    QPointer<QLabel>FCSToutputLabel;
     /**
      * Object for calling FCST.
      */
@@ -477,7 +477,7 @@ private slots:
     /**
      * Sets the numbers of CPU's used for the simulation
      */
-    QString CpuNumbers;
+    QString NumberOfCores;
     /**
      * Action to set fuel_chell-2d.bin
      * and run OpenFCST in 2D simulation
@@ -527,7 +527,7 @@ private slots:
     /**
      * SpinBox to set numbers of CPU's 
      */
-    QPointer<QSpinBox> CpuAmound_SpinBox;
+    QPointer<QSpinBox> CoreNumber_SpinBox;
     /**
      * Function for creating QActions, returns QAction
      */

src/fcst/GUI/include/settings_window.h

@@ -88,7 +88,7 @@ namespace FCSTGUI
         QLineEdit* createQLineEdit();
 
         /**
-         * Hold the revieved data from settings.ini file
+         * Hold the reviewed data from settings.ini file
          */
         QPointer<QSettings> gui_setting;
         /**
@@ -120,9 +120,9 @@ namespace FCSTGUI
          */
         QPointer<QLineEdit> opt_file_edit;
         /**
-         * QSpinBox for setting numbers of CPU's
+         * QSpinBox for setting number of CPU cores
          */
-        QPointer<QSpinBox> cpu_amount_spinbox;
+        QPointer<QSpinBox> core_number_spinbox;
         /**
          * Showing 2D bin path
          */