Update to SkeinPyPy to work with SF50

diff --git a/SkeinPyPy/fabmetheus_utilities/settings.py b/SkeinPyPy/fabmetheus_utilities/settings.py
index d211deb769e72f062614b288bfed2daa80af6127..3c312b16479ba3a16f2e289f15f5966dd6576ad0 100644 (file)
--- a/SkeinPyPy/fabmetheus_utilities/settings.py
+++ b/SkeinPyPy/fabmetheus_utilities/settings.py
@@ -125,10 +125,11 @@ def getSkeinPyPyProfileInformation():
                        'Turn_Extruder_Off_at_Start_Up': DEFSET,
                },'widen': {
                        'Activate_Widen': DEFSET,
+                       'Widen_Width_over_Edge_Width_ratio': DEFSET,
                },'inset': {
                        'Add_Custom_Code_for_Temperature_Reading': DEFSET,
                        'Infill_in_Direction_of_Bridge': "True",
-                       'Infill_Width_over_Thickness_ratio': DEFSET,
+                       'Infill_Width': storedPreference("nozzle_size"),
                        'Loop_Order_Choice': DEFSET,
                        'Overlap_Removal_Width_over_Perimeter_Width_ratio': DEFSET,
                        'Turn_Extruder_Heater_Off_at_Shut_Down': DEFSET,
@@ -157,6 +158,7 @@ def getSkeinPyPyProfileInformation():
                        'Infill_Perimeter_Overlap_ratio': storedPercentSetting('fill_overlap'),
                        'Infill_Solidity_ratio': storedPercentSetting('fill_density'),
                        'Infill_Width': storedPreference("nozzle_size"),
+                       'Sharpest_Angle_degrees': DEFSET,
                        'Solid_Surface_Thickness_layers': calculateSolidLayerCount,
                        'Start_From_Choice': DEFSET,
                        'Surrounding_Angle_degrees': DEFSET,

diff --git a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py
index bb68db20e4339ef2d9d206fb09b7644212a1639c..3a5115aefadd920f203eda1b518a25ebdaa74211 100644 (file)
--- a/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py
+++ b/SkeinPyPy/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py
@@ -301,7 +301,7 @@ class InsetRepository:
                self.openWikiManualHelpPage = settings.HelpPage().getOpenFromAbsolute('http://fabmetheus.crsndoo.com/wiki/index.php/Skeinforge_Inset')
                self.addCustomCodeForTemperatureReading = settings.BooleanSetting().getFromValue('Add Custom Code for Temperature Reading', self, True)
                self.infillInDirectionOfBridge = settings.BooleanSetting().getFromValue('Infill in Direction of Bridge', self, True)
-               self.infillWidthOverThickness = settings.FloatSpin().getFromValue(1.3, 'Infill Width over Thickness (ratio):', self, 1.7, 1.5)
+               self.infillWidth = settings.FloatSpin().getFromValue(0.1, 'Infill Width:', self, 1.7, 0.4)
                self.loopOrderChoice = settings.MenuButtonDisplay().getFromName('Loop Order Choice:', self )
                self.loopOrderAscendingArea = settings.MenuRadio().getFromMenuButtonDisplay(self.loopOrderChoice, 'Ascending Area', self, True)
                self.loopOrderDescendingArea = settings.MenuRadio().getFromMenuButtonDisplay(self.loopOrderChoice, 'Descending Area', self, False)
@@ -430,7 +430,7 @@ class InsetSkein:
                                return
                        elif firstWord == '(<layerHeight>':
                                layerHeight = float(splitLine[1])
-                               self.infillWidth = self.repository.infillWidthOverThickness.value * layerHeight
+                               self.infillWidth = self.repository.infillWidth.value
                                self.distanceFeedRate.addTagRoundedLine('infillWidth', self.infillWidth)
                                self.distanceFeedRate.addTagRoundedLine('volumeFraction', self.repository.volumeFraction.value)
                        elif firstWord == '(<edgeWidth>':