Skip to content

Commit f2f39bb

Browse files
merydianmerydian
authored
fix: improve batch jobs tab (#321)
1 parent fea095e commit f2f39bb

File tree

2 files changed

+63
-15
lines changed

2 files changed

+63
-15
lines changed

‎ORStools/gui/ORStoolsDialog.py‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,24 +333,33 @@ def __init__(self, iface: QgisInterface, parent=None) -> None:
333333
self.save_vertices.clicked.connect(self._save_vertices_to_layer)
334334

335335
# Batch
336-
self.batch_routing_points.clicked.connect(
336+
self.pushButton_routing_points.clicked.connect(
337337
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:directions_from_points_2_layers")
338338
)
339-
self.batch_routing_point.clicked.connect(
339+
self.pushButton_routing_point.clicked.connect(
340340
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:directions_from_points_1_layer")
341341
)
342-
self.batch_routing_line.clicked.connect(
342+
self.pushButton_routing_line.clicked.connect(
343343
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:directions_from_polylines_layer")
344344
)
345-
self.batch_iso_point.clicked.connect(
345+
self.pushButton_iso_point.clicked.connect(
346346
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:isochrones_from_point")
347347
)
348-
self.batch_iso_layer.clicked.connect(
348+
self.pushButton_iso_layer.clicked.connect(
349349
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:isochrones_from_layer")
350350
)
351-
self.batch_matrix.clicked.connect(
351+
self.pushButton_matrix.clicked.connect(
352352
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:matrix_from_layers")
353353
)
354+
self.pushButton_snap_point.clicked.connect(
355+
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:snap_from_point_layer")
356+
)
357+
self.pushButton_snap_layer.clicked.connect(
358+
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:snap_from_point")
359+
)
360+
self.pushButton_export.clicked.connect(
361+
lambda: processing.execAlgorithmDialog(f"{PLUGIN_NAME}:export_network_from_map")
362+
)
354363

355364
# Reset index of list items every time something is moved or deleted
356365
self.routing_fromline_list.model().rowsMoved.connect(self._reindex_list_items)

‎ORStools/gui/ORStoolsDialogUI.ui‎

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -696,9 +696,9 @@ p, li { white-space: pre-wrap; }
696696
</item>
697697
</layout>
698698
</widget>
699-
<widget class="QWidget" name="batch_tab">
699+
<widget class="QWidget" name="processing_tab">
700700
<attribute name="title">
701-
<string>Batch Jobs</string>
701+
<string>Processing Tools</string>
702702
</attribute>
703703
<layout class="QVBoxLayout" name="verticalLayout">
704704
<item>
@@ -708,7 +708,7 @@ p, li { white-space: pre-wrap; }
708708
</property>
709709
<layout class="QHBoxLayout" name="horizontalLayout">
710710
<item>
711-
<widget class="QPushButton" name="batch_routing_line">
711+
<widget class="QPushButton" name="pushButton_routing_line">
712712
<property name="sizePolicy">
713713
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
714714
<horstretch>0</horstretch>
@@ -721,7 +721,7 @@ p, li { white-space: pre-wrap; }
721721
</widget>
722722
</item>
723723
<item>
724-
<widget class="QPushButton" name="batch_routing_point">
724+
<widget class="QPushButton" name="pushButton_routing_point">
725725
<property name="sizePolicy">
726726
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
727727
<horstretch>0</horstretch>
@@ -734,15 +734,15 @@ p, li { white-space: pre-wrap; }
734734
</widget>
735735
</item>
736736
<item>
737-
<widget class="QPushButton" name="batch_routing_points">
737+
<widget class="QPushButton" name="pushButton_routing_points">
738738
<property name="sizePolicy">
739739
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
740740
<horstretch>0</horstretch>
741741
<verstretch>0</verstretch>
742742
</sizepolicy>
743743
</property>
744744
<property name="text">
745-
<string>Points (2 Layer)</string>
745+
<string>Points (2 Layers)</string>
746746
</property>
747747
</widget>
748748
</item>
@@ -756,14 +756,14 @@ p, li { white-space: pre-wrap; }
756756
</property>
757757
<layout class="QHBoxLayout" name="horizontalLayout_4">
758758
<item>
759-
<widget class="QPushButton" name="batch_iso_point">
759+
<widget class="QPushButton" name="pushButton_iso_point">
760760
<property name="text">
761761
<string>Isochrones from Point</string>
762762
</property>
763763
</widget>
764764
</item>
765765
<item>
766-
<widget class="QPushButton" name="batch_iso_layer">
766+
<widget class="QPushButton" name="pushButton_iso_layer">
767767
<property name="text">
768768
<string>Isochrones from Layer</string>
769769
</property>
@@ -779,7 +779,7 @@ p, li { white-space: pre-wrap; }
779779
</property>
780780
<layout class="QHBoxLayout" name="horizontalLayout_5">
781781
<item>
782-
<widget class="QPushButton" name="batch_matrix">
782+
<widget class="QPushButton" name="pushButton_matrix">
783783
<property name="text">
784784
<string>Matrix</string>
785785
</property>
@@ -788,6 +788,45 @@ p, li { white-space: pre-wrap; }
788788
</layout>
789789
</widget>
790790
</item>
791+
<item>
792+
<widget class="QGroupBox" name="groupBox_4">
793+
<property name="title">
794+
<string>Snapping</string>
795+
</property>
796+
<layout class="QHBoxLayout" name="horizontalLayout_6">
797+
<item>
798+
<widget class="QPushButton" name="pushButton_snap_point">
799+
<property name="text">
800+
<string>Snap from Point Layer</string>
801+
</property>
802+
</widget>
803+
</item>
804+
<item>
805+
<widget class="QPushButton" name="pushButton_snap_layer">
806+
<property name="text">
807+
<string>Snap from Point</string>
808+
</property>
809+
</widget>
810+
</item>
811+
</layout>
812+
</widget>
813+
</item>
814+
<item>
815+
<widget class="QGroupBox" name="groupBox_5">
816+
<property name="title">
817+
<string>Graph Export</string>
818+
</property>
819+
<layout class="QHBoxLayout" name="horizontalLayout_9">
820+
<item>
821+
<widget class="QPushButton" name="pushButton_export">
822+
<property name="text">
823+
<string>Export</string>
824+
</property>
825+
</widget>
826+
</item>
827+
</layout>
828+
</widget>
829+
</item>
791830
<item>
792831
<spacer name="verticalSpacer">
793832
<property name="orientation">

0 commit comments

Comments
 (0)