Merge branch 'master' into github_master

README.md

@@ -19,13 +19,14 @@ $ ./scripts/build.sh --clean && ./scripts/create_package.sh
 ```
 $ ./scripts/build.sh --clean && ./scripts/create_mac_app.sh
 ```
-Above command will produce `./build-Release/packages/range-3.2.7.dmg` which can be installed with following command:
+Above command will produce `./build-Release/packages/range-3.2.8.dmg` which can be installed with following command:
 ```
-$ open './build-Release/packages/range-3.2.7.dmg'
+$ open './build-Release/packages/range-3.2.8.dmg'
 ```
+
 ## Running the software
 ```
-$ $HOME/bin/range-3.2.7/bin/Range
+$ $HOME/bin/range-3.2.8/bin/Range
 ```
 
 ## Download

range/Range/Range.pro

@@ -26,7 +26,7 @@ else {
 
     !win* {
         CONFIG += link_pkgconfig
-        PKGCONFIG += libavutil libavformat libswscale
+        PKGCONFIG += libavformat libswscale
     }
 }
 
@@ -494,7 +494,9 @@ INCLUDEPATH += $${_PRO_FILE_PWD_}/../TetGen
 INCLUDEPATH += $${_PRO_FILE_PWD_}/../RangeBase/include
 INCLUDEPATH += $${_PRO_FILE_PWD_}/../RangeModel/include
 INCLUDEPATH += $${_PRO_FILE_PWD_}/../RangeSolverLib/include
-INCLUDEPATH += $${_PRO_FILE_PWD_}/../../ffmpeg/ffmpeg-4.3.2-win64/include
+win* {
+    INCLUDEPATH += $${_PRO_FILE_PWD_}/../../ffmpeg/ffmpeg-4.3.2-win64/include
+}
 
 RESOURCES += \
     range.qrc

range/Range/doc/RELEASE_NOTES.txt

@@ -1,3 +1,18 @@
+------------------------------------------------------------------
+Version 3.2.8
+
+* ALL: Resolved build warnings
+* ALL: Optimised detection of self-intersecting elements
+* GUI: Change order of entities in the model tree to "Points,Lines,Surfaces,Volumes,Cuts,ISO surfaces,Stream Lines, Scalar fields,Vector fields"
+* GUI: Append counter to newly created cut name
+* GUI: Improved problem time setup dock.
+* SOLVER: Improved stability of CFD solver
+
+Bug fixes:
+
+* GUI: Fixed glitches when zooming using mouse wheel
+* GUI: Vector and scalar field entity list can get lost when results are reloaded
+
 ------------------------------------------------------------------
 Version 3.2.7
 

range/Range/help/action_Export RAW model.html

@@ -1,6 +1,6 @@
 <h1>Export RAW model</h1>
 <p>Export selected model to <b>RAW</b> type file.</p>
-<p>Each line in <b>RAW</b> file contains coordeinates of all nodes of exactly one element (simplex). Empty lines and comments that begins with <b>#</b> are accepted.</p>
+<p>Each line in <b>RAW</b> file contains coordinates of all nodes of exactly one element (simplex). Empty lines and comments that begin with <b>#</b> are accepted.</p>
 <p>
 Following simplexes are accepted:
 </p>

range/Range/help/action_New Session.html

@@ -1,3 +1,3 @@
 <h1>New Session</h1>
 <p>Create a new <b>Session</b>.</p>
-<p><b>Session</b> serves as a 'container' for multiple models. These models are not directly linked so no data can be exchanged nor shared between them. Purpose of session is to give possibility to work on multiple models simultaneously.</p>
+<p><b>Session</b> serves as a 'container' for multiple models. These models are not directly linked so no data can be exchanged nor shared between them. The purpose of the session is to give the possibility to work on multiple models simultaneously.</p>

range/Range/help/action_Save Model As.html

@@ -1,2 +1,2 @@
 <h1>Save Model As</h1>
-Save selected model under a different file-name.
+Save selected model under different filename.

range/Range/help/action_Save Session As.html

@@ -1,2 +1,2 @@
 <h1>Save Session As</h1>
-Save current <b>Session</b> under different file name.
+Save current <b>Session</b> under different filename.

range/Range/help/general_Boundary condition.html

@@ -3,8 +3,8 @@ <h1>Boundary condition</h1>
 <p>Boundary conditions are:
 <ul>
 <li><b>Problem</b> specific - Each <b>Problem type</b> defines its own set of <b>boundary conditions</b>.</li>
-<li><b>Explicit</b> - Exact solution is prescribed at the boundary (eg. <b>Temperature</b> for <b>Heat transfer</b>). Bold text in <b>Boundary conditions</b> list.</li>
-<li><b>Implicit</b> - Implies a solution at the boundary (eg. <b>Heat flux</b> for <b>Heat transfer</b>).</li>
+<li><b>Explicit</b> - Exact solution is prescribed at the boundary (e.g., <b>Temperature</b> for <b>Heat transfer</b>). Bold text in <b>Boundary conditions</b> list.</li>
+<li><b>Implicit</b> - Implies a solution at the boundary (e.g., <b>Heat flux</b> for <b>Heat transfer</b>).</li>
 </ul>
 </p>
-<p>If problem is <b>transient</b> (time-dependent) then time dependent values can be assigned to boundary condition.</p>
+<p>If problem is <b>transient</b> (time-dependent) then time dependent values can be assigned to boundary condition.</p>

range/Range/help/general_Environment condition.html

@@ -1,3 +1,3 @@
 <h1>Environment condition</h1>
-<p><b>Environment condition</b> is a condition which can be specified at any model entity such as Point, Line, Surface or Volume. <b>Environment condition</b> specifies <b>problem</b> specific values for given environment (eg. <b>Environment temperature</b> or <b>Gravitational force</b>.</p>
-<p>If no <b>Initial condition</b> for given model entity is specified then <b>environment condition</b> is used.</p>
+<p><b>Environment condition</b> is a condition which can be specified at any model entity such as Point, Line, Surface or Volume. <b>Environment condition</b> specifies <b>problem</b> specific values for given environment (e.g., <b>Environment temperature</b> or <b>Gravitational force</b>.</p>
+<p>If no <b>Initial condition</b> for given model entity is specified then <b>environment condition</b> is used.</p>

range/Range/help/general_Problem type.html

@@ -1,6 +1,6 @@
 <h1>Problem type</h1>
-<p><b>Problem type</b> is an unique identifier of the physical phenomena to be solved.</p>
-<p>It is possible to combine multiple different <b>problem types</b> (eg. <b>Heat transfer</b> and <b>Stress analysis</b> or <b>In-compressible viscous flow</b> and <b>Contaminant dispersion</b>).</p>
+<p><b>Problem type</b> is a unique identifier of the physical phenomena to be solved.</p>
+<p>It is possible to combine multiple different <b>problem types</b> (e.g., <b>Heat transfer</b> and <b>Stress analysis</b> or <b>In-compressible viscous flow</b> and <b>Contaminant dispersion</b>).</p>
 <p>
 List of supported problem types:
 <ul>
@@ -14,4 +14,4 @@ <h1>Problem type</h1>
 <li>Stress analysis</li>
 <li>Modal analysis</li>
 </ul>
-</p>
+</p>

range/Range/help/general_Results.html

@@ -1,6 +1,6 @@
 <h1>Results</h1>
 <p><b>Results</b> are produced by the <b>Solver</b> and consist of <b>Result variables</b>.</p>
 <h2>Results variable</h2>
-<p><b>Results variable</b> is set of values computed by the <b>Solver</b>. <b>Results variable</b> is defined <b>type</b> (e.g. <b>Temperature</b> or <b>Displacement</b> and a vector of values. Based on <b>type</b> <b>Results variable</b> can contain vector of scalar values or vector values.</p>
-<p>For example <b>Temperature</b> results variable will contain vector of temperatures for each node whereas <b>Displacement</b> will contain vector of displacement vectors for each node.</p>
-<p><b>Results variable</b> can be computed either on node or on element level. For example <b>Displacement</b> is computed on node level, whereas <b>Stress</b> is computed on element level. Each element level variable once computed can be converted to node level. Converting element level variable to node level is one time operation and can not be reverted. To do so results have to be recalculated by the <b>Solver</b>.</p>
+<p><b>Results variable</b> is set of values computed by the <b>Solver</b>. <b>Results variable</b> is defined <b>type</b> (e.g., <b>Temperature</b> or <b>Displacement</b> and a vector of values. Based on <b>type</b> <b>Results variable</b> can contain vector of scalar values or vector values.</p>
+<p>For example, <b>Temperature</b> results variable will contain vector of temperatures for each node whereas <b>Displacement</b> will contain vector of displacement vectors for each node.</p>
+<p><b>Results variable</b> can be computed either on node or on element level. For example, <b>Displacement</b> is computed on node level, whereas <b>Stress</b> is computed on element level. Each element level variable once computed can be converted to node level. Converting element level variable to node level is one time operation and can not be reverted. To do so results have to be recalculated by the <b>Solver</b>.</p>

range/Range/help/tutorial_Draw cube.html

@@ -17,4 +17,4 @@ <h2>2. Draw a cube</h2>
 <h2>Save model</h2>
 <p>To save model just execute following action.</p>
 <p style="background-color: #999999;"><b>Menu:</b> <i>File -> Save Model</i></p>
-<p>If model has not been saved before, program will show <b>Save model</b> dialog offering a file-name and path were to store. Click <b>Save</b> to accept.</p>
+<p>If model has not been saved before, program will show <b>Save model</b> dialog offering a filename and path were to store. Click <b>Save</b> to accept.</p>

range/Range/src/application_settings_dialog.cpp

@@ -21,7 +21,6 @@
 
 #include "application_settings_dialog.h"
 #include "keyboard_shortcuts_edit.h"
-#include "main_settings.h"
 
 ApplicationSettingsDialog::ApplicationSettingsDialog(ApplicationSettings *applicationSettings, QWidget *parent) :
     QDialog(parent),
@@ -70,7 +69,7 @@ ApplicationSettingsDialog::ApplicationSettingsDialog(ApplicationSettings *applic
     QObject::connect(this->okButton,&QPushButton::clicked,this,&QDialog::accept);
 }
 
-int ApplicationSettingsDialog::exec(void)
+int ApplicationSettingsDialog::exec()
 {
     int retVal = QDialog::exec();
 
@@ -94,7 +93,7 @@ int ApplicationSettingsDialog::exec(void)
     return retVal;
 }
 
-QWidget *ApplicationSettingsDialog::createGeneralTab(void)
+QWidget *ApplicationSettingsDialog::createGeneralTab()
 {
     QWidget *widget = new QWidget;
 
@@ -173,7 +172,7 @@ QWidget *ApplicationSettingsDialog::createGeneralTab(void)
     return widget;
 }
 
-QWidget *ApplicationSettingsDialog::createShortcutsTab(void)
+QWidget *ApplicationSettingsDialog::createShortcutsTab()
 {
     QWidget *widget = new QWidget;
 
@@ -191,7 +190,7 @@ QWidget *ApplicationSettingsDialog::createShortcutsTab(void)
     return widget;
 }
 
-QWidget *ApplicationSettingsDialog::createRangeAccountTab(void)
+QWidget *ApplicationSettingsDialog::createRangeAccountTab()
 {
     QWidget *widget = new QWidget;
 
@@ -283,7 +282,7 @@ void ApplicationSettingsDialog::onRangeApiServerChanged(const QString &)
     this->okButton->setEnabled(true);
 }
 
-void ApplicationSettingsDialog::onDefaultClicked(void)
+void ApplicationSettingsDialog::onDefaultClicked()
 {
     this->solverFileChooserButton->setFileName(ApplicationSettings::getDefaultRangeSolverExecutable());
     this->helpFileChooserButton->setFileName(ApplicationSettings::getDefaultHelpDir());

range/Range/src/application_settings_dialog.h

@@ -62,18 +62,18 @@ class ApplicationSettingsDialog : public QDialog
         explicit ApplicationSettingsDialog(ApplicationSettings *applicationSettings, QWidget *parent = nullptr);
 
         //! Execute dialog.
-        int exec(void);
+        int exec();
 
     private:
 
         //! Create tab containing general settings.
-        QWidget *createGeneralTab(void);
+        QWidget *createGeneralTab();
 
         //! Create tab short-cut settings.
-        QWidget *createShortcutsTab(void);
+        QWidget *createShortcutsTab();
 
         //! Create tab containing Range account settings.
-        QWidget *createRangeAccountTab(void);
+        QWidget *createRangeAccountTab();
 
     protected slots:
 
@@ -108,7 +108,7 @@ class ApplicationSettingsDialog : public QDialog
         void onRangeApiServerChanged(const QString &);
 
         //! Default button was clicked.
-        void onDefaultClicked(void);
+        void onDefaultClicked();
 
 };
 

range/Range/src/cut_dialog.cpp

@@ -167,13 +167,13 @@ void CutDialog::onAccept(void)
             rCut.addElementGroupID(elementGroupId);
         }
 
-        RLogger::info("Modified vector field \'%s\'\n",rCut.getName().toUtf8().constData());
+        RLogger::info("Modified cut \'%s\'\n",rCut.getName().toUtf8().constData());
     }
     else
     {
         RCut cut;
 
-        cut.setName("Cut");
+        cut.setName("Cut " + QString::number(Session::getInstance().getModel(this->modelID).getNCuts() + 1));
         cut.setPlane(this->cutPlane);
 
         for (int i=0;i<entities.size();i++)
@@ -184,7 +184,7 @@ void CutDialog::onAccept(void)
         }
 
         Session::getInstance().getModel(this->modelID).addCut(cut);
-        RLogger::info("Created new vector field \'%s\'\n",cut.getName().toUtf8().constData());
+        RLogger::info("Created new cut \'%s\'\n",cut.getName().toUtf8().constData());
     }
 
     Session::getInstance().setModelChanged(this->modelID);

range/Range/src/draw_input_tree.cpp

@@ -455,5 +455,5 @@ void DrawInputTree::onItemChanged(QTreeWidgetItem *item, int column)
 
 void DrawInputTree::onItemSelectionChanged()
 {
-    emit this->selectionChanged(this->getSelectedObjectIDs());
+    emit this->objectSelectionChanged(this->getSelectedObjectIDs());
 }

range/Range/src/draw_input_tree.h

@@ -80,7 +80,7 @@ class DrawInputTree : public QTreeWidget
     signals:
 
         //! Emit selection changed signal.
-        void selectionChanged(const QList<uint>&objectIDs);
+        void objectSelectionChanged(const QList<uint>&objectIDs);
 
         //! Position request signal.
         void positionRequest(const RR3Vector &position);

range/Range/src/draw_input_widget.cpp

@@ -73,7 +73,7 @@ DrawInputWidget::DrawInputWidget(QWidget *parent) :
     layout->addWidget(this->tree,0,0,1,2);
 
     QObject::connect(this->tree,
-                     &DrawInputTree::selectionChanged,
+                     &DrawInputTree::objectSelectionChanged,
                      this,
                      &DrawInputWidget::onSelectionChanged);
     QObject::connect(this->tree,

range/Range/src/gl_arrow.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL arrow class definition                       *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_arrow.h"
 #include "gl_line.h"
 

range/Range/src/gl_axis.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL axis class definition                        *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_axis.h"
 
 void GLAxis::_init(const GLAxis *pGlAxis)

range/Range/src/gl_cut_plane.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL cut plane class definition                   *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_cut_plane.h"
 #include "gl_arrow.h"
 

range/Range/src/gl_element_base.cpp

@@ -10,9 +10,8 @@
 
 #include <rblib.h>
 
+#include "gl_functions.h"
 #include "gl_element_base.h"
-#include "gl_texture.h"
-#include "session.h"
 
 void GLElementBase::_init(const GLElementBase *pGlElement)
 {

range/Range/src/gl_element_group.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL element group class definition               *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_element_group.h"
 #include "gl_element.h"
 #include "model.h"

range/Range/src/gl_functions.cpp

@@ -8,7 +8,6 @@
  *  DESCRIPTION: OpenGL functions definitions                        *
  *********************************************************************/
 
-#include <QOpenGLFunctions>
 #include <QString>
 
 #include <rblib.h>

range/Range/src/gl_functions.h

@@ -11,7 +11,9 @@
 #ifndef GL_FUNCTIONS_H
 #define GL_FUNCTIONS_H
 
-#include <rblib.h>
+#ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION
+#endif
 
 #include <QOpenGLFunctions>
 

range/Range/src/gl_grid.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL grid class definition                        *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_grid.h"
 #include "gl_line.h"
 #include "gl_node.h"

range/Range/src/gl_interpolated_element.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL interpolated element class definition        *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_interpolated_element.h"
 
 void GLInterpolatedElement::_init(const GLInterpolatedElement *pGlElement)

range/Range/src/gl_interpolated_entity.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL interpolated entity class definition         *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_interpolated_entity.h"
 #include "gl_interpolated_element.h"
 #include "session.h"

range/Range/src/gl_line.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL line class definition                        *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_line.h"
 
 

range/Range/src/gl_list.cpp

@@ -10,6 +10,7 @@
 
 #include <rblib.h>
 
+#include "gl_functions.h"
 #include "gl_list.h"
 
 GLList::GLList(GLuint nLists)

range/Range/src/gl_list.h

@@ -13,9 +13,11 @@
 
 #include <vector>
 
-#include <QOpenGLFunctions>
+#ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION
+#endif
 
-#include "gl_functions.h"
+#include <QOpenGLFunctions>
 
 class GLList
 {

range/Range/src/gl_node.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL node class definition                        *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_node.h"
 
 GLNode::GLNode(GLWidget *glWidget) : GLObject(glWidget)

range/Range/src/gl_object.cpp

@@ -8,6 +8,7 @@
  *  DESCRIPTION: OpenGL object class definition                      *
  *********************************************************************/
 
+#include "gl_functions.h"
 #include "gl_object.h"
 
 GLObject::GLObject(GLWidget *glWidget) :