Permalink
Browse files

Merge Dopey with MyPaint HEAD

  • Loading branch information...
2 parents 0638c50 + d8c4263 commit d7e1a1c2e69921f5ebdf285ca7ea11ec21ba170d davissorenson committed Oct 31, 2013
Showing with 919 additions and 469 deletions.
  1. +1 −1 gui/brushiconeditor.py
  2. +2 −466 gui/canvasevent.py
  3. +5 −1 gui/drawwindow.py
  4. +762 −0 gui/freehand.py
  5. +1 −1 gui/tileddrawwidget.py
  6. +146 −0 lib/eventhack.hpp
  7. +1 −0 lib/mypaintlib.hpp
  8. +1 −0 lib/mypaintlib.i
View
@@ -21,7 +21,7 @@
import windowing
import lib.document
from document import CanvasController
-from canvasevent import FreehandOnlyMode
+from freehand import FreehandOnlyMode
import brushmanager
from lib.helpers import escape
from lib.observable import event
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -332,7 +332,11 @@ def doit():
profile.dump_stats('profile_fromgui.pstats')
logger.debug('profile written to mypaint_profile.pstats')
- os.system('gprof2dot.py -f pstats profile_fromgui.pstats | dot -Tpng -o profile_fromgui.png && feh profile_fromgui.png &')
+ if os.path.exists("profile_fromgui.png"):
+ os.unlink("profile_fromgui.png")
+ os.system('gprof2dot.py -f pstats profile_fromgui.pstats | dot -Tpng -o profile_fromgui.png')
+ if os.path.exists("profile_fromgui.png"):
+ os.system('xdg-open profile_fromgui.png &')
gobject.idle_add(doit)
Oops, something went wrong.

0 comments on commit d7e1a1c

Please sign in to comment.