7c48b6c446
Cleanup temp report parsing
...
Factorize into a single function and support Marlin-style reports
2012-07-31 09:00:28 +02:00
57c71300e2
Whitespace cleanups
2012-07-31 08:45:15 +02:00
8b83ba62b6
fix custom button drag and drop being broken, with different strategy (1px size) to hide the drag-drop targets when not in use
2012-07-23 16:08:41 +03:00
89364d6f84
tweak temperature gauge layout a little
2012-07-23 16:01:47 +03:00
2cfca605c2
fail more cleanly on non-ascii macro name
2012-07-23 15:48:18 +03:00
e73e11d554
Allow unicode characters in custom button command names
2012-07-15 14:55:11 +02:00
da2a02693d
Save command currently being typed so pressing up does not accidentally delete it.
2012-07-15 14:27:22 +02:00
c1a9f8d6b6
Save commands entered into command box and retrieve them when up/down key is pressed.
2012-07-15 14:22:57 +02:00
193347b63d
Set target temps to zero on reset.
2012-07-15 13:43:34 +02:00
73055e59a8
Fix math domain error in estimation code.
...
Make crash in estimation code not block file load.
Diable web interface by default.
2012-07-15 13:07:16 +02:00
a20c1fe4c0
POtential fix for wx unicode decode errors
2012-07-11 20:56:15 +02:00
dceaf26f48
Merge pull request #192 from tjhowse/patch-1
...
Changed the title of the gcode view window to accurately describe the fu...
2012-06-13 09:19:17 -07:00
48f82b9062
Merge Complete
2012-06-05 09:56:37 -05:00
4158bc63ca
Only enable webinterface if CherryPy is available. Fix buttons on the web
2012-06-04 13:44:49 -05:00
e2e47c494c
Added custom buttons, gui, cleaned up interface
2012-05-31 17:10:51 -05:00
f2e87c6e7c
Kill CherryPy when Pronterface closes
2012-05-31 14:49:32 -05:00
b3eab2386b
remove some excess logging
2012-05-31 12:37:23 -05:00
c2e68056ac
Added Viewing of Console to Web Interface
2012-05-30 17:04:10 -05:00
16cf3d764f
Added Initial Web Framework for Pronterface, right now, read only global settings.
2012-05-30 16:13:49 -05:00
af37c07d9a
Fixed using configured background to XYButtons ZButtons and TempGauge
2012-05-28 17:34:43 +02:00
0603d9c74b
Merge pull request #220 from jezmy/experimental
...
Fix print button, add tooltips, add icons to layer preview
2012-05-08 07:05:10 -07:00
a49194a19f
Updated with tooltips; gviz now has toolbar with icons; fixed binding to print button
2012-05-08 14:53:33 +01:00
e9d686a523
Reduce size for buttons where text does not change
2012-05-06 19:06:03 +02:00
523a2a4f6e
Merge branch 'experimental' of https://github.com/jezmy/Printrun into experimental
2012-05-06 19:01:43 +02:00
8237b63417
Remove redundant data from status bar.
2012-05-06 19:00:56 +02:00
8bdb86f6df
Set top buttons to consistant (70, 25) size
2012-05-06 16:57:50 +01:00
d19ee50c04
Set top buttons to consistant (70, 25) size
2012-05-06 16:00:50 +01:00
8a0e703331
Supress Temperature message in log, but allow other info through
2012-05-06 00:17:21 +01:00
dbbb51a4e0
Disable constant Temperature display in console
2012-05-05 20:10:30 +01:00
556ba0fbc2
Merge branch 'master' of https://github.com/PxT/Printrun into experimental
2012-05-04 07:47:21 +02:00
7317a3a283
Make graph work again, and threadsafe
2012-05-04 06:40:19 +02:00
fee5b5b9f7
Adds support for running an executable when print is finished.
2012-05-03 13:55:41 -07:00
51a4636c1e
Make control panel more compact with long translation texts such as Italian
2012-05-03 19:33:16 +02:00
f10d6c06e6
Merge branch 'spacebar' of https://github.com/canadaduane/Printrun into experimental
2012-05-03 09:53:09 +02:00
3c7b538633
Temp graph works again.
...
Ignore "wait" messages from spammy firmwares and show timestamps with received messages (courtesy of juri_)
2012-05-03 09:48:54 +02:00
6071c42984
Add ability to repeat last movement command with the spacebar
2012-04-30 12:59:18 -05:00
40e7c3ba2e
Make pronterface window even more compact
2012-04-30 19:51:03 +02:00
0dd3ce31e8
Made pronterface extremely compact to help it fit a tiny netbook screen
2012-04-26 10:08:59 +02:00
92cba52dfd
Update pronterface.py
2012-04-23 01:33:47 +02:00
253088d4aa
Destroy file open dialog after it's closed.
2012-04-18 15:09:41 +02:00
b74598784e
Fix dialog modality when defining new macro.
2012-04-16 13:18:01 +02:00
09bd18e5a1
Renamed Ex1 to Ex0 and Ex2 to Ex1 to better match what is said on RAMPS for instance.
...
Changed order to draw the target line first, and then the actual line so this line is shown above the target line.
Graying out graph when it's offline.
2012-03-24 16:32:24 +01:00
30d399dbb6
Listening to M104, M109 and M140 commands from gcode to update the UI appropriately.
2012-03-20 23:52:00 +01:00
fa6a3cd7e6
Added a simple Graph class to be used in Pronterface.
2012-03-20 18:57:57 +01:00
1dff073c86
Remember eslaped time since the actual beginning of the print
2012-03-16 04:37:05 +01:00
a2285efd5f
Merge pull request #194 from kliment/master
...
Merge fixes added to master into experimental
2012-03-15 13:52:30 -07:00
87eabd654f
Added wildcard filter for All Files for FileDialog
2012-03-15 10:43:01 -10:00
ca0d49bcdb
Changed the title of the gcode view window to accurately describe the functionality.
2012-03-07 19:37:16 +10:00
1b2811231e
Merge pull request #181 from iXce/master
...
Minor fixes
2012-03-05 01:55:43 -08:00
9b32c9ae9e
Reset Print button and status when resetting machine
2012-02-28 03:12:02 +01:00
2421afa48c
Replace "T:" and "B:" in temp monitoring display since a B might be in the translation for Heater
2012-02-28 03:11:54 +01:00
0f8235ef05
Merge pull request #180 from iXce/master
...
Fix some translation strings and update translations
2012-02-26 16:36:11 -08:00
2afaf4c61a
Use format strings as much as possible for translations
2012-02-26 02:14:06 +01:00
9a20974d8f
Mark button name as translatable
2012-02-26 02:08:57 +01:00
536c84ae47
Fix minor typo (translation argument inside _())
2012-02-26 01:00:20 +01:00
4198697112
changed console window log hiding pattern logic to avoid memory leaking and newlines separating from lines to be hidden
2012-02-13 09:39:35 +02:00
34ede756a6
Full GPLv3 notice
2012-01-23 12:36:49 +01:00
7d2ef9a6b6
Added licensing info to README and all source files
2012-01-23 12:17:28 +01:00
2c28694b03
merge missing translations from pronsole, add new ones, clean up naming scheme
2012-01-19 09:26:23 +01:00
aeaaf5835b
Fixed the Options Dialog so that only the input boxes resize.
...
Added right alignment for labels for easier reading/connecting label to input box.
Centered vertically the label and box so they line up clearly.
2012-01-18 20:44:40 -08:00
74a7388f01
Add rudimentary slice projector support for resin printing. Uses relative moves in Z.
2012-01-10 15:05:56 +01:00
6dff577613
Merge branch 'experimental' of github.com:kliment/Printrun into experimental
2012-01-09 14:07:57 +01:00
7dc1eb7900
Allow unicode strings to be printed to console
2012-01-09 14:07:28 +01:00
e8daa864f7
Moved around and added back temperature gauges for hotend and bed. Hide auto-monitoring temp updates from text-box.
2012-01-09 12:35:47 +02:00
ef1436bfc3
Bring layer view window to front if already open. Closes #124 .
2012-01-07 20:06:46 +01:00
ea7c3ed3d5
Changed exception: "Skeinforge/Slic3r execution failed: " to "Failed to execute slicing software: "
2012-01-07 18:59:38 +01:00
0fa92b4188
Changed exception: "Skeinforge execution failed." to "Skeinforge/Slic3r execution failed."
2012-01-07 18:36:42 +01:00
ec3d066a59
Resizing the options dialog is now possible, this will allow you to check the paths for slicecommand and sliceoptscommand
2012-01-07 18:29:29 +01:00
bd5dd75e1a
Merge remote-tracking branch 'origin/master' into experimental
...
Conflicts:
pronterface.py
2012-01-07 16:34:53 +01:00
1ad6e75568
Merge pull request #148 from kliment/master
...
Merge fixes added to master into experimental
2012-01-07 07:25:11 -08:00
2a18b298f0
add possibility to choose bgcolor for whole main screen in config file
2012-01-07 08:33:34 +01:00
6a63009895
Better condition for auto-selecting the last used port.
2011-12-28 21:08:01 +02:00
1a90feb2ef
Fix command line handling for stl files with spaces in the name
2011-12-22 11:07:52 +01:00
5b0e0c9878
Merge remote-tracking branch 'origin/master' into experimental
2011-12-21 09:14:06 +01:00
9adefb57da
Merge branch 'experimental' of github.com:kliment/Printrun into experimental
2011-12-21 09:11:39 +01:00
642c6dad9e
Use callafter to avoid threading issues on gtk
2011-12-21 09:11:14 +01:00
930583a176
Added Tooltips and a Help Dictionary for the User Options.
2011-12-20 03:48:23 -08:00
0f26512f7d
Fixed default ports on windows
2011-12-15 22:12:05 +01:00
5abf7b1fbe
resolve merge conflicts
2011-12-11 05:04:08 -05:00
7c9e076f0f
simpler code for build dimensions, remove debugging prints
2011-12-11 04:17:29 -05:00
5d4aad0c89
all dimensions in one string
2011-12-11 04:11:47 -05:00
5b4b84d819
add bed center coordinate option, sort options in dialog
2011-12-10 09:04:53 -05:00
a2d5cd5d1c
Merge pull request #122 from kliment/master
...
Merge fixes added to master into experimental
2011-12-07 05:08:49 -08:00
882e68e4a3
Merged connect and disconnect buttons.
2011-12-04 02:17:19 +01:00
086620c6ce
Fixed SD Upload being enabled without a file being loaded.
2011-12-04 01:58:47 +01:00
04b72b2835
Made SD Upload call the right function - not the SD Print function
2011-12-04 01:41:33 +01:00
2e416a7c25
Merge branch 'master', remote-tracking branch 'origin' into experimental
2011-12-03 23:10:59 +01:00
10c2841c3f
Merge branch 'experimental' of github.com:kliment/Printrun into experimental
2011-12-03 23:06:38 +01:00
0421125340
Add buggy and slow gcode rendering (hard disabled by default)
2011-12-03 23:05:30 +01:00
79223d3156
port setting is now also respected if the port exists but is not detected in scan (for udev symlinks)
2011-12-03 20:19:33 +01:00
7030fcad05
sort settings alphabetically in options dialog
2011-12-02 10:21:16 +02:00
a99a801c02
escape backslashes - work around shlex eating them before passing filename on to slicer
2011-12-02 10:20:37 +02:00
1c707c7a7e
Make the send textbox in the GUI expand properly
2011-11-30 13:59:38 +00:00
fe1e6659c5
Fix the custom color dialog to resize properly
2011-11-30 13:35:33 +00:00
daf74897ae
Fixed indenting.
2011-11-30 23:18:12 +10:00
c4251c1925
SD Upload and SD Print buttons send an M21.
...
Automatically attempts to initialise the SD card whenever either of the SD
card related buttons are used.
2011-11-30 23:12:59 +10:00
6d8be315d8
Allow the graph to expand
2011-11-30 12:29:51 +00:00
033daa2105
Clean up the layouting code and let the log box grow with the dialog box
2011-11-30 11:21:09 +00:00
5c4e1691e2
Merge branch 'master', remote-tracking branch 'origin' into experimental
2011-11-30 06:44:00 +01:00
225d61651c
Added Current Z-Height to the status message.
...
Also added "Print Began at: HH:MM:SS"
and added the message "Print Ended at: HH:MM:SS: and took...
2011-11-29 14:37:34 -08:00
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
Guillaume Seguin