IPKM/python-damaris
3
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Activity

bumped version string

Browse Source
This commit is contained in:
Markus Rosenstihl
2018-04-09 15:46:38 +02:00
parent c3c4839d3c
commit 463f499f57
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/DamarisGUI.py
View File

@@ -81,7 +81,7 @@ from damaris.data import DataPool, Accumulation, ADC_Result, MeasurementResult
debug = False debug = False
# version info # version info
__version__ = "0.18-0-$Revision$" __version__ = "0.18.1"
class logstream: class logstream:
@@ -449,7 +449,7 @@ class DamarisGUI:
self.log.textbuffer.create_mark( "lastdumped", self.log.textbuffer.get_end_iter( ), left_gravity=True ) self.log.textbuffer.create_mark( "lastdumped", self.log.textbuffer.get_end_iter( ), left_gravity=True )
loop_run=0 loop_run=0
interval = 2 interval = 0.1
self.id = self.lockfile.add_experiment() self.id = self.lockfile.add_experiment()
while not self.lockfile.am_i_next(): while not self.lockfile.am_i_next():
time.sleep(interval) time.sleep(interval)
@@ -558,6 +558,7 @@ class DamarisGUI:
print "experiment script finished" print "experiment script finished"
self.si.exp_handling = None self.si.exp_handling = None
else: else:
#print self.si.back_driver.get_messages()
e_text = "Experiment Script Running (%d)" % e e_text = "Experiment Script Running (%d)" % e
if self.si.res_handling is not None: if self.si.res_handling is not None:
@@ -765,7 +766,7 @@ class DamarisGUI:
os.mkdir( dir_trunk ) os.mkdir( dir_trunk )
except OSError, e: except OSError, e:
print e print e
print "coud not create dump directory '%s', so hdf5 dumps disabled" % dir_trunk print "could not create dump directory '%s', so hdf5 dumps disabled" % dir_trunk
self.dump_filename = "" self.dump_filename = ""
self.dump_timeinterval = 0 self.dump_timeinterval = 0
return True return True
@@ -817,7 +818,7 @@ class DamarisGUI:
if dump_file is None: if dump_file is None:
# exit! # exit!
print "coud not create dump directory '%s', so hdf5 dumps disabled" % dir_trunk print "could not create dump directory '%s', so hdf5 dumps disabled" % dir_trunk
self.dump_filename = "" self.dump_filename = ""
self.dump_timeinterval = 0 self.dump_timeinterval = 0
return True return True