Merge pull request #317 from USEPA/dev-ui-py3qt5

MTP6r0 release
USEPA · Sep 24, 2019 · aa915b2 · aa915b2
2 parents 3441d7c + 4d8d53a
commit aa915b2
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 19 deletions.
diff --git a/src/Externals/epanet/model/epanet2_amd64.dll b/src/Externals/epanet/model/epanet2_amd64.dll
diff --git a/src/Externals/epanet/outputapi/ENOutputWrapper.py b/src/Externals/epanet/outputapi/ENOutputWrapper.py
@@ -326,11 +326,12 @@ def __init__(self, output_file_name):
             self._raise_error(ret)
         file_version = self._call_int(_lib.ENR_getVersion)
         print("ENR opened {} Version {}".format(output_file_name, str(file_version)))
-        self._measure_new_out_value_series()
-        self._get_units()
         self.dates = []
         self.times = []
         self._get_times()
+        if self.simDuration > 0:
+            self._measure_new_out_value_series()
+        self._get_units()
         self.nodes = ENR_node_type.read_all(self)
         self.links = ENR_link_type.read_all(self)
         self.all_items = (self.nodes, self.links)

diff --git a/src/core/swmm/inp_reader_sections.py b/src/core/swmm/inp_reader_sections.py
@@ -1715,13 +1715,15 @@ def read(new_text, project):
                 object_name = fields[1]
                 tag = ' '.join(fields[2:])
                 sections = section_map[object_type_name]
+                tag_applied = False
                 for section in sections:
-                    try:
-                        candidate = section.value[object_name]
+                    candidate = section.find_item(object_name)
+                    if candidate:
                         candidate.tag = tag
+                        tag_applied = True
                         break
-                    except KeyError as ke:
-                        print("Tag not applied: " + line + "\n")
+                if not tag_applied:
+                    print("Tag not applied: " + line + "\n")
 
 
 class LossesReader(SectionReader):

diff --git a/src/ui/EPANET/frmAboutDesigner.py b/src/ui/EPANET/frmAboutDesigner.py
@@ -66,7 +66,7 @@ def retranslateUi(self, frmAbout):
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt; font-weight:600;\">Version MTP5r3</span></p>\n"
+"<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt; font-weight:600;\">Version MTP6r0</span></p>\n"
 "<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt; font-weight:600;\">Using Python 3.7.0</span></p>\n"
 "<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt; font-weight:600;\">PyQGIS 3.6.0-Noosa</span></p>\n"
 "<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt; font-weight:600;\">PyQt 5.11.3</span></p>\n"

diff --git a/src/ui/EPANET/frmAboutDesigner.ui b/src/ui/EPANET/frmAboutDesigner.ui
@@ -43,7 +43,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;center&quot; 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; font-weight:600;&quot;&gt;Version MTP5r3&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; 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; font-weight:600;&quot;&gt;Version MTP6r0&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; 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; font-weight:600;&quot;&gt;Using Python 3.7.0&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; 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; font-weight:600;&quot;&gt;PyQGIS 3.6.0-Noosa&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; 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; font-weight:600;&quot;&gt;PyQt 5.11.3&lt;/span&gt;&lt;/p&gt;

diff --git a/src/ui/SWMM/frmAboutDesigner.py b/src/ui/SWMM/frmAboutDesigner.py
@@ -88,7 +88,7 @@ def setupUi(self, frmAbout):
     def retranslateUi(self, frmAbout):
         _translate = QtCore.QCoreApplication.translate
         frmAbout.setWindowTitle(_translate("frmAbout", "About SWMM"))
