From: daid303 <daid303@gmail.com>
Date: Fri, 12 Oct 2012 07:52:34 +0000 (+0200)
Subject: Allow the skirt to be used as brim when the skirt distance is zero. This will hug... 
X-Git-Tag: 13.03~252^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fab673713d44ab334dfc0fbf16052acc6679dc42;p=cura.git

Allow the skirt to be used as brim when the skirt distance is zero. This will hug the object and attach a easy to cut base to the object.
---

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index c460b6f1..b5d03d3b 100644
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -246,7 +246,7 @@ def getProfileInformation():
 			'Support_Offset_Y_mm': lambda setting: -profile.getPreferenceFloat('extruder_offset_y1') if profile.getProfileSetting('support_dual_extrusion') == 'True' and int(profile.getPreference('extruder_amount')) > 1 else '0',
 		},'skirt': {
 			'Skirt_line_count': storedSetting("skirt_line_count"),
-			'Convex': "True",
+			'Convex': lambda setting: "True" if profile.getProfileSettingFloat('skirt_gap') > 0.0 else "False",
 			'Gap_Width_mm': storedSetting("skirt_gap"),
 			'Layers_To_index': "1",
 		},'joris': {
diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
index 51f3549c..9dae4183 100644
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
@@ -206,7 +206,7 @@ class SkirtSkein:
 		outerLoops = getOuterLoops(loops)
 		self.outsetLoops = []
 		for i in xrange(self.repository.skirtLineCount.value, 0, -1):
-			outsetLoops = intercircle.getInsetSeparateLoopsFromLoops(outerLoops, -self.skirtOutset - i * self.edgeWidth)
+			outsetLoops = intercircle.getInsetSeparateLoopsFromLoops(outerLoops, -self.skirtOutset - (i-1) * self.edgeWidth)
 			outsetLoops = getOuterLoops(outsetLoops)
 			if self.repository.convex.value:
 				outsetLoops = [euclidean.getLoopConvex(euclidean.getConcatenatedList(outsetLoops))]