diff --git a/main/astrodatagui/AstrodataGUI.py b/main/astrodatagui/AstrodataGUI.py index 9c3b337..a7042fa 100644 --- a/main/astrodatagui/AstrodataGUI.py +++ b/main/astrodatagui/AstrodataGUI.py @@ -161,13 +161,13 @@ class AstrodataGUI(QtWidgets.QMainWindow): self.listAltIDs.addItem(f"{an[0]}") def updateStarInfo(self, starInfo): - self.lbSpType.setText(starInfo[0]) - if(starInfo[1] > 0): - self.lbRotVel.setText(f"{starInfo[1]} {starInfo[2]}") + self.lbSpType.setText(starInfo["SpType"]) + if(starInfo["RotVel"] > 0): + self.lbRotVel.setText(f"{starInfo['RotVel']} {starInfo['RotVelUnit']}") else: self.lbRotVel.setText("-") - if(starInfo[3] > 0): - self.lbDistance.setText(f"{starInfo[3]} {starInfo[4]}") + if(starInfo["Distance"] > 0): + self.lbDistance.setText(f"{starInfo['Distance']} {starInfo['DistanceUnit']}") else: self.lbDistance.setText("-") diff --git a/main/astrodatagui/db/StarsDB.py b/main/astrodatagui/db/StarsDB.py index 1fa26ad..fbbde2a 100644 --- a/main/astrodatagui/db/StarsDB.py +++ b/main/astrodatagui/db/StarsDB.py @@ -153,7 +153,13 @@ class StarDB(): res = self.dbCursor.execute(f"""SELECT spType, rotVel, rotVelUnit, dist, distUnit FROM starInfo WHERE mainName = \"{mainName}\"""") - return res.fetchone() + info = res.fetchone() + res = {"SpType": info[0], + "RotVel": info[1], + "RotVelUnit": info[2], + "Distance": info[3], + "DistanceUnit": info[4]} + return res def getFilePath(self, mainName, source, sequence): print(f"Trying for {mainName}, {source}, {sequence}")