Skip to content

Commit

Permalink
Fixed wrong zerotime on imports, ESS-963
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniele Paganelli committed May 3, 2016
1 parent d9d8f40 commit 3f107da
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion misura/canon/plugin/dataimport.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def measure_dict():
ao(out, 'id', 'String', 'Conversion source ID')
ao(out, 'uid', 'String', 'Unique ID')
ao(out, 'date', 'Date', '00:00:00 01/01/2000', name='Test date')
ao(out, 'zerotime', 'Float', name='Acquisition starting time', attr = ['Hidden'])
ao(out, 'elapsed', 'Float', name='Test duration', unit='second')
ao(out, 'operator', 'String', 'Operator')
return out
Expand Down Expand Up @@ -66,7 +67,6 @@ def instr_dict():
"""Returns a dictionary containing typical options for generic instrument object"""
out = base_dict()
ao(out, 'nSamples', 'Integer', 1, attr=['Hidden'])
ao(out, 'camera', 'Role', ['camerapath', 'default'])
ao(out, 'devices', 'List', attr=['Hidden'])
ao(out, 'initTest', 'Progress', attr=['Hidden'])
ao(out, 'closingTest', 'Progress', attr=['Hidden'])
Expand Down

0 comments on commit 3f107da

Please sign in to comment.