Skip to content

Commit 6ee3558

Browse files
aaronwmorrisaaronwmorris
authored
Merge pull request #504 from aaronwmorris/dev
Export RAW will export a non-stacked image
2 parents 1ee3027 + 2304d91 commit 6ee3558

6 files changed

Lines changed: 107 additions & 86 deletions

File tree

‎indi_allsky/allsky.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ def run(self):
998998
self._miscDb.addNotification(
999999
NotificationCategory.STATE,
10001000
'indi-allsky',
1001-
'indi-allsky was shut down at {0:s}'.format(str(now)),
1001+
'indi-allsky was shutdown',
10021002
expire=timedelta(hours=1),
10031003
)
10041004

@@ -1084,7 +1084,7 @@ def run(self):
10841084
self._miscDb.addNotification(
10851085
NotificationCategory.STATE,
10861086
'indi-allsky',
1087-
'indi-allsky was shut down at {0:s}'.format(str(now)),
1087+
'indi-allsky was shutdown',
10881088
expire=timedelta(hours=1),
10891089
)
10901090

‎indi_allsky/flask/forms.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ def IMAGE_EXPORT_RAW_validator(form, field):
591591
if not field.data:
592592
return
593593

594-
if field.data not in ('png', 'tif'):
594+
if field.data not in ('png', 'tif', 'jpg'):
595595
raise ValidationError('Please select a valid file type')
596596

597597

@@ -1263,6 +1263,7 @@ class IndiAllskyConfigForm(FlaskForm):
12631263
('', 'Disabled'),
12641264
('png', 'PNG'),
12651265
('tif', 'TIFF'),
1266+
('jpg', 'JPEG'),
12661267
)
12671268

