From 1abaa7c03f7c0f8c9586dacab165402c47f8dca2 Mon Sep 17 00:00:00 2001 From: daid Date: Tue, 14 Feb 2012 14:26:56 +0100 Subject: [PATCH] Fixed the cool/dimension plugin so they work without a "flowrate". --- .../skeinforge_plugins/craft_plugins/cool.py | 6 ++++-- .../skeinforge_plugins/craft_plugins/dimension.py | 10 +++++----- .../skeinforge_plugins/craft_plugins/speed.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py index e70d078..d8572d3 100644 --- a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py +++ b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py @@ -374,7 +374,8 @@ class CoolSkein: self.addOrbitsIfNecessary(remainingOrbitTime) else: self.setMultiplier(remainingOrbitTime) - self.addFlowRate(self.multiplier * self.oldFlowRate) + if self.oldFlowRate != None: + self.addFlowRate(self.multiplier * self.oldFlowRate) z = float(splitLine[1]) self.boundaryLayer = euclidean.LoopLayer(z) self.highestZ = max(z, self.highestZ) @@ -386,7 +387,8 @@ class CoolSkein: if self.coolTemperature != None: self.addTemperature(self.oldTemperature) self.coolTemperature = None - self.addFlowRate(self.oldFlowRate) + if self.oldFlowRate != None: + self.addFlowRate(self.oldFlowRate) elif firstWord == '()': self.boundaryLoop = [] self.boundaryLayer.loops.append(self.boundaryLoop) diff --git a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py index 713ad4d..e95f2c1 100644 --- a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py +++ b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py @@ -211,9 +211,6 @@ class DimensionSkein: if not self.repository.retractWithinIsland.value: self.parseBoundaries() self.flowScaleSixty = 60.0 * self.layerHeight * self.edgeWidth / filamentPackingArea - if self.operatingFlowRate == None: - print('There is no operatingFlowRate so dimension will do nothing.') - return gcodeText self.restartDistance = self.repository.retractionDistance.value + self.repository.restartExtraDistance.value self.extruderRetractionSpeedMinuteString = self.distanceFeedRate.getRounded(60.0 * self.repository.extruderRetractionSpeed.value) if self.maximumZFeedRatePerSecond != None and self.travelFeedRatePerSecond != None: @@ -287,8 +284,11 @@ class DimensionSkein: print(distance) print(splitLine) return '' - scaledFlowRate = self.flowRate * self.flowScaleSixty - return self.getExtrusionDistanceStringFromExtrusionDistance(scaledFlowRate / self.feedRateMinute * distance) + if self.operatingFlowRate == None: + return self.getExtrusionDistanceStringFromExtrusionDistance(self.flowScaleSixty / 60 * distance) + else: + scaledFlowRate = self.flowRate * self.flowScaleSixty + return self.getExtrusionDistanceStringFromExtrusionDistance(scaledFlowRate / self.feedRateMinute * distance) def getExtrusionDistanceStringFromExtrusionDistance(self, extrusionDistance): 'Get the extrusion distance string from the extrusion distance.' diff --git a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py index 56b8066..370a315 100644 --- a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py +++ b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py @@ -174,7 +174,7 @@ class SpeedRepository: self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Speed', self, '') self.openWikiManualHelpPage = settings.HelpPage().getOpenFromAbsolute('http://fabmetheus.crsndoo.com/wiki/index.php/Skeinforge_Speed') self.activateSpeed = settings.BooleanSetting().getFromValue('Activate Speed', self, True ) - self.addFlowRate = settings.BooleanSetting().getFromValue('Add Flow Rate:', self, True ) + self.addFlowRate = settings.BooleanSetting().getFromValue('Add Flow Rate:', self, False ) settings.LabelSeparator().getFromRepository(self) settings.LabelDisplay().getFromName('- Bridge -', self ) self.bridgeFeedRateMultiplier = settings.FloatSpin().getFromValue( 0.8, 'Bridge Feed Rate Multiplier (ratio):', self, 1.2, 1.0 )