Commit Graph

201 Commits (1ad6e75568ef49ab6ccf7909dea42309aa3f2229)

Author SHA1 Message Date
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
Kliment 291aac90e5 Merge branch 'master' of github.com:kliment/Printrun
Conflicts:
	pronterface.py
2011-08-11 15:04:26 +02:00
Kliment dbf3e7f0a2 Close gcode file explicitly after reading 2011-08-11 15:02:41 +02:00
kliment 6d32cfa6dc Merge pull request #46 from jmarsden/master
i18n for Pronterface
2011-08-07 21:51:37 -07:00
Keegi cf62dc2504 preview extrusion width as setting 2011-08-07 23:11:35 +03:00
Keegi eaa2a4c0cc settings for bed size/grid lines 2011-08-07 23:00:13 +03:00
Jonathan Marsden c2649a291f Add gettext i18n to pronterface 2011-08-06 16:45:52 -07:00
Kliment df051e600f Add horrifyingly simple gcode editor 2011-08-06 15:28:25 +02:00
Kliment ed20b692ef Merge branch 'master' of github.com:kliment/Printrun
Conflicts:
	pronterface.py
2011-08-06 14:49:59 +02:00
Kliment 013c9f0bec Add estimated filament length used.
Print elapsed time at end of print.
2011-08-06 14:48:10 +02:00
Keegi df81a73dcc use enable/disable for pause button instead of hide/show to not interfere with custombuttons 2011-08-05 01:32:22 +03:00
Keegi 97a530d53b fix typo 2011-08-04 22:28:34 +03:00
Keegi 38b69e7d74 another attempt to get popup menu for buttons on mac 2011-08-04 21:15:34 +03:00
Keegi e6f4f9dfb5 attempt to get button popup to work on mac 2011-08-04 15:20:45 +03:00
Keegi 8dd97e12e7 Custom button customisation implemented 2011-08-04 14:03:35 +03:00
Keegi 353e51d6dd fix specifying colours causing exception 2011-08-03 22:27:41 +03:00
Keegi 799a3ec0e1 customise custom buttons via UI 2011-08-03 21:49:19 +03:00
Ahmet Cem TURAN 06a7827dde Garys Hack and SFACT all together in a package 2011-08-01 23:04:42 +03:00
kliment 76fafca31d Merge branch 'master' of git@github.com:kliment/Printrun 2011-07-28 12:01:24 +02:00
kliment 9c531f56d3 Print out error instead of crashing on skeinforge errors 2011-07-28 12:00:57 +02:00
Keegi 7245e54b4a Monitor command in pronterface now toggles the checkbox and sets the interval 2011-07-28 12:33:39 +03:00
Alessandro Ranellucci 9e11e5eef0 Move all button enable/disable/setlabel calls inside wx.CallAfter() to avoid threading issues 2011-07-27 17:23:28 +02:00
Keegi fba262be54 Options dialog 2011-07-26 19:29:55 +03:00
Keegi 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
Keegi 0af5005052 Edit macros via menu access 2011-07-26 19:29:52 +03:00
kliment cf49a963b1 Autoload skeined STL files in addition to stl files. 2011-07-24 11:14:12 +02:00
kliment 8d2c609a1f Revert previous commit 2011-07-22 16:34:23 +02:00
kliment 77149a2257 Load gcode file with same name as stl file (no _export) 2011-07-22 14:05:21 +02:00
kliment 929c245069 Change working dir to enable skeinforge detection 2011-07-21 15:17:40 +02:00
kliment d483f84b6f Disable skeinforge settings on mac 2011-07-20 10:23:07 +02:00
Alessandro Ranellucci d9a0526c46 Minimal UI improvements to avoid text clipping on Mac 2011-07-19 17:33:08 +02:00
Keegi 174321aaea Save last used temperature in pronterface, to put it in combo box for next run. 2011-07-19 11:02:48 +03:00
kliment 30023a5be1 Remove end callback until pausing bug is fixed 2011-07-17 18:08:18 +02:00
kliment 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
kliment 8125f893f6 Print elapsed time after print is done. 2011-07-17 12:53:13 +02:00
kliment bfe99db55e Merge branch 'master' of github.com:kliment/Printrun 2011-07-15 12:11:48 +02:00
kliment 71dfcf141e Autoload file and enable print after skeining 2011-07-15 12:11:09 +02:00
Keegi 1d5ce77a36 some fixes to macro editor routines 2011-07-15 11:12:21 +03:00
Keegi 2834e5631e Merge remote branch 'kliment/master' 2011-07-15 10:19:53 +03:00
Keegi 049400b66b indent/unindent multiline macros automatically for macro editor 2011-07-15 10:19:28 +03:00
kliment 655ab135e5 Fix permissions, allow commands when printer disconnected 2011-07-15 09:15:12 +02:00
Keegi 7e80870c52 Merge remote branch 'kliment/master' 2011-07-12 00:15:58 +03:00
kliment c93ecbf993 Do not show gcode window unless file is loaded 2011-07-10 20:56:25 +02:00
Keegi e986b82440 Merge remote branch 'kliment/master' 2011-07-09 19:46:54 +03:00
Alessandro Ranellucci 4724fc0c04 Hide the pause button until needed. 2011-07-09 16:07:17 +02:00
Alessandro Ranellucci 6d78deeab2 Leave Reset enabled and allow loading a GCode file without connecting to the printer. 2011-07-09 15:54:59 +02:00