12681269
IMAGE_STACK_METHOD_choices = (

‎indi_allsky/flask/miscDb.py‎

Lines changed: 51 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,13 @@ def addImage(
7878
if not filename:
7979
return
8080

81-
p_filename = Path(filename)
82-
if not p_filename.exists():
83-
logger.warning('File not found: %s', p_filename)
81+
filename_p = Path(filename)
8482

83+
#if not filename_p.exists():
84+
# logger.warning('File not found: %s', filename_p)
8585

86-
logger.info('Adding image %s to DB', filename)
8786

88-
89-
filename_str = str(filename) # might be a pathlib object
87+
logger.info('Adding image %s to DB', filename_p)
9088

9189

9290
# If temp is 0, write null
@@ -117,7 +115,7 @@ def addImage(
117115

118116
image = IndiAllSkyDbImageTable(
119117
camera_id=camera_id,
120-
filename=filename_str,
118+
filename=str(filename_p),
121119
createDate=createDate,
122120
dayDate=dayDate,
123121
exposure=exposure,
@@ -149,15 +147,14 @@ def addDarkFrame(self, filename, camera_id, bitdepth, exposure, gain, binmode, t
149147

150148
#logger.info('####### Exposure: %s', pformat(exposure))
151149

152-
p_filename = Path(filename)
153-
if not p_filename.exists():
154-
logger.warning('File not found: %s', p_filename)
150+
filename_p = Path(filename)
155151

152+
#if not filename_p.exists():
153+
# logger.warning('File not found: %s', filename_p)
156154

157-
logger.info('Adding dark frame %s to DB', filename)
158155

156+
logger.info('Adding dark frame %s to DB', filename_p)
159157

160-
filename_str = str(filename) # might be a pathlib object
161158

162159
exposure_int = int(exposure)
163160

@@ -172,7 +169,7 @@ def addDarkFrame(self, filename, camera_id, bitdepth, exposure, gain, binmode, t
172169

173170
dark = IndiAllSkyDbDarkFrameTable(
174171
camera_id=camera_id,
175-
filename=filename_str,
172+
filename=str(filename_p),
176173
bitdepth=bitdepth,
177174
exposure=exposure_int,
178175
gain=gain,
@@ -192,15 +189,14 @@ def addBadPixelMap(self, filename, camera_id, bitdepth, exposure, gain, binmode,
192189

193190
#logger.info('####### Exposure: %s', pformat(exposure))
194191

195-
p_filename = Path(filename)
196-
if not p_filename.exists():
197-
logger.warning('File not found: %s', p_filename)
192+
filename_p = Path(filename)
198193

194+
#if not filename_p.exists():
195+
# logger.warning('File not found: %s', filename_p)
199196

200-
logger.info('Adding bad pixel map %s to DB', filename)
201197

198+
logger.info('Adding bad pixel map %s to DB', filename_p)
202199

203-
filename_str = str(filename) # might be a pathlib object
204200

205201
exposure_int = int(exposure)
206202

@@ -215,7 +211,7 @@ def addBadPixelMap(self, filename, camera_id, bitdepth, exposure, gain, binmode,
215211

216212
bpm = IndiAllSkyDbBadPixelMapTable(
217213
camera_id=camera_id,
218-
filename=filename_str,
214+
filename=str(filename_p),
219215
bitdepth=bitdepth,
220216
exposure=exposure_int,
221217
gain=gain,
@@ -233,16 +229,14 @@ def addVideo(self, filename, camera_id, dayDate, timeofday):
233229
if not filename:
234230
return
235231

236-
p_filename = Path(filename)
237-
if not p_filename.exists():
238-
# this is a normal condition, DB entry is created before file exists
239-
logger.warning('File not found: %s', p_filename)
240-
232+
filename_p = Path(filename)
241233

242-
logger.info('Adding video %s to DB', filename)
234+
#if not filename_p.exists():
235+
# # this is a normal condition, DB entry is created before file exists
236+
# logger.warning('File not found: %s', filename_p)
243237

244238

245-
filename_str = str(filename) # might be a pathlib object
239+
logger.info('Adding video %s to DB', filename_p)
246240

247241

248242
if timeofday == 'night':
@@ -253,7 +247,7 @@ def addVideo(self, filename, camera_id, dayDate, timeofday):
253247

254248
video = IndiAllSkyDbVideoTable(
255249
camera_id=camera_id,
256-
filename=filename_str,
250+
filename=str(filename_p),
257251
dayDate=dayDate,
258252
night=night,
259253
)
@@ -268,16 +262,14 @@ def addKeogram(self, filename, camera_id, dayDate, timeofday):
268262
if not filename:
269263
return
270264

271-
p_filename = Path(filename)
272-
if not p_filename.exists():
273-
# this is a normal condition, DB entry is created before file exists
274-
logger.warning('File not found: %s', p_filename)
275-
265+
filename_p = Path(filename)
276266

277-
logger.info('Adding keogram %s to DB', filename)
267+
#if not filename_p.exists():
268+
# # this is a normal condition, DB entry is created before file exists
269+
# logger.warning('File not found: %s', filename_p)
278270

279271

280-
filename_str = str(filename) # might be a pathlib object
272+
logger.info('Adding keogram %s to DB', filename_p)
281273

282274

283275
if timeofday == 'night':
@@ -288,7 +280,7 @@ def addKeogram(self, filename, camera_id, dayDate, timeofday):
288280

289281
keogram = IndiAllSkyDbKeogramTable(
290282
camera_id=camera_id,
291-
filename=filename_str,
283+
filename=str(filename_p),
292284
dayDate=dayDate,
293285
night=night,
294286
)
@@ -303,16 +295,14 @@ def addStarTrail(self, filename, camera_id, dayDate, timeofday='night'):
303295
if not filename:
304296
return
305297

306-
p_filename = Path(filename)
307-
if not p_filename.exists():
308-
# this is a normal condition, DB entry is created before file exists
309-
logger.warning('File not found: %s', p_filename)
298+
filename_p = Path(filename)
310299

300+
#if not filename_p.exists():
301+
# # this is a normal condition, DB entry is created before file exists
302+
# logger.warning('File not found: %s', filename_p)
311303

312-
logger.info('Adding star trail %s to DB', filename)
313304

314-
315-
filename_str = str(filename) # might be a pathlib object
305+
logger.info('Adding star trail %s to DB', filename_p)
316306

317307

318308
if timeofday == 'night':
@@ -323,7 +313,7 @@ def addStarTrail(self, filename, camera_id, dayDate, timeofday='night'):
323313

324314
startrail = IndiAllSkyDbStarTrailsTable(
325315
camera_id=camera_id,
326-
filename=filename_str,
316+
filename=str(filename_p),
327317
dayDate=dayDate,
328318
night=night,
329319
)
@@ -338,16 +328,14 @@ def addStarTrailVideo(self, filename, camera_id, dayDate, timeofday='night'):
338328
if not filename:
339329
return
340330

341-
p_filename = Path(filename)
342-
if not p_filename.exists():
343-
# this is a normal condition, DB entry is created before file exists
344-
logger.warning('File not found: %s', p_filename)
345-
331+
filename_p = Path(filename)
346332

347-
logger.info('Adding star trail video %s to DB', filename)
333+
#if not filename_p.exists():
334+
# # this is a normal condition, DB entry is created before file exists
335+
# logger.warning('File not found: %s', filename_p)
348336

349337

350-
filename_str = str(filename) # might be a pathlib object
338+
logger.info('Adding star trail video %s to DB', filename_p)
351339

352340

353341
if timeofday == 'night':
@@ -358,7 +346,7 @@ def addStarTrailVideo(self, filename, camera_id, dayDate, timeofday='night'):
358346

359347
startrail_video = IndiAllSkyDbStarTrailsVideoTable(
360348
camera_id=camera_id,
361-
filename=filename_str,
349+
filename=str(filename_p),
362350
dayDate=dayDate,
363351
night=night,
364352
)
@@ -373,9 +361,10 @@ def addFitsImage(self, filename, camera_id, createDate, exposure, gain, binmode,
373361
if not filename:
374362
return
375363

376-
p_filename = Path(filename)
377-
if not p_filename.exists():
378-
logger.warning('File not found: %s', p_filename)
364+
filename_p = Path(filename)
365+
366+
#if not filename_p.exists():
367+
# logger.warning('File not found: %s', filename_p)
379368

380369

381370
if night:
@@ -385,15 +374,12 @@ def addFitsImage(self, filename, camera_id, createDate, exposure, gain, binmode,
385374
dayDate = createDate.date()
386375

387376

388-
logger.info('Adding fits image %s to DB', filename)
389-
390-
391-
filename_str = str(filename) # might be a pathlib object
377+
logger.info('Adding fits image %s to DB', filename_p)
392378

393379

394380
fits_image = IndiAllSkyDbFitsImageTable(
395381
camera_id=camera_id,
396-
filename=filename_str,
382+
filename=str(filename_p),
397383
createDate=createDate,
398384
exposure=exposure,
399385
gain=gain,
@@ -412,9 +398,10 @@ def addRawImage(self, filename, camera_id, createDate, exposure, gain, binmode,
412398
if not filename:
413399
return
414400

415-
p_filename = Path(filename)
416-
if not p_filename.exists():
417-
logger.warning('File not found: %s', p_filename)
401+
filename_p = Path(filename)
402+
403+
#if not filename_p.exists():
404+
# logger.warning('File not found: %s', filename_p)
418405

419406

420407
if night:
@@ -424,15 +411,12 @@ def addRawImage(self, filename, camera_id, createDate, exposure, gain, binmode,
424411
dayDate = createDate.date()
425412

426413

427-
logger.info('Adding raw image %s to DB', filename)
428-
429-
430-
filename_str = str(filename) # might be a pathlib object
414+
logger.info('Adding raw image %s to DB', filename_p)
431415

432416

433417
fits_image = IndiAllSkyDbRawImageTable(
434418
camera_id=camera_id,
435-
filename=filename_str,
419+
filename=str(filename_p),
436420
createDate=createDate,
437421
exposure=exposure,
438422
gain=gain,

‎indi_allsky/flask/templates/config.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@
10791079
{{ form_config.IMAGE_EXPORT_RAW(class='form-control bg-secondary') }}
10801080
<div id="IMAGE_EXPORT_RAW-error" class="invalid-feedback text-danger" style="display: none;"></div>
10811081
</div>
1082-
<div class="col-sm-8">Enable saving raw images</div>
1082+
<div class="col-sm-8">Enable saving raw (non-stacked) images</div>
10831083
</div>
10841084

10851085
<div class="form-group row">
@@ -1090,7 +1090,7 @@
10901090
{{ form_config.IMAGE_EXPORT_FOLDER(class='form-control bg-secondary') }}
10911091
<div id="IMAGE_EXPORT_FOLDER-error" class="invalid-feedback text-danger" style="display: none;"></div>
10921092
</div>
1093-
<div class="col-sm-5">Folder to save raw TIF images</div>
1093+
<div class="col-sm-5">Folder to save raw exported images</div>
10941094
</div>
10951095

10961096
<hr />
@@ -1105,7 +1105,7 @@
11051105
<div id="IMAGE_SAVE_FITS-error" class="invalid-feedback text-danger" style="display: none;"></div>
11061106
</div>
11071107
</div>
1108-
<div class="col-sm-8">Enable saving raw FITS data</div>
1108+
<div class="col-sm-8">Enable saving raw FITS (non-stacked) data</div>
11091109
</div>
11101110

11111111
<div class="form-group row">

0 commit comments

Comments
 (0)