33610d53fb
Improved status line estimated time remaining.
...
uses format:
SD Printing: pp.p% | Est: hh:mm:ss of hh:mm:ss of hh:mm:ss remaining
Printing: pp.p% | @ Line# xxx of yyyyy lines | Est: hh:mm:ss of hh:mm:ss remaining
2011-11-28 20:24:18 -08:00
3316dac639
Merge branch 'master' into experimental
...
Conflicts:
stlview.py
2011-11-28 18:27:27 +01:00
2079a99278
Added Estimated time left, and total time,
...
for non-SD Printing. They get more and more accurate until the end.
2011-11-28 07:44:29 -08:00
97af7725d9
Prevent (harmless) exception on every printed gcode line
2011-11-24 00:41:49 +01:00
aa0a045ecd
Reduce memory usage by clearing gviz cache. Avoid delays by using a queue to draw executed gcodes.
2011-11-22 19:08:00 +01:00
d05a399684
Fix bug where second and subsequent file load would cause an error and refuse to load further files. Closes #102
2011-11-22 18:51:18 +01:00
03f727aa92
Merge branch 'master' into experimental
2011-11-20 09:20:37 +01:00
82aa15becc
Merge branch 'master' of github.com:kliment/Printrun
2011-11-20 09:19:23 +01:00
db0b48ce25
Remove readonly attribute from dropdowns for port and baud rate
2011-11-20 09:18:38 +01:00
0afcc88bd4
Integrate plating into pronterface UI
2011-11-18 09:52:16 +01:00
8f3df9c2e9
Modified size of + button
2011-11-16 16:09:12 +01:00
a0bf2c4536
don't set font for new button button
2011-11-15 11:06:25 +02:00
87ef3e6e8c
hide temperature gauge until better place is found for it
2011-11-15 11:06:03 +02:00
16fb5176cf
some tool tips
2011-11-14 21:43:16 +02:00
848eee2d68
Merge remote branch 'kliment/master' into experimental
2011-11-14 21:36:07 +02:00
0839071f51
new button button
2011-11-14 21:35:18 +02:00
440a5ca5af
Use CallAfter to prevent mysterious double free or corruption error in wx.
2011-11-14 16:20:32 +01:00
e27befbea3
Fix alignment of port button
2011-11-14 09:14:27 +01:00
6453dbb175
Merge remote branch 'kliment/master' into experimental
2011-11-14 08:25:46 +02:00
9c36456500
Populate port dialog by default
2011-11-13 23:54:00 +01:00
0e7c70dbdf
Merge remote branch 'kliment/master' into experimental
2011-11-14 00:30:32 +02:00
7124f2f982
Make newly deceted port first if previously chosen port not detected
2011-11-13 21:55:12 +01:00
7c5efbd619
Add port rescan button.
2011-11-13 21:44:45 +01:00
ad21eefe69
Merge remote branch 'kliment/master' into experimental
2011-11-13 00:12:49 +02:00
9a7baf64a0
make temperature dropdown slightly bigger
2011-11-13 00:12:41 +02:00
a05f8839b3
made temperature gauge visually similar style as the printer position controls
2011-11-12 16:35:37 +02:00
3d08436499
Remove alphabetic sort order from baud rate combo box
2011-11-12 07:49:21 -06:00
3d2054bf06
Merge branch 'master' into experimental
...
Conflicts:
pronterface.py
2011-11-12 12:10:26 +02:00
37858bb166
Added 250000 baud for marlin compatibility
2011-11-12 00:33:19 -05:00
08d4abbe91
Fix that enable/disable does not immediately redraw. Fix that buttons are not disabled on disconnect.
2011-11-11 10:37:01 -06:00
c113e2bffc
Merge branch 'master' of https://github.com/kliment/Printrun
2011-11-11 10:23:52 -06:00
7c310d7bfd
Shrunk XY and Z controls. Added Home buttons. Added enable/disable.
2011-11-11 10:22:31 -06:00
b0cd17ee6e
Create absolute-positioned "Home" buttons as a layer on top of XYButtons
2011-11-09 20:55:41 -06:00
1d6605065d
Merge branch 'master' into experimental
2011-11-09 15:16:04 +02:00
1ce9f3a536
workaround for buttons appearing in empty custom button slots on linux
...
attempt to fix panel context menu not appearing on empty slot
2011-11-09 11:10:17 +02:00
38cefcd00e
attempt to fix panel context menu not appearing on empty slot
2011-11-08 21:33:24 +02:00
1fb9890464
workaround for frozen buttons appearing on some cases
2011-11-08 21:19:12 +02:00
437f069921
Fix issue with XYButtons stealing keys. Added ESC key to blur.
2011-11-08 10:48:15 -06:00
50d340f900
Fixed transparency issues in Windows by using a GraphicsContext. Changed background to white.
...
- The white background is a workaround for not being able to set the
exact color of gray for the XY/Z widgets.
2011-11-08 09:37:35 -06:00
39a99314b3
Fix position of all buttons below the new XY/Z widgets.
2011-11-07 22:29:28 -06:00
f4d18e4dff
Fixed keypad toggle for XY controls. Defaults to off.
2011-11-07 22:09:18 -06:00
3722b11aab
Merge branch 'master' of github.com:canadaduane/Printrun
2011-11-07 14:42:09 -06:00
8b56bbe548
Integrate new UI with pronterface
2011-11-07 13:41:14 -06:00
c4884cf1af
Merge pull request #75 from sdevijver/master
...
Print time guesstimation on file load
2011-11-06 23:13:54 -08:00
7077c3c9b8
Added OBJ to the types of files that can be opened.
...
Added final semicolon after final OBJ in the file filter
2011-11-05 02:13:50 -07:00
be5f0e4900
Moved estimated duration code to pronterface
2011-11-04 11:49:05 +01:00
4c2e31f3a8
add threshold for button dragging in case of jittery mouse
2011-10-27 16:37:54 +03:00
1fe67e7d23
fixed temperature gauge lagging
2011-10-27 16:37:10 +03:00
010a3fcb15
add threshold for button dragging in case of jittery mouse
2011-10-27 16:36:30 +03:00
d2db9ca389
fancy temperature gauge...
2011-10-25 22:58:13 +03:00
f0f6333681
better temperature combo box behavior when heated up
2011-10-25 22:56:44 +03:00
506d9bb172
Rearrange temperature setting controls, explicit temperature off button, color-feedback
2011-10-24 15:21:33 +03:00
55dd423951
Merge remote branch 'kliment/master' into experimental
2011-10-11 10:26:48 +03:00
541242efd2
Added feed back to console for Connect, Reset, Pause. Added periods to existing outputs.
...
Now when the program starts the last temp is set for Heater and Bed. Also a (user) is attached if it is a manual entry.
2011-10-07 19:43:01 +03:00
e9e721bd5a
Merge remote branch 'kliment/master' into experimental
2011-10-07 17:00:17 +03:00
6af04ed612
Fix indentation problems in macro editor preventing it to create new multi-line macros
2011-10-07 16:49:53 +03:00
d1f2ebd717
last used serial port pre-selection logic change, based on if it is autodetected to be present or not
2011-10-07 15:11:58 +03:00
2806120123
custom button drag-drop rearranging
2011-09-30 17:41:30 +03:00
e97754e3dc
Spawn sfact settings in a separate subprocess - this needs thorough testing or various OSs.
...
Closes #41
Closes #51
2011-09-28 13:47:57 +02:00
0da65f14d0
Fix exception on removing the last custombutton when there are no other custombuttons
2011-09-13 14:41:05 +03:00
16fd9fd04d
Open .gco files
2011-09-09 18:14:49 +02:00
786bf24f32
Moved "Clear" button to menu
2011-09-06 21:26:37 +02:00
1e91e807b7
Removing Tab chars, adding "Clear" button, and resizing translations
2011-09-06 18:55:52 +02:00
b03443cc6a
Translations + some minors gui improvements
...
- french translations
- added some translated strings in pronterface.py
- resized macro window and control's positions
- reordered main menu
2011-09-06 17:48:16 +02:00
d2ba1b2cc4
Change location of locale/ directory
...
necessary for windows compatibility
2011-09-06 14:06:42 +02:00
88a7b10c79
Merge branch 'master' of github.com:kliment/Printrun
2011-09-05 00:08:51 +02:00
895a958ea3
Fix edit dialog on Windows
2011-09-05 00:08:09 +02:00
6e0d5a700b
Revert "Merge pull request #55 from nesqi/master" - breaks custom buttons and scroll zoom in gviz
...
This reverts commit d2b90ebe778af5496a4a
2011-09-02 11:58:58 +03:00
4f4b1b4a8a
Made the gviz component resize as the window resizes.
2011-08-28 15:09:26 +02:00
712fe6b970
removed line 1028 as it was left over from pasting. oops.
2011-08-28 08:35:48 +02:00
f23f62098a
Edited pronterface.py via GitHub
2011-08-27 09:31:32 +02:00
d4285ad1e2
removed brackets
2011-08-27 09:26:07 +02:00
d01621d5e5
condensed measurements code.
2011-08-27 09:15:22 +02:00
313163721e
Edited pronterface.py via GitHub
2011-08-27 08:45:35 +02:00
b5c182a19a
Push gui updates to a separate thread
2011-08-23 14:33:28 +02:00
291aac90e5
Merge branch 'master' of github.com:kliment/Printrun
...
Conflicts:
pronterface.py
2011-08-11 15:04:26 +02:00
dbf3e7f0a2
Close gcode file explicitly after reading
2011-08-11 15:02:41 +02:00
6d32cfa6dc
Merge pull request #46 from jmarsden/master
...
i18n for Pronterface
2011-08-07 21:51:37 -07:00
cf62dc2504
preview extrusion width as setting
2011-08-07 23:11:35 +03:00
eaa2a4c0cc
settings for bed size/grid lines
2011-08-07 23:00:13 +03:00
c2649a291f
Add gettext i18n to pronterface
2011-08-06 16:45:52 -07:00
df051e600f
Add horrifyingly simple gcode editor
2011-08-06 15:28:25 +02:00
ed20b692ef
Merge branch 'master' of github.com:kliment/Printrun
...
Conflicts:
pronterface.py
2011-08-06 14:49:59 +02:00
013c9f0bec
Add estimated filament length used.
...
Print elapsed time at end of print.
2011-08-06 14:48:10 +02:00
df81a73dcc
use enable/disable for pause button instead of hide/show to not interfere with custombuttons
2011-08-05 01:32:22 +03:00
97a530d53b
fix typo
2011-08-04 22:28:34 +03:00
38b69e7d74
another attempt to get popup menu for buttons on mac
2011-08-04 21:15:34 +03:00
e6f4f9dfb5
attempt to get button popup to work on mac
2011-08-04 15:20:45 +03:00
8dd97e12e7
Custom button customisation implemented
2011-08-04 14:03:35 +03:00
353e51d6dd
fix specifying colours causing exception
2011-08-03 22:27:41 +03:00
799a3ec0e1
customise custom buttons via UI
2011-08-03 21:49:19 +03:00
06a7827dde
Garys Hack and SFACT all together in a package
2011-08-01 23:04:42 +03:00
76fafca31d
Merge branch 'master' of git@github.com:kliment/Printrun
2011-07-28 12:01:24 +02:00
9c531f56d3
Print out error instead of crashing on skeinforge errors
2011-07-28 12:00:57 +02:00
7245e54b4a
Monitor command in pronterface now toggles the checkbox and sets the interval
2011-07-28 12:33:39 +03:00
9e11e5eef0
Move all button enable/disable/setlabel calls inside wx.CallAfter() to avoid threading issues
2011-07-27 17:23:28 +02:00
fba262be54
Options dialog
2011-07-26 19:29:55 +03:00
64fd8aebd7
make macro editor a Dialog, not a Frame so it does not get lost behind the main window
2011-07-26 19:29:53 +03:00
0af5005052
Edit macros via menu access
2011-07-26 19:29:52 +03:00
cf49a963b1
Autoload skeined STL files in addition to stl files.
2011-07-24 11:14:12 +02:00
8d2c609a1f
Revert previous commit
2011-07-22 16:34:23 +02:00
77149a2257
Load gcode file with same name as stl file (no _export)
2011-07-22 14:05:21 +02:00
929c245069
Change working dir to enable skeinforge detection
2011-07-21 15:17:40 +02:00
d483f84b6f
Disable skeinforge settings on mac
2011-07-20 10:23:07 +02:00
d9a0526c46
Minimal UI improvements to avoid text clipping on Mac
2011-07-19 17:33:08 +02:00
174321aaea
Save last used temperature in pronterface, to put it in combo box for next run.
2011-07-19 11:02:48 +03:00
30023a5be1
Remove end callback until pausing bug is fixed
2011-07-17 18:08:18 +02:00
18722636e6
Show STL files as well as stl files in load dialog. Reset Print/Pause buttons on file load
2011-07-17 14:28:15 +02:00
8125f893f6
Print elapsed time after print is done.
2011-07-17 12:53:13 +02:00
bfe99db55e
Merge branch 'master' of github.com:kliment/Printrun
2011-07-15 12:11:48 +02:00
71dfcf141e
Autoload file and enable print after skeining
2011-07-15 12:11:09 +02:00
1d5ce77a36
some fixes to macro editor routines
2011-07-15 11:12:21 +03:00
2834e5631e
Merge remote branch 'kliment/master'
2011-07-15 10:19:53 +03:00
049400b66b
indent/unindent multiline macros automatically for macro editor
2011-07-15 10:19:28 +03:00
655ab135e5
Fix permissions, allow commands when printer disconnected
2011-07-15 09:15:12 +02:00
7e80870c52
Merge remote branch 'kliment/master'
2011-07-12 00:15:58 +03:00
c93ecbf993
Do not show gcode window unless file is loaded
2011-07-10 20:56:25 +02:00
e986b82440
Merge remote branch 'kliment/master'
2011-07-09 19:46:54 +03:00
4724fc0c04
Hide the pause button until needed.
2011-07-09 16:07:17 +02:00
6d78deeab2
Leave Reset enabled and allow loading a GCode file without connecting to the printer.
2011-07-09 15:54:59 +02:00
cac5f9bc71
Enable/disable all printer controls when we're connected or disconnected.
2011-07-09 15:38:49 +02:00
1c8f97cc20
Enable/disable Connect/Disconnect buttons alternatively.
2011-07-09 15:20:33 +02:00
38f34ac934
Enable and disable Print and Pause buttons consistently.
2011-07-09 15:18:03 +02:00
cf8c8ffa42
Rename Restart/Resume buttons back to Print/Pause when a new GCode file was loaded.
2011-07-09 15:13:11 +02:00
d08bc641c0
simple small GUI editor for macros in pronterface
2011-07-07 00:19:45 +03:00
8ca085a728
changed order of parsing startup config files and -e commands
2011-07-04 13:06:58 +03:00
54e208a1fb
Merge pull request #32 from k-eex/master
...
command line parsing, add -c and -e
2011-07-04 02:48:27 -07:00
51f59b0618
Fix crash on new gcode file load if no previous file was loaded
2011-07-04 11:45:17 +02:00
6f4ea3baf1
command line parsing, -c for overriding .pronsolerc filename/location, -e for commands from command line
2011-07-04 12:06:18 +03:00
4d1917fcbc
Temp report display below check temp button
2011-06-30 09:14:09 +02:00
8078f72a70
Move monitor checkbox, add M84 and M105 buttons, make more space for custom buttons on top
2011-06-30 09:09:53 +02:00
fa53fc900b
Clear loaded part in gviz window when new part is loaded
2011-06-30 06:57:40 +02:00
35c00f6da9
Treat STL and Stl files like stl files and skein them.
2011-06-30 06:54:45 +02:00
3273f5cc4c
save last file path
2011-06-30 00:34:01 +03:00
0b8855781c
only save feedrates when changed
2011-06-30 00:34:00 +03:00
faa01969e1
Save pronterface changes into settings, fix not taking feedrate spinners into account
2011-06-29 23:34:27 +03:00
afb7236d03
pronterface to take into account the defaults (port, baudrate, feedrates)
2011-06-29 22:27:00 +03:00
3de92320f8
command "set" to store persistent variables for preferences
2011-06-29 21:51:24 +03:00
83d593ee11
Add custom button support, change progress bar color, make gcode preview bigger
2011-06-25 01:28:36 +02:00
96243e1883
Fix gcode visualization window caption and highlights
2011-06-23 14:53:44 +02:00
48b981f2b1
Bigger gcode visualization window on click, layer progress bar
2011-06-22 14:54:59 +02:00
f69de94a47
Real-time print move visualization
2011-06-22 13:40:27 +02:00
52a51fc75a
Show current layer in visualization instead of all layers
2011-06-22 12:21:04 +02:00
39245779d8
Merge pull request #17 from k-eex/macros
...
making macros work on pronterface
2011-06-22 03:13:00 -07:00
0b147a12bd
Added very basic gcode visualization
2011-06-21 18:52:11 +02:00
936a2685be
making macros work on pronterface (it was missing pronsole.__init__ call)
...
refactored reading pronsolerc as separate function, call that from pronterface
2011-06-20 23:41:31 +03:00
71762e17bf
Auto-select all text in command box after executing the line
2011-06-18 13:01:31 +03:00
20d5ffad83
Switch to sizers
2011-06-16 06:28:46 +02:00
4b87be7b29
Add installation instructions.
...
Add skeinforge settings option to pronterface menu.
Fix mini window size on a mac.
Make retract option more robust.
2011-06-13 09:09:29 +02:00
60fba0d810
Merge branch 'master' of github.com:kliment/Printrun
2011-06-12 00:26:49 +02:00
347124df57
Safer string handling.
2011-06-11 23:03:01 +02:00
acf6986705
Reversing the extruder did not work. Corrected
2011-06-11 09:13:13 -07:00
40ba0e592d
Restart functionality
2011-06-10 20:34:04 +02:00
cac4a96f17
Do not change directory on load
2011-06-10 14:47:49 +02:00
c495dcdad4
Show filename in status string
2011-06-10 10:55:12 +02:00
0d5809eada
Slow approach on homing. Loaded filename in monitor output
2011-06-10 10:12:12 +02:00
48f156954a
Highlight home buttons
2011-06-09 21:43:42 +02:00
a0e6c61cd8
Fix window size on Windows
2011-06-09 19:26:07 +02:00
220ce936c8
Fix ALL dropdowns on Windows
2011-06-09 19:21:13 +02:00
c5e6fe2283
Fix dropdowns on Windows
2011-06-09 19:20:13 +02:00
80b222902b
Remove dependency on "with" - works with python 2.5
2011-06-09 19:03:57 +02:00
cee3698530
Controllable feedrates
2011-06-09 18:44:57 +02:00
7a8819e448
Pronterface: remember dir across opened files
2011-06-09 16:43:03 +02:00
b3053854ca
Allow copy from pronterface window. rstrip incoming lines.
2011-06-09 16:13:17 +02:00
5fc2fe09f8
Pronsole: Print all unknown responses
...
Updated readme
2011-06-09 16:01:23 +02:00
961ad6b8b2
Pronterface: Full printer control, mini-mode.
2011-06-09 15:19:03 +02:00
f13110a68b
Temperature setting
2011-06-09 12:54:03 +02:00
95ce7969c6
Preliminary control panel, pronsole integration
2011-06-09 08:18:13 +02:00
b3da9b1204
SD Upload works.
2011-06-09 00:02:00 +02:00
4ed07aef0c
Add log window and fix print from SD command
2011-06-08 17:25:01 +02:00
275fcb2901
Added pronterface
2011-06-08 16:19:38 +02:00
Christopher Keller