-        self.lblSwmm.setText(_translate("frmAbout", "<html><head/><body><p align=\"center\"><span style=\" font-size:14pt; font-weight:600; color:#0000ff;\">Storm Water Management Model</span></p><p align=\"center\"><span style=\" font-weight:600; color:#000000;\">Version MTP5r3 (Python 3.7, PyQGIS 3.6.0, PyQt 5.11.3)</span></p><p align=\"center\"><span style=\" font-weight:600; color:#000000;\">SWMM Engine Version 5.1.013</span></p></body></html>"))
+        self.lblSwmm.setText(_translate("frmAbout", "<html><head/><body><p align=\"center\"><span style=\" font-size:14pt; font-weight:600; color:#0000ff;\">Storm Water Management Model</span></p><p align=\"center\"><span style=\" font-weight:600; color:#000000;\">Version MTP6r0 (Python 3.7, PyQGIS 3.6.0, PyQt 5.11.3)</span></p><p align=\"center\"><span style=\" font-weight:600; color:#000000;\">SWMM Engine Version 5.1.013</span></p></body></html>"))
         self.lblAbout.setText(_translate("frmAbout", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"

diff --git a/src/ui/SWMM/frmAboutDesigner.ui b/src/ui/SWMM/frmAboutDesigner.ui
@@ -32,7 +32,7 @@
        <item>
         <widget class="QLabel" name="lblSwmm">
          <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600; color:#0000ff;&quot;&gt;Storm Water Management Model&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#000000;&quot;&gt;Version MTP5r3 (Python 3.7, PyQGIS 3.6.0, PyQt 5.11.3)&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#000000;&quot;&gt;SWMM Engine Version 5.1.013&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600; color:#0000ff;&quot;&gt;Storm Water Management Model&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#000000;&quot;&gt;Version MTP6r0 (Python 3.7, PyQGIS 3.6.0, PyQt 5.11.3)&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#000000;&quot;&gt;SWMM Engine Version 5.1.013&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>

diff --git a/src/ui/SWMM/frmLID.py b/src/ui/SWMM/frmLID.py
@@ -206,11 +206,6 @@ def cmdOK_Clicked(self):
         oldname = self.editing_item.name
         self.editing_item.name = self.txtName.text()
 
-        if oldname != self.editing_item.name:
-            edited_names = []
-            edited_names.append((oldname, self.editing_item))
-            self._main_form.edited_name(edited_names)
-
         orig_lid_type = self.editing_item.lid_type
         orig_surface_layer_storage_depth = self.editing_item.surface_layer_storage_depth
         orig_surface_layer_vegetative_cover_fraction = self.editing_item.surface_layer_vegetative_cover_fraction
@@ -385,6 +380,10 @@ def cmdOK_Clicked(self):
             self._main_form.add_item(self.new_item)
             self._main_form.mark_project_as_unsaved()
         else:
+            if oldname != self.editing_item.name:
+                edited_names = []
+                edited_names.append((oldname, self.editing_item))
+                self._main_form.edited_name(edited_names)
             pass
 
         if orig_lid_type != self.editing_item.lid_type or \

diff --git a/src/ui/map_tools.py b/src/ui/map_tools.py
@@ -1077,16 +1077,18 @@ def set_default_line_renderer(layer, do_labels=True):
             symbol = symbol.createSimple({})
             symbol.deleteSymbolLayer(0)
             slayer = QgsSimpleLineSymbolLayer()
-            slayer.setWidth(1.0)
-            slayer.setColor(QColor("dark gray"))
+            # slayer.setWidth(1.0)
+            # slayer.setColor(QColor("dark gray"))
+            slayer.setWidth(0.2)
+            slayer.setColor(QColor("black"))
             symbol.appendSymbolLayer(slayer)
             layer_name_upper = layer.name().upper()
             if "CONDUIT" in layer_name_upper or \
                "PIPE" in layer_name_upper:
                 slayer = QgsSimpleLineSymbolLayer()
                 slayer.setWidth(0.5)
                 slayer.setColor(QColor("light gray"))
-                symbol.appendSymbolLayer(slayer)
+                # symbol.appendSymbolLayer(slayer)
                 renderer = QgsSingleSymbolRenderer(symbol)
                 layer.setRenderer(renderer)
             elif "SUBLINK" in layer_name_upper:
@@ -1099,7 +1101,8 @@ def set_default_line_renderer(layer, do_labels=True):
                 renderer = QgsSingleSymbolRenderer(symbol)
                 layer.setRenderer(renderer)
             else:
-                slayer.setWidth(1.0)
+                # slayer.setWidth(1.0)
+                slayer.setWidth(0.2)
                 slayer = QgsMarkerLineSymbolLayer(True, 1.5)
                 mlayer = slayer.subSymbol()
                 anewlayer = None