chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b2a96f
)
Quick and ugly change which fixes slicing with pypy. Cleanup will follow.
author
daid303
<daid303@gmail.com>
Thu, 6 Dec 2012 13:57:00 +0000
(14:57 +0100)
committer
daid303
<daid303@gmail.com>
Thu, 6 Dec 2012 13:57:00 +0000
(14:57 +0100)
Cura/cura.py
patch
|
blob
|
history
diff --git
a/Cura/cura.py
b/Cura/cura.py
index abc2163d128fbe89f70a8c2b904ba08e7a732358..fae6d8bbc99aea693b96d3efe786bbe5d569a8ec 100644
(file)
--- a/
Cura/cura.py
+++ b/
Cura/cura.py
@@
-14,8
+14,6
@@
import sys
import warnings
from optparse import OptionParser
import warnings
from optparse import OptionParser
-import wx._core
-
from Cura.util import profile
__author__ = 'Daid'
from Cura.util import profile
__author__ = 'Daid'
@@
-46,13
+44,6
@@
Art of Illusion <http://www.artofillusion.org/>"""
__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
-class CuraApp(wx.App):
- def MacOpenFile(self, path):
- try:
- pass
- except Exception as e:
- warnings.warn("File at {p} cannot be read: {e}".format(p=path, e=str(e)))
-
def main():
parser = OptionParser(usage="usage: %prog [options] <filename>.stl")
parser.add_option("-i", "--ini", action="store", type="string", dest="profileini",
def main():
parser = OptionParser(usage="usage: %prog [options] <filename>.stl")
parser.add_option("-i", "--ini", action="store", type="string", dest="profileini",
@@
-90,8
+81,16
@@
def main():
if len(args) > 0:
profile.putPreference('lastFile', ';'.join(args))
if len(args) > 0:
profile.putPreference('lastFile', ';'.join(args))
+ import wx._core
from Cura.gui import splashScreen
from Cura.gui import splashScreen
+ class CuraApp(wx.App):
+ def MacOpenFile(self, path):
+ try:
+ pass
+ except Exception as e:
+ warnings.warn("File at {p} cannot be read: {e}".format(p=path, e=str(e)))
+
def mainWindowRunCallback(splash):
from Cura.gui import mainWindow
if splash is not None:
def mainWindowRunCallback(splash):
from Cura.gui import mainWindow
if splash is not None: