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
b5179175
Commit
b5179175
authored
Oct 22, 2018
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor correction to avoid a change in AO when scaning from 0 to 0
parent
acfa4d16
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
myWidgets.py
myWidgets.py
+3
-2
No files found.
myWidgets.py
View file @
b5179175
...
@@ -96,7 +96,7 @@ class anal_control_signal(QWidget):
...
@@ -96,7 +96,7 @@ class anal_control_signal(QWidget):
def
scanEvent
(
self
):
def
scanEvent
(
self
):
if
float
(
self
.
scan_step
)
<
float
(
self
.
scan_sb_start
.
val
)
or
float
(
self
.
scan_step
)
>
float
(
self
.
scan_sb_stop
.
val
):
if
float
(
self
.
scan_step
)
<
float
(
self
.
scan_sb_start
.
val
)
or
float
(
self
.
scan_step
)
>
float
(
self
.
scan_sb_stop
.
val
):
self
.
scan_direction
=
(
-
1
)
*
self
.
scan_direction
self
.
scan_direction
=
(
-
1
)
*
self
.
scan_direction
self
.
scan_step
=
self
.
scan_step
+
self
.
scan_direction
self
.
scan_step
=
self
.
scan_step
+
self
.
scan_direction
self
.
AO
.
set_out
(
self
.
scan_step
)
self
.
AO
.
set_out
(
self
.
scan_step
)
...
@@ -151,10 +151,11 @@ class anal_control_signal(QWidget):
...
@@ -151,10 +151,11 @@ class anal_control_signal(QWidget):
else
:
else
:
self
.
sb
.
setEnabled
(
False
)
self
.
sb
.
setEnabled
(
False
)
self
.
scan_button
.
setStyleSheet
(
"background-color: green"
)
self
.
scan_button
.
setStyleSheet
(
"background-color: green"
)
self
.
PbarTimer
.
start
(
dt
*
1e3
)
self
.
ScanTimer
.
start
(
dt
*
1e3
)
self
.
ScanTimer
.
start
(
dt
*
1e3
)
self
.
scan_button
.
setText
(
'Scanning'
)
self
.
scan_button
.
setText
(
'Scanning'
)
self
.
PbarTimer
.
start
(
dt
*
1e3
)
...
...
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