minor changes

marek-cel · Jun 26, 2021 · 4e3d5bf · 4e3d5bf
1 parent b1b0b33
commit 4e3d5bf
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 27 deletions.
diff --git a/deb_create.sh b/deb_create.sh
@@ -3,7 +3,7 @@
 ################################################################################
 
 APP_NAME=mc-aero
-APP_VER=0.1
+APP_VER=0.2
 
 ################################################################################
 

diff --git a/deb_mc-aero_amd64.control b/deb_mc-aero_amd64.control
@@ -1,8 +1,8 @@
 Package: mc-aero
-Version: 0.1
+Version: 0.2
 Architecture: amd64
 Maintainer: Marek M. Cel <marekcel@marekcel.pl>
 Depends: libqt5core5a, libqt5gui5, libqt5opengl5, libqt5svg5, libqt5widgets5, libqt5xml5, libqwt-qt5-6
 Installed-Size: 196
 Homepage: http://marekcel.pl
-Description: Application for estimating basic aerodynamics characteristics of an aircraft wing.
+Description: Software for estimating basic aerodynamics characteristics of an aircraft wing.
diff --git a/make_zip.bat b/make_zip.bat
@@ -21,6 +21,6 @@ rem call "%QTDIR%\bin\windeployqt.exe" --release mscsim.exe
 rem cd ..\..
 call "%QTDIR%\bin\windeployqt.exe" --release mc-aero\bin\mc-aero.exe
 
-"C:\Program Files\7-Zip\7z.exe" a mc-aero_0.1_win64.zip -r mc-aero\
+"C:\Program Files\7-Zip\7z.exe" a mc-aero_0.2_win64.zip -r mc-aero\
 
 pause
diff --git a/mc-aero.desktop b/mc-aero.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=0.1
+Version=0.2
 Name=MC-Aero
 GenericName=MC-Aero
 Exec=mc-aero

diff --git a/src/defs.h b/src/defs.h
@@ -129,7 +129,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #define APP_NAME   "mc-aero"
-#define APP_VER    "0.1"
+#define APP_VER    "0.2"
 #define ORG_NAME   "Marek_Cel"
 #define ORG_DOMAIN "marekcel.pl"
 

diff --git a/src/gui/DialogAddAngle.h b/src/gui/DialogAddAngle.h
@@ -147,9 +147,9 @@ class DialogAddAngle : public QDialog
 
 public:
 
-    DialogAddAngle( QWidget *parent = NULLPTR );
+    explicit DialogAddAngle( QWidget *parent = NULLPTR );
 
-    ~DialogAddAngle();
+    virtual ~DialogAddAngle();
 
     double getAngle() const;
 

diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
@@ -38,7 +38,7 @@
            <item row="2" column="2">
             <widget class="QLabel" name="labelCD_1">
              <property name="text">
-              <string>CD_1</string>
+              <string>CD_1 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -61,7 +61,7 @@
            <item row="2" column="0">
             <widget class="QLabel" name="labelAD_1">
              <property name="text">
-              <string>AD_1</string>
+              <string>AD_1 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -74,7 +74,7 @@
            <item row="5" column="0">
             <widget class="QLabel" name="labelAD_4">
              <property name="text">
-              <string>AD_4</string>
+              <string>AD_4 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -133,7 +133,7 @@
            <item row="4" column="2">
             <widget class="QLabel" name="labelCD_3">
              <property name="text">
-              <string>CD_3</string>
+              <string>CD_3 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -146,7 +146,7 @@
            <item row="4" column="0">
             <widget class="QLabel" name="labelAD_3">
              <property name="text">
-              <string>AD_3</string>
+              <string>AD_3 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -159,7 +159,7 @@
            <item row="3" column="0">
             <widget class="QLabel" name="labelAD_2">
              <property name="text">
-              <string>AD_2</string>
+              <string>AD_2 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -214,7 +214,7 @@
            <item row="5" column="2">
             <widget class="QLabel" name="labelCD_4">
              <property name="text">
-              <string>CD_4</string>
+              <string>CD_4 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -227,7 +227,7 @@
            <item row="3" column="2">
             <widget class="QLabel" name="labelCD_2">
              <property name="text">
-              <string>CD_2</string>
+              <string>CD_2 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -250,7 +250,7 @@
            <item row="1" column="2">
             <widget class="QLabel" name="labelCD_0">
              <property name="text">
-              <string>CD_0</string>
+              <string>CD_0 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -276,7 +276,7 @@
            <item row="6" column="2">
             <widget class="QLabel" name="labelCD_5">
              <property name="text">
-              <string>CD_5</string>
+              <string>CD_5 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -342,7 +342,7 @@
            <item row="1" column="0">
             <widget class="QLabel" name="labelAD_0">
              <property name="text">
-              <string>AD_0</string>
+              <string>AD_0 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -352,7 +352,7 @@
            <item row="6" column="0">
             <widget class="QLabel" name="labelAD_5">
              <property name="text">
-              <string>AD_5</string>
+              <string>AD_5 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -385,7 +385,7 @@
               <bool>false</bool>
              </property>
              <property name="text">
-              <string>CL_0</string>
+              <string>CL_0 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -424,7 +424,7 @@
            <item row="2" column="0">
             <widget class="QLabel" name="labelAL_S">
              <property name="text">
-              <string>AL_S</string>
+              <string>AL_S [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -437,7 +437,7 @@
            <item row="3" column="0">
             <widget class="QLabel" name="labelAL_1">
              <property name="text">
-              <string>AL_1</string>
+              <string>AL_1 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -463,7 +463,7 @@
            <item row="4" column="2">
             <widget class="QLabel" name="labelCL_2">
              <property name="text">
-              <string>CL_2</string>
+              <string>CL_2 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -476,7 +476,7 @@
            <item row="3" column="2">
             <widget class="QLabel" name="labelCL_1">
              <property name="text">
-              <string>CL_1</string>
+              <string>CL_1 [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -544,7 +544,7 @@
            <item row="2" column="2">
             <widget class="QLabel" name="labelCL_S">
              <property name="text">
-              <string>CL_S</string>
+              <string>CL_S [-]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -557,7 +557,7 @@
            <item row="4" column="0">
             <widget class="QLabel" name="labelAL_2">
              <property name="text">
-              <string>AL_2</string>
+              <string>AL_2 [deg]:</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

diff --git a/src/main.cpp b/src/main.cpp
@@ -126,6 +126,8 @@
 
 #include <QApplication>
 
+#include <clocale>
+
 #include <defs.h>
 
 #include <gui/MainWindow.h>