Skip to content

Commit 670b187

Browse files
committed
maint: remove trailing whitespace from source code
1 parent 90b76c9 commit 670b187

File tree

6 files changed

+87
-94
lines changed

6 files changed

+87
-94
lines changed

microscope/cameras/SDK3.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
errorCodes = {}
4747
def errCode(name,value):
4848
errorCodes[value] = name
49-
49+
5050
AT_INFINITE = 0xFFFFFFFF
5151
AT_CALLBACK_SUCCESS = 0
5252

@@ -99,18 +99,18 @@ class CameraError(Exception):
9999
def __init__(self, fcnName, errNo):
100100
self.errNo = errNo
101101
self.fcnName = fcnName
102-
102+
103103
def __str__(self):
104104
return 'when calling %s - %s' % (self.fcnName, errorCodes[self.errNo])
105-
105+
106106

107107
#special case for buffer timeout
108108
AT_ERR_TIMEDOUT = 13
109109
AT_ERR_NODATA = 11
110110

111111
class TimeoutError(CameraError):
112112
pass
113-
113+
114114

115115

116116
AT_HANDLE_UNINITIALISED = -1
@@ -127,62 +127,62 @@ class OUTPUT(_meta):
127127
def __init__(self, val):
128128
self.type = val
129129
self.val = POINTER(val)
130-
130+
131131
def getVar(self, bufLen=0):
132132
v = self.type()
133133
return v, ctypes.byref(v)
134-
134+
135135
class _OUTSTRING(OUTPUT):
136136
def __init__(self):
137137
self.val = STRING
138-
138+
139139
def getVar(self, bufLen):
140140
v = ctypes.create_unicode_buffer(bufLen)
141141
return v, v
142-
142+
143143
OUTSTRING = _OUTSTRING()
144144

145145
class _OUTSTRLEN(_meta):
146146
def __init__(self):
147147
self.val = c_int
148-
148+
149149
OUTSTRLEN = _OUTSTRLEN()
150-
150+
151151

152152
def stripMeta(val):
153153
if isinstance(val, _meta):
154154
return val.val
155155
else:
156156
return val
157-
157+
158158
class dllFunction:
159159
def __init__(self, name, args = [], argnames = [], lib='ATCORE'):
160160
self.f = getattr(_stdcall_libraries[lib], name)
161161
self.f.restype = c_int
162162
self.f.argtypes = [stripMeta(a) for a in args]
163-
163+
164164
self.fargs = args
165165
self.fargnames = argnames
166166
self.name = name
167-
167+
168168
self.inp = [not isinstance(a, OUTPUT) for a in args]
169169
self.in_args = [a for a in args if not isinstance(a, OUTPUT)]
170170
self.out_args = [a for a in args if isinstance(a, OUTPUT)]
171-
171+
172172
self.buf_size_arg_pos = -1
173173
for i in range(len(self.in_args)):
174174
if isinstance(self.in_args[i], _OUTSTRLEN):
175175
self.buf_size_arg_pos = i
176-
176+
177177
ds = name + '\n\nArguments:\n===========\n'
178178
for i in range(len(args)):
179179
an = ''
180180
if i <len(argnames):
181181
an = argnames[i]
182182
ds += '\t%s\t%s\n' % (args[i], an)
183-
183+
184184
self.f.__doc__ = ds
185-
185+
186186
def __call__(self, *args):
187187
ars = []
188188
i = 0
@@ -195,7 +195,7 @@ def __call__(self, *args):
195195
bs = args[self.buf_size_arg_pos]
196196
else:
197197
bs = 255
198-
198+
199199
for j in range(len(self.inp)):
200200
if self.inp[j]: #an input
201201
ars.append(args[i])
@@ -205,30 +205,30 @@ def __call__(self, *args):
205205
ars.append(ar)
206206
ret.append(r)
207207
#print r, r._type_
208-
208+
209209
#print ars
210210
res = self.f(*ars)
211211
#print res
212-
212+
213213
if not res == AT_SUCCESS:
214214
if res == AT_ERR_TIMEDOUT or res == AT_ERR_NODATA:
215215
#handle timeouts as a special case, as we expect to get them
216216
raise TimeoutError(self.name, res)
217217
else:
218218
raise CameraError(self.name, res)
219-
219+
220220
if len(ret) == 0:
221221
return None
222222
if len(ret) == 1:
223223
return ret[0]
224224
else:
225225
return ret
226-
227-
228-
229-
226+
227+
228+
229+
230230
def dllFunc(name, args = [], argnames = [], lib='ATCORE'):
231-
f = dllFunction(name, args, argnames, lib)
231+
f = dllFunction(name, args, argnames, lib)
232232
globals()[name[3:]] = f
233233

234234
dllFunc('AT_InitialiseLibrary')

microscope/cameras/SDK3Cam.py

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -41,133 +41,127 @@ def isReadOnly(self):
4141
class ATInt(ATProperty):
4242
def getValue(self):
4343
return SDK3.GetInt(self.handle, self.propertyName).value
44-
44+
4545
def setValue(self, val):
4646
SDK3.SetInt(self.handle, self.propertyName, val)
47-
47+
4848
def max(self):
4949
return SDK3.GetIntMax(self.handle, self.propertyName).value
50-
50+
5151
def min(self):
5252
return SDK3.GetIntMin(self.handle, self.propertyName).value
53-
53+
5454

5555
class ATBool(ATProperty):
5656
def getValue(self):
5757
return SDK3.GetBool(self.handle, self.propertyName).value > 0
58-
58+
5959
def setValue(self, val):
6060
SDK3.SetBool(self.handle, self.propertyName, val)
61-
6261

