Skip to content

Commit 3d5f259

Browse files
changes to export window
1 parent d97bcf7 commit 3d5f259

File tree

2 files changed

+42
-162
lines changed

2 files changed

+42
-162
lines changed

PythonGUI_apps/Export_Windows/Export_window.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ def __init__(self):
5858

5959
self.ui = export_WindowTemplate()
6060
self.ui.setupUi(self)
61-
self.ui.traceColor_comboBox.addItems(["C0","C1","C2","C3","C4","C5","C6","C7", "r", "g", "b", "y", "k"])
62-
self.ui.fitColor_comboBox.addItems(["k", "r", "b", "y", "g","C0","C1","C2","C3","C4","C5","C6","C7"])
61+
#self.ui.traceColor_comboBox.addItems(["C0","C1","C2","C3","C4","C5","C6","C7", "r", "g", "b", "y", "k"])
62+
#self.ui.fitColor_comboBox.addItems(["k", "r", "b", "y", "g","C0","C1","C2","C3","C4","C5","C6","C7"])
6363
self.ui.export_pushButton.clicked.connect(self.export)
64-
self.ui.legend_checkBox.stateChanged.connect(self.legend_title)
64+
#self.ui.legend_checkBox.stateChanged.connect(self.legend_title)
6565
self.show()
6666

67-
def legend_title(self):
68-
if self.ui.legend_checkBox.isChecked():
69-
self.ui.legend1_lineEdit.setEnabled(True)
70-
self.ui.legend2_lineEdit.setEnabled(True)
71-
else:
72-
self.ui.legend1_lineEdit.setEnabled(False)
73-
self.ui.legend2_lineEdit.setEnabled(False)
67+
#def legend_title(self):
68+
# if self.ui.legend_checkBox.isChecked():
69+
# self.ui.legend1_lineEdit.setEnabled(True)
70+
# self.ui.legend2_lineEdit.setEnabled(True)
71+
# else:
72+
# self.ui.legend1_lineEdit.setEnabled(False)
73+
# self.ui.legend2_lineEdit.setEnabled(False)
7474

7575
def export(self):
7676
self.export_fig_signal.emit()

PythonGUI_apps/Export_Windows/export_plot.ui

