Skip to content

Commit 0a3eb2d

Browse files
SarthakJariwalaSarthakJariwala
committed
added code to connect gui to stage and do PL x-y scan, gui minor modifications in design
1 parent 9ccce76 commit 0a3eb2d

File tree

2 files changed

+257
-72
lines changed

2 files changed

+257
-72
lines changed

‎PythonGUI_apps/OceanOptics_acquire/OO_PZstageScan_acquire_gui.ui‎

Lines changed: 79 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,6 @@
5858
</property>
5959
</widget>
6060
</item>
61-
<item row="2" column="0">
62-
<widget class="QLabel" name="label_8">
63-
<property name="font">
64-
<font>
65-
<pointsize>12</pointsize>
66-
</font>
67-
</property>
68-
<property name="text">
69-
<string>Y Start (um)</string>
70-
</property>
71-
</widget>
72-
</item>
7361
<item row="4" column="1">
7462
<widget class="QDoubleSpinBox" name="x_size_doubleSpinBox">
7563
<property name="font">
@@ -95,42 +83,39 @@
9583
</property>
9684
</spacer>
9785
</item>
98-
<item row="5" column="0">
99-
<widget class="QLabel" name="label_4">
86+
<item row="2" column="0">
87+
<widget class="QLabel" name="label_8">
10088
<property name="font">
10189
<font>
10290
<pointsize>12</pointsize>
10391
</font>
10492
</property>
10593
<property name="text">
106-
<string>Y Scan Size (um)</string>
94+
<string>Y Start (um)</string>
10795
</property>
10896
</widget>
10997
</item>
110-
<item row="5" column="1">
111-
<widget class="QDoubleSpinBox" name="y_size_doubleSpinBox">
98+
<item row="5" column="0">
99+
<widget class="QLabel" name="label_4">
112100
<property name="font">
113101
<font>
114102
<pointsize>12</pointsize>
115103
</font>
116104
</property>
117-
<property name="value">
118-
<double>5.000000000000000</double>
105+
<property name="text">
106+
<string>Y Scan Size (um)</string>
119107
</property>
120108
</widget>
121109
</item>
122-
<item row="1" column="1">
123-
<widget class="QDoubleSpinBox" name="x_start_doubleSpinBox">
110+
<item row="5" column="1">
111+
<widget class="QDoubleSpinBox" name="y_size_doubleSpinBox">
124112
<property name="font">
125113
<font>
126114
<pointsize>12</pointsize>
127115
</font>
128116
</property>
129-
<property name="maximum">
130-
<double>100.000000000000000</double>
131-
</property>
132117
<property name="value">
133-
<double>50.000000000000000</double>
118+
<double>5.000000000000000</double>
134119
</property>
135120
</widget>
136121
</item>
@@ -174,27 +159,39 @@
174159
</property>
175160
</widget>
176161
</item>
177-
<item row="0" column="0" colspan="2">
178-
<widget class="QPushButton" name="init_stage_pushButton">
162+
<item row="1" column="0">
163+
<widget class="QLabel" name="label_9">
179164
<property name="font">
180165
<font>
181166
<pointsize>12</pointsize>
182167
</font>
183168
</property>
184169
<property name="text">
185-
<string>Initialize Piezo Stage</string>
170+
<string>X Start (um)</string>
186171
</property>
187172
</widget>
188173
</item>
189-
<item row="1" column="0">
190-
<widget class="QLabel" name="label_9">
174+
<item row="7" column="0">
175+
<widget class="QLabel" name="label_6">
191176
<property name="font">
192177
<font>
193178
<pointsize>12</pointsize>
194179
</font>
195180
</property>
196181
<property name="text">
197-
<string>X Start (um)</string>
182+
<string>X Step (um)</string>
183+
</property>
184+
</widget>
185+
</item>
186+
<item row="0" column="0" colspan="2">
187+
<widget class="QPushButton" name="init_stage_pushButton">
188+
<property name="font">
189+
<font>
190+
<pointsize>12</pointsize>
191+
</font>
192+
</property>
193+
<property name="text">
194+
<string>Initialize Piezo Stage</string>
198195
</property>
199196
</widget>
200197
</item>
@@ -213,39 +210,42 @@
213210
</property>
214211
</widget>
215212
</item>
216-
<item row="7" column="0">
217-
<widget class="QLabel" name="label_6">
213+
<item row="1" column="1">
214+
<widget class="QDoubleSpinBox" name="x_start_doubleSpinBox">
218215
<property name="font">
219216
<font>
220217
<pointsize>12</pointsize>
221218
</font>
222219
</property>
223-
<property name="text">
224-
<string>X Step (um)</string>
220+
<property name="maximum">
221+
<double>100.000000000000000</double>
222+
</property>
223+
<property name="value">
224+
<double>50.000000000000000</double>
225225
</property>
226226
</widget>
227227
</item>
228-
<item row="9" column="0">
229-
<widget class="QPushButton" name="start_x_y_sacan_pushButton">
228+
<item row="9" column="0" colspan="2">
229+
<widget class="QPushButton" name="estimate_scan_time_pushButton">
230230
<property name="font">
231231
<font>
232232
<pointsize>12</pointsize>
233233
</font>
234234
</property>
235235
<property name="text">
236-
<string>Start X-Y Scan</string>
236+
<string>Estimate Scan Time</string>
237237
</property>
238238
</widget>
239239
</item>
240-
<item row="9" column="1">
241-
<widget class="QPushButton" name="start_line_scan_pushButton">
240+
<item row="10" column="0" colspan="2">
241+
<widget class="QPushButton" name="start_x_y_sacan_pushButton">
242242
<property name="font">
243243
<font>
244244
<pointsize>12</pointsize>
245245
</font>
246246
</property>
247247
<property name="text">
248-
<string>Start Line Scan</string>
248+
<string>Start X-Y Scan</string>
249249
</property>
250250
</widget>
251251
</item>
@@ -321,6 +321,9 @@
321321
<property name="maximum">
322322
<number>3000</number>
323323
</property>
324+
<property name="value">
325+
<number>100</number>
326+
</property>
324327
</widget>
325328
</item>
326329
<item row="1" column="1">
@@ -489,7 +492,7 @@ BEFORE EXITING APP</string>
489492
</item>
490493
<item row="0" column="1">
491494
<layout class="QGridLayout" name="gridLayout_6">
492-
<item row="2" column="1">
495+
<item row="7" column="1">
493496
<widget class="QGroupBox" name="groupBox_4">
494497
<property name="font">
495498
<font>
@@ -586,7 +589,7 @@ BEFORE EXITING APP</string>
586589
</widget>
587590
</item>
588591
<item row="4" column="1">
589-
<widget class="QDoubleSpinBox" name="doubleSpinBox">
592+
<widget class="QDoubleSpinBox" name="x_abs_doubleSpinBox">
590593
<property name="font">
591594
<font>
592595
<pointsize>12</pointsize>
@@ -607,7 +610,7 @@ BEFORE EXITING APP</string>
607610
</widget>
608611
</item>
609612
<item row="6" column="1">
610-
<widget class="QDoubleSpinBox" name="doubleSpinBox_7">
613+
<widget class="QDoubleSpinBox" name="y_abs_doubleSpinBox">
611614
<property name="font">
612615
<font>
613616
<pointsize>12</pointsize>
@@ -665,7 +668,7 @@ BEFORE EXITING APP</string>
665668
</widget>
666669
</item>
667670
<item row="10" column="1">
668-
<widget class="QDoubleSpinBox" name="doubleSpinBox_8">
671+
<widget class="QDoubleSpinBox" name="x_rel_doubleSpinBox">
669672
<property name="font">
670673
<font>
671674
<pointsize>12</pointsize>
@@ -686,7 +689,7 @@ BEFORE EXITING APP</string>
686689
</widget>
687690
</item>
688691
<item row="12" column="1">
689-
<widget class="QDoubleSpinBox" name="doubleSpinBox_9">
692+
<widget class="QDoubleSpinBox" name="y_rel_doubleSpinBox">
690693
<property name="font">
691694
<font>
692695
<pointsize>12</pointsize>
@@ -709,7 +712,19 @@ BEFORE EXITING APP</string>
709712
</layout>
710713
</widget>
711714
</item>
712-
<item row="1" column="0">
715+
<item row="0" column="0" colspan="2">
716+
<widget class="PlotWidget" name="plot"/>
717+
</item>
718+
<item row="7" column="0">
719+
<widget class="QTextBrowser" name="status_textBrowser">
720+
<property name="font">
721+
<font>
722+
<pointsize>12</pointsize>
723+
</font>
724+
</property>
725+
</widget>
726+
</item>
727+
<item row="6" column="0">
713728
<widget class="QLabel" name="label_23">
714729
<property name="font">
715730
<font>
@@ -721,16 +736,28 @@ BEFORE EXITING APP</string>
721736
</property>
722737
</widget>
723738
</item>
724-
<item row="0" column="0" colspan="2">
725-
<widget class="PlotWidget" name="plot"/>
726-
</item>
727-
<item row="2" column="0">
728-
<widget class="QTextBrowser" name="status_textBrowser">
739+
<item row="3" column="1">
740+
<widget class="QProgressBar" name="progressBar">
729741
<property name="font">
730742
<font>
731743
<pointsize>12</pointsize>
732744
</font>
733745
</property>
746+
<property name="value">
747+
<number>0</number>
748+
</property>
749+
</widget>
750+
</item>
751+
<item row="3" column="0">
752+
<widget class="QLabel" name="label_17">
753+
<property name="font">
754+
<font>
755+
<pointsize>15</pointsize>
756+
</font>
757+
</property>
758+
<property name="text">
759+
<string>Scan Progress:</string>
760+
</property>
734761
</widget>
735762
</item>
736763
</layout>

0 commit comments

Comments
 (0)