Commit Graph

35 Commits (master)

Author SHA1 Message Date
Guillaume Seguin 3b8352acdf Cleanup a little bit gviz 2013-05-19 13:20:01 +02:00
Guillaume Seguin 75afa014e3 Use a deque instead of a list to store hilighted lines
This might speed up Pronterface while printing.
Indeed, as we keep adding items we keep expanding the list and Python has to
move it all the time.
2013-05-19 13:13:03 +02:00
Guillaume Seguin 1fec635721 Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2013-05-18 19:14:21 +02:00
Guillaume Seguin d8277e61a0 Cleanup 2013-05-18 18:40:30 +02:00
Guillaume Seguin 6164e162b5 Remove old comment 2013-05-18 18:36:11 +02:00
Guillaume Seguin eee65d71dd Cleanup 2013-05-18 18:33:13 +02:00
Guillaume Seguin aadd62ef09 Fix error in gcode arc parsing 2013-05-18 18:30:54 +02:00
Guillaume Seguin 97f7635fbd Reduce delay a little bit. 2013-05-18 17:16:01 +02:00
Guillaume Seguin 13592b865f Delay zooming on resize a little bit in gviz to prevent hogging CPU. 2013-05-18 17:15:19 +02:00
Guillaume Seguin 82b95c67cc More cleanup on gviz.
I'm hunting unjustified try: except: blocks.
2013-05-18 17:06:04 +02:00
Guillaume Seguin a53c88a325 Remove dead code 2013-05-18 17:02:55 +02:00
Guillaume Seguin 856b46ccef Clean up gviz a little more and ensure we have room to display border 2013-05-18 17:01:55 +02:00
Guillaume Seguin a6cab813c1 Add icon for gviz window "reset view"
The icon was adapted from the 24x24 "Refresh" icon from Humanity Icon theme.
2013-05-18 16:47:38 +02:00
Guillaume Seguin dc2a425068 Fix reparenting error 2013-05-18 15:16:36 +02:00
Guillaume Seguin e29dd70efe Merge branch 'experimental' into HEAD
Conflicts:
	printrun/gviz.py
2013-05-18 11:14:50 +02:00
Guillaume Seguin 68c13162e1 Fix #363 by correctly doing the wxFrame/wxPanel parenting
As far as I understand, a wxFrame needs a wxPanel child, but we shouldn't
reparent this wxPanel to some other container. As a consequence, I created an
initial wxPanel for the gwindow wxFrame and assigned it the previous sizer
(instead of using the gviz panel as the wxFrame's panel).
Not sure why it wasn't segfaulting on my other systems, though.
2013-05-18 11:09:22 +02:00
Guillaume Seguin 16b5f6db25 Cleanup some code
Not sure about that dropping of the self.gwindow.Destroy try block, we'll see
2013-05-18 11:05:45 +02:00
Guillaume Seguin 102a14ff38 Ensure canvas is marked as dirty when setting showall in gviz 2013-05-17 00:39:07 +02:00
Guillaume Seguin 975b45936d Handle N... gcodes in GCoder 2013-05-16 19:16:13 +02:00
Guillaume Seguin 9a19e12777 Fix gviz.add_parsed_gcode for relative gcodes 2013-05-16 17:39:45 +02:00
Guillaume Seguin a49b487124 Start cleaning up addgcode()
There is a lot of code duplication between addgcode() and add_parsed_gcode,
which would probably need to be cleaned up.
2013-05-16 17:10:46 +02:00
Guillaume Seguin a2977663f0 Factor 2 lines in printrun/gviz.py 2013-05-16 16:14:40 +02:00
Guillaume Seguin dbc5362085 Improve zooming buttons by dynamically computing center
This might be slightly off, but it could also be the zooming code that's off.
2013-05-16 16:13:31 +02:00
Guillaume Seguin cc64aef5f2 Improve and cleanup gviz resizing 2013-05-16 16:12:54 +02:00
Guillaume Seguin 72bd19d8bd Remove debug output 2013-05-16 16:02:23 +02:00
Guillaume Seguin 0920bc6e97 Greatly improve resizing behavior of GViz windows 2013-05-16 15:57:18 +02:00
Guillaume Seguin db04449a2b Cleanup and speedup gviz
This commit mostly removes unused code and cleans some things up.
The main contribution is that instead of calling repaint() and Refresh(), we
now only mark the canvas as dirty and call Refresh(), which will do the repaint
just-in-time. This speeds things a lot when quickly changing layers or zooming,
as it does not repaint once per keyboard/mouse event but once per actual
Refresh, which makes it much smoother.
2013-05-16 15:31:32 +02:00
Guillaume Seguin 260d65643c Fix gviz.py __main__ 2013-05-16 15:06:48 +02:00
Guillaume Seguin 4b372f5686 Speedup full file gcode loading in printrun/gviz.py
FWIW, on my test system with my test GCode loading time goes down from 5.7s to
2.3s between b3a673bc97 and this commit, that's almost 60% gone.
However, there is still a lot of room for functional improvements :
- I don't think the roundtrip through the target array is useful
- There's no handling of relative coordinates (neither for position nor for e)
- The arcs drawing code might be wrong
- The stlview bits are not enabled and probably have to be looked at and updated
2013-05-16 14:05:28 +02:00
Guillaume Seguin a46f73595e Use GCoder parsed gcode in gviz 2013-05-15 22:44:59 +02:00
Christopher Keller a868e571f3 Fixed bug that caused divide by zero error if main gviz window was sized too small. 2012-09-05 02:21:02 -07:00
Guillaume Seguin 6f446e3726 More automated cleanup 2012-08-08 09:58:09 +02:00
Guillaume Seguin 77eb2440e3 Semi-automated coding style cleanup 2012-08-08 09:38:48 +02:00
Guillaume Seguin 8cc134955f Run reindent.py on the whole repository 2012-08-08 08:39:50 +02:00
Guillaume Seguin 888143be42 Initial work towards a setup.py build system 2012-07-31 10:51:17 +02:00