Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
total_control_app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Martin Drechsler
total_control_app
Commits
a3e8a24a
Commit
a3e8a24a
authored
Feb 12, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oven control as an electrode added
parent
014be47f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
myGUI.py
myGUI.py
+4
-6
myToolbar.py
myToolbar.py
+4
-1
No files found.
myGUI.py
View file @
a3e8a24a
...
@@ -112,13 +112,14 @@ class GuiMainWindow(QMainWindow):
...
@@ -112,13 +112,14 @@ class GuiMainWindow(QMainWindow):
self
.
piezoB397
=
anal_control_signal
(
'piezoB397'
,
7
,
out_step
=
0.01
)
self
.
piezoB397
=
anal_control_signal
(
'piezoB397'
,
7
,
out_step
=
0.01
)
self
.
piezoA866
=
anal_control_signal
(
'piezoA866'
,
14
,
out_minimum
=
0
,
out_maximum
=
4
,
out_step
=
0.01
)
self
.
piezoA866
=
anal_control_signal
(
'piezoA866'
,
14
,
out_minimum
=
0
,
out_maximum
=
4
,
out_step
=
0.01
)
self
.
piezoB866
=
anal_control_signal
(
'piezoB866'
,
6
,
out_step
=
0.01
)
self
.
piezoB866
=
anal_control_signal
(
'piezoB866'
,
6
,
out_step
=
0.01
)
self
.
piezoA423
=
anal_control_signal
(
'piezoA423'
,
1
,
out_step
=
0.01
,
feedfoward
=
True
)
self
.
piezoA423
=
anal_control_signal
(
'piezoA423'
,
1
,
out_step
=
0.01
)
self
.
piezoA423
.
set_scan_feedfoward_analog_out
(
0
)
self
.
trapDCA
=
anal_control_signal
(
'DC A'
,
2
)
self
.
trapDCA
=
anal_control_signal
(
'DC A'
,
2
)
self
.
trapDCB
=
anal_control_signal
(
'DC B'
,
3
)
self
.
trapDCB
=
anal_control_signal
(
'DC B'
,
3
)
self
.
trapCompC
=
anal_control_signal
(
'Comp C'
,
4
)
self
.
trapCompC
=
anal_control_signal
(
'Comp C'
,
4
)
self
.
trapCompD
=
anal_control_signal
(
'Comp D'
,
5
)
self
.
trapCompD
=
anal_control_signal
(
'Comp D'
,
5
)
self
.
trapCompOven
=
anal_control_signal
(
'Comp Oven'
,
0
)
...
@@ -199,9 +200,6 @@ class GuiMainWindow(QMainWindow):
...
@@ -199,9 +200,6 @@ class GuiMainWindow(QMainWindow):
self
.
layout423_scan
.
addWidget
(
self
.
piezoA423
.
scanLabelValue
,
5
,
0
)
self
.
layout423_scan
.
addWidget
(
self
.
piezoA423
.
scanLabelValue
,
5
,
0
)
self
.
layout423_scan
.
addWidget
(
self
.
piezoA423
.
scanpBar
,
5
,
1
)
self
.
layout423_scan
.
addWidget
(
self
.
piezoA423
.
scanpBar
,
5
,
1
)
self
.
layout423_scan
.
addWidget
(
self
.
piezoA423
.
scan_feedfoward_button
,
6
,
0
)
self
.
layout423_scan
.
addWidget
(
self
.
piezoA423
.
scan_feedfoward_sb
,
6
,
1
)
#########################
#########################
...
@@ -211,7 +209,7 @@ class GuiMainWindow(QMainWindow):
...
@@ -211,7 +209,7 @@ class GuiMainWindow(QMainWindow):
self
.
layout_trap_electrodes
.
addWidget
(
QtGui
.
QLabel
(
self
.
trapDCB
.
name
),
2
,
1
),
self
.
layout_trap_electrodes
.
addWidget
(
self
.
trapDCB
.
sb
,
2
,
2
)
self
.
layout_trap_electrodes
.
addWidget
(
QtGui
.
QLabel
(
self
.
trapDCB
.
name
),
2
,
1
),
self
.
layout_trap_electrodes
.
addWidget
(
self
.
trapDCB
.
sb
,
2
,
2
)
self
.
layout_trap_electrodes
.
addWidget
(
QtGui
.
QLabel
(
self
.
trapCompC
.
name
),
1
,
3
),
self
.
layout_trap_electrodes
.
addWidget
(
self
.
trapCompC
.
sb
,
1
,
4
)
self
.
layout_trap_electrodes
.
addWidget
(
QtGui
.
QLabel
(
self
.
trapCompC
.
name
),
1
,
3
),
self
.
layout_trap_electrodes
.
addWidget
(
self
.
trapCompC
.
sb
,
1
,
4
)
self
.
layout_trap_electrodes
.
addWidget
(
QtGui
.
QLabel
(
self
.
trapCompD
.
name
),
2
,
3
),
self
.
layout_trap_electrodes
.
addWidget
(
self
.
trapCompD
.
sb
,
2
,
4
)
self
.
layout_trap_electrodes
.
addWidget
(
QtGui
.
QLabel
(
self
.
trapCompD
.
name
),
2
,
3
),
self
.
layout_trap_electrodes
.
addWidget
(
self
.
trapCompD
.
sb
,
2
,
4
)
self
.
layout_trap_electrodes
.
addWidget
(
QtGui
.
QLabel
(
self
.
trapCompOven
.
name
),
1
,
5
),
self
.
layout_trap_electrodes
.
addWidget
(
self
.
trapCompOven
.
sb
,
1
,
6
)
###########################################################
###########################################################
...
...
myToolbar.py
View file @
a3e8a24a
...
@@ -88,7 +88,10 @@ class myToolbarMenu(QWidget):
...
@@ -88,7 +88,10 @@ class myToolbarMenu(QWidget):
spin_boxes
=
ao
.
spin_boxes
spin_boxes
=
ao
.
spin_boxes
for
text
,
spinb
in
spin_boxes
:
for
text
,
spinb
in
spin_boxes
:
spin
=
settings
.
value
(
str
(
ao
.
name
)
+
'_'
+
text
)
spin
=
settings
.
value
(
str
(
ao
.
name
)
+
'_'
+
text
)
try
:
spinb
.
setValue
(
float
(
spin
)
)
spinb
.
setValue
(
float
(
spin
)
)
except
TypeError
:
spinb
.
setValue
(
float
(
ao
.
initial_value
)
)
settings
.
endGroup
()
settings
.
endGroup
()
def
first_load
(
self
,
aos
):
def
first_load
(
self
,
aos
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment