From 65103a8f097e6958bec4cc846ba4172dc247249b Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 15 Dec 2011 10:58:10 +0100 Subject: [PATCH 1/4] Added requirements for "printrun" to python. Will add printrun later. --- build.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 65772860..b72d222b 100755 --- a/build.sh +++ b/build.sh @@ -10,13 +10,20 @@ fi if [ ! -f "PortablePython_2.7.2.1.exe" ]; then wget http://ftp.nluug.nl/languages/python/portablepython/v2.7/PortablePython_2.7.2.1.exe fi +if [ ! -f pyserial.exe ]; then + wget http://sourceforge.net/projects/pyserial/files/pyserial/2.5/pyserial-2.5.win32.exe/download + mv download pyserial.exe +fi if [ ! -d target/python ]; then 7z x PortablePython_2.7.2.1.exe \$_OUTDIR/App - 7z x PortablePython_2.7.2.1.exe \$_OUTDIR/Lib/site-packages/wx-2.8-msw-unicode + 7z x PortablePython_2.7.2.1.exe \$_OUTDIR/Lib/site-packages + 7z x pyserial.exe PURELIB mkdir -p target/python mv \$_OUTDIR/App/* target/python - mv \$_OUTDIR/Lib target/python + mv \$_OUTDIR/Lib/site-packages/wx* target/python/Lib/site-packages/ + mv PURELIB/serial target/python/Lib rm -rf \$_OUTDIR + rm -rf PURELIB fi #Get pypy and extract it From 23da09ce195036d676e7e71e70d811c6a0b63b42 Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 15 Dec 2011 11:42:09 +0100 Subject: [PATCH 2/4] Added slowdown over first 3 layers option. This reduces failures in the first layers. For SF45 you can also configure the travel speed. Due to the flow of the code I cannot find this in SF41 --- README | 3 ++ patches/41 | 99 +++++++++++++++++++++++++++++++++++++++++------------- patches/45 | 98 ++++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 153 insertions(+), 47 deletions(-) diff --git a/README b/README index 20a4ece7..e9a5014e 100644 --- a/README +++ b/README @@ -10,6 +10,9 @@ The final result is a release package for Windows which should be ready to run w With 5D machines this makes more sense, as you have good control over the width. * All: Save settings in .skeinforge_pypy to not mess up normal skeinforge profiles. * All: Default settings changed to match Ultimaker with dimension firmware (Marlin or Sprinter) +* All: Modified "Object first layer speed" settings to work on the first 3 layers (configurable) +* SF45: Added "Object first layer travel speed" setting, to slow down the travel on the first layers. + Reduces the chance that a travel pulls the first layer lose. * SF41: Dimensions patch against short pauses * SF41: Speedup patch in euclidean.py (Merged in mainline SF43) diff --git a/patches/41 b/patches/41 index 5d076501..7fa71c6e 100644 --- a/patches/41 +++ b/patches/41 @@ -1,6 +1,6 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/archive.py target/SF41/fabmetheus_utilities/archive.py --- ori/41/fabmetheus_utilities/archive.py 2011-04-12 00:32:25.000000000 +0200 -+++ target/SF41/fabmetheus_utilities/archive.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/fabmetheus_utilities/archive.py 2011-12-15 10:57:21.000000000 +0100 @@ -18,7 +18,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' @@ -12,7 +12,7 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/archive.py target/SF41/fabme def addToNamePathDictionary(directoryPath, namePathDictionary): diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/euclidean.py target/SF41/fabmetheus_utilities/euclidean.py --- ori/41/fabmetheus_utilities/euclidean.py 2011-04-15 02:32:27.000000000 +0200 -+++ target/SF41/fabmetheus_utilities/euclidean.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/fabmetheus_utilities/euclidean.py 2011-12-15 10:57:21.000000000 +0100 @@ -64,7 +64,7 @@ def addElementToPixelList( element, pixelDictionary, x, y ): @@ -124,7 +124,7 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/euclidean.py target/SF41/fab return squareValues diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/settings.py target/SF41/fabmetheus_utilities/settings.py --- ori/41/fabmetheus_utilities/settings.py 2011-04-26 10:32:32.000000000 +0200 -+++ target/SF41/fabmetheus_utilities/settings.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/fabmetheus_utilities/settings.py 2011-12-15 10:57:21.000000000 +0100 @@ -271,7 +271,7 @@ if repository.baseNameSynonym != None: text = archive.getFileText(archive.getProfilesPath(getProfileBaseNameSynonym(repository)), False) @@ -136,7 +136,7 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/settings.py target/SF41/fabm readSettingsFromText(repository, text) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/end.gcode target/SF41/skeinforge_application/alterations/end.gcode --- ori/41/skeinforge_application/alterations/end.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF41/skeinforge_application/alterations/end.gcode 2011-12-14 15:01:34.000000000 +0100 ++++ target/SF41/skeinforge_application/alterations/end.gcode 2011-12-15 10:57:21.000000000 +0100 @@ -0,0 +1,10 @@ +(start of end.gcode) +M104 S0 (extruder heat off) @@ -150,7 +150,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/end.gcode targ + diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/start.gcode target/SF41/skeinforge_application/alterations/start.gcode --- ori/41/skeinforge_application/alterations/start.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF41/skeinforge_application/alterations/start.gcode 2011-12-14 15:02:41.000000000 +0100 ++++ target/SF41/skeinforge_application/alterations/start.gcode 2011-12-15 10:57:21.000000000 +0100 @@ -0,0 +1,30 @@ +(start of start.txt) +M92 E926.5 (the number of extruder steps to take in 1mm of filament) @@ -184,7 +184,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/start.gcode ta + diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py --- ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py 2011-04-14 06:57:37.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py 2011-12-15 10:57:21.000000000 +0100 @@ -297,7 +297,7 @@ self.baseNameSynonym = 'behold.csv' self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeiniso', self, '') @@ -196,7 +196,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py --- ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-04-14 06:57:37.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-15 10:57:21.000000000 +0100 @@ -195,7 +195,7 @@ self.baseNameSynonym = 'skeinview.csv' self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeinlayer', self, '') @@ -208,7 +208,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze self.goAroundExtruderOffTravel = settings.BooleanSetting().getFromValue('Go Around Extruder Off Travel', self, False ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-04-08 10:20:48.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-15 10:57:21.000000000 +0100 @@ -157,7 +157,7 @@ self.extraDecimalPlaces = settings.FloatSpin().getFromValue(0.0, 'Extra Decimal Places (float):', self, 3.0, 2.0) self.importCoarseness = settings.FloatSpin().getFromValue( 0.5, 'Import Coarseness (ratio):', self, 2.0, 1.0 ) @@ -247,7 +247,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p carving.getCarveCornerMaximum(), diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-02-09 08:31:34.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-15 10:57:21.000000000 +0100 @@ -166,7 +166,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.chamber.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Chamber', self, '') @@ -259,7 +259,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.holdingForce = settings.FloatSpin().getFromValue( 0.0, 'Holding Force (bar):', self, 100.0, 0.0 ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-15 10:57:21.000000000 +0100 @@ -86,7 +86,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.clip.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Clip', self, '') @@ -271,7 +271,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.executeTitle = 'Clip' diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-15 10:57:21.000000000 +0100 @@ -126,7 +126,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.comb.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Comb', self, '') @@ -283,7 +283,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p def execute(self): diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-03-08 08:30:18.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-15 10:57:21.000000000 +0100 @@ -142,7 +142,7 @@ self.orbit = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Orbit', self, False) self.slowDown = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Slow Down', self, True) @@ -295,7 +295,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-03-22 21:08:23.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-15 10:57:21.000000000 +0100 @@ -124,7 +124,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.dimension.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Dimension', self, '') @@ -347,7 +347,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.addLinearMoveExtrusionDistanceLine( - self.repository.retractionDistance.value ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-02-09 08:28:22.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 10:57:21.000000000 +0100 @@ -214,7 +214,7 @@ self.exportLabel = settings.LabelDisplay().getFromName('Export Operations: ', self) self.exportPlugins = [] @@ -368,7 +368,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.fileExtension = settings.StringSetting().getFromValue('File Extension:', self, 'gcode') diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-03-29 22:07:15.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-15 10:57:21.000000000 +0100 @@ -808,7 +808,7 @@ self.infillPatternLine = settings.Radio().getFromRadio( infillLatentStringVar, 'Line', self, True ) self.infillPerimeterOverlap = settings.FloatSpin().getFromValue( 0.0, 'Infill Perimeter Overlap (ratio):', self, 0.4, 0.15 ) @@ -389,7 +389,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-15 10:57:21.000000000 +0100 @@ -82,7 +82,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.home.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Home', self, '') @@ -401,7 +401,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-04-19 09:36:28.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-15 10:57:21.000000000 +0100 @@ -113,7 +113,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.jitter.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Jitter', self, '') @@ -413,7 +413,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-02-09 08:31:44.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-15 10:57:21.000000000 +0100 @@ -88,7 +88,7 @@ 'Set the default settings, execute title & settings fileName.' skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.limit.html', self ) @@ -425,7 +425,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.executeTitle = 'Limit' diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-02-09 08:33:32.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-15 10:57:21.000000000 +0100 @@ -105,7 +105,7 @@ self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Multiply', self, '') @@ -437,7 +437,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.centerX = settings.FloatSpin().getFromValue(-100.0, 'Center X (mm):', self, 100.0, 0.0) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-04-23 09:44:37.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-15 11:41:05.000000000 +0100 @@ -358,7 +358,7 @@ self.baseInfillDensity = settings.FloatSpin().getFromValue(0.3, 'Base Infill Density (ratio):', self, 0.9, 0.5) self.baseLayerThicknessOverLayerThickness = settings.FloatSpin().getFromValue( @@ -456,9 +456,62 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.interfaceNozzleLiftOverInterfaceLayerThickness = settings.FloatSpin().getFromValue( 0.25, 'Interface Nozzle Lift over Interface Layer Thickness (ratio):', self, 0.85, 0.45) settings.LabelSeparator().getFromRepository(self) +@@ -385,7 +385,7 @@ + self.nameOfSupportStartFile = settings.StringSetting().getFromValue( + 'Name of Support Start File:', self, 'support_start.gcode') + settings.LabelSeparator().getFromRepository(self) +- settings.LabelDisplay().getFromName('- Object First Layer -', self) ++ settings.LabelDisplay().getFromName('- Object First Layers -', self) + self.objectFirstLayerFeedRateInfillMultiplier = settings.FloatSpin().getFromValue( + 0.2, 'Object First Layer Feed Rate Infill Multiplier (ratio):', self, 1.0, 0.4) + self.objectFirstLayerFeedRatePerimeterMultiplier = settings.FloatSpin().getFromValue( +@@ -394,6 +394,8 @@ + 0.2, 'Object First Layer Flow Rate Infill Multiplier (ratio):', self, 1.0, 0.4) + self.objectFirstLayerFlowRatePerimeterMultiplier = settings.FloatSpin().getFromValue( + 0.2, 'Object First Layer Flow Rate Perimeter Multiplier (ratio):', self, 1.0, 0.4) ++ self.objectFirstLayersLayerAmount = settings.IntSpin().getFromValue( ++ 1, 'Object First Layers Amount Of Layers For Speed Change:', self, 10, 3) + settings.LabelSeparator().getFromRepository(self) + self.operatingNozzleLiftOverLayerThickness = settings.FloatSpin().getFromValue( + 0.3, 'Operating Nozzle Lift over Layer Thickness (ratio):', self, 0.7, 0.5) +@@ -744,9 +746,9 @@ + paths = euclidean.getPathsFromEndpoints(endpoints, 1.5 * self.interfaceStep, aroundPixelTable, aroundWidth) + feedRateMinuteMultiplied = self.feedRateMinute + supportFlowRateMultiplied = self.supportFlowRate +- if self.layerIndex == 0: +- feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRateInfillMultiplier.value +- supportFlowRateMultiplied *= self.repository.objectFirstLayerFlowRateInfillMultiplier.value ++ if self.layerIndex < self.repository.objectFirstLayersLayerAmount.value: ++ feedRateMinuteMultiplied *= ((self.repository.objectFirstLayerFeedRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ supportFlowRateMultiplied *= ((self.repository.objectFirstLayerFlowRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + self.addFlowRateValueIfDifferent(supportFlowRateMultiplied) + for path in paths: + self.distanceFeedRate.addGcodeFromFeedRateThreadZ(feedRateMinuteMultiplied, path, self.travelFeedRateMinute, z) +@@ -874,14 +876,17 @@ + z += self.operatingJump + flowRate = self.oldFlowRateInput + temperature = self.objectNextLayersTemperature ++ if self.layerIndex < self.repository.objectFirstLayersLayerAmount.value: ++ if self.isPerimeterPath: ++ feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ flowRate *= self.repository.objectFirstLayerFlowRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ else: ++ feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ flowRate *= self.repository.objectFirstLayerFlowRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + if self.layerIndex == 0: + if self.isPerimeterPath: +- feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRatePerimeterMultiplier.value +- flowRate *= self.repository.objectFirstLayerFlowRatePerimeterMultiplier.value + temperature = self.objectFirstLayerPerimeterTemperature + else: +- feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRateInfillMultiplier.value +- flowRate *= self.repository.objectFirstLayerFlowRateInfillMultiplier.value + temperature = self.objectFirstLayerInfillTemperature + self.addFlowRateValueIfDifferent(flowRate) + self.addTemperatureLineIfDifferent(temperature) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-15 10:57:21.000000000 +0100 @@ -148,15 +148,15 @@ self.dutyCycleAtBeginning = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Beginning (portion):', self, 1.0, 1.0 ) self.dutyCycleAtEnding = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Ending (portion):', self, 1.0, 0.0 ) @@ -482,7 +535,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p def execute(self): diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-02-09 08:31:01.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-13 16:40:24.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-15 10:57:21.000000000 +0100 @@ -122,7 +122,7 @@ "Set the default settings, execute title & settings fileName." skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.temperature.html', self ) @@ -494,7 +547,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.coolingRate = settings.FloatSpin().getFromValue( 1.0, 'Cooling Rate (Celcius/second):', self, 20.0, 3.0 ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge.py target/SF41/skeinforge_application/skeinforge.py --- ori/41/skeinforge_application/skeinforge.py 2011-04-27 02:14:25.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge.py 2011-12-14 15:07:47.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge.py 2011-12-15 10:57:21.000000000 +0100 @@ -228,6 +228,7 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import os diff --git a/patches/45 b/patches/45 index aaa6e37b..70a92781 100644 --- a/patches/45 +++ b/patches/45 @@ -1,6 +1,6 @@ diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/archive.py target/SF45/fabmetheus_utilities/archive.py --- ori/45/fabmetheus_utilities/archive.py 2011-10-09 09:33:57.000000000 +0200 -+++ target/SF45/fabmetheus_utilities/archive.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/fabmetheus_utilities/archive.py 2011-12-15 10:57:21.000000000 +0100 @@ -18,7 +18,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' @@ -12,7 +12,7 @@ diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/archive.py target/SF45/fabme def addToNamePathDictionary(directoryPath, namePathDictionary): diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/settings.py target/SF45/fabmetheus_utilities/settings.py --- ori/45/fabmetheus_utilities/settings.py 2011-11-05 06:16:39.000000000 +0100 -+++ target/SF45/fabmetheus_utilities/settings.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/fabmetheus_utilities/settings.py 2011-12-15 10:57:21.000000000 +0100 @@ -289,7 +289,7 @@ if repository.baseNameSynonym != None: text = archive.getFileText(archive.getProfilesPath(getProfileBaseNameSynonym(repository)), False) @@ -24,7 +24,7 @@ diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/settings.py target/SF45/fabm readSettingsFromText(repository, text) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/end.gcode target/SF45/skeinforge_application/alterations/end.gcode --- ori/45/skeinforge_application/alterations/end.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF45/skeinforge_application/alterations/end.gcode 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/alterations/end.gcode 2011-12-15 10:57:21.000000000 +0100 @@ -0,0 +1,10 @@ +(start of end.gcode) +M104 S0 (extruder heat off) @@ -38,7 +38,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/end.gcode targ + diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/start.gcode target/SF45/skeinforge_application/alterations/start.gcode --- ori/45/skeinforge_application/alterations/start.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF45/skeinforge_application/alterations/start.gcode 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/alterations/start.gcode 2011-12-15 10:57:21.000000000 +0100 @@ -0,0 +1,30 @@ +(start of start.txt) +M92 E926.5 (the number of extruder steps to take in 1mm of filament) @@ -72,7 +72,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/start.gcode ta + diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py target/SF45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py --- ori/45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-11-01 08:59:54.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-15 10:57:21.000000000 +0100 @@ -200,7 +200,7 @@ self.baseNameSynonym = 'skeinview.csv' self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeinlayer', self, '') @@ -84,7 +84,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/analyze self.goAroundExtruderOffTravel = settings.BooleanSetting().getFromValue('Go Around Extruder Off Travel', self, False ) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-11-05 23:59:49.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-14 15:43:45.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-15 10:57:21.000000000 +0100 @@ -163,7 +163,7 @@ self.addLayerTemplateToSVG = settings.BooleanSetting().getFromValue('Add Layer Template to SVG', self, True) self.extraDecimalPlaces = settings.FloatSpin().getFromValue(0.0, 'Extra Decimal Places (float):', self, 3.0, 2.0) @@ -123,7 +123,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p carving.getCarveCornerMaximum(), diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-09-29 05:15:43.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-14 15:45:43.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-15 10:57:21.000000000 +0100 @@ -201,7 +201,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.chamber.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Chamber', self, '') @@ -135,7 +135,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.holdingForce = settings.FloatSpin().getFromValue( 0.0, 'Holding Force (bar):', self, 100.0, 0.0 ) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-11-05 04:20:52.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-15 10:57:21.000000000 +0100 @@ -92,7 +92,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.clip.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Clip', self, '') @@ -147,7 +147,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.executeTitle = 'Clip' diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-11-01 09:00:22.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-15 10:57:21.000000000 +0100 @@ -126,7 +126,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.comb.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Comb', self, '') @@ -159,7 +159,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p def execute(self): diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-11-05 06:50:45.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-15 10:57:21.000000000 +0100 @@ -149,7 +149,7 @@ self.orbit = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Orbit', self, False) self.slowDown = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Slow Down', self, True) @@ -171,7 +171,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-11-06 00:12:00.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-15 10:57:21.000000000 +0100 @@ -148,7 +148,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.dimension.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Dimension', self, '') @@ -192,7 +192,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.maximumEValueBeforeReset = settings.FloatSpin().getFromValue(0.0, 'Maximum E Value before Reset (float):', self, 999999.9, 91234.0) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-10-17 22:31:29.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 10:57:21.000000000 +0100 @@ -339,7 +339,7 @@ self.exportLabel = settings.LabelDisplay().getFromName('Export Operations: ', self) self.exportPlugins = [] @@ -213,7 +213,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.fileExtension = settings.StringSetting().getFromValue('File Extension:', self, 'gcode') diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-11-08 06:25:20.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-14 15:41:36.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-15 10:57:21.000000000 +0100 @@ -803,7 +803,7 @@ self.infillPatternLine = settings.Radio().getFromRadio( infillLatentStringVar, 'Line', self, True ) self.infillPerimeterOverlap = settings.FloatSpin().getFromValue( 0.0, 'Infill Perimeter Overlap (ratio):', self, 0.4, 0.15 ) @@ -234,7 +234,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.distanceFeedRate.addTagRoundedLine('infillWidth', self.infillWidth) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-11-06 00:03:11.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-14 15:39:15.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-15 10:57:21.000000000 +0100 @@ -82,7 +82,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.home.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Home', self, '') @@ -246,7 +246,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-10-17 10:32:26.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-15 10:57:21.000000000 +0100 @@ -116,7 +116,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.jitter.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Jitter', self, '') @@ -258,7 +258,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-10-24 08:01:44.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-15 10:57:21.000000000 +0100 @@ -85,7 +85,7 @@ 'Set the default settings, execute title & settings fileName.' skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.limit.html', self ) @@ -270,7 +270,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-10-24 08:08:11.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-14 15:42:23.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-15 10:57:21.000000000 +0100 @@ -112,7 +112,7 @@ self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Multiply', self, '') @@ -282,7 +282,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.centerX = settings.FloatSpin().getFromValue(-100.0, 'Center X (mm):', self, 100.0, 0.0) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-11-05 23:59:49.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-15 10:57:21.000000000 +0100 @@ -338,7 +338,7 @@ self.baseInfillDensity = settings.FloatSpin().getFromValue(0.3, 'Base Infill Density (ratio):', self, 0.9, 0.5) self.baseLayerThicknessOverLayerThickness = settings.FloatSpin().getFromValue( @@ -303,8 +303,8 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-11-05 23:59:49.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-14 15:45:26.000000000 +0100 -@@ -180,8 +180,8 @@ ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-15 11:32:27.000000000 +0100 +@@ -180,18 +180,22 @@ self.dutyCycleAtBeginning = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Beginning (portion):', self, 1.0, 1.0 ) self.dutyCycleAtEnding = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Ending (portion):', self, 1.0, 0.0 ) settings.LabelSeparator().getFromRepository(self) @@ -313,9 +313,24 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p + self.feedRatePerSecond = settings.FloatSpin().getFromValue( 2.0, 'Feed Rate (mm/s):', self, 250.0, 50.0 ) + self.flowRateSetting = settings.FloatSpin().getFromValue( 50.0, 'Flow Rate Setting (float):', self, 250.0, 50.0 ) settings.LabelSeparator().getFromRepository(self) - settings.LabelDisplay().getFromName('- Object First Layer -', self) +- settings.LabelDisplay().getFromName('- Object First Layer -', self) ++ settings.LabelDisplay().getFromName('- Object First Layers -', self) self.objectFirstLayerFeedRateInfillMultiplier = settings.FloatSpin().getFromValue( -@@ -200,7 +200,7 @@ + 0.2, 'Object First Layer Feed Rate Infill Multiplier (ratio):', self, 1.0, 0.4) + self.objectFirstLayerFeedRatePerimeterMultiplier = settings.FloatSpin().getFromValue( + 0.2, 'Object First Layer Feed Rate Perimeter Multiplier (ratio):', self, 1.0, 0.4) ++ self.objectFirstLayerFeedRateTravelMultiplier = settings.FloatSpin().getFromValue( ++ 0.2, 'Object First Layer Feed Rate Travel Multiplier (ratio):', self, 1.0, 0.4) + self.objectFirstLayerFlowRateInfillMultiplier = settings.FloatSpin().getFromValue( + 0.2, 'Object First Layer Flow Rate Infill Multiplier (ratio):', self, 1.0, 0.4) + self.objectFirstLayerFlowRatePerimeterMultiplier = settings.FloatSpin().getFromValue( + 0.2, 'Object First Layer Flow Rate Perimeter Multiplier (ratio):', self, 1.0, 0.4) ++ self.objectFirstLayersLayerAmount = settings.IntSpin().getFromValue( ++ 1, 'Object First Layers Amount Of Layers For Speed Change:', self, 10, 3) + settings.LabelSeparator().getFromRepository(self) + self.orbitalFeedRateOverOperatingFeedRate = settings.FloatSpin().getFromValue( 0.1, 'Orbital Feed Rate over Operating Feed Rate (ratio):', self, 0.9, 0.5 ) + self.maximumZFeedRatePerSecond = settings.FloatSpin().getFromValue(0.5, 'Maximum Z Feed Rate (mm/s):', self, 10.0, 1.0) +@@ -200,7 +204,7 @@ self.perimeterFeedRateMultiplier = settings.FloatSpin().getFromValue(0.5, 'Perimeter Feed Rate Multiplier (ratio):', self, 1.0, 1.0) self.perimeterFlowRateMultiplier = settings.FloatSpin().getFromValue(0.5, 'Perimeter Flow Rate Multiplier (ratio):', self, 1.0, 1.0) settings.LabelSeparator().getFromRepository(self) @@ -324,9 +339,44 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.executeTitle = 'Speed' def execute(self): +@@ -233,11 +237,11 @@ + flowRate *= self.repository.bridgeFlowRateMultiplier.value + if self.isPerimeterPath: + flowRate *= self.repository.perimeterFlowRateMultiplier.value +- if self.layerIndex == 0: ++ if self.layerIndex < self.repository.objectFirstLayersLayerAmount.value: + if self.isPerimeterPath: +- flowRate *= self.repository.objectFirstLayerFlowRatePerimeterMultiplier.value ++ flowRate *= ((self.repository.objectFirstLayerFlowRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + else: +- flowRate *= self.repository.objectFirstLayerFlowRateInfillMultiplier.value ++ flowRate *= ((self.repository.objectFirstLayerFlowRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + if flowRate != self.oldFlowRate: + self.distanceFeedRate.addLine('M108 S' + euclidean.getFourSignificantFigures(flowRate)) + self.oldFlowRate = flowRate +@@ -270,14 +274,16 @@ + feedRateMinute *= self.repository.bridgeFeedRateMultiplier.value + if self.isPerimeterPath: + feedRateMinute *= self.repository.perimeterFeedRateMultiplier.value +- if self.layerIndex == 0: ++ if self.layerIndex < self.repository.objectFirstLayersLayerAmount.value: + if self.isPerimeterPath: +- feedRateMinute *= self.repository.objectFirstLayerFeedRatePerimeterMultiplier.value ++ feedRateMinute *= ((self.repository.objectFirstLayerFeedRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + else: +- feedRateMinute *= self.repository.objectFirstLayerFeedRateInfillMultiplier.value ++ feedRateMinute *= ((self.repository.objectFirstLayerFeedRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + self.addFlowRateLine() + if not self.isExtruderActive: + feedRateMinute = self.travelFeedRateMinute ++ if self.layerIndex < self.repository.objectFirstLayersLayerAmount.value: ++ feedRateMinute *= ((self.repository.objectFirstLayerFeedRateTravelMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + return self.distanceFeedRate.getLineWithFeedRate(feedRateMinute, line, splitLine) + + def parseInitialization(self): diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-09-28 20:58:13.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-14 15:39:44.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-15 10:57:21.000000000 +0100 @@ -122,7 +122,7 @@ "Set the default settings, execute title & settings fileName." skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.temperature.html', self ) @@ -338,7 +388,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.coolingRate = settings.FloatSpin().getFromValue( 1.0, 'Cooling Rate (Celcius/second):', self, 20.0, 3.0 ) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge.py target/SF45/skeinforge_application/skeinforge.py --- ori/45/skeinforge_application/skeinforge.py 2011-11-08 10:32:18.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge.py 2011-12-14 15:34:38.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge.py 2011-12-15 10:57:21.000000000 +0100 @@ -228,6 +228,7 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import os From 6c380aeece55eabcf86a2619d6a2e96f3610d87f Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 15 Dec 2011 14:40:37 +0100 Subject: [PATCH 3/4] Fixed bug in SF41 patch (error in raft.py) --- patches/41 | 54 +++++++++++++++++++++++++++--------------------------- patches/45 | 42 +++++++++++++++++++++--------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/patches/41 b/patches/41 index 7fa71c6e..805a1b91 100644 --- a/patches/41 +++ b/patches/41 @@ -1,6 +1,6 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/archive.py target/SF41/fabmetheus_utilities/archive.py --- ori/41/fabmetheus_utilities/archive.py 2011-04-12 00:32:25.000000000 +0200 -+++ target/SF41/fabmetheus_utilities/archive.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/fabmetheus_utilities/archive.py 2011-12-15 11:43:14.000000000 +0100 @@ -18,7 +18,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' @@ -12,7 +12,7 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/archive.py target/SF41/fabme def addToNamePathDictionary(directoryPath, namePathDictionary): diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/euclidean.py target/SF41/fabmetheus_utilities/euclidean.py --- ori/41/fabmetheus_utilities/euclidean.py 2011-04-15 02:32:27.000000000 +0200 -+++ target/SF41/fabmetheus_utilities/euclidean.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/fabmetheus_utilities/euclidean.py 2011-12-15 11:43:14.000000000 +0100 @@ -64,7 +64,7 @@ def addElementToPixelList( element, pixelDictionary, x, y ): @@ -124,7 +124,7 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/euclidean.py target/SF41/fab return squareValues diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/settings.py target/SF41/fabmetheus_utilities/settings.py --- ori/41/fabmetheus_utilities/settings.py 2011-04-26 10:32:32.000000000 +0200 -+++ target/SF41/fabmetheus_utilities/settings.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/fabmetheus_utilities/settings.py 2011-12-15 11:43:14.000000000 +0100 @@ -271,7 +271,7 @@ if repository.baseNameSynonym != None: text = archive.getFileText(archive.getProfilesPath(getProfileBaseNameSynonym(repository)), False) @@ -136,7 +136,7 @@ diff -r -x'*.pyc' -N -u ori/41/fabmetheus_utilities/settings.py target/SF41/fabm readSettingsFromText(repository, text) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/end.gcode target/SF41/skeinforge_application/alterations/end.gcode --- ori/41/skeinforge_application/alterations/end.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF41/skeinforge_application/alterations/end.gcode 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/alterations/end.gcode 2011-12-15 11:43:14.000000000 +0100 @@ -0,0 +1,10 @@ +(start of end.gcode) +M104 S0 (extruder heat off) @@ -150,7 +150,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/end.gcode targ + diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/start.gcode target/SF41/skeinforge_application/alterations/start.gcode --- ori/41/skeinforge_application/alterations/start.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF41/skeinforge_application/alterations/start.gcode 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/alterations/start.gcode 2011-12-15 11:43:14.000000000 +0100 @@ -0,0 +1,30 @@ +(start of start.txt) +M92 E926.5 (the number of extruder steps to take in 1mm of filament) @@ -184,7 +184,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/alterations/start.gcode ta + diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py --- ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py 2011-04-14 06:57:37.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeiniso.py 2011-12-15 11:43:14.000000000 +0100 @@ -297,7 +297,7 @@ self.baseNameSynonym = 'behold.csv' self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeiniso', self, '') @@ -196,7 +196,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py --- ori/41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-04-14 06:57:37.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-15 11:43:14.000000000 +0100 @@ -195,7 +195,7 @@ self.baseNameSynonym = 'skeinview.csv' self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeinlayer', self, '') @@ -208,7 +208,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/analyze self.goAroundExtruderOffTravel = settings.BooleanSetting().getFromValue('Go Around Extruder Off Travel', self, False ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-04-08 10:20:48.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-15 11:43:14.000000000 +0100 @@ -157,7 +157,7 @@ self.extraDecimalPlaces = settings.FloatSpin().getFromValue(0.0, 'Extra Decimal Places (float):', self, 3.0, 2.0) self.importCoarseness = settings.FloatSpin().getFromValue( 0.5, 'Import Coarseness (ratio):', self, 2.0, 1.0 ) @@ -247,7 +247,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p carving.getCarveCornerMaximum(), diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-02-09 08:31:34.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-15 11:43:14.000000000 +0100 @@ -166,7 +166,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.chamber.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Chamber', self, '') @@ -259,7 +259,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.holdingForce = settings.FloatSpin().getFromValue( 0.0, 'Holding Force (bar):', self, 100.0, 0.0 ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-15 11:43:14.000000000 +0100 @@ -86,7 +86,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.clip.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Clip', self, '') @@ -271,7 +271,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.executeTitle = 'Clip' diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-15 11:43:14.000000000 +0100 @@ -126,7 +126,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.comb.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Comb', self, '') @@ -283,7 +283,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p def execute(self): diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-03-08 08:30:18.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-15 11:43:14.000000000 +0100 @@ -142,7 +142,7 @@ self.orbit = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Orbit', self, False) self.slowDown = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Slow Down', self, True) @@ -295,7 +295,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-03-22 21:08:23.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-15 11:43:14.000000000 +0100 @@ -124,7 +124,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.dimension.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Dimension', self, '') @@ -347,7 +347,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.addLinearMoveExtrusionDistanceLine( - self.repository.retractionDistance.value ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-02-09 08:28:22.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 11:43:14.000000000 +0100 @@ -214,7 +214,7 @@ self.exportLabel = settings.LabelDisplay().getFromName('Export Operations: ', self) self.exportPlugins = [] @@ -368,7 +368,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.fileExtension = settings.StringSetting().getFromValue('File Extension:', self, 'gcode') diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-03-29 22:07:15.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-15 11:43:14.000000000 +0100 @@ -808,7 +808,7 @@ self.infillPatternLine = settings.Radio().getFromRadio( infillLatentStringVar, 'Line', self, True ) self.infillPerimeterOverlap = settings.FloatSpin().getFromValue( 0.0, 'Infill Perimeter Overlap (ratio):', self, 0.4, 0.15 ) @@ -389,7 +389,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-15 11:43:14.000000000 +0100 @@ -82,7 +82,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.home.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Home', self, '') @@ -401,7 +401,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-04-19 09:36:28.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-15 11:43:14.000000000 +0100 @@ -113,7 +113,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.jitter.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Jitter', self, '') @@ -413,7 +413,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-02-09 08:31:44.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-15 11:43:14.000000000 +0100 @@ -88,7 +88,7 @@ 'Set the default settings, execute title & settings fileName.' skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.limit.html', self ) @@ -425,7 +425,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.executeTitle = 'Limit' diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-02-09 08:33:32.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-15 11:43:14.000000000 +0100 @@ -105,7 +105,7 @@ self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Multiply', self, '') @@ -437,7 +437,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.centerX = settings.FloatSpin().getFromValue(-100.0, 'Center X (mm):', self, 100.0, 0.0) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-04-23 09:44:37.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-15 11:41:05.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-15 14:36:04.000000000 +0100 @@ -358,7 +358,7 @@ self.baseInfillDensity = settings.FloatSpin().getFromValue(0.3, 'Base Infill Density (ratio):', self, 0.9, 0.5) self.baseLayerThicknessOverLayerThickness = settings.FloatSpin().getFromValue( @@ -493,11 +493,11 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p temperature = self.objectNextLayersTemperature + if self.layerIndex < self.repository.objectFirstLayersLayerAmount.value: + if self.isPerimeterPath: -+ feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value -+ flowRate *= self.repository.objectFirstLayerFlowRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ feedRateMinuteMultiplied *= ((self.repository.objectFirstLayerFeedRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ flowRate *= ((self.repository.objectFirstLayerFlowRatePerimeterMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value + else: -+ feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value -+ flowRate *= self.repository.objectFirstLayerFlowRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ feedRateMinuteMultiplied *= ((self.repository.objectFirstLayerFeedRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value ++ flowRate *= ((self.repository.objectFirstLayerFlowRateInfillMultiplier.value * (self.repository.objectFirstLayersLayerAmount.value - self.layerIndex)) + self.layerIndex) / self.repository.objectFirstLayersLayerAmount.value if self.layerIndex == 0: if self.isPerimeterPath: - feedRateMinuteMultiplied *= self.repository.objectFirstLayerFeedRatePerimeterMultiplier.value @@ -511,7 +511,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.addTemperatureLineIfDifferent(temperature) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-02-22 08:41:38.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-15 11:43:14.000000000 +0100 @@ -148,15 +148,15 @@ self.dutyCycleAtBeginning = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Beginning (portion):', self, 1.0, 1.0 ) self.dutyCycleAtEnding = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Ending (portion):', self, 1.0, 0.0 ) @@ -535,7 +535,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p def execute(self): diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-02-09 08:31:01.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-15 11:43:14.000000000 +0100 @@ -122,7 +122,7 @@ "Set the default settings, execute title & settings fileName." skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.temperature.html', self ) @@ -547,7 +547,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.coolingRate = settings.FloatSpin().getFromValue( 1.0, 'Cooling Rate (Celcius/second):', self, 20.0, 3.0 ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge.py target/SF41/skeinforge_application/skeinforge.py --- ori/41/skeinforge_application/skeinforge.py 2011-04-27 02:14:25.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge.py 2011-12-15 11:43:14.000000000 +0100 @@ -228,6 +228,7 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import os diff --git a/patches/45 b/patches/45 index 70a92781..3a9c91d2 100644 --- a/patches/45 +++ b/patches/45 @@ -1,6 +1,6 @@ diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/archive.py target/SF45/fabmetheus_utilities/archive.py --- ori/45/fabmetheus_utilities/archive.py 2011-10-09 09:33:57.000000000 +0200 -+++ target/SF45/fabmetheus_utilities/archive.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/fabmetheus_utilities/archive.py 2011-12-15 11:43:14.000000000 +0100 @@ -18,7 +18,7 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' @@ -12,7 +12,7 @@ diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/archive.py target/SF45/fabme def addToNamePathDictionary(directoryPath, namePathDictionary): diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/settings.py target/SF45/fabmetheus_utilities/settings.py --- ori/45/fabmetheus_utilities/settings.py 2011-11-05 06:16:39.000000000 +0100 -+++ target/SF45/fabmetheus_utilities/settings.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/fabmetheus_utilities/settings.py 2011-12-15 11:43:14.000000000 +0100 @@ -289,7 +289,7 @@ if repository.baseNameSynonym != None: text = archive.getFileText(archive.getProfilesPath(getProfileBaseNameSynonym(repository)), False) @@ -24,7 +24,7 @@ diff -r -x'*.pyc' -N -u ori/45/fabmetheus_utilities/settings.py target/SF45/fabm readSettingsFromText(repository, text) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/end.gcode target/SF45/skeinforge_application/alterations/end.gcode --- ori/45/skeinforge_application/alterations/end.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF45/skeinforge_application/alterations/end.gcode 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/alterations/end.gcode 2011-12-15 11:43:14.000000000 +0100 @@ -0,0 +1,10 @@ +(start of end.gcode) +M104 S0 (extruder heat off) @@ -38,7 +38,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/end.gcode targ + diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/start.gcode target/SF45/skeinforge_application/alterations/start.gcode --- ori/45/skeinforge_application/alterations/start.gcode 1970-01-01 01:00:00.000000000 +0100 -+++ target/SF45/skeinforge_application/alterations/start.gcode 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/alterations/start.gcode 2011-12-15 11:43:14.000000000 +0100 @@ -0,0 +1,30 @@ +(start of start.txt) +M92 E926.5 (the number of extruder steps to take in 1mm of filament) @@ -72,7 +72,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/alterations/start.gcode ta + diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py target/SF45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py --- ori/45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-11-01 08:59:54.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/analyze_plugins/skeinlayer.py 2011-12-15 11:43:14.000000000 +0100 @@ -200,7 +200,7 @@ self.baseNameSynonym = 'skeinview.csv' self.fileNameInput = settings.FileNameInput().getFromFileName( [ ('Gcode text files', '*.gcode') ], 'Open File for Skeinlayer', self, '') @@ -84,7 +84,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/analyze self.goAroundExtruderOffTravel = settings.BooleanSetting().getFromValue('Go Around Extruder Off Travel', self, False ) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-11-05 23:59:49.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py 2011-12-15 11:43:14.000000000 +0100 @@ -163,7 +163,7 @@ self.addLayerTemplateToSVG = settings.BooleanSetting().getFromValue('Add Layer Template to SVG', self, True) self.extraDecimalPlaces = settings.FloatSpin().getFromValue(0.0, 'Extra Decimal Places (float):', self, 3.0, 2.0) @@ -123,7 +123,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p carving.getCarveCornerMaximum(), diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-09-29 05:15:43.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py 2011-12-15 11:43:14.000000000 +0100 @@ -201,7 +201,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.chamber.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Chamber', self, '') @@ -135,7 +135,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.holdingForce = settings.FloatSpin().getFromValue( 0.0, 'Holding Force (bar):', self, 100.0, 0.0 ) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-11-05 04:20:52.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py 2011-12-15 11:43:14.000000000 +0100 @@ -92,7 +92,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.clip.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Clip', self, '') @@ -147,7 +147,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.executeTitle = 'Clip' diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-11-01 09:00:22.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py 2011-12-15 11:43:14.000000000 +0100 @@ -126,7 +126,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.comb.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Comb', self, '') @@ -159,7 +159,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p def execute(self): diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-11-05 06:50:45.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py 2011-12-15 11:43:14.000000000 +0100 @@ -149,7 +149,7 @@ self.orbit = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Orbit', self, False) self.slowDown = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Slow Down', self, True) @@ -171,7 +171,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-11-06 00:12:00.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py 2011-12-15 11:43:14.000000000 +0100 @@ -148,7 +148,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.dimension.html', self ) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Dimension', self, '') @@ -192,7 +192,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.maximumEValueBeforeReset = settings.FloatSpin().getFromValue(0.0, 'Maximum E Value before Reset (float):', self, 999999.9, 91234.0) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-10-17 22:31:29.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 11:43:14.000000000 +0100 @@ -339,7 +339,7 @@ self.exportLabel = settings.LabelDisplay().getFromName('Export Operations: ', self) self.exportPlugins = [] @@ -213,7 +213,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.fileExtension = settings.StringSetting().getFromValue('File Extension:', self, 'gcode') diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-11-08 06:25:20.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py 2011-12-15 11:43:14.000000000 +0100 @@ -803,7 +803,7 @@ self.infillPatternLine = settings.Radio().getFromRadio( infillLatentStringVar, 'Line', self, True ) self.infillPerimeterOverlap = settings.FloatSpin().getFromValue( 0.0, 'Infill Perimeter Overlap (ratio):', self, 0.4, 0.15 ) @@ -234,7 +234,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.distanceFeedRate.addTagRoundedLine('infillWidth', self.infillWidth) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-11-06 00:03:11.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/home.py 2011-12-15 11:43:14.000000000 +0100 @@ -82,7 +82,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.home.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Home', self, '') @@ -246,7 +246,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-10-17 10:32:26.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py 2011-12-15 11:43:14.000000000 +0100 @@ -116,7 +116,7 @@ skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.jitter.html', self) self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Jitter', self, '') @@ -258,7 +258,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-10-24 08:01:44.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py 2011-12-15 11:43:14.000000000 +0100 @@ -85,7 +85,7 @@ 'Set the default settings, execute title & settings fileName.' skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.limit.html', self ) @@ -270,7 +270,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-10-24 08:08:11.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py 2011-12-15 11:43:14.000000000 +0100 @@ -112,7 +112,7 @@ self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Multiply', self, '') @@ -282,7 +282,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.centerX = settings.FloatSpin().getFromValue(-100.0, 'Center X (mm):', self, 100.0, 0.0) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-11-05 23:59:49.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py 2011-12-15 11:43:14.000000000 +0100 @@ -338,7 +338,7 @@ self.baseInfillDensity = settings.FloatSpin().getFromValue(0.3, 'Base Infill Density (ratio):', self, 0.9, 0.5) self.baseLayerThicknessOverLayerThickness = settings.FloatSpin().getFromValue( @@ -303,7 +303,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p settings.LabelSeparator().getFromRepository(self) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-11-05 23:59:49.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-15 11:32:27.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py 2011-12-15 11:43:14.000000000 +0100 @@ -180,18 +180,22 @@ self.dutyCycleAtBeginning = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Beginning (portion):', self, 1.0, 1.0 ) self.dutyCycleAtEnding = settings.FloatSpin().getFromValue( 0.0, 'Duty Cyle at Ending (portion):', self, 1.0, 0.0 ) @@ -376,7 +376,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p def parseInitialization(self): diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-09-28 20:58:13.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py 2011-12-15 11:43:14.000000000 +0100 @@ -122,7 +122,7 @@ "Set the default settings, execute title & settings fileName." skeinforge_profile.addListsToCraftTypeRepository('skeinforge_application.skeinforge_plugins.craft_plugins.temperature.html', self ) @@ -388,7 +388,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.coolingRate = settings.FloatSpin().getFromValue( 1.0, 'Cooling Rate (Celcius/second):', self, 20.0, 3.0 ) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge.py target/SF45/skeinforge_application/skeinforge.py --- ori/45/skeinforge_application/skeinforge.py 2011-11-08 10:32:18.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge.py 2011-12-15 10:57:21.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge.py 2011-12-15 11:43:14.000000000 +0100 @@ -228,6 +228,7 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import os From d41ae73dbb15ac80e2804554bd16d6a0b073bc82 Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 15 Dec 2011 17:29:10 +0100 Subject: [PATCH 4/4] Updated SF41 to have tiny_gcode export option --- patches/41 | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++--- patches/45 | 23 ++++++--- 2 files changed, 151 insertions(+), 16 deletions(-) diff --git a/patches/41 b/patches/41 index 805a1b91..0ae342fc 100644 --- a/patches/41 +++ b/patches/41 @@ -345,10 +345,131 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.isExtruderActive = True elif firstWord == 'M103': self.addLinearMoveExtrusionDistanceLine( - self.repository.retractionDistance.value ) +diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_tiny.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_tiny.py +--- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_tiny.py 1970-01-01 01:00:00.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_tiny.py 2011-12-15 16:23:55.000000000 +0100 +@@ -0,0 +1,117 @@ ++""" ++This page is in the table of contents. ++Gcode_tiny is an export plugin to remove the comments and the redundant z and feed rate parameters from a gcode file. ++ ++An export plugin is a script in the export_plugins folder which has the getOutput function, the globalIsReplaceable variable and if it's output is not replaceable, the writeOutput function. It is meant to be run from the export tool. To ensure that the plugin works on platforms which do not handle file capitalization properly, give the plugin a lower case name. ++ ++The getOutput function of this script takes a gcode text and returns that text without comments and redundant z and feed rate parameters. The writeOutput function of this script takes a gcode text and writes that text without comments and redundant z and feed rate parameters to a file. ++ ++Many of the functions in this script are copied from gcodec in skeinforge_utilities. They are copied rather than imported so developers making new plugins do not have to learn about gcodec, the code here is all they need to learn. ++ ++""" ++ ++from __future__ import absolute_import ++import cStringIO ++import os ++ ++ ++__author__ = 'Enrique Perez (perez_enrique@yahoo.com)' ++__date__ = '$Date: 2008/21/04 $' ++__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' ++ ++ ++# This is true if the output is text and false if it is binary." ++globalIsReplaceable = True ++ ++ ++def getOutput(gcodeText): ++ 'Get the exported version of a gcode file.' ++ return GcodeTinySkein().getCraftedGcode(gcodeText) ++ ++def getSplitLineBeforeBracketSemicolon(line): ++ "Get the split line before a bracket or semicolon." ++ bracketSemicolonIndex = min( line.find(';'), line.find('(') ) ++ if bracketSemicolonIndex < 0: ++ return line.split() ++ return line[ : bracketSemicolonIndex ].split() ++ ++def getStringFromCharacterSplitLine(character, splitLine): ++ "Get the string after the first occurence of the character in the split line." ++ indexOfCharacter = getIndexOfStartingWithSecond(character, splitLine) ++ if indexOfCharacter < 0: ++ return None ++ return splitLine[indexOfCharacter][1 :] ++ ++def getSummarizedFileName(fileName): ++ "Get the fileName basename if the file is in the current working directory, otherwise return the original full name." ++ if os.getcwd() == os.path.dirname(fileName): ++ return os.path.basename(fileName) ++ return fileName ++ ++def getTextLines(text): ++ "Get the all the lines of text of a text." ++ return text.replace('\r', '\n').split('\n') ++ ++def getIndexOfStartingWithSecond(letter, splitLine): ++ "Get index of the first occurence of the given letter in the split line, starting with the second word. Return - 1 if letter is not found" ++ for wordIndex in xrange( 1, len(splitLine) ): ++ word = splitLine[ wordIndex ] ++ firstLetter = word[0] ++ if firstLetter == letter: ++ return wordIndex ++ return - 1 ++ ++ ++class GcodeTinySkein: ++ "A class to remove redundant z and feed rate parameters from a skein of extrusions." ++ "Also remove spaces and minimize the exported numbers, this will create GCode which not every tool will understand." ++ def __init__(self): ++ self.lastFeedRateString = None ++ self.lastZString = None ++ self.output = cStringIO.StringIO() ++ ++ def getCraftedGcode( self, gcodeText ): ++ "Parse gcode text and store the gcode." ++ lines = getTextLines(gcodeText) ++ for line in lines: ++ self.parseLine(line) ++ return self.output.getvalue() ++ ++ def fixStringNumber(self, s): ++ if s == None: ++ return None ++ return str(float(s)) ++ ++ def parseLine(self, line): ++ "Parse a gcode line." ++ splitLine = getSplitLineBeforeBracketSemicolon(line) ++ if len(splitLine) < 1: ++ return ++ firstWord = splitLine[0] ++ if len(firstWord) < 1: ++ return ++ if firstWord[0] == '(': ++ return ++ if firstWord != 'G1': ++ self.output.write(line + '\n') ++ return ++ eString = self.fixStringNumber(getStringFromCharacterSplitLine('E', splitLine )) ++ xString = self.fixStringNumber(getStringFromCharacterSplitLine('X', splitLine )) ++ yString = self.fixStringNumber(getStringFromCharacterSplitLine('Y', splitLine )) ++ zString = self.fixStringNumber(getStringFromCharacterSplitLine('Z', splitLine )) ++ feedRateString = self.fixStringNumber(getStringFromCharacterSplitLine('F', splitLine )) ++ self.output.write('G1') ++ if xString != None: ++ self.output.write('X' + xString ) ++ if yString != None: ++ self.output.write('Y' + yString ) ++ if zString != None and zString != self.lastZString: ++ self.output.write('Z' + zString ) ++ if feedRateString != None and feedRateString != self.lastFeedRateString: ++ self.output.write('F' + feedRateString ) ++ if eString != None: ++ self.output.write('E' + eString ) ++ self.lastFeedRateString = feedRateString ++ self.lastZString = zString ++ self.output.write('\n') ++ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py --- ori/41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-02-09 08:28:22.000000000 +0100 -+++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 11:43:14.000000000 +0100 -@@ -214,7 +214,7 @@ ++++ target/SF41/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 16:14:40.000000000 +0100 +@@ -214,17 +214,20 @@ self.exportLabel = settings.LabelDisplay().getFromName('Export Operations: ', self) self.exportPlugins = [] exportLatentStringVar = settings.LatentStringVar() @@ -357,12 +478,18 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.doNotChangeOutput.directoryPath = None allExportPluginFileNames = exportPluginFileNames + exportStaticPluginFileNames for exportPluginFileName in allExportPluginFileNames: -@@ -224,7 +224,7 @@ - exportPlugin = settings.RadioCapitalizedButton().getFromPath(exportLatentStringVar, exportPluginFileName, path, self, False) + exportPlugin = None ++ default = False ++ if exportPluginFileName == "gcode_small": ++ default = True + if exportPluginFileName in exportPluginFileNames: + path = os.path.join(exportPluginsFolderPath, exportPluginFileName) +- exportPlugin = settings.RadioCapitalizedButton().getFromPath(exportLatentStringVar, exportPluginFileName, path, self, False) ++ exportPlugin = settings.RadioCapitalizedButton().getFromPath(exportLatentStringVar, exportPluginFileName, path, self, default) exportPlugin.directoryPath = exportPluginsFolderPath else: - exportPlugin = settings.RadioCapitalized().getFromRadio(exportLatentStringVar, exportPluginFileName, self, False) -+ exportPlugin = settings.RadioCapitalized().getFromRadio(exportLatentStringVar, exportPluginFileName, self, True) ++ exportPlugin = settings.RadioCapitalized().getFromRadio(exportLatentStringVar, exportPluginFileName, self, default) exportPlugin.directoryPath = exportStaticDirectoryPath self.exportPlugins.append(exportPlugin) self.fileExtension = settings.StringSetting().getFromValue('File Extension:', self, 'gcode') @@ -547,7 +674,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge_plugins/craft_p self.coolingRate = settings.FloatSpin().getFromValue( 1.0, 'Cooling Rate (Celcius/second):', self, 20.0, 3.0 ) diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge.py target/SF41/skeinforge_application/skeinforge.py --- ori/41/skeinforge_application/skeinforge.py 2011-04-27 02:14:25.000000000 +0200 -+++ target/SF41/skeinforge_application/skeinforge.py 2011-12-15 11:43:14.000000000 +0100 ++++ target/SF41/skeinforge_application/skeinforge.py 2011-12-15 15:28:29.000000000 +0100 @@ -228,6 +228,7 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import os @@ -564,7 +691,7 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge.py target/SF41/ class SkeinforgeRepository: -@@ -568,13 +568,35 @@ +@@ -568,13 +568,36 @@ settings.LabelDisplay().getFromName('', self) importantFileNames = ['craft', 'profile'] getRadioPluginsAddPluginGroupFrame(archive.getSkeinforgePluginsPath(), importantFileNames, getPluginFileNames(), self) @@ -598,7 +725,8 @@ diff -r -x'*.pyc' -N -u ori/41/skeinforge_application/skeinforge.py target/SF41/ + if pypyExe == False or platform.python_implementation() == "PyPy": + skeinforge_craft.writeOutput(fileName) + else: -+ os.system(pypyExe + " '" + fileName + "'"); ++ if os.system(pypyExe + " '" + fileName + "'") > 0: ++ skeinforge_craft.writeOutput(fileName) def save(self): 'Profile has been saved and profile menu should be updated.' diff --git a/patches/45 b/patches/45 index 3a9c91d2..c10986e5 100644 --- a/patches/45 +++ b/patches/45 @@ -192,8 +192,8 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.maximumEValueBeforeReset = settings.FloatSpin().getFromValue(0.0, 'Maximum E Value before Reset (float):', self, 999999.9, 91234.0) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py --- ori/45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-10-17 22:31:29.000000000 +0200 -+++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 11:43:14.000000000 +0100 -@@ -339,7 +339,7 @@ ++++ target/SF45/skeinforge_application/skeinforge_plugins/craft_plugins/export.py 2011-12-15 16:15:45.000000000 +0100 +@@ -339,17 +339,20 @@ self.exportLabel = settings.LabelDisplay().getFromName('Export Operations: ', self) self.exportPlugins = [] exportLatentStringVar = settings.LatentStringVar() @@ -202,12 +202,18 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.doNotChangeOutput.directoryPath = None allExportPluginFileNames = exportPluginFileNames + exportStaticPluginFileNames for exportPluginFileName in allExportPluginFileNames: -@@ -349,7 +349,7 @@ - exportPlugin = settings.RadioCapitalizedButton().getFromPath(exportLatentStringVar, exportPluginFileName, path, self, False) + exportPlugin = None ++ default = False ++ if exportPluginFileName == "gcode_small": ++ default = True + if exportPluginFileName in exportPluginFileNames: + path = os.path.join(exportPluginsFolderPath, exportPluginFileName) +- exportPlugin = settings.RadioCapitalizedButton().getFromPath(exportLatentStringVar, exportPluginFileName, path, self, False) ++ exportPlugin = settings.RadioCapitalizedButton().getFromPath(exportLatentStringVar, exportPluginFileName, path, self, default) exportPlugin.directoryPath = exportPluginsFolderPath else: - exportPlugin = settings.RadioCapitalized().getFromRadio(exportLatentStringVar, exportPluginFileName, self, False) -+ exportPlugin = settings.RadioCapitalized().getFromRadio(exportLatentStringVar, exportPluginFileName, self, True) ++ exportPlugin = settings.RadioCapitalized().getFromRadio(exportLatentStringVar, exportPluginFileName, self, default) exportPlugin.directoryPath = exportStaticDirectoryPath self.exportPlugins.append(exportPlugin) self.fileExtension = settings.StringSetting().getFromValue('File Extension:', self, 'gcode') @@ -388,7 +394,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge_plugins/craft_p self.coolingRate = settings.FloatSpin().getFromValue( 1.0, 'Cooling Rate (Celcius/second):', self, 20.0, 3.0 ) diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge.py target/SF45/skeinforge_application/skeinforge.py --- ori/45/skeinforge_application/skeinforge.py 2011-11-08 10:32:18.000000000 +0100 -+++ target/SF45/skeinforge_application/skeinforge.py 2011-12-15 11:43:14.000000000 +0100 ++++ target/SF45/skeinforge_application/skeinforge.py 2011-12-15 15:29:07.000000000 +0100 @@ -228,6 +228,7 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import os @@ -405,7 +411,7 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge.py target/SF45/ class SkeinforgeRepository: -@@ -576,13 +576,35 @@ +@@ -576,13 +576,36 @@ settings.LabelDisplay().getFromName('', self) importantFileNames = ['craft', 'profile'] getRadioPluginsAddPluginGroupFrame(archive.getSkeinforgePluginsPath(), importantFileNames, getPluginFileNames(), self) @@ -439,7 +445,8 @@ diff -r -x'*.pyc' -N -u ori/45/skeinforge_application/skeinforge.py target/SF45/ + if pypyExe == False or platform.python_implementation() == "PyPy": + skeinforge_craft.writeOutput(fileName) + else: -+ os.system(pypyExe + " '" + fileName + "'"); ++ if os.system(pypyExe + " '" + fileName + "'") > 0: ++ skeinforge_craft.writeOutput(fileName) def save(self): 'Profile has been saved and profile menu should be updated.'