Add impulse class percentage display

motorlib/simResult.py

@@ -184,12 +184,21 @@ def getDesignation(self):
         imp = self.getImpulse()
         if imp < 1.25: # This is to avoid a domain error finding log(0)
             return 'N/A'
-        return chr(int(math.log(imp/1.25, 2)) + 65) + str(int(self.getAverageForce()))
+        return chr(int(math.log(imp / 1.25, 2)) + 65) + str(int(self.getAverageForce()))
 
     def getFullDesignation(self):
         """Returns the full motor designation, which also includes the total impulse prepended on"""
         return '{:.0f}{}'.format(self.getImpulse(), self.getDesignation())
 
+    def getImpulseClassPercentage(self):
+        """Returns the percentage of the way between the minimum and maximum impulse for the impulse class that the
+        motor is"""
+        impulse = self.getImpulse()
+        if impulse < 1.25:  # This is to avoid a domain error finding log(0)
+            return 0
+        minClassImpulse = 1.25 * 2 ** int(math.log(impulse / 1.25, 2))
+        return (impulse - minClassImpulse) / minClassImpulse
+
     def getPeakMassFlux(self):
         """Returns the maximum mass flux observed at any grain end."""
         return self.channels['massFlux'].getMax()

uilib/widgets/mainWindow.py

@@ -291,7 +291,7 @@ def formatMotorStat(self, quantity, inUnit):
         return '{:.2f} {}'.format(motorlib.units.convert(quantity, inUnit, convUnit), convUnit)
 
     def updateMotorStats(self, simResult):
-        self.ui.labelMotorDesignation.setText(simResult.getDesignation())
+        self.ui.labelMotorDesignation.setText('{} ({:.0%})'.format(simResult.getDesignation(), simResult.getImpulseClassPercentage()))
         self.ui.labelImpulse.setText(self.formatMotorStat(simResult.getImpulse(), 'Ns'))
         self.ui.labelDeliveredISP.setText(self.formatMotorStat(simResult.getISP(), 's'))
         self.ui.labelBurnTime.setText(self.formatMotorStat(simResult.getBurnTime(), 's'))