Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GEPARD
GEPARD
Commits
ff9142ea
Commit
ff9142ea
authored
Dec 02, 2019
by
Josef Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Several fixes
parent
8b813392
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
opticalscan.py
opticalscan.py
+0
-1
ramancom/WITecCOM.py
ramancom/WITecCOM.py
+3
-2
ramancom/ramanbase.py
ramancom/ramanbase.py
+1
-1
ramanscanui.py
ramanscanui.py
+1
-0
No files found.
opticalscan.py
View file @
ff9142ea
...
...
@@ -28,7 +28,6 @@ import sys, os
import
cv2
from
.helperfunctions
import
cv2imread_fix
,
cv2imwrite_fix
from
time
import
time
import
sys
from
.opticalbackground
import
BackGroundManager
from
.uielements
import
TimeEstimateProgressbar
from
.zlevelsetter
import
ZLevelSetter
...
...
ramancom/WITecCOM.py
View file @
ff9142ea
...
...
@@ -347,13 +347,14 @@ class WITecCOM(RamanBase):
self
.
doSpectralAutoFocus
()
self
.
acquireSilentSpectrum
(
num
)
def
finishMeasurement
(
self
):
def
finishMeasurement
(
self
,
aborted
=
False
):
if
self
.
advancedInterface
:
self
.
advSpec
.
createSummarizedSpecFiles
()
state
=
self
.
BeamPathState
.
GetValue
()
if
state
==
'Raman'
:
self
.
MicroscopeIdle
.
SetValue
(
'BeamPath|SetStateVideo'
)
self
.
BeamPathSetVideoState
.
OperateTrigger
()
if
not
aborted
:
self
.
advSpec
.
createSummarizedSpecFiles
()
def
initiateTimeSeriesMeasurement
(
self
,
ramanSettings
):
self
.
timeseries
=
ramanSettings
[
'numPoints'
]
...
...
ramancom/ramanbase.py
View file @
ff9142ea
...
...
@@ -68,5 +68,5 @@ class RamanBase(object):
def
triggerMeasurement
(
self
,
num
):
raise
NotImplementedError
def
finishMeasurement
(
self
):
def
finishMeasurement
(
self
,
aborted
=
False
):
raise
NotImplementedError
\ No newline at end of file
ramanscanui.py
View file @
ff9142ea
...
...
@@ -186,6 +186,7 @@ class RamanScanUI(QtWidgets.QWidget):
QtWidgets
.
QMessageBox
.
No
,
QtWidgets
.
QMessageBox
.
No
)
if
reply
==
QtWidgets
.
QMessageBox
.
Yes
:
self
.
timer
.
stop
()
self
.
ramanctrl
.
finishMeasurement
(
aborted
=
True
)
self
.
progressbar
.
resetTimerAndCounter
()
self
.
processstopevent
.
set
()
self
.
process
.
join
()
...
...
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