Merge fix.

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 8b7f26ff02d4ce36e4d3dc8244659ac6d82d51a7..d83fd99ebea5902ef17f1d3f75cb7ac2a4fe6d5e 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -288,7 +288,7 @@ class mainWindow(wx.Frame):
 
        def _loadModels(self, filelist):
                self.filelist = filelist
-               self.SetTitle(filelist[-1] + ' - Cura - ' + version.getVersion())
+               self.SetTitle('Cura - %s - %s' % (version.getVersion(), filelist[-1]))
                profile.putPreference('lastFile', ';'.join(self.filelist))
                self.preview3d.loadModelFiles(self.filelist, True)
                self.preview3d.setViewMode("Normal")
@@ -298,6 +298,9 @@ class mainWindow(wx.Frame):
                        self.addToModelMRU(self.filelist[idx])
 
        def OnDropFiles(self, files):
+               profile.putProfileSetting('model_matrix', '1,0,0,0,1,0,0,0,1')
+               profile.setPluginConfig([])
+               self.updateProfileToControls()
                self._loadModels(files)
 
        def OnLoadModel(self, e):
@@ -623,7 +626,7 @@ class normalSettingsPanel(configBase.configPanelBase):
                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, "Cut off object bottom (mm)", 'object_sink', 0.05, '...')
+#              c = configBase.SettingRow(right, "Cut off object bottom (mm)", 'object_sink', 0.05, 'Sinks the object into the platform, this can be used for objects that do not have a flat bottom and thus create a too small first layer.')
 #              validators.validFloat(c, 0.0)
 #              configBase.settingNotify(c, lambda : self.GetParent().GetParent().GetParent().preview3d.Refresh())
 #              c = configBase.SettingRow(right, "Duplicate outlines", '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.')

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 162bbc654e4c2eef02fd074ec4b5519e41aa1584..df36953e962502f1b5bf5ec440903f6af27a9c0c 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -291,7 +291,7 @@ class previewPanel(wx.Panel):
                if mode == "GCode":
                        self.viewSelection.setValue(4)
                wx.CallAfter(self.glCanvas.Refresh)
-       
+
        def loadModelFiles(self, filelist, showWarning = False):
                while len(filelist) > len(self.objectList):
                        self.objectList.append(previewObject())
@@ -304,8 +304,8 @@ class previewPanel(wx.Panel):
                                obj.fileTime = None
                                self.gcodeFileTime = None
                                self.logFileTime = None
+                               obj.mesh = None
                        obj.filename = filelist[idx]
-                       obj.mesh = None
 
                self.deselectTool()
                self.gcodeFilename = sliceRun.getExportFilename(filelist[0])

diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 4700216e2d52d655a88f4f099a3c1cba35a2db0d..438475259f4fd1fceb38659bb1ba3a90ad53506b 100644 (file)
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -493,6 +493,7 @@ class glComboButton(glButton):
 
        def setValue(self, value):
                self._selection = value
+               self._imageID = self._imageIDs[self._selection]
                self._comboCallback()
 
        def OnMouseDown(self, x, y):

diff --git a/Cura/util/meshLoaders/dae.py b/Cura/util/meshLoaders/dae.py
index 4332ea16db9a0038851a3b6030e9b7770f311a2e..ba830a9e16d2065e2481ae1f8f996237072ccff5 100644 (file)
--- a/Cura/util/meshLoaders/dae.py
+++ b/Cura/util/meshLoaders/dae.py
@@ -30,7 +30,7 @@ class daeModel(mesh.mesh):
                                self._ProcessNode2(node)
 
                scale = float(self._base['collada'][0]['asset'][0]['unit'][0]['_meter']) * 1000
-               self.origonalVertexes *= scale
+               self.vertexes *= scale
                
                self._base = None
                self._cur = None

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index fb3d255d787bfd46d3cc437f1cb817e4c75ad0ce..823fe3e95cfde36cea9d67012b163582c01a3f6f 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -87,7 +87,6 @@ M107       ;start with the fan off
 
 G28 X0 Y0  ;move X/Y to min endstops
 G28 Z0     ;move Z to min endstops
