Merge branch 'dev' into feat/transit-zone-label-tool

Author: s-hiitola

Scripts/emme_tools/helmet_link_printing.py

@@ -12,6 +12,7 @@
 
 class LinkPrinting(_m.Tool()):
     results_path = _m.Attribute(str)
+    scenarios = _m.Attribute(list)
 
     def __init__(self):
         """Tool with click-button that can be imported in the Modeller GUI.
@@ -23,9 +24,12 @@ def __init__(self):
     def page(self):
         pb = _m.ToolPageBuilder(self)
         pb.title = "Print link attributes to file"
+        pb.add_select_scenario(tool_attribute_name="scenarios",
+            title="Scenarios:",
+            note="Scenario selection for link printing.")
         pb.add_select_file(
             "results_path", "directory", file_filter="", start_path="",
-            title="Directory to save file in:")
+            title="Directory to save file(s) in:")
         if self.tool_run_msg:
             pb.add_html(self.tool_run_msg)
         return pb.render()
@@ -36,12 +40,16 @@ def run(self):
     def __call__(self):
         """Print link attributes for current scenario.
         """
-        scen = _m.Modeller().scenario
-        print_links(scen.get_network(), ResultsData(self.results_path))
-        msg = "Link attributes for scenario {} printed to links.txt!".format(
-            scen.id)
+        if self.scenarios == []:
+            self.scenarios.append(_m.Modeller().scenario)
+        msg_strings = []
+        for scen in self.scenarios:
+            print_links(scen, ResultsData(self.results_path))
+            scen_msg = f"Link attributes for scenario {scen.id} printed to links_{scen.id}.txt!"
+            msg_strings.append(scen_msg)
+        msg = ("<br>").join(msg_strings)
         self.write(msg)
-        self.tool_run_msg = _m.PageBuilder.format_info(msg)
+        self.tool_run_msg = _m.PageBuilder.format_info(msg, escape=False)
 
     def write(self, message):
         _m.logbook_write(message)

Scripts/utils/print_links.py

@@ -1,7 +1,7 @@
 from utils.calc_noise import NoiseModel
+from datahandling.resultdata import ResultsData
 
-
-def print_links(network, resultdata):
+def print_links(scenario, resultdata: ResultsData):
     """Dump link attributes with wkt coordinates to file.
  
     Includes noise calculation (works well only when morning peak hour
@@ -10,12 +10,13 @@ def print_links(network, resultdata):
  
     Parameters
     ----------
-    network : inro.emme.network.Network
-        Network where whole-day results are stored
+    scenario : inro.emme.database.scenario.Scenario
+        Scenario with a network where whole-day results are stored
     """
+    network = scenario.get_network()
     attr_names = network.attributes("LINK")
     resultdata.print_line(
-        "Link\tnode_i\tnode_j\tmodes" + "\t".join(attr_names) + "\tNoise_zone_width", "links")
+        "Link\tnode_i\tnode_j\tmodes\t" + "\t".join(attr_names) + "\tNoise_zone_width", f"links_{scenario.id}")
     noisemodel = NoiseModel(
         network, ("@car_work_vrk", "@car_leisure_vrk", "@van_vrk"),
         ("@truck_vrk", "@trailer_truck_vrk"))
@@ -27,6 +28,6 @@ def print_links(network, resultdata):
         attrs = "\t".join([str(link[attr]) for attr in attr_names])
         noise_zone_width = noisemodel.calc_noise(link)
         resultdata.print_line(
-            wkt + "\t" + str(link.i_node.id) + "\t" + str(link.j_node.id)+ "\t" + modes + "\t" + attrs + "\t" + str(noise_zone_width), "links")
+            wkt + "\t" + str(link.i_node.id) + "\t" + str(link.j_node.id)+ "\t" + modes + "\t" + attrs + "\t" + str(noise_zone_width), f"links_{scenario.id}")
     resultdata.flush()