Version 4.3.2

Response to #687 and minor fix in SUEWS DB Prepare
UMEP-dev · Dec 16, 2024 · 69a4d6d · 69a4d6d
1 parent 1ebe9e0
commit 69a4d6d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/MetdataProcessor/metdata_processor.py b/MetdataProcessor/metdata_processor.py
@@ -214,7 +214,8 @@ def import_file(self):
                     delim = ':'
 
                 f = open(self.folderPath[0])
-                header = f.readline().split(delim)
+                #header = f.readline().split(delim)
+                header = f.readlines()[int(headernum - 1)].split(delim)
 
                 for i in range(0, header.__len__()):
                     self.dlg.comboBox_yyyy.addItem(header[i])

diff --git a/MetdataProcessor/metdata_processor_dialog_base.ui b/MetdataProcessor/metdata_processor_dialog_base.ui
@@ -131,7 +131,7 @@ p, li { white-space: pre-wrap; }
         <item>
          <widget class="QLabel" name="label_4">
           <property name="text">
-           <string>Number of header lines:</string>
+           <string>Line number including header information</string>
           </property>
          </widget>
         </item>

diff --git a/UMEP_about.ui b/UMEP_about.ui
@@ -31,7 +31,7 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;UMEP - Universal Multi-scale Environmental Predictor &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Version: 4.3.1 for QGIS 3.x, 13 December 2024&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Version: 4.3.2 for QGIS 3.x, 16 December 2024&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;UMEP is a plugin designed for urban climate in general and climate sensitive planning applications in particular. The plugin consist of a pre-processor, a processor and a post-processor.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;UMEP plugin - License GNU GPL 3&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Developers -  Fredrik Lindberg, Sue Grimmond, Leena Järvi, Helen Ward, Niklas Krave, Christoph William Kent, Andy Gabey, Shiho Onomura, Frans Olofson, Bei Huang, Ting Sun, Nils Wallenberg, Oskar Bäcklin, Jeremy Bernard, Sandro Oswald, Matthias Demuzere, Kerry Nice, Jixuan Chen.&lt;/span&gt;&lt;/p&gt;

diff --git a/metadata.txt b/metadata.txt
@@ -11,7 +11,7 @@ name=UMEP
 qgisMinimumVersion=3.0
 description=Urban Multi-scale Environmental Predictor
 
-version=4.3.1
+version=4.3.2
 author=Fredrik Lindberg - Sue Grimmond - Niklas Krave - Leena Jarvi - Helen Ward - Shiho Onomura - Christoph Kent - Natalie Theeuwes - Andy Gabey - Frans Olofson - Ting Sun - Bei Huang - Nils Wallenberg - Oscar Bäcklin - Jeremy Bernard - Sandro Oswald - Matthias Demuzere - Kerry Nice - Jixuan Chen
 [email protected]
 
@@ -29,6 +29,7 @@ repository=https://github.com/UMEP-dev/UMEP
 
 # Uncomment the following line and add your changelog:
 changelog=
+   4.3.2 : Respone to #687 and minor fix in SUEWS DB Prepare
    4.3.1 : Response to #680
    4.3   : Added SUEWS Database Manager och SUEWS Database Prepare
    4.2.1 : Response to #668

diff --git a/suews_database_manager/data/database.xlsx b/suews_database_manager/data/database.xlsx
diff --git a/suews_prepare_database/suews_prepare_database.py b/suews_prepare_database/suews_prepare_database.py
@@ -123,7 +123,7 @@ def __init__(self, iface):
         self.day_since_rain = 0
         self.leaf_cycle = 1
         self.soil_moisture = 100
-        self.utc = 0
+        self.utc = 1
         self.file_code = ''
         self.steps = 0
         # self.region = None