Commit Graph

246 Commits (a49194a19ff6ef4ce0cfa1e0bd8b063649bd4a5b)

Author SHA1 Message Date
Kliment Yanev 642c6dad9e Use callafter to avoid threading issues on gtk 2011-12-21 09:11:14 +01:00
Christopher Keller 930583a176 Added Tooltips and a Help Dictionary for the User Options. 2011-12-20 03:48:23 -08:00
Nathan Zadoks 0f26512f7d Fixed default ports on windows 2011-12-15 22:12:05 +01:00
Clarence Risher 5abf7b1fbe resolve merge conflicts 2011-12-11 05:04:08 -05:00
Clarence Risher 7c9e076f0f simpler code for build dimensions, remove debugging prints 2011-12-11 04:17:29 -05:00
Clarence Risher 5d4aad0c89 all dimensions in one string 2011-12-11 04:11:47 -05:00
Clarence Risher 5b4b84d819 add bed center coordinate option, sort options in dialog 2011-12-10 09:04:53 -05:00
kliment a2d5cd5d1c Merge pull request #122 from kliment/master
Merge fixes added to master into experimental
2011-12-07 05:08:49 -08:00
Nathan Zadoks 882e68e4a3 Merged connect and disconnect buttons. 2011-12-04 02:17:19 +01:00
Nathan Zadoks 086620c6ce Fixed SD Upload being enabled without a file being loaded. 2011-12-04 01:58:47 +01:00
Nathan Zadoks 04b72b2835 Made SD Upload call the right function - not the SD Print function 2011-12-04 01:41:33 +01:00
Kliment Yanev 2e416a7c25 Merge branch 'master', remote-tracking branch 'origin' into experimental 2011-12-03 23:10:59 +01:00
Kliment Yanev 10c2841c3f Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2011-12-03 23:06:38 +01:00
Kliment Yanev 0421125340 Add buggy and slow gcode rendering (hard disabled by default) 2011-12-03 23:05:30 +01:00
Nathan Zadoks 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
Keegi 7030fcad05 sort settings alphabetically in options dialog 2011-12-02 10:21:16 +02:00
Keegi a99a801c02 escape backslashes - work around shlex eating them before passing filename on to slicer 2011-12-02 10:20:37 +02:00
John Tapsell 1c707c7a7e Make the send textbox in the GUI expand properly 2011-11-30 13:59:38 +00:00
John Tapsell fe1e6659c5 Fix the custom color dialog to resize properly 2011-11-30 13:35:33 +00:00
tjhowse daf74897ae Fixed indenting. 2011-11-30 23:18:12 +10:00
tjhowse 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
John Tapsell 6d8be315d8 Allow the graph to expand 2011-11-30 12:29:51 +00:00
John Tapsell 033daa2105 Clean up the layouting code and let the log box grow with the dialog box 2011-11-30 11:21:09 +00:00
Kliment Yanev 5c4e1691e2 Merge branch 'master', remote-tracking branch 'origin' into experimental 2011-11-30 06:44:00 +01:00
Christopher Keller 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
Christopher Keller 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
Kliment Yanev 3316dac639 Merge branch 'master' into experimental
Conflicts:
	stlview.py
2011-11-28 18:27:27 +01:00
Christopher Keller 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
Kliment Yanev 97af7725d9 Prevent (harmless) exception on every printed gcode line 2011-11-24 00:41:49 +01:00
Kliment Yanev 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
Kliment Yanev 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
Kliment Yanev 03f727aa92 Merge branch 'master' into experimental 2011-11-20 09:20:37 +01:00
Kliment Yanev 82aa15becc Merge branch 'master' of github.com:kliment/Printrun 2011-11-20 09:19:23 +01:00
Kliment Yanev db0b48ce25 Remove readonly attribute from dropdowns for port and baud rate 2011-11-20 09:18:38 +01:00
Kliment Yanev 0afcc88bd4 Integrate plating into pronterface UI 2011-11-18 09:52:16 +01:00
Kliment Yanev 8f3df9c2e9 Modified size of + button 2011-11-16 16:09:12 +01:00
Keegi a0bf2c4536 don't set font for new button button 2011-11-15 11:06:25 +02:00
Keegi 87ef3e6e8c hide temperature gauge until better place is found for it 2011-11-15 11:06:03 +02:00
Keegi 16fb5176cf some tool tips 2011-11-14 21:43:16 +02:00
Keegi 848eee2d68 Merge remote branch 'kliment/master' into experimental 2011-11-14 21:36:07 +02:00
Keegi 0839071f51 new button button 2011-11-14 21:35:18 +02:00
Kliment Yanev 440a5ca5af Use CallAfter to prevent mysterious double free or corruption error in wx. 2011-11-14 16:20:32 +01:00
Kliment Yanev e27befbea3 Fix alignment of port button 2011-11-14 09:14:27 +01:00
Keegi 6453dbb175 Merge remote branch 'kliment/master' into experimental 2011-11-14 08:25:46 +02:00
Kliment Yanev 9c36456500 Populate port dialog by default 2011-11-13 23:54:00 +01:00
Keegi 0e7c70dbdf Merge remote branch 'kliment/master' into experimental 2011-11-14 00:30:32 +02:00
Kliment Yanev 7124f2f982 Make newly deceted port first if previously chosen port not detected 2011-11-13 21:55:12 +01:00
Kliment Yanev 7c5efbd619 Add port rescan button. 2011-11-13 21:44:45 +01:00
Keegi ad21eefe69 Merge remote branch 'kliment/master' into experimental 2011-11-13 00:12:49 +02:00
Keegi 9a7baf64a0 make temperature dropdown slightly bigger 2011-11-13 00:12:41 +02:00
Keegi a05f8839b3 made temperature gauge visually similar style as the printer position controls 2011-11-12 16:35:37 +02:00
Duane Johnson 3d08436499 Remove alphabetic sort order from baud rate combo box 2011-11-12 07:49:21 -06:00
Keegi 3d2054bf06 Merge branch 'master' into experimental
Conflicts:
	pronterface.py
