From 8aeb8d33d6516ab3f02a34cef2b4c5663a404377 Mon Sep 17 00:00:00 2001
From: Mark Wolfman <canismarko@gmail.com>
Date: Sun, 30 Jun 2024 23:35:11 -0500
Subject: [PATCH] Fixed the xafs scan window after Firefly re-factoring.

---
 src/firefly/plans/xafs_scan.py      | 5 ++++-
 src/firefly/plans/xafs_scan.ui      | 6 +++---
 src/firefly/tests/test_xafs_scan.py | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/firefly/plans/xafs_scan.py b/src/firefly/plans/xafs_scan.py
index e615c44c..e1ede330 100644
--- a/src/firefly/plans/xafs_scan.py
+++ b/src/firefly/plans/xafs_scan.py
@@ -254,7 +254,10 @@ def customize_ui(self):
         self.ui.regions_spin_box.editingFinished.connect(self.update_regions)
 
         # reset button
-        self.ui.pushButton.clicked.connect(self.reset_default_regions)
+        self.ui.reset_button.clicked.connect(self.reset_default_regions)
+
+        # Run scan button
+        self.ui.run_button.clicked.connect(self.queue_plan)
 
         # connect checkboxes with all regions' check box
         self.title_region.regions_all_checkbox.stateChanged.connect(
diff --git a/src/firefly/plans/xafs_scan.ui b/src/firefly/plans/xafs_scan.ui
index c988f749..d1a65e7b 100644
--- a/src/firefly/plans/xafs_scan.ui
+++ b/src/firefly/plans/xafs_scan.ui
@@ -110,7 +110,7 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="pushButton">
+        <widget class="QPushButton" name="reset_button">
          <property name="toolTip">
           <string>Reset to default values</string>
          </property>
@@ -143,8 +143,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>700</width>
-            <height>156</height>
+            <width>581</width>
+            <height>198</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">
diff --git a/src/firefly/tests/test_xafs_scan.py b/src/firefly/tests/test_xafs_scan.py
index f875dae8..19d9bbab 100644
--- a/src/firefly/tests/test_xafs_scan.py
+++ b/src/firefly/tests/test_xafs_scan.py
@@ -164,7 +164,7 @@ def check_item(item):
         qtbot.mouseClick(display.ui.run_button, QtCore.Qt.LeftButton)
 
 
-def test_xafs_scan_plan_queued_energies_k_mixed(display, qtbot):
+def test_xafs_scan_plan_queued_energies_k_mixed(qtbot, display):
     display.ui.regions_spin_box.setValue(2)
     display.edge_combo_box.setCurrentText("Pt L3 (11500.8 eV)")