From 5a2d769c1b110287260fa7953298956d40b25631 Mon Sep 17 00:00:00 2001 From: Bill Bumgarner Date: Sat, 10 Mar 2012 11:01:46 -0800 Subject: [PATCH 01/11] - build.sh can now take an optional argument that is the architecture of the target platform. I.e.: ./build.sh osx64 - updated to use the latest nightly pypy as it both seems relatively stable and the URL is subject to less rot - updated pronterface.sh to push user to installing Cocoa variant of wxPython and to no longer launch in 32 bit mode --- build.sh | 6 +++--- scripts/osx64/pronterface.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index e6981c5e95..51a08c6362 100755 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ ##Select the build target -BUILD_TARGET=win32 +BUILD_TARGET=${1:-win32} #BUILD_TARGET=linux #BUILD_TARGET=osx64 @@ -20,7 +20,7 @@ BUILD_NAME=NewUI-Beta4 TARGET_DIR=${BUILD_TARGET}-SkeinPyPy-${BUILD_NAME} ##Which versions of external programs to use -PYPY_VERSION=c-jit-53274-487174b08100 +PYPY_VERSION=c-jit-latest WIN_PORTABLE_PY_VERSION=2.7.2.1 WIN_PYSERIAL_VERSION=2.5 @@ -126,7 +126,7 @@ if [ $BUILD_TARGET = "win32" ]; then mv ${TARGET_DIR}/pypy-${PYPY_VERSION}* ${TARGET_DIR}/pypy else cd ${TARGET_DIR}; $TAR -xjf ../pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2; cd .. - mv ${TARGET_DIR}/pypy-${PYPY_VERSION}* ${TARGET_DIR}/pypy + mv ${TARGET_DIR}/pypy-*-${BUILD_TARGET} ${TARGET_DIR}/pypy fi #Cleanup pypy rm -rf ${TARGET_DIR}/pypy/lib-python/2.7/test diff --git a/scripts/osx64/pronterface.sh b/scripts/osx64/pronterface.sh index 93005942b0..83896aa0c7 100644 --- a/scripts/osx64/pronterface.sh +++ b/scripts/osx64/pronterface.sh @@ -1,8 +1,8 @@ #!/bin/bash -arch -arch i386 python2.7 -c 'import wx' +python2.7 -c 'import wx' if [ $? != 0 ]; then - echo "Requires wx. Download and install from:" + echo "Requires wx. Download and install (the Cocoa/64-bit variant) from:" echo " http://www.wxpython.org/download.php" exit 1 fi @@ -15,5 +15,5 @@ if [ $? != 0 ]; then fi SCRIPT_DIR=`dirname $0` -arch -arch i386 python2.7 ${SCRIPT_DIR}/Printrun/pronterface.py +python2.7 ${SCRIPT_DIR}/Printrun/pronterface.py From 8d78a0224f12fdf77264f4a89989eeacd83b341a Mon Sep 17 00:00:00 2001 From: Bill Bumgarner Date: Sat, 10 Mar 2012 11:25:11 -0800 Subject: [PATCH 02/11] - build.sh now copies just the startup scripts, and not any editor turds. - startup scripts on Mac OS X are marked executable - startup scripts now make sure that PyOpenGL is installed --- build.sh | 6 +++++- scripts/osx64/pronterface.sh | 0 scripts/osx64/skeinpypy.sh | 26 ++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) mode change 100644 => 100755 scripts/osx64/pronterface.sh create mode 100755 scripts/osx64/skeinpypy.sh diff --git a/build.sh b/build.sh index 51a08c6362..d3e1acd465 100755 --- a/build.sh +++ b/build.sh @@ -138,7 +138,11 @@ cp -a SkeinPyPy_NewUI ${TARGET_DIR}/SkeinPyPy mv Printrun ${TARGET_DIR}/Printrun #add script files -cp -a scripts/${BUILD_TARGET}/* $TARGET_DIR/ +if [ $BUILD_TARGET = "win32" ]; then + cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/ +else + cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/ +fi #add readme file cp README ${TARGET_DIR}/README.txt diff --git a/scripts/osx64/pronterface.sh b/scripts/osx64/pronterface.sh old mode 100644 new mode 100755 diff --git a/scripts/osx64/skeinpypy.sh b/scripts/osx64/skeinpypy.sh new file mode 100755 index 0000000000..736b301881 --- /dev/null +++ b/scripts/osx64/skeinpypy.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +python2.7 -c 'import OpenGL' +if [ $? != 0 ]; then + echo "Requires PyOpenGL" + echo " sudo easy_install-2.7 PyOpenGL" + exit 1 +fi + +python2.7 -c 'import wx' +if [ $? != 0 ]; then + echo "Requires wx. Download and install (the Cocoa/64-bit variant) from:" + echo " http://www.wxpython.org/download.php" + exit 1 +fi + +python2.7 -c 'import serial' +if [ $? != 0 ]; then + echo "Requires pyserial." + echo " sudo easy_install-2.7 pyserial" + exit 1 +fi + +SCRIPT_DIR=`dirname $0` +python2.7 ${SCRIPT_DIR}/SkeinPyPy/skeinpypy.py + From f5e5278fc4601fac8089dc3f8672f25fa62cec18 Mon Sep 17 00:00:00 2001 From: Bill Bumgarner Date: Sun, 11 Mar 2012 11:23:44 -0700 Subject: [PATCH 03/11] updated readme --- README | 81 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 28 deletions(-) diff --git a/README b/README index 735b4df900..e087e1a904 100644 --- a/README +++ b/README @@ -1,45 +1,70 @@ For documentation check: https://github.com/daid/SkeinPyPy/wiki For downloads check: https://github.com/daid/SkeinPyPy/downloads +This package includes two programs: +Pronterface: + An application for both manually controlling and automatically feeding gcode to a 3D printer. +SkeinPyPy: + A easy to use program for slicing STL files using SkeinForge. SkeinPyPy can also visualize the 3D models in a variety of ways. -(Old README, is outdated!) + On first run, SkeinPyPy will ask to go through a set of calibration steps that will perform a series of operations on your 3D printer. + One of those steps involves extruding a bit of filament where the filament is initially nearly fully extracted. As such, it you will + probably need to run Pronterface first, heat up the extruder enough to be able to extract the filament and then use the Pronterface + interface to reverse the extruder motor until the filament is at the right position (specifically, until the filament end is even with + where the Bowden tube leaves the extuder motor assembly, on an Ultimaker). -SkeinPyPy is a patched version of Skeinforge. Made to make use of PyPy in combination with Skeinforge easier. -It's also packaged with a customized version of PrintRun. To make a compleet software package. +======== +BUILDING +======== -It's best to use this package with the Marlin firmware. See: http://wiki.ultimaker.com/Skeinforge_PyPy + ./build.sh + +The build script defaults to building for Windows. If you want to build for Mac OS X or Linux, choose one of: -====How to use=== -Download the package for your operating system. + ./build.sh osx64 + ./build.sh linux -Windows: - Double click the "skeinforge.bat" for Skeinforge, this can be used to slice your models into GCode. - Double click the "Printrun.bat" for "PrintRun" this is a graphical command&control interface for your printer. This can run the generated GCode. +Note that Mac OS X currently requires the manual installation of wxPython, PySerial, and PyOpenGL: -Linux/MacOSX: (experimental, no packaged python) - First you'll need to have python installed on your system! With pyserial when you want to use PrintRun. You do not need pypy, this is packaged with SkeinPyPy - Then run SkeinPyPy/skeinforge_application/skeinforge.py for skeinforge to slice your model - Or run printrun\\pronterface.py for the PrintRun interface to print your model + sudo easy_install-2.7 pyserial + sudo easy_install-2.7 PyOpenGL -====What is changed==== -* Do not show settings when ran from command line -* Run PyPy to slice a model instead of normal python -* Changing "Perimeter width over thickness (ratio)" into "Perimeter width". - With 5D machines this makes more sense, as you have good control over the width. -* Save settings in .skeinforge_pypy to not mess up normal skeinforge profiles. -* Default settings changed to match Ultimaker with dimension firmware (Marlin or Sprinter) and PLA. -* Modified "Object first layer speed" settings to work on the first 3 layers (configurable) -* 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. +You will need to download the appropriate wxPython Installer package and install it. It is available from: -====Bugs==== -The graphical analize plugins don't work (Skeinlayer and Skeiniso) + http://www.wxpython.org/download.php -====How does it work==== -The user interface still runs in normal python (as PyPy with TK is a bit hard to build, especially for windows), - and when you slice it will run command line PyPy to slice the model. +Specifically, install "wxPython2.9-osx-cocoa-py2.7" as it is the build that supports 64-bit execution. + +======= +RUNNING +======= + +Windows +------- + +Double-click skeinforge.bat and Printrun.bat. + +Mac OS X & Linux +---------------- + +Once built, the two apps -- Pronterface and SkeinPyPy -- must be started from the command line (for now): + + # open a new terminal window and.... + cd osx64-SkeinPyPy-NewUI-Beta4 + ./pronterface.sh & + ./skeinpypy.sh & + +This will start both applications with their console logging output directed into the terminal window. + +======== +FIRMWARE +======== + +For Ultimaker users, it is highly recommended -- nearly required -- that you upgrade your firmware to the latest Marlin builds. See: + + http://wiki.ultimaker.com/Skeinforge_PyPy From c70edc80de66d3135a08dec519e178bad8b56825 Mon Sep 17 00:00:00 2001 From: Bill Bumgarner Date: Sun, 11 Mar 2012 11:26:43 -0700 Subject: [PATCH 04/11] update format --- README | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README b/README index e087e1a904..20f2b209d2 100644 --- a/README +++ b/README @@ -11,11 +11,7 @@ SkeinPyPy: A easy to use program for slicing STL files using SkeinForge. SkeinPyPy can also visualize the 3D models in a variety of ways. - On first run, SkeinPyPy will ask to go through a set of calibration steps that will perform a series of operations on your 3D printer. - One of those steps involves extruding a bit of filament where the filament is initially nearly fully extracted. As such, it you will - probably need to run Pronterface first, heat up the extruder enough to be able to extract the filament and then use the Pronterface - interface to reverse the extruder motor until the filament is at the right position (specifically, until the filament end is even with - where the Bowden tube leaves the extuder motor assembly, on an Ultimaker). + On first run, SkeinPyPy will ask to go through a set of calibration steps that will perform a series of operations on your 3D printer. One of those steps involves extruding a bit of filament where the filament is initially nearly fully extracted. As such, it you will probably need to run Pronterface first, heat up the extruder enough to be able to extract the filament and then use the Pronterface interface to reverse the extruder motor until the filament is at the right position (specifically, until the filament end is even with where the Bowden tube leaves the extuder motor assembly, on an Ultimaker). ======== BUILDING From bcf7466f9da939920f626e581ffc910078964c8f Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 6 Apr 2012 14:41:38 +0200 Subject: [PATCH 05/11] Updated advanced window (old name) to expert window (new name), was already called expert config in the GUI, just refactor in the code --- Cura/gui/{advancedConfig.py => expertConfig.py} | 6 +++--- Cura/gui/mainWindow.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) rename Cura/gui/{advancedConfig.py => expertConfig.py} (96%) diff --git a/Cura/gui/advancedConfig.py b/Cura/gui/expertConfig.py similarity index 96% rename from Cura/gui/advancedConfig.py rename to Cura/gui/expertConfig.py index 99c841f815..786c587f04 100644 --- a/Cura/gui/advancedConfig.py +++ b/Cura/gui/expertConfig.py @@ -10,10 +10,10 @@ from gui import sliceProgessPanel from gui import alterationPanel from gui import validators -class advancedConfigWindow(configBase.configWindowBase): - "Advanced configuration window" +class expertConfigWindow(configBase.configWindowBase): + "Expert configuration window" def __init__(self): - super(advancedConfigWindow, self).__init__(title='Expert config') + super(expertConfigWindow, self).__init__(title='Expert config') wx.EVT_CLOSE(self, self.OnClose) diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index d602ce4026..1fe2650e9e 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -4,7 +4,7 @@ import __init__ import wx, os, platform, types, webbrowser from gui import configBase -from gui import advancedConfig +from gui import expertConfig from gui import preview3d from gui import sliceProgessPanel from gui import alterationPanel @@ -126,7 +126,7 @@ class mainWindow(configBase.configWindowBase): configBase.TitleRow(right, "Support") c = configBase.SettingRow(right, "Support type", 'support', ['None', 'Exterior Only', 'Everywhere', 'Empty Layers Only'], 'Type of support structure build.\nNone does not do any support.\nExterior only only creates support on the outside.\nEverywhere creates support even on the insides of the model.\nOnly on empty layers is for stacked objects.') - c = configBase.SettingRow(right, "Add raft", 'enable_raft', False, 'A raft is a few layers of lines below the bottom of the object. It prevents warping. Full raft settings can be found in the advanced settings.\nFor PLA this is usually not required. But if you print with ABS it is almost required.') + c = configBase.SettingRow(right, "Add raft", 'enable_raft', False, 'A raft is a few layers of lines below the bottom of the object. It prevents warping. Full raft settings can be found in the expert settings.\nFor PLA this is usually not required. But if you print with ABS it is almost required.') configBase.TitleRow(right, "Filament") c = configBase.SettingRow(right, "Diameter (mm)", 'filament_diameter', '2.89', 'Diameter of your filament, as accurately as possible.\nIf you cannot measure this value you will have to callibrate it, a higher number means less extrusion, a smaller number generates more extrusion.') @@ -291,9 +291,9 @@ class mainWindow(configBase.configWindowBase): printWindow.printFile(self.filename[: self.filename.rfind('.')] + "_export.gcode") def OnExpertOpen(self, e): - acw = advancedConfig.advancedConfigWindow() - acw.Centre() - acw.Show(True) + ecw = expertConfig.expertConfigWindow() + ecw.Centre() + ecw.Show(True) def removeSliceProgress(self, spp): self.progressPanelList.remove(spp) From 1ded2a5c18d017b4ba80b5b87f3e63b12ae9a524 Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 6 Apr 2012 15:15:41 +0200 Subject: [PATCH 06/11] Added defaults for swap_xz and swap_yz --- Cura/gui/mainWindow.py | 3 ++- Cura/util/profile.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 1fe2650e9e..5740fc72df 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -96,7 +96,7 @@ class mainWindow(configBase.configWindowBase): configBase.TitleRow(left, "Accuracy") c = configBase.SettingRow(left, "Layer height (mm)", 'layer_height', '0.2', 'Layer height in millimeters.\n0.2 is a good value for quick prints.\n0.1 gives high quality prints.') validators.validFloat(c, 0.0) - validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 80 / 100), "Thicker layers then %.2fmm (80%% nozzle size) usually give bad results and are not recommended.") + validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 80.0 / 100.0), "Thicker layers then %.2fmm (80%% nozzle size) usually give bad results and are not recommended.") c = configBase.SettingRow(left, "Wall thickness (mm)", 'wall_thickness', '0.8', 'Thickness of the walls.\nThis is used in combination with the nozzle size to define the number\nof perimeter lines and the thickness of those perimeter lines.') validators.validFloat(c, 0.0) validators.wallThicknessValidator(c) @@ -174,6 +174,7 @@ class mainWindow(configBase.configWindowBase): configBase.TitleRow(right, "Accuracy") c = configBase.SettingRow(right, "Initial layer thickness (mm)", 'bottom_thickness', '0.0', 'Layer thickness of the bottom layer. A thicker bottom layer makes sticking to the bed easier. Set to 0.0 to have the bottom layer thickness the same as the other layers.') validators.validFloat(c, 0.0) + validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 3.0 / 4.0), "A bottom layer of more then %.2fmm (3/4 nozzle size) usually give bad results and is not recommended.") nb.AddPage(alterationPanel.alterationPanel(nb), "Start/End-GCode") diff --git a/Cura/util/profile.py b/Cura/util/profile.py index c63ef0c049..8229aeec43 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -42,6 +42,8 @@ profileDefaultSettings = { 'flip_x': 'False', 'flip_y': 'False', 'flip_z': 'False', + 'swap_xz': 'False', + 'swap_yz': 'False', 'model_rotate_base': '0', 'model_multiply_x': '1', 'model_multiply_y': '1', From 0626dae61cf7d5bd2b25ad367e3fde96e1c35fb7 Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 6 Apr 2012 16:20:22 +0200 Subject: [PATCH 07/11] Update README to point people better to the right location --- README | 66 ------------------------------------------------------- README.md | 17 ++++++++++++++ 2 files changed, 17 insertions(+), 66 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 7d879ae7b8..0000000000 --- a/README +++ /dev/null @@ -1,66 +0,0 @@ -For documentation check: https://github.com/daid/Cura/wiki -For downloads check: https://github.com/daid/Cura/downloads - -This package includes two programs: - -Pronterface: - - An application for both manually controlling and automatically feeding gcode to a 3D printer. - -Cura: - - A easy to use program for slicing STL files using SkeinForge. Cura can also visualize the 3D models in a variety of ways. - - On first run, Cura will ask to go through a set of calibration steps that will perform a series of operations on your 3D printer. One of those steps involves extruding a bit of filament where the filament is initially nearly fully extracted. As such, it you will probably need to run Pronterface first, heat up the extruder enough to be able to extract the filament and then use the Pronterface interface to reverse the extruder motor until the filament is at the right position (specifically, until the filament end is even with where the Bowden tube leaves the extuder motor assembly, on an Ultimaker). - -======== -BUILDING -======== - - ./package.sh - -The build script defaults to building for Windows. If you want to build for Mac OS X or Linux, choose one of: - - ./package.sh osx64 - ./package.sh linux - -Note that Mac OS X currently requires the manual installation of wxPython, PySerial, and PyOpenGL: - - sudo easy_install-2.7 pyserial - sudo easy_install-2.7 PyOpenGL - -You will need to download the appropriate wxPython Installer package and install it. It is available from: - - http://www.wxpython.org/download.php - -Specifically, install "wxPython2.9-osx-cocoa-py2.7" as it is the build that supports 64-bit execution. - -======= -RUNNING -======= - -Windows -------- - -Double-click skeinforge.bat and Printrun.bat. - -Mac OS X & Linux ----------------- - -Once built, the two apps -- Pronterface and Cura -- must be started from the command line (for now): - - # open a new terminal window and.... - cd osx64-Cura-NewUI-Beta4 - ./pronterface.sh & - ./Cura.sh & - -This will start both applications with their console logging output directed into the terminal window. - -======== -FIRMWARE -======== - -For Ultimaker users, it is highly recommended -- nearly required -- that you upgrade your firmware to the latest Marlin builds. See: - - http://wiki.ultimaker.com/Skeinforge_PyPy - diff --git a/README.md b/README.md new file mode 100644 index 0000000000..4bae532aec --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +Cura +==== + +If you are reading this, then you are looking at the *development* version of Cura. If you just want to use Cura look at the following location: https://github.com/daid/Cura/wiki + +Development +=========== + +Cura is developed in Python. Getting Cura up and running for development is not very difficult. If you copy the python and pypy from a release into your Cura development checkout then you can use Cura right away, just like you would with a release. +For development with git, check the help on github. Pull requests is the fastest way to get changes into Cura. + +Packaging +--------- + +Cura development comes with a script "package.sh", this script has been designed to run under unix like OSes (Linux, MacOS). Running it from sygwin is not a priority. +The "package.sh" script generates a final release package. You should not need it during development, unless you are changing the release process. If you want to distribute your own version of Cura, then the package.sh script will allow you to do that. + From b294aede47c24cf12dff15678913b933872b07b5 Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 6 Apr 2012 17:08:49 +0200 Subject: [PATCH 08/11] Added skin setting to advanced settings --- Cura/cura_sf/fabmetheus_utilities/settings.py | 12 ++++++------ Cura/gui/mainWindow.py | 1 + Cura/util/gcodeInterpreter.py | 2 +- Cura/util/profile.py | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py index fb19b972fa..e765bff0bf 100644 --- a/Cura/cura_sf/fabmetheus_utilities/settings.py +++ b/Cura/cura_sf/fabmetheus_utilities/settings.py @@ -270,12 +270,12 @@ def getProfileInformation(): 'Perimeter_Outside_Stretch_Over_Perimeter_Width_ratio': DEFSET, 'Stretch_From_Distance_Over_Perimeter_Width_ratio': DEFSET, },'skin': { - 'Activate_Skin': "False", - 'Horizontal_Infill_Divisions_integer': DEFSET, - 'Horizontal_Perimeter_Divisions_integer': DEFSET, - 'Vertical_Divisions_integer': DEFSET, - 'Hop_When_Extruding_Infill': DEFSET, - 'Layers_From_index': DEFSET, + 'Activate_Skin': storedSetting("enable_skin"), + 'Horizontal_Infill_Divisions_integer': "1", + 'Horizontal_Perimeter_Divisions_integer': "1", + 'Vertical_Divisions_integer': "2", + 'Hop_When_Extruding_Infill': "False", + 'Layers_From_index': "1", },'comb': { 'Activate_Comb': "True", 'Running_Jump_Space_mm': DEFSET, diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 5740fc72df..05170c8541 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -175,6 +175,7 @@ class mainWindow(configBase.configWindowBase): c = configBase.SettingRow(right, "Initial layer thickness (mm)", 'bottom_thickness', '0.0', 'Layer thickness of the bottom layer. A thicker bottom layer makes sticking to the bed easier. Set to 0.0 to have the bottom layer thickness the same as the other layers.') validators.validFloat(c, 0.0) validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 3.0 / 4.0), "A bottom layer of more then %.2fmm (3/4 nozzle size) usually give bad results and is not recommended.") + c = configBase.SettingRow(right, "Enable 'skin'", 'enable_skin', False, 'Skin prints the outer lines of the prints twice, each time with half the thickness. This gives the illusion of a higher print quality.') nb.AddPage(alterationPanel.alterationPanel(nb), "Start/End-GCode") diff --git a/Cura/util/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py index 3570d49e99..0518be2731 100644 --- a/Cura/util/gcodeInterpreter.py +++ b/Cura/util/gcodeInterpreter.py @@ -105,7 +105,7 @@ class gcode(): else: pos.z += z * scale #Check if we have a new layer. - if oldPos.z != pos.z and startCodeDone: + if oldPos.z < pos.z and startCodeDone and len(currentLayer) > 0: self.layerList.append(currentLayer) currentLayer = [] if f is not None: diff --git a/Cura/util/profile.py b/Cura/util/profile.py index 8229aeec43..34df82db33 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -56,6 +56,7 @@ profileDefaultSettings = { 'support_rate': '50', 'support_distance': '0.5', 'joris': 'False', + 'enable_skin': 'False', 'enable_raft': 'False', 'cool_min_feedrate': '5', 'bridge_speed': '100', From d0691018c211d1dbd500c0b3d363da8c5bd2f11d Mon Sep 17 00:00:00 2001 From: Daid Date: Sat, 7 Apr 2012 16:27:22 +0200 Subject: [PATCH 09/11] Fixed progress bar error when slicing with skin enabled. --- Cura/gui/sliceProgessPanel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py index bdf2e82e0c..577b55454c 100644 --- a/Cura/gui/sliceProgessPanel.py +++ b/Cura/gui/sliceProgessPanel.py @@ -28,6 +28,7 @@ class sliceProgessPanel(wx.Panel): 'speed': 12.759510994, 'raft': 31.4580039978, 'skirt': 19.3436040878, + 'skin': 1.0, 'joris': 1.0, 'comb': 23.7805759907, 'cool': 27.148763895, From a055b03422e972b285d65eeaf02cd9a6f3fe8084 Mon Sep 17 00:00:00 2001 From: Lawrence Johnston Date: Sat, 7 Apr 2012 13:28:43 -0700 Subject: [PATCH 10/11] https://github.com/daid/Cura/issues/37 package.sh does not run correctly when current directory is not script directory --- package.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.sh b/package.sh index 2a9038ae32..d059f665f7 100755 --- a/package.sh +++ b/package.sh @@ -40,6 +40,11 @@ function checkTool # Actual build script ############################# +# Change working directory to the directory the script is in +# http://stackoverflow.com/a/246128 +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $SCRIPT_DIR + checkTool git "git: http://git-scm.com/" checkTool curl "curl: http://curl.haxx.se/" if [ $BUILD_TARGET = "win32" ]; then From d3bfafb2bd6d92db4a7116fd17ab6b939b7bed40 Mon Sep 17 00:00:00 2001 From: Lawrence Johnston Date: Sat, 7 Apr 2012 13:34:15 -0700 Subject: [PATCH 11/11] https://github.com/daid/Cura/issues/38 .gitignore does not ignore packages now that NewUI is no longer part of the name --- .gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6c1debd6df..417c7e31f1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *.pyc *.zip *.exe -osx64-Cura-NewUI* -win32-Cura-NewUI* -linux-Cura-NewUI* -Printrun +osx64-Cura-* +win32-Cura-* +linux-Cura-* +Printrun \ No newline at end of file