2011-11-12 12:10:26 +02:00
ERoth3 37858bb166 Added 250000 baud for marlin compatibility 2011-11-12 00:33:19 -05:00
Duane Johnson 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
Duane Johnson c113e2bffc Merge branch 'master' of https://github.com/kliment/Printrun 2011-11-11 10:23:52 -06:00
Duane Johnson 7c310d7bfd Shrunk XY and Z controls. Added Home buttons. Added enable/disable. 2011-11-11 10:22:31 -06:00
Duane Johnson b0cd17ee6e Create absolute-positioned "Home" buttons as a layer on top of XYButtons 2011-11-09 20:55:41 -06:00
Keegi 1d6605065d Merge branch 'master' into experimental 2011-11-09 15:16:04 +02:00
Keegi 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
Keegi 38cefcd00e attempt to fix panel context menu not appearing on empty slot 2011-11-08 21:33:24 +02:00
Keegi 1fb9890464 workaround for frozen buttons appearing on some cases 2011-11-08 21:19:12 +02:00
Duane Johnson 437f069921 Fix issue with XYButtons stealing keys. Added ESC key to blur. 2011-11-08 10:48:15 -06:00
Duane Johnson 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
Duane Johnson 39a99314b3 Fix position of all buttons below the new XY/Z widgets. 2011-11-07 22:29:28 -06:00
Duane Johnson f4d18e4dff Fixed keypad toggle for XY controls. Defaults to off. 2011-11-07 22:09:18 -06:00
Duane Johnson 3722b11aab Merge branch 'master' of github.com:canadaduane/Printrun 2011-11-07 14:42:09 -06:00
Duane Johnson 8b56bbe548 Integrate new UI with pronterface 2011-11-07 13:41:14 -06:00
kliment c4884cf1af Merge pull request #75 from sdevijver/master
Print time guesstimation on file load
2011-11-06 23:13:54 -08:00
Christopher Keller 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
Steven Devijver be5f0e4900 Moved estimated duration code to pronterface 2011-11-04 11:49:05 +01:00
Keegi 4c2e31f3a8 add threshold for button dragging in case of jittery mouse 2011-10-27 16:37:54 +03:00
Keegi 1fe67e7d23 fixed temperature gauge lagging 2011-10-27 16:37:10 +03:00
Keegi 010a3fcb15 add threshold for button dragging in case of jittery mouse 2011-10-27 16:36:30 +03:00
Keegi d2db9ca389 fancy temperature gauge... 2011-10-25 22:58:13 +03:00
Keegi f0f6333681 better temperature combo box behavior when heated up 2011-10-25 22:56:44 +03:00
Keegi 506d9bb172 Rearrange temperature setting controls, explicit temperature off button, color-feedback 2011-10-24 15:21:33 +03:00
Keegi 55dd423951 Merge remote branch 'kliment/master' into experimental 2011-10-11 10:26:48 +03:00
l4nce0 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
Keegi e9e721bd5a Merge remote branch 'kliment/master' into experimental 2011-10-07 17:00:17 +03:00
Keegi 6af04ed612 Fix indentation problems in macro editor preventing it to create new multi-line macros 2011-10-07 16:49:53 +03:00
Keegi 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
Keegi 2806120123 custom button drag-drop rearranging 2011-09-30 17:41:30 +03:00
Kliment Yanev 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
Keegi 0da65f14d0 Fix exception on removing the last custombutton when there are no other custombuttons 2011-09-13 14:41:05 +03:00
Kliment Yanev 16fd9fd04d Open .gco files 2011-09-09 18:14:49 +02:00
Cyril Laguilhon-Debat 786bf24f32 Moved "Clear" button to menu 2011-09-06 21:26:37 +02:00
Cyril Laguilhon-Debat 1e91e807b7 Removing Tab chars, adding "Clear" button, and resizing translations 2011-09-06 18:55:52 +02:00
Cyril Laguilhon-Debat 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
Cyril Laguilhon-Debat d2ba1b2cc4 Change location of locale/ directory
necessary for windows compatibility
2011-09-06 14:06:42 +02:00
Kliment Yanev 88a7b10c79 Merge branch 'master' of github.com:kliment/Printrun 2011-09-05 00:08:51 +02:00
Kliment Yanev 895a958ea3 Fix edit dialog on Windows 2011-09-05 00:08:09 +02:00
Keegi 6e0d5a700b Revert "Merge pull request #55 from nesqi/master" - breaks custom buttons and scroll zoom in gviz
This reverts commit d2b90ebe77, reversing
changes made to 8af5496a4a.
2011-09-02 11:58:58 +03:00
Erik Jonsson 4f4b1b4a8a Made the gviz component resize as the window resizes. 2011-08-28 15:09:26 +02:00
Skateboss 712fe6b970 removed line 1028 as it was left over from pasting. oops. 2011-08-28 08:35:48 +02:00
Skateboss f23f62098a Edited pronterface.py via GitHub 2011-08-27 09:31:32 +02:00
Skateboss d4285ad1e2 removed brackets 2011-08-27 09:26:07 +02:00
Skateboss d01621d5e5 condensed measurements code. 2011-08-27 09:15:22 +02:00
Skateboss 313163721e Edited pronterface.py via GitHub 2011-08-27 08:45:35 +02:00
Kliment b5c182a19a Push gui updates to a separate thread 2011-08-23 14:33:28 +02:00