From 2bb491c22c77827332215e530f5fabcd3f315ba9 Mon Sep 17 00:00:00 2001 From: Reece Johnson Date: Sat, 20 Jan 2018 16:42:35 -0500 Subject: [PATCH] Fix Issue 586 This fixes issue 586 by allowing measurement values to be re-entered if a successful calibration was not able to be performed. --- UIElements/triangularCalibration.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/UIElements/triangularCalibration.py b/UIElements/triangularCalibration.py index 49e32542..3cfc7668 100755 --- a/UIElements/triangularCalibration.py +++ b/UIElements/triangularCalibration.py @@ -199,11 +199,6 @@ def enterTestPaternValuesTriangular(self): ChainErrorCut4 = acceptableTolerance n = 0 - self.horzMeasureT1.disabled = True - self.horzMeasureT2.disabled = True - self.vertMeasureT1.disabled = True - self.enterValuesT.disabled = True - print "Iterating for new machine parameters" # Iterate until error tolerance is achieved or maximum number of iterations occurs @@ -296,6 +291,11 @@ def enterTestPaternValuesTriangular(self): return + self.horzMeasureT1.disabled = True + self.horzMeasureT2.disabled = True + self.vertMeasureT1.disabled = True + self.enterValuesT.disabled = True + print "Machine parameters found:" motorYoffsetEst = motorYcoordEst - distWorkareaTopToCut5 - (bitDiameter / 2) - 12.7