63-
62+
63+
6464
class ATFloat(ATProperty):
6565
def getValue(self):
6666
return SDK3.GetFloat(self.handle, self.propertyName).value
67-
67+
6868
def setValue(self, val):
6969
SDK3.SetFloat(self.handle, self.propertyName, val)
70-
70+
7171
def max(self):
7272
return SDK3.GetFloatMax(self.handle, self.propertyName).value
73-
73+
7474
def min(self):
7575
return SDK3.GetFloatMin(self.handle, self.propertyName).value
76-
76+
7777
class ATString(ATProperty):
7878
def getValue(self):
7979
return SDK3.GetString(self.handle, self.propertyName, 255).value
80-
80+
8181
def setValue(self, val):
8282
SDK3.SetString(self.handle, self.propertyName, val)
83-
83+
8484
def maxLength(self):
8585
return SDK3.GetStringMaxLength(self.handle, self.propertyName).value
86-
86+
8787
class ATEnum(ATProperty):
8888
def getIndex(self):
8989
return SDK3.GetEnumIndex(self.handle, self.propertyName).value
90-
90+
9191
def setIndex(self, val):
9292
SDK3.SetEnumIndex(self.handle, self.propertyName, val)
93-
93+
9494
def getString(self):
9595
return self.__getitem__(self.getIndex())
96-
96+
9797
def setString(self, val):
9898
SDK3.SetEnumString(self.handle, self.propertyName, val)
99-
99+
100100
def __len__(self):
101101
return SDK3.GetEnumCount(self.handle, self.propertyName).value
102-
103-
def __getitem__(self, key):
102+
103+
def __getitem__(self, key):
104104
return SDK3.GetEnumStringByIndex(self.handle, self.propertyName, key, 255).value
105-
105+
106106
def getAvailableValues(self):
107107
n = SDK3.GetEnumCount(self.handle, self.propertyName).value
108108
return [SDK3.GetEnumStringByIndex(self.handle, self.propertyName, i, 255).value for i in range(n) if SDK3.IsEnumIndexAvailable(self.handle, self.propertyName, i).value]
109109

110110
def getAvailableValueMap(self):
111111
n = SDK3.GetEnumCount(self.handle, self.propertyName).value
112112
return {i: SDK3.GetEnumStringByIndex(self.handle, self.propertyName, i, 255).value for i in range(n) if SDK3.IsEnumIndexAvailable(self.handle, self.propertyName, i).value}
113-
113+
114114
class ATCommand(ATProperty):
115115
def __call__(self):
116116
return SDK3.Command(self.handle, self.propertyName)
117-
117+
118118
class camReg:
119119
#keep track of the number of cameras initialised so we can initialise and finalise the library
120120
numCameras = 0
121-
121+
122122
@classmethod
123123
def regCamera(cls):
124124
if cls.numCameras == 0:
125125
SDK3.InitialiseLibrary()
126-
126+
127127
cls.numCameras += 1
128-
128+
129129
@classmethod
130130
def unregCamera(cls):
131131
cls.numCameras -= 1
132132
if cls.numCameras == 0:
133133
SDK3.FinaliseLibrary()
134-
134+
135135
#make sure the library is intitalised
136136
camReg.regCamera()
137137

138138
def GetNumCameras():
139139
return SDK3.GetInt(SDK3.AT_HANDLE_SYSTEM, 'DeviceCount').value
140-
140+
141141
def GetSoftwareVersion():
142142
return SDK3.GetString(SDK3.AT_HANDLE_SYSTEM, 'SoftwareVersion', 255)
143143

144144

145-
class SDK3Camera:
145+
class SDK3Camera:
146146
def __init__(self, camNum):
147147
"""camera initialisation - note that this should be called from derived classes
148148
*AFTER* the properties have been defined"""
149149
#camReg.regCamera() #initialise the library if needed
150150
self.camNum = camNum
151-
152-
151+
152+
153153
def Init(self):
154-
print('Foo')
154+
print('Foo')
155155
self.handle = SDK3.Open(self.camNum)
156156
self.connectProperties()
157-
158-
157+
158+
159159
def connectProperties(self):
160160
for name, var in self.__dict__.items():
161161
if isinstance(var, ATProperty):
162162
var.connect(self.handle, name)
163-
164-
163+
164+
165165
def shutdown(self):
166166
SDK3.Close(self.handle)
167167
#camReg.unregCamera()
168-
169-
170-
171-
172-
173-

microscope/cameras/ximea.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def set_exposure_time(self, value):
111111

112112
def get_exposure_time(self):
113113
#exposure times are in us, so multiple by 1E-6 to get seconds.
114-
return (self.handle.get_exposure()*1.0E-6)
114+
return (self.handle.get_exposure()*1.0E-6)
115115

116116
def get_cycle_time(self):
117117
return (1.0/self.handle.get_framerate())
@@ -126,7 +126,7 @@ def get_trigger_type(self):
126126
return devices.TRIGGER_SOFT
127127
elif trig==XI_TRG_EDGE_RISING:
128128
return devices.TRIGGER_BEFORE
129-
129+
130130
def set_trigger_type(self, trigger):
131131
if (trigger == devices.TRIGGER_SOFT):
132132
self.handle.set_triger_source(XI_TG_SOURCE['Xi_TRG_SOFTWARE'])
@@ -160,4 +160,3 @@ def _on_shutdown(self):
160160
if self._acquiring:
161161
self.handle.stop_acquisition()
162162
self.handle.close_device()
163-

microscope/filterwheels/aurox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def _on_enable(self):
160160

161161
def _on_disable(self):
162162
self._send_command(__SETONOFF, __SLEEP)
163-
163+
164164
def set_calibration(self, state):
165165
if state:
166166
result = self._send_command(__SETCAL, __CALON)

0 commit comments

Comments
 (0)