Guillaume Seguin
06e3a02d4f
Fix used filament estimation
...
Compute the max of all total lengths
2013-05-18 20:20:53 +02:00
Guillaume Seguin
c6104d56ef
Remove "pessimistic" from estimated duration string
...
The computed duration is no more pessimistic, for a few reasons.
- the main one is that it does not take retraction into account
- Z moves are not taken into account either
- arcs are not supported
- the acceleration code seems to estimate acceleration time correctly but is
wrong for deceleration
So instead of telling the user this estimation is pessimistic, let's just tell
them this is an estimate.
2013-05-18 19:52:05 +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
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
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
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
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
a46f73595e
Use GCoder parsed gcode in gviz
2013-05-15 22:44:59 +02:00
Spencer Bliven
70ca8ace07
Setting BufferedCanvas sizes at creation.
...
This fixes bug #359
2013-05-02 15:05:37 -07:00
Spencer Bliven
b77ce7a2e7
Adding w,h parameters to BufferedCanvas.draw
...
All subclasses of BufferedCanvas require dimensions,
so the interface should be consistent.
2013-05-02 15:00:36 -07:00
Spencer Bliven
83b3bb6b71
Widen serial port dropbox to fill available space
2013-04-30 15:57:46 -07:00
D1plo1d
31891fa3da
Merging experimental branch with Pronserve
2013-04-19 20:42:03 -04:00
D1plo1d
c8d309f717
Removing the web interface
2013-04-08 21:04:39 -04:00
N Oliver
06280e2ba8
Update webinterface.py
...
oops! :'( web/css/style.css
2013-03-25 16:38:13 -07:00
OliverEngineer
3cfe86f96e
Adding AJAX to the web interface
...
need to explore CherryPy & websockets, but this quick'n'dirty is a big
speed increase
2013-03-23 18:02:18 -07:00
N Oliver
c298228ce9
attempting fix for issue 305
...
Encountered https://github.com/kliment/Printrun/issues/305#issuecomment-12306186
This edit removed the error, but I don't know what the original output was so I'm not sure if this really _fixes_ it, or is just a band-aid.
2013-03-23 14:36:15 -07:00