-G92 X0 Y0 Z0 E0         ;reset software position to front/left/z=0.0
 
 G1 Z15.0 F{max_z_speed} ;move the platform down 15mm
 

diff --git a/package.sh b/package.sh
index 457715b40d79d9063a502ac4685c58d760361747..1724179adb5649360922a3133e5172a3111dd017 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -12,6 +12,7 @@ BUILD_TARGET=${1:-all}
 #BUILD_TARGET=win32
 #BUILD_TARGET=linux
 #BUILD_TARGET=darwin
+#BUILD_TARGET=debian
 
 ##Do we need to create the final archive
 ARCHIVE_FOR_DISTRIBUTION=1
@@ -134,6 +135,25 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
        exit
 fi
 
+#############################
+# Debian .deb
+#############################
+
+if [ "$BUILD_TARGET" = "debian" ]; then
+       git clone https://github.com/GreatFruitOmsk/Power
+       rm -rf scripts/linux/debian/usr/share/cura
+       mkdir -p scripts/linux/debian/usr/share/cura
+       cp -a Cura scripts/linux/debian/usr/share/cura/
+       cp scripts/linux/cura.py scripts/linux/debian/usr/share/cura/
+       cp -a Power/power scripts/linux/debian/usr/share/cura/
+       echo $BUILD_NAME > scripts/linux/debian/usr/share/cura/Cura/version
+       sudo chown root:root scripts/linux/debian -R
+       sudo chmod 755 scripts/linux/debian/DEBIAN/*
+       cd scripts/linux
+       dpkg-deb --build debian ${TARGET_DIR}.deb
+       sudo chown `id -un`:`id -gn` debian -R
+       exit
+fi
 
 #############################
 # Rest

diff --git a/scripts/linux/cura.py b/scripts/linux/cura.py
index c055fdebf48c0a190e6d2f213978757a24035a02..caf264d2df9377f447a43022eb982804fc4c9e42 100755 (executable)
--- a/scripts/linux/cura.py
+++ b/scripts/linux/cura.py
@@ -2,6 +2,8 @@
 
 import os, sys
 
+sys.path.insert(1, os.path.dirname(__file__))
+
 try:
     import OpenGL
     import wx
@@ -25,7 +27,6 @@ except ImportError as e:
     
     exit(1)
 
-sys.path.insert(1, os.path.dirname(__file__))
 
 import Cura.cura as cura
 

diff --git a/scripts/linux/debian/DEBIAN/control b/scripts/linux/debian/DEBIAN/control
new file mode 100755 (executable)
index 0000000..dd2af10
--- /dev/null
+++ b/scripts/linux/debian/DEBIAN/control
@@ -0,0 +1,14 @@
+Package: cura
+Version: 13.03-1
+Section: misc
+Priority: optional
+Architecture: all
+Essential: no
+Depends: python-wxgtk2.8, python-opengl, python-serial, python-numpy, pypy
+Maintainer: Daid <daid303@gmail.com>
+Provides: cura
+Installed-Size: 10000
+Description: Cura is a full software solution for 3D printing,
+ aimed at RepRaps and the Ultimaker. It's free software payed for
+ and maintained by Ultimaker.
+

diff --git a/scripts/linux/debian/DEBIAN/postinst b/scripts/linux/debian/DEBIAN/postinst
new file mode 100755 (executable)
index 0000000..1a24852
--- /dev/null
+++ b/scripts/linux/debian/DEBIAN/postinst
@@ -0,0 +1 @@
+#!/bin/sh

diff --git a/scripts/linux/debian/usr/share/applications/cura.desktop b/scripts/linux/debian/usr/share/applications/cura.desktop
new file mode 100644 (file)
index 0000000..f9be277
--- /dev/null
+++ b/scripts/linux/debian/usr/share/applications/cura.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Cura
+Comment=Cura
+Icon=/usr/share/cura/Cura/resources/images/c.png
+Exec=/usr/bin/python /usr/share/cura/cura.py
+StartupNotify=true
+Terminal=false
+Categories=GNOME;GTK;Utility;