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
Gina Häußge
f4df354cd0
Removed left overs from former cura integration
2015-01-28 15:36:44 +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
Gina Häußge
b4068f36e1
Highlighted changed lines
2015-01-27 16:08:10 +01:00
Gina Häußge
4223d48edd
Docs: Started on a basic plugin tutorial
2015-01-27 14:21:41 +01:00
Teja
fa48a1393f
trying to get the gcode viewer working
2015-01-27 11:48:07 +01:00
Gina Häußge
f32c977381
Update CONTRIBUTING.md
2015-01-27 09:53:09 +01:00
Gina Häußge
d96e56e3c7
Also include module_name in plugin origin tuple for entry points
2015-01-26 22:30:31 +01:00
Gina Häußge
c3bb575b48
Added plugin metadata to bundled plugins
2015-01-26 22:22:19 +01:00
Gina Häußge
2d2285861f
Also track disabled plugins and allow defining/retrieving license information in plugins
2015-01-26 22:21:58 +01:00
Gina Häußge
19f9400b11
Read pkginfo data for plugins retrieved via entry_point and use that to populate author, version, name, description and url data in PluginInfo object
...
This data can still be overwritten from within the Plugin itself by setting the correponding __plugin_xyz__ variables, however it allows getting rid of some repetition if that data has already been specified in setup.py
2015-01-26 17:27:34 +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
Артем Груничев
344a505903
Icons at Action column in Access Controll settings page are now wrapped correctly with any translation language; regenerated .css file according to .less one.
2015-01-26 17:24:37 +03: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
Gina Häußge
922ee39109
Plugins can now also supply information regarding the plugin author and website, metadata also tracks from where they were loaded
2015-01-26 12:51:44 +01:00
Gina Häußge
4b60475a02
Also properly inject printer into plugin implementations (as self._printer)
2015-01-26 12:48: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
Gina Häußge
2de863c5db
Update CONTRIBUTING.md
2015-01-23 12:50:34 +01:00
Gina Häußge
09e5676009
Update CONTRIBUTING.md
2015-01-23 12:30:02 +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