astrodatadownloader: show later/better matching stage for fetching which files to download
This commit is contained in:
@@ -44,7 +44,12 @@ class NewStarDialog(QDialog):
|
||||
"Please select atleast one source before proceeding")
|
||||
return
|
||||
|
||||
obs = getStarObservations(star, sources)
|
||||
keplerKadences = [self.cbKeplerShortCadence.isChecked(),
|
||||
self.cbKeplerLongCadence.isChecked()]
|
||||
k2Kadences = [self.cbK2ShortCadence.isChecked(),
|
||||
self.cbK2LongCadence.isChecked()]
|
||||
|
||||
obs = getStarObservations(star, keplerKadences, k2Kadences, sources)
|
||||
if(len(obs) == 0):
|
||||
self.showErrorMessage("No observations found",
|
||||
"No observationnal data has been found with the current filters")
|
||||
@@ -52,7 +57,8 @@ class NewStarDialog(QDialog):
|
||||
|
||||
self.listPreview.clear()
|
||||
for o in obs:
|
||||
self.listPreview.addItem(QListWidgetItem(f"{o['target_name']} - {o['obs_collection']} - {o['sequence_number']}"))
|
||||
print(o)
|
||||
self.listPreview.addItem(QListWidgetItem(f"{star} - {o['obs_collection']} - {o['sequence_number']}"))
|
||||
|
||||
self.currentObservations = obs
|
||||
self.starIdentifier = star
|
||||
@@ -62,14 +68,7 @@ class NewStarDialog(QDialog):
|
||||
if(self.leStarIdentifier.text() != self.starIdentifier):
|
||||
self.showErrorMessage("Star Identifier", "Star identifier of fetched data does not match current name")
|
||||
return
|
||||
|
||||
keplerKadences = [self.cbKeplerShortCadence.isChecked(),
|
||||
self.cbKeplerLongCadence.isChecked()]
|
||||
k2Kadences = [self.cbK2ShortCadence.isChecked(),
|
||||
self.cbK2LongCadence.isChecked()]
|
||||
|
||||
self.productManifest = downloadStarProducts(self.currentObservations,
|
||||
keplerKadences, k2Kadences)
|
||||
self.productManifest = downloadStarProducts(self.currentObservations)
|
||||
self.accept()
|
||||
else:
|
||||
self.showErrorMessage("No data fetched", "You have to fetch data first before you can proceed!")
|
||||
|
||||
Reference in New Issue
Block a user