Lines changed: 32 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,19 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>980</width>
9+
<width>930</width>
1010
<height>435</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="0">
18-
<widget class="QLabel" name="label">
19-
<property name="font">
20-
<font>
21-
<pointsize>15</pointsize>
22-
</font>
23-
</property>
24-
<property name="text">
25-
<string>X limits</string>
26-
</property>
27-
</widget>
28-
</item>
29-
<item row="0" column="3">
30-
<widget class="QLabel" name="label_6">
31-
<property name="font">
32-
<font>
33-
<pointsize>12</pointsize>
34-
</font>
35-
</property>
36-
<property name="text">
37-
<string>Upper</string>
38-
</property>
39-
</widget>
40-
</item>
4117
<item row="0" column="4">
4218
<widget class="QSpinBox" name="upperX_spinBox">
4319
<property name="font">
4420
<font>
45-
<pointsize>12</pointsize>
21+
<pointsize>10</pointsize>
4622
</font>
4723
</property>
4824
<property name="maximum">
@@ -53,23 +29,11 @@
5329
</property>
5430
</widget>
5531
</item>
56-
<item row="1" column="1">
57-
<widget class="QLabel" name="label_3">
58-
<property name="font">
59-
<font>
60-
<pointsize>12</pointsize>
61-
</font>
62-
</property>
63-
<property name="text">
64-
<string>Lower</string>
65-
</property>
66-
</widget>
67-
</item>
6832
<item row="1" column="4">
6933
<widget class="QDoubleSpinBox" name="upperY_doubleSpinBox">
7034
<property name="font">
7135
<font>
72-
<pointsize>12</pointsize>
36+
<pointsize>10</pointsize>
7337
</font>
7438
</property>
7539
<property name="decimals">
@@ -78,40 +42,19 @@
7842
<property name="minimum">
7943
<double>-100.000000000000000</double>
8044
</property>
45+
<property name="maximum">
46+
<double>10000000000000000000000.000000000000000</double>
47+
</property>
8148
<property name="value">
8249
<double>1.500000000000000</double>
8350
</property>
8451
</widget>
8552
</item>
86-
<item row="2" column="0">
87-
<widget class="QLabel" name="label_9">
88-
<property name="font">
89-
<font>
90-
<pointsize>15</pointsize>
91-
</font>
92-
</property>
93-
<property name="text">
94-
<string>Color</string>
95-
</property>
96-
</widget>
97-
</item>
98-
<item row="2" column="1">
99-
<widget class="QLabel" name="label_7">
100-
<property name="font">
101-
<font>
102-
<pointsize>12</pointsize>
103-
</font>
104-
</property>
105-
<property name="text">
106-
<string>Trace</string>
107-
</property>
108-
</widget>
109-
</item>
110-
<item row="0" column="1">
111-
<widget class="QLabel" name="label_5">
53+
<item row="1" column="1">
54+
<widget class="QLabel" name="label_3">
11255
<property name="font">
11356
<font>
114-
<pointsize>12</pointsize>
57+
<pointsize>10</pointsize>
11558
</font>
11659
</property>
11760
<property name="text">
@@ -123,7 +66,7 @@
12366
<widget class="QSpinBox" name="lowerX_spinBox">
12467
<property name="font">
12568
<font>
126-
<pointsize>12</pointsize>
69+
<pointsize>10</pointsize>
12770
</font>
12871
</property>
12972
<property name="minimum">
@@ -134,156 +77,93 @@
13477
</property>
13578
</widget>
13679
</item>
137-
<item row="1" column="0">
138-
<widget class="QLabel" name="label_2">
80+
<item row="0" column="1">
81+
<widget class="QLabel" name="label_5">
13982
<property name="font">
14083
<font>
141-
<pointsize>15</pointsize>
84+
<pointsize>10</pointsize>
14285
</font>
14386
</property>
14487
<property name="text">
145-
<string>Y limits</string>
88+
<string>Lower</string>
14689
</property>
14790
</widget>
14891
</item>
14992
<item row="1" column="3">
15093
<widget class="QLabel" name="label_4">
15194
<property name="font">
15295
<font>
153-
<pointsize>12</pointsize>
96+
<pointsize>10</pointsize>
15497
</font>
15598
</property>
15699
<property name="text">
157100
<string>Upper</string>
158101
</property>
159102
</widget>
160103
</item>
161-
<item row="5" column="0" colspan="5">
104+
<item row="2" column="0" colspan="5">
162105
<widget class="QPushButton" name="export_pushButton">
163106
<property name="font">
164107
<font>
165-
<pointsize>17</pointsize>
108+
<pointsize>15</pointsize>
166109
</font>
167110
</property>
168111
<property name="text">
169112
<string>Export Graph</string>
170113
</property>
171114
</widget>
172115
</item>
173-
<item row="4" column="3">
174-
<widget class="QLabel" name="label_11">
175-
<property name="font">
176-
<font>
177-
<pointsize>12</pointsize>
178-
</font>
179-
</property>
180-
<property name="text">
181-
<string>Legend 2</string>
182-
</property>
183-
</widget>
184-
</item>
185-
<item row="4" column="2">
186-
<widget class="QLineEdit" name="legend1_lineEdit">
187-
<property name="enabled">
188-
<bool>false</bool>
189-
</property>
190-
<property name="font">
191-
<font>
192-
<pointsize>12</pointsize>
193-
</font>
194-
</property>
195-
</widget>
196-
</item>
197-
<item row="2" column="4">
198-
<widget class="QComboBox" name="fitColor_comboBox">
199-
<property name="font">
200-
<font>
201-
<pointsize>12</pointsize>
202-
</font>
203-
</property>
204-
</widget>
205-
</item>
206-
<item row="2" column="2">
207-
<widget class="QComboBox" name="traceColor_comboBox">
208-
<property name="font">
209-
<font>
210-
<pointsize>12</pointsize>
211-
</font>
212-
</property>
213-
</widget>
214-
</item>
215-
<item row="2" column="3">
216-
<widget class="QLabel" name="label_8">
116+
<item row="1" column="0">
117+
<widget class="QLabel" name="label_2">
217118
<property name="font">
218119
<font>
219120
<pointsize>12</pointsize>
220121
</font>
221122
</property>
222123
<property name="text">
223-
<string>Fit</string>
224-
</property>
225-
</widget>
226-
</item>
227-
<item row="4" column="4">
228-
<widget class="QLineEdit" name="legend2_lineEdit">
229-
<property name="enabled">
230-
<bool>false</bool>
231-
</property>
232-
<property name="font">
233-
<font>
234-
<pointsize>12</pointsize>
235-
</font>
124+
<string>Y limits</string>
236125
</property>
237126
</widget>
238127
</item>
239-
<item row="4" column="0">
240-
<widget class="QLabel" name="label_12">
128+
<item row="0" column="3">
129+
<widget class="QLabel" name="label_6">
241130
<property name="font">
242131
<font>
243-
<pointsize>15</pointsize>
132+
<pointsize>10</pointsize>
244133
</font>
245134
</property>
246135
<property name="text">
247-
<string>Legends</string>
136+
<string>Upper</string>
248137
</property>
249138
</widget>
250139
</item>
251-
<item row="4" column="1">
252-
<widget class="QLabel" name="label_10">
140+
<item row="0" column="0">
141+
<widget class="QLabel" name="label">
253142
<property name="font">
254143
<font>
255144
<pointsize>12</pointsize>
256145
</font>
257146
</property>
258147
<property name="text">
259-
<string>Legend 1</string>
260-
</property>
261-
</widget>
262-
</item>
263-
<item row="3" column="0" colspan="2">
264-
<widget class="QCheckBox" name="legend_checkBox">
265-
<property name="font">
266-
<font>
267-
<pointsize>15</pointsize>
268-
</font>
269-
</property>
270-
<property name="text">
271-
<string>Add Legends to the Plot</string>
148+
<string>X limits</string>
272149
</property>
273150
</widget>
274151
</item>
275152
<item row="1" column="2">
276153
<widget class="QDoubleSpinBox" name="lowerY_spinBox">
277154
<property name="font">
278155
<font>
279-
<pointsize>12</pointsize>
156+
<pointsize>10</pointsize>
280157
</font>
281158
</property>
282159
<property name="decimals">
283160
<number>4</number>
284161
</property>
285162
<property name="minimum">
286-
<double>0.000000000000000</double>
163+
<double>-10000.000000000000000</double>
164+
</property>
165+
<property name="maximum">
166+
<double>1000000000000000000.000000000000000</double>
287167
</property>
288168
<property name="value">
289169
<double>0.010000000000000</double>

0 commit comments

Comments
 (0)