Fixed the cool/dimension plugin so they work without a "flowrate".
This commit is contained in:
parent
5f36247788
commit
1abaa7c03f
3 changed files with 10 additions and 8 deletions
|
@ -374,6 +374,7 @@ class CoolSkein:
|
||||||
self.addOrbitsIfNecessary(remainingOrbitTime)
|
self.addOrbitsIfNecessary(remainingOrbitTime)
|
||||||
else:
|
else:
|
||||||
self.setMultiplier(remainingOrbitTime)
|
self.setMultiplier(remainingOrbitTime)
|
||||||
|
if self.oldFlowRate != None:
|
||||||
self.addFlowRate(self.multiplier * self.oldFlowRate)
|
self.addFlowRate(self.multiplier * self.oldFlowRate)
|
||||||
z = float(splitLine[1])
|
z = float(splitLine[1])
|
||||||
self.boundaryLayer = euclidean.LoopLayer(z)
|
self.boundaryLayer = euclidean.LoopLayer(z)
|
||||||
|
@ -386,6 +387,7 @@ class CoolSkein:
|
||||||
if self.coolTemperature != None:
|
if self.coolTemperature != None:
|
||||||
self.addTemperature(self.oldTemperature)
|
self.addTemperature(self.oldTemperature)
|
||||||
self.coolTemperature = None
|
self.coolTemperature = None
|
||||||
|
if self.oldFlowRate != None:
|
||||||
self.addFlowRate(self.oldFlowRate)
|
self.addFlowRate(self.oldFlowRate)
|
||||||
elif firstWord == '(<nestedRing>)':
|
elif firstWord == '(<nestedRing>)':
|
||||||
self.boundaryLoop = []
|
self.boundaryLoop = []
|
||||||
|
|
|
@ -211,9 +211,6 @@ class DimensionSkein:
|
||||||
if not self.repository.retractWithinIsland.value:
|
if not self.repository.retractWithinIsland.value:
|
||||||
self.parseBoundaries()
|
self.parseBoundaries()
|
||||||
self.flowScaleSixty = 60.0 * self.layerHeight * self.edgeWidth / filamentPackingArea
|
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.restartDistance = self.repository.retractionDistance.value + self.repository.restartExtraDistance.value
|
||||||
self.extruderRetractionSpeedMinuteString = self.distanceFeedRate.getRounded(60.0 * self.repository.extruderRetractionSpeed.value)
|
self.extruderRetractionSpeedMinuteString = self.distanceFeedRate.getRounded(60.0 * self.repository.extruderRetractionSpeed.value)
|
||||||
if self.maximumZFeedRatePerSecond != None and self.travelFeedRatePerSecond != None:
|
if self.maximumZFeedRatePerSecond != None and self.travelFeedRatePerSecond != None:
|
||||||
|
@ -287,6 +284,9 @@ class DimensionSkein:
|
||||||
print(distance)
|
print(distance)
|
||||||
print(splitLine)
|
print(splitLine)
|
||||||
return ''
|
return ''
|
||||||
|
if self.operatingFlowRate == None:
|
||||||
|
return self.getExtrusionDistanceStringFromExtrusionDistance(self.flowScaleSixty / 60 * distance)
|
||||||
|
else:
|
||||||
scaledFlowRate = self.flowRate * self.flowScaleSixty
|
scaledFlowRate = self.flowRate * self.flowScaleSixty
|
||||||
return self.getExtrusionDistanceStringFromExtrusionDistance(scaledFlowRate / self.feedRateMinute * distance)
|
return self.getExtrusionDistanceStringFromExtrusionDistance(scaledFlowRate / self.feedRateMinute * distance)
|
||||||
|
|
||||||
|
|
|
@ -174,7 +174,7 @@ class SpeedRepository:
|
||||||
self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Speed', self, '')
|
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.openWikiManualHelpPage = settings.HelpPage().getOpenFromAbsolute('http://fabmetheus.crsndoo.com/wiki/index.php/Skeinforge_Speed')
|
||||||
self.activateSpeed = settings.BooleanSetting().getFromValue('Activate Speed', self, True )
|
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.LabelSeparator().getFromRepository(self)
|
||||||
settings.LabelDisplay().getFromName('- Bridge -', self )
|
settings.LabelDisplay().getFromName('- Bridge -', self )
|
||||||
self.bridgeFeedRateMultiplier = settings.FloatSpin().getFromValue( 0.8, 'Bridge Feed Rate Multiplier (ratio):', self, 1.2, 1.0 )
|
self.bridgeFeedRateMultiplier = settings.FloatSpin().getFromValue( 0.8, 'Bridge Feed Rate Multiplier (ratio):', self, 1.2, 1.0 )
|
||||||
|
|
Loading…
Reference in a new issue