Merge branch 'master' of https://github.com/daid/Cura
commit
465e37a19c
|
@ -1,5 +1,6 @@
|
||||||
*.tar.bz2
|
*.tar.bz2
|
||||||
*.tar.gz
|
*.tar.gz
|
||||||
|
*.7z
|
||||||
*.pyc
|
*.pyc
|
||||||
*.zip
|
*.zip
|
||||||
*.exe
|
*.exe
|
||||||
|
@ -22,3 +23,5 @@ object.png
|
||||||
scripts/darwin/dist/*
|
scripts/darwin/dist/*
|
||||||
scripts/darwin/build/*
|
scripts/darwin/build/*
|
||||||
scripts/darwin/Cura.dmg.sparseimage
|
scripts/darwin/Cura.dmg.sparseimage
|
||||||
|
scripts/win32/dist/*
|
||||||
|
log.txt
|
||||||
|
|
|
@ -273,7 +273,7 @@ class mainWindow(wx.Frame):
|
||||||
spp = sliceProgessPanel.sliceProgessPanel(self, self, self.filelist)
|
spp = sliceProgessPanel.sliceProgessPanel(self, self, self.filelist)
|
||||||
self.sizer.Add(spp, (len(self.progressPanelList)+2,0), span=(1, 3 + self.extruderCount), flag=wx.EXPAND)
|
self.sizer.Add(spp, (len(self.progressPanelList)+2,0), span=(1, 3 + self.extruderCount), flag=wx.EXPAND)
|
||||||
self.sizer.Layout()
|
self.sizer.Layout()
|
||||||
newSize = self.GetSize();
|
newSize = self.GetSize()
|
||||||
newSize.IncBy(0, spp.GetSize().GetHeight())
|
newSize.IncBy(0, spp.GetSize().GetHeight())
|
||||||
if newSize.GetWidth() < wx.GetDisplaySize()[0]:
|
if newSize.GetWidth() < wx.GetDisplaySize()[0]:
|
||||||
self.SetSize(newSize)
|
self.SetSize(newSize)
|
||||||
|
@ -292,7 +292,7 @@ class mainWindow(wx.Frame):
|
||||||
|
|
||||||
def removeSliceProgress(self, spp):
|
def removeSliceProgress(self, spp):
|
||||||
self.progressPanelList.remove(spp)
|
self.progressPanelList.remove(spp)
|
||||||
newSize = self.GetSize();
|
newSize = self.GetSize()
|
||||||
newSize.IncBy(0, -spp.GetSize().GetHeight())
|
newSize.IncBy(0, -spp.GetSize().GetHeight())
|
||||||
if newSize.GetWidth() < wx.GetDisplaySize()[0]:
|
if newSize.GetWidth() < wx.GetDisplaySize()[0]:
|
||||||
self.SetSize(newSize)
|
self.SetSize(newSize)
|
||||||
|
|
|
@ -150,7 +150,7 @@ G92 E0
|
||||||
}
|
}
|
||||||
preferencesDefaultSettings = {
|
preferencesDefaultSettings = {
|
||||||
'startMode': 'Simple',
|
'startMode': 'Simple',
|
||||||
'lastFile': os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'example', 'UltimakerRobot_support.stl')),
|
'lastFile': os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'resources', 'example', 'UltimakerRobot_support.stl')),
|
||||||
'machine_width': '205',
|
'machine_width': '205',
|
||||||
'machine_depth': '205',
|
'machine_depth': '205',
|
||||||
'machine_height': '200',
|
'machine_height': '200',
|
||||||
|
@ -397,7 +397,7 @@ def calculateEdgeWidth():
|
||||||
if wallThickness < nozzleSize:
|
if wallThickness < nozzleSize:
|
||||||
return wallThickness
|
return wallThickness
|
||||||
|
|
||||||
lineCount = int(wallThickness / nozzleSize)
|
lineCount = int(wallThickness / nozzleSize + 0.0001)
|
||||||
lineWidth = wallThickness / lineCount
|
lineWidth = wallThickness / lineCount
|
||||||
lineWidthAlt = wallThickness / (lineCount + 1)
|
lineWidthAlt = wallThickness / (lineCount + 1)
|
||||||
if lineWidth > nozzleSize * 1.5:
|
if lineWidth > nozzleSize * 1.5:
|
||||||
|
|
|
@ -1,10 +1,15 @@
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
|
from Cura.util import resources
|
||||||
|
|
||||||
def getVersion(getGitVersion = True):
|
def getVersion(getGitVersion = True):
|
||||||
gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.git"))
|
gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.git"))
|
||||||
versionFile = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../version"))
|
if hasattr(sys, 'frozen'):
|
||||||
|
versionFile = os.path.normpath(os.path.join(resources.resourceBasePath, "version"))
|
||||||
|
else:
|
||||||
|
versionFile = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../version"))
|
||||||
if os.path.exists(gitPath):
|
if os.path.exists(gitPath):
|
||||||
if not getGitVersion:
|
if not getGitVersion:
|
||||||
return "dev"
|
return "dev"
|
||||||
|
|
|
@ -106,6 +106,9 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
|
||||||
#For now, just copy all of Cura so pypy can find it
|
#For now, just copy all of Cura so pypy can find it
|
||||||
cp -a Cura scripts/darwin/dist/Cura.app/Contents/Resources/
|
cp -a Cura scripts/darwin/dist/Cura.app/Contents/Resources/
|
||||||
|
|
||||||
|
#Add cura version file (should read the version from the bundle with pyobjc, but will figure that out later)
|
||||||
|
echo $BUILD_NAME > scripts/darwin/dist/Cura.app/Contents/Resources/version
|
||||||
|
|
||||||
cd scripts/darwin
|
cd scripts/darwin
|
||||||
|
|
||||||
# Install QuickLook plugin
|
# Install QuickLook plugin
|
||||||
|
@ -150,6 +153,9 @@ if [ $BUILD_TARGET = "win32" ]; then
|
||||||
downloadURL http://www.uwe-sieber.de/files/ejectmedia.zip
|
downloadURL http://www.uwe-sieber.de/files/ejectmedia.zip
|
||||||
#Get pypy
|
#Get pypy
|
||||||
downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip
|
downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip
|
||||||
|
#Get the power module for python
|
||||||
|
rm -rf Power
|
||||||
|
git clone https://github.com/GreatFruitOmsk/Power
|
||||||
else
|
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
|
||||||
|
@ -183,10 +189,13 @@ if [ $BUILD_TARGET = "win32" ]; then
|
||||||
mv PURELIB/OpenGL ${TARGET_DIR}/python/Lib
|
mv PURELIB/OpenGL ${TARGET_DIR}/python/Lib
|
||||||
mv PURELIB/comtypes ${TARGET_DIR}/python/Lib
|
mv PURELIB/comtypes ${TARGET_DIR}/python/Lib
|
||||||
mv PLATLIB/numpy ${TARGET_DIR}/python/Lib
|
mv PLATLIB/numpy ${TARGET_DIR}/python/Lib
|
||||||
|
mv Power/power ${TARGET_DIR}/python/Lib
|
||||||
mv VideoCapture-0.9-5/Python27/DLLs/vidcap.pyd ${TARGET_DIR}/python/DLLs
|
mv VideoCapture-0.9-5/Python27/DLLs/vidcap.pyd ${TARGET_DIR}/python/DLLs
|
||||||
mv ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe ${TARGET_DIR}/Cura/
|
mv ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe ${TARGET_DIR}/Cura/
|
||||||
mv ffmpeg-20120927-git-13f0cd6-win32-static/licenses ${TARGET_DIR}/Cura/ffmpeg-licenses/
|
mv ffmpeg-20120927-git-13f0cd6-win32-static/licenses ${TARGET_DIR}/Cura/ffmpeg-licenses/
|
||||||
mv Win32/EjectMedia.exe ${TARGET_DIR}/Cura/
|
mv Win32/EjectMedia.exe ${TARGET_DIR}/Cura/
|
||||||
|
|
||||||
|
rm -rf Power/
|
||||||
rm -rf \$_OUTDIR
|
rm -rf \$_OUTDIR
|
||||||
rm -rf PURELIB
|
rm -rf PURELIB
|
||||||
rm -rf PLATLIB
|
rm -rf PLATLIB
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleDevelopmentRegion</key>
|
||||||
|
<string>English</string>
|
||||||
|
<key>CFBundleIdentifier</key>
|
||||||
|
<string>com.apple.xcode.dsym.com.pleasantsoftware.qlgenerator.STLQuickLook</string>
|
||||||
|
<key>CFBundleInfoDictionaryVersion</key>
|
||||||
|
<string>6.0</string>
|
||||||
|
<key>CFBundlePackageType</key>
|
||||||
|
<string>dSYM</string>
|
||||||
|
<key>CFBundleSignature</key>
|
||||||
|
<string>????</string>
|
||||||
|
<key>CFBundleShortVersionString</key>
|
||||||
|
<string>1.1</string>
|
||||||
|
<key>CFBundleVersion</key>
|
||||||
|
<string>2</string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
Binary file not shown.
Binary file not shown.
0
scripts/darwin/STLQuickLook.qlgenerator/Contents/Resources/stlTagImage.png
Executable file → Normal file
0
scripts/darwin/STLQuickLook.qlgenerator/Contents/Resources/stlTagImage.png
Executable file → Normal file
Before Width: | Height: | Size: 933 B After Width: | Height: | Size: 933 B |
|
@ -1,2 +1,2 @@
|
||||||
@python\python.exe Cura\cura.py %*
|
@python\python.exe -m Cura.cura %*
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
@python\python.exe printrun\pronterface.py
|
|
Loading…
Reference in New Issue