Commit Graph

669 Commits (9692593f5ef8f36a24bff511341236b93db8be62)

Author SHA1 Message Date
unknown 9692593f5e Added Authentication and updated status xml format 2012-05-31 12:26:14 -05:00
unknown 376bb068cd Update Readme for Web-Interface 2012-05-31 11:45:53 -05:00
unknown 471e500d24 Add styling place holders for style gurus to go to down... 2012-05-31 11:42:34 -05:00
unknown fb42d91156 Added xml status 2012-05-31 11:39:18 -05:00
unknown 0e647da104 Updates for web itnerface, add actions, and custom styling using css/style.css 2012-05-31 11:14:47 -05:00
unknown c2e68056ac Added Viewing of Console to Web Interface 2012-05-30 17:04:10 -05:00
unknown 16cf3d764f Added Initial Web Framework for Pronterface, right now, read only global settings. 2012-05-30 16:13:49 -05:00
kliment d9a3363a6f Merge pull request #222 from cwc/master
Add __init__.py so Printrun can be used as package
2012-05-10 12:57:30 -07:00
Cameron Currie bf0add09f6 Add __init__.py so Printrun can be used as package 2012-05-10 12:31:05 -05:00
kliment d731aaf9b3 Merge pull request #204 from jezmy/master
GCode viewer now displays layer info in status bar when scrolling
2012-04-20 04:58:16 -07:00
Jeremy Hammett 2613f65d18 Update gviz.py 2012-04-20 13:52:31 +02:00
Jeremy Hammett b5db90d1e4 Update gviz.py 2012-04-20 13:49:54 +02:00
Jeremy Hammett 4cfd073f1f Update gviz.py 2012-04-20 13:25:28 +02:00
Kliment Yanev a06669fe35 Destroy file selection dialogs after use - fixes a memory leak as well as a gtk bug that vim triggers when editing gcode files 2012-04-18 15:19:44 +02:00
Kliment Yanev 253088d4aa Destroy file open dialog after it's closed. 2012-04-18 15:09:41 +02:00
Kliment Yanev b74598784e Fix dialog modality when defining new macro. 2012-04-16 13:18:01 +02:00
kliment 05058c5bff Merge pull request #201 from kliment/experimental
Merge experimental back into master
2012-03-29 11:18:37 -07:00
kliment 2a15576a5b Merge pull request #199 from Chillance/experimental
Minor updates to the graph functionality
2012-03-24 08:38:04 -07:00
Chillance 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
kliment 762c4a5d60 Merge pull request #198 from Chillance/experimental
Updating target temperatures in UI based on gcode
2012-03-20 16:16:17 -07:00
Chillance 30d399dbb6 Listening to M104, M109 and M140 commands from gcode to update the UI appropriately. 2012-03-20 23:52:00 +01:00
kliment 13f945b8bc Merge pull request #197 from Chillance/experimental
Temperature graph
2012-03-20 12:08:38 -07:00
Chillance fa6a3cd7e6 Added a simple Graph class to be used in Pronterface. 2012-03-20 18:57:57 +01:00
Kliment Yanev ae7b6f5c77 Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2012-03-18 16:40:26 +01:00
kliment 7a1787337e Merge pull request #195 from iXce/experimental
- update French translation
- store elapsed time since the actual beginning of the print to make ETA non crazy when pausing in the middle of the print
- handle another exception which happens when the printer gets disconnected
2012-03-18 06:20:21 -07:00
Guillaume Seguin ba759e9264 Handle another exception most likely caused by a disconnected printer 2012-03-16 04:37:43 +01:00
Guillaume Seguin 1dff073c86 Remember eslaped time since the actual beginning of the print 2012-03-16 04:37:05 +01:00
Guillaume Seguin 6f5fa527ca Update French translation and template 2012-03-16 03:50:31 +01:00
Guillaume Seguin d21f4d0a2c Merge branch 'experimental' of https://github.com/kliment/Printrun into experimental 2012-03-16 03:43:09 +01:00
kliment a2285efd5f Merge pull request #194 from kliment/master
Merge fixes added to master into experimental
2012-03-15 13:52:30 -07:00
kliment 65e01214ac Merge pull request #193 from OhmEye/master
Modified wildcard for FileDialog to add an choice to show All Files
2012-03-15 13:50:09 -07:00
OhmEye 87eabd654f Added wildcard filter for All Files for FileDialog 2012-03-15 10:43:01 -10:00
Kliment Yanev 9131246628 Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2012-03-05 11:05:58 +01:00
kliment 36a2034a87 Merge pull request #189 from hurzl/experimental
preview zoom by key
2012-03-05 02:04:14 -08:00
hurzl 5c22914f2b Merge pull request #1 from hurzl/patch-3
zoom big preview by shift + key
2012-03-05 01:59:51 -08:00
kliment 1b2811231e Merge pull request #181 from iXce/master
Minor fixes
2012-03-05 01:55:43 -08:00
hurzl 6fb50be6f4 zoom by shift+key 2012-03-05 10:42:14 +01:00
Kliment Yanev ed4cf4a0d4 Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2012-03-05 09:31:21 +01:00
Kliment Yanev 83d5966020 Add export button to integrated Plater too 2012-03-05 09:31:05 +01:00
Kliment Yanev 1e6885d25d Add blanking to projection for photopolymer printing 2012-03-04 19:02:28 +01:00
kliment 9167dfb8ba Merge pull request #184 from FrozenFire/experimental
Made lines starting with $ pass through
2012-03-01 05:16:56 -08:00
kliment abe7d684bd Merge pull request #183 from FrozenFire/experimental
Made greetings configurable (no longer just 'start')
2012-03-01 05:14:01 -08:00
Nathan Zadoks c2baae7bbb Lines starting with $ are now passed through too. 2012-03-01 14:13:57 +01:00
Nathan Zadoks 501254a72f Made greetings configurable (no longer just 'start') 2012-03-01 14:12:10 +01:00
Guillaume Seguin 9b32c9ae9e Reset Print button and status when resetting machine 2012-02-28 03:12:02 +01:00
Guillaume Seguin 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
Guillaume Seguin 134704b721 Reset Print button and status when resetting machine 2012-02-28 03:08:56 +01:00
Guillaume Seguin 6dbf8b34c4 Replace "T:" and "B:" in temp monitoring display since a B might be in the translation for Heater 2012-02-28 03:06:55 +01:00
kliment 0f8235ef05 Merge pull request #180 from iXce/master
Fix some translation strings and update translations
2012-02-26 16:36:11 -08:00
Guillaume Seguin 3c599713f9 Merge branch 'master' of github.com:iXce/Printrun into experimental 2012-02-26 04:11:35 +01:00