Teja
|
8bc350fa8e
|
hacked the gCodeViewer to render into our svg preview
|
2015-01-29 20:45:41 +01:00 |
|
Teja
|
3746ecd17b
|
bugfix. don't send move commands while printing state
|
2015-01-29 18:06:26 +01:00 |
|
Teja
|
73da6e57de
|
bugfix. correct slider value for feedrate
|
2015-01-29 17:57:46 +01:00 |
|
Teja
|
b837975805
|
bugfix. () in filenames are stripped by svg id generation.
|
2015-01-29 17:36:00 +01:00 |
|
Teja
|
9bd5a71875
|
code cleanup, svgDPI introduced in settings
|
2015-01-29 17:21:18 +01:00 |
|
Teja
|
06a279b4a4
|
quickly added a clear button for the working area. needs ui improvement.
|
2015-01-29 14:06:56 +01:00 |
|
Teja
|
5d9eba510d
|
avoid double binding of the event. max speed now from machine profile
|
2015-01-28 20:36:54 +01:00 |
|
Teja
|
336076f254
|
code cleanup
|
2015-01-28 18:34:17 +01:00 |
|
Teja
|
61033fe7e5
|
bugfix: intensity and feedrate sliders working again.
|
2015-01-28 18:31:41 +01:00 |
|
Teja
|
79f053be80
|
bugfix. y axis coordinates are working correct again when clicking into working area
|
2015-01-28 17:24:12 +01:00 |
|
Teja
|
d546c1140a
|
code cleanup
|
2015-01-28 17:16:27 +01:00 |
|
Teja
|
022372c497
|
grid over working area
|
2015-01-28 16:32:00 +01:00 |
|
Teja
|
7e088c15a3
|
visual fix
|
2015-01-28 13:19:08 +01:00 |
|
Teja
|
ff5e371bff
|
gcode preview works now on direct load and laser working area workflows
|
2015-01-28 12:50:37 +01:00 |
|
Teja
|
4ecf06bedd
|
Merge branch 'mrbeam-ui' into gcode-preview
|
2015-01-28 11:22:03 +01:00 |
|
Teja
|
6cc8ea4882
|
beautified focus mode tab
|
2015-01-28 11:21:02 +01:00 |
|
Teja
|
e5d2d8e6eb
|
fixed y shift on gcode preview
|
2015-01-28 01:09:43 +01:00 |
|
Teja
|
206c8cbcc3
|
fixed gcode preview. not all but much.
|
2015-01-28 00:33:48 +01:00 |
|
Teja
|
fa48a1393f
|
trying to get the gcode viewer working
|
2015-01-27 11:48:07 +01:00 |
|
Teja
|
a4a274b78b
|
disabled infill algorithm as it is very experimental and needs testing.
|
2015-01-26 16:58:54 +01:00 |
|
Teja
|
67f7d3dbaa
|
code cleanup
|
2015-01-26 16:50:02 +01:00 |
|
Teja
|
5535f256c8
|
changed name of the plugin.
|
2015-01-26 16:48:59 +01:00 |
|
Teja
|
2c7ef276a7
|
minor fixes in the profile list
|
2015-01-26 16:26:35 +01:00 |
|
Teja
|
05687b1699
|
fixed z-axis setting
|
2015-01-26 16:13:57 +01:00 |
|
Teja
|
9e2abc3632
|
set coordinate origin button implemented
|
2015-01-26 15:16:53 +01:00 |
|
Teja
|
901e63aef9
|
working area fix. edit fix of default profiles
|
2015-01-26 14:24:31 +01:00 |
|
Teja
|
8237d3c98f
|
fixed profile editing
|
2015-01-26 13:31:07 +01:00 |
|
Teja
|
040035b7ff
|
work in progress. still buggy.
|
2015-01-25 19:19:58 +01:00 |
|
Teja
|
5c9567309f
|
using the new settigns from upstream
|
2015-01-24 20:54:27 +01:00 |
|
Teja
|
f2054a1bc3
|
somehow resolved the merge conflicts
|
2015-01-23 21:32:57 +01:00 |
|
Teja
|
d55e723f75
|
Merge remote-tracking branch 'upstream/devel' into update_merge
Conflicts:
src/octoprint/plugins/cura/profile.py
src/octoprint/plugins/cura/static/js/cura.js
src/octoprint/plugins/svgtogcode/__init__.py
src/octoprint/plugins/svgtogcode/templates/svgtogcode_settings_dialog.jinja2
src/octoprint/server/__init__.py
src/octoprint/server/api/settings.py
src/octoprint/settings.py
src/octoprint/static/js/app/main.js
src/octoprint/static/js/app/viewmodels/control.js
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/templates/dialogs.jinja2
src/octoprint/templates/index.jinja2
|
2015-01-23 11:37:47 +01:00 |
|
Gina Häußge
|
657629183b
|
Custom 400 response if requests that need json don't contain proper json
|
2015-01-22 17:59:31 +01:00 |
|
Gina Häußge
|
9cefd06655
|
Added missing pagination for printer profiles
|
2015-01-22 17:57:25 +01:00 |
|
Teja
|
8d5cc52ee5
|
Merge branch 'mrbeam' into update_merge
Conflicts:
src/octoprint/plugins/cura/__init__.py
src/octoprint/plugins/cura/profile.py
src/octoprint/printer/__init__.py
src/octoprint/server/__init__.py
src/octoprint/server/api/printer.py
src/octoprint/server/api/settings.py
src/octoprint/static/js/app/main.js
src/octoprint/static/js/app/viewmodels/control.js
src/octoprint/static/js/app/viewmodels/settings.js
|
2015-01-22 17:51:28 +01:00 |
|
Gina Häußge
|
ac549770ee
|
Move onStartup call to before any bindings getting applied
|
2015-01-22 16:56:42 +01:00 |
|
Teja
|
b41032cc1c
|
Merge branch 'mrbeam' into update_merge
|
2015-01-21 20:50:36 +01:00 |
|
Teja
|
cb983a4b38
|
code cleanup
|
2015-01-21 19:09:26 +01:00 |
|
Teja
|
3184b0251f
|
bugfixes! state model works again. feature: printing of placed svg files & direct gcode.
|
2015-01-21 17:38:53 +01:00 |
|
Teja
|
5ef6600ab6
|
bugfix. fixed status message filter in terminal
|
2015-01-21 12:31:41 +01:00 |
|
Teja
|
f19d2deffa
|
bugfix. working area svg stays where it is on modal dialogs.
|
2015-01-21 12:26:16 +01:00 |
|
Teja
|
a49f2b721f
|
meaningful gcode names
|
2015-01-21 11:54:46 +01:00 |
|
Teja
|
aab27fa181
|
progress in direct lasering the working area
|
2015-01-20 21:55:37 +01:00 |
|
Gina Häußge
|
22623fb0b6
|
Allow setting the default printer profile when creating a new one
|
2015-01-20 15:17:49 +01:00 |
|
Gina Häußge
|
98ac877033
|
Merge branch 'master' into devel
Conflicts:
CHANGELOG.md
|
2015-01-19 16:48:51 +01:00 |
|
Gina Häußge
|
5f835edf2e
|
Changelog entries for #706 and #719
|
2015-01-19 16:48:03 +01:00 |
|
Gina Häußge
|
83790fcd64
|
Do not truncate error reported from printer in UI
Closes #706
|
2015-01-19 16:42:09 +01:00 |
|
Gina Häußge
|
6dd2dcee16
|
GCODE viewer: Even better version of initial bed centering, backported from c858c8f75b
See #719
|
2015-01-19 16:34:40 +01:00 |
|
Gina Häußge
|
a91a354fa9
|
Fixed a bug causing the GCODE viewer to be zoomed in outside of the print bed due to missing initial move
Possible fix for #719
|
2015-01-19 16:26:52 +01:00 |
|
Gina Häußge
|
4bf3d698e3
|
Fixed some changelog entries and added commit history to unreleased 1.1.2
|
2015-01-19 15:52:20 +01:00 |
|
Gina Häußge
|
67a884fc9d
|
Added a lot of changelog entries
|
2015-01-19 13:18:43 +01:00 |
|