q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/daid/Cura

master
Daid 2012-10-12 11:45:46 +02:00
parent 0cc89eb33a c62a9be304
commit bc7ed76636
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cura/cura_sf/fabmetheus_utilities/settings.py
View File

@ -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', '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': {
'Skirt_line_count': storedSetting("skirt_line_count"), '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"), 'Gap_Width_mm': storedSetting("skirt_gap"),
'Layers_To_index': "1", 'Layers_To_index': "1",
},'joris': { },'joris': {

2
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
View File

@ -206,7 +206,7 @@ class SkirtSkein:
outerLoops = getOuterLoops(loops) outerLoops = getOuterLoops(loops)
self.outsetLoops = [] self.outsetLoops = []
for i in xrange(self.repository.skirtLineCount.value, 0, -1): 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) outsetLoops = getOuterLoops(outsetLoops)
if self.repository.convex.value: if self.repository.convex.value:
outsetLoops = [euclidean.getLoopConvex(euclidean.getConcatenatedList(outsetLoops))] outsetLoops = [euclidean.getLoopConvex(euclidean.getConcatenatedList(outsetLoops))]

4
Cura/gui/projectPlanner.py
View File

@ -974,7 +974,9 @@ class ProjectSliceProgressWindow(wx.Frame):
resultFile.write('T%d\n' % (action.extruder)) resultFile.write('T%d\n' % (action.extruder))
currentExtruder = action.extruder currentExtruder = action.extruder
prevTemp = action.temperature prevTemp = action.temperature
resultFile.write(profile.getAlterationFileContents('start.gcode')) startGCode = profile.getAlterationFileContents('start.gcode')
startGCode = startGCode.replace('?filename?', 'Multiple files')
resultFile.write(startGCode)
else: else:
#reset the extrusion length, and move to the next object center. #reset the extrusion length, and move to the next object center.
resultFile.write(';TYPE:CUSTOM\n') resultFile.write(';TYPE:CUSTOM\n')

14
package.sh
View File

@ -103,16 +103,6 @@ else
downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2 downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2
fi fi
#Get our own version of Printrun
if [ ! -d "Printrun" ]; then
git clone git://github.com/daid/Printrun.git
else
echo "Updating Printrun"
cd Printrun
git pull
cd ..
fi
############################# #############################
# Build the packages # Build the packages
############################# #############################
@ -180,10 +170,6 @@ cp -a Cura/* ${TARGET_DIR}/Cura
#Add cura version file #Add cura version file
echo $BUILD_NAME > ${TARGET_DIR}/Cura/version echo $BUILD_NAME > ${TARGET_DIR}/Cura/version
#add printrun
cp -a Printrun ${TARGET_DIR}/Printrun
rm -rf ${TARGET_DIR}/Printrun/.git*
#add script files #add script files
if [ $BUILD_TARGET = "win32" ]; then if [ $BUILD_TARGET = "win32" ]; then
cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/ cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/