Only draw the GCode layers when they are on screen, to remove the slowdown in model...

[cura.git] / Cura / slice / cura_sf / skeinforge_application / skeinforge_plugins / craft_plugins / cool.py

diff --git a/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py
index db54b48b6cf7e053a6ea9645b127ac2c648961be..66b3e58f98d1ad4bc527c228d1f47e6a28f4d23b 100644 (file)
--- a/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py
+++ b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py
@@ -263,7 +263,7 @@ class CoolSkein(object):
        def getCoolMove(self, line, location, splitLine):
                'Get cool line according to time spent on layer.'
                self.feedRateMinute = gcodec.getFeedRateMinute(self.feedRateMinute, splitLine)
-               return self.distanceFeedRate.getLineWithFeedRate(max(self.minFeedrate, self.multiplier * self.feedRateMinute), line, splitLine)
+               return self.distanceFeedRate.getLineWithFeedRate(self.multiplier * self.feedRateMinute, line, splitLine)
 
        def getCraftedGcode(self, gcodeText, repository):
                'Parse gcode text and store the cool gcode.'
@@ -420,6 +420,8 @@ class CoolSkein(object):
                layerTimeActive = self.getLayerTimeActive()
                if remainingOrbitTime + layerTimeActive > 0.00001:
                        self.multiplier = min(1.0, layerTimeActive / (remainingOrbitTime + layerTimeActive))
+                       if self.feedRateMinute * self.multiplier < self.minFeedrate:
+                               self.multiplier = self.minFeedrate / self.feedRateMinute
                else:
                        self.multiplier = 1.0