Commit Graph

1039 Commits (e29dd70efe3162ed7853e6cdfd6390b6849f5c4a)

Author SHA1 Message Date
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 7657b37539 Expand gauges as much as possible 2013-05-17 17:53:05 +02:00
Guillaume Seguin dfa474e0b1 Correctly draw right edge shadow for temp gauges 2013-05-17 17:52:33 +02:00
Guillaume Seguin 7fc0f1c475 Add -g/--gauges CLI argument for temp gauges, and improved argparsing.
The gauges options is a CLI parameter as having it as an option would be
too painful to handle for now.
Argument parsing has been improved so that pronterface can add its own CLI
parameters in addition to pronsole's ones.
2013-05-17 17:04:41 +02:00
Guillaume Seguin 90e32562ea More work on getting the gauges back 2013-05-17 16:59:28 +02:00
Guillaume Seguin 89453befd1 Fix possible issue where checksum would break layer change detection
Should fix #348
2013-05-17 16:48:53 +02:00
Guillaume Seguin a9c3e8b442 Revert "Remove temperature gauges entirely from codebase"
This reverts commit 02ef52d777.
First step towards getting the gauges optionally back for #296.
2013-05-17 16:33:05 +02:00
Guillaume Seguin 94d69f793c Set transparent brush for painting temp graph's background
This should fix the weird graph background for #359
2013-05-17 16:21:21 +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 ec76dc6de0 Woops, forgot to commit this major thing 2013-05-17 00:18:54 +02:00
Guillaume Seguin 0376729afc Woops, typo 2013-05-16 22:50:28 +02:00
Guillaume Seguin 7a528800e6 Minor changes : mark 2 strings for translations + cleanup
One of the strings is to give a hint for wrong baudrates (#276)
2013-05-16 20:47:56 +02:00
Guillaume Seguin df00b7e2a1 Don't parse gcodes other than G* (attempt to harden against #303) 2013-05-16 20:32:50 +02:00
Guillaume Seguin d2a0163a4e Merge git://github.com/sbliven/Printrun into experimental
Should fix #359 initial issues

Conflicts:
	.gitignore
	printrun/gui.py
2013-05-16 19:30:39 +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 251bda7dbe Improve resizing behavior of Pronterface main window 2013-05-16 16:53:02 +02:00
Guillaume Seguin e85f2cc69c Rework left pane arrangement 2013-05-16 16:38:01 +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 3339501383 Very minor cleanup 2013-05-16 15:27:41 +02:00
Guillaume Seguin 260d65643c Fix gviz.py __main__ 2013-05-16 15:06:48 +02:00
Guillaume Seguin 9dec54886b Remove gcoder.py from setup.py 2013-05-16 15:05:52 +02:00
Guillaume Seguin a80a2fea4b Move gcoder.py into printrun module 2013-05-16 15:05:28 +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 0833d3787a Add argparse dependency to README.md 2013-05-16 12:26:26 +02:00
Guillaume Seguin fb3e4068c0 Replace getopt CLI option parsing with a cleaner argparse parsing 2013-05-16 12:21:37 +02:00
Guillaume Seguin f63dfe9981 Minor presentation error fix in pronsole.py 2013-05-16 12:21:17 +02:00
Guillaume Seguin 280731f07b Remove debug statement in gcoder.py 2013-05-16 12:20:56 +02:00
Guillaume Seguin c5cb9a9926 Minor cleanups in pronsole.py
Command line option parsing really needs a better rework, to use optparse or
argparse and support gcode/stl filename argument.
2013-05-16 11:45:52 +02:00
Guillaume Seguin a46f73595e Use GCoder parsed gcode in gviz 2013-05-15 22:44:59 +02:00
Guillaume Seguin ea604380db Cleanup duration estimation
Estimation duration now uses the already parsed GCode instead of reparsing it.
It also computes a per layer duration estimation which can probably be used to
produce better ETAs.

The only difference is that it does not compute duration for Z layers changes,                                                                                                                        but it was probably super wrong already given how it is done (it only changes
the estimation by than 2s over 2 hours of print and 54 layers, and the feedrate
stuff mixes all the axes together).

I also detected a few potential issues in the code, which are marked by FIXMEs.
2013-05-15 21:49:12 +02:00
Guillaume Seguin 9816ea7c8a Cleanup some code in pronterface 2013-05-15 21:39:08 +02:00
Guillaume Seguin f15b0cdabb Speed up various parts of gcoder GCode processing 2013-05-15 19:43:26 +02:00
Guillaume Seguin b1113f06a5 Woops, typoz 2013-05-15 19:42:38 +02:00
Guillaume Seguin 595edf6064 More cleanup on gcode measurement 2013-05-15 15:35:48 +02:00
Guillaume Seguin ed38564549 Missing import 2013-05-15 15:28:09 +02:00
Guillaume Seguin b3d2a6f12f Woops, fix a typo 2013-05-15 15:24:33 +02:00
Guillaume Seguin 79d0477553 Move code around and remove useless helpers from pronsole.py 2013-05-15 15:23:46 +02:00
Guillaume Seguin d0a0ffbdf6 Fix and cleanup used filament length measurement 2013-05-15 15:19:23 +02:00
Guillaume Seguin 1dcf7be5eb Start cleaning up gcode measurement code 2013-05-15 15:18:36 +02:00
Guillaume Seguin f4a16223b0 Remove orphaned code 2013-05-15 15:12:03 +02:00
Guillaume Seguin b367fa2a0d Cleanup gcoder.py indent 2013-05-15 14:45:17 +02:00