Commit graph

1226 commits

Author SHA1 Message Date
Teja
060b967efc pierce time support for img engraving. 2015-08-16 15:10:46 +02:00
Teja
236d2cd7fc explanations for the conversion popup. 2015-08-16 13:58:10 +02:00
Teja
86570f7e4d code cleanup 2015-08-16 12:45:18 +02:00
Teja
d5c1a8178a bugfix. focus mode disabling disables timeout as well. 2015-08-16 12:38:09 +02:00
Teja
8bb698c886 improved preview of gcode generated through img2gcode 2015-08-16 11:43:28 +02:00
Teja
b2555d3850 slicing progress visualized 2015-08-15 21:54:47 +02:00
Teja
45a42c4972 got rid of the gcode viewer - not in use here. 2015-08-15 19:39:51 +02:00
Teja
01d1f5b181 conversion progress reporting 2015-08-15 18:16:56 +02:00
Teja
517ea1a007 more performant gcode visualization for raster-gcode. disabled gcode analysis of octoprint. direct call of gcode generation scripts 2015-08-15 16:57:49 +02:00
Teja
9980030a51 fixes initial image size after placing 2015-08-13 20:07:52 +02:00
Teja
81e5c795a8 bugfix. line width parameter passed correct. 2015-08-13 16:36:08 +02:00
Teja
cdc744537d max values for sharpening and contrast 2015-08-13 12:18:49 +02:00
Teja
0bf06885dc configurable max values for sharpening and contrast. code cleanup 2015-08-13 11:10:43 +02:00
Teja
233f426dff minor ui fixes 2015-08-12 11:42:19 +02:00
Teja
4ac1707052 minor us fixes, photo attribution 2015-08-12 09:31:50 +02:00
Teja
383326932e explanatory preview for contrast, sharpening and dithering 2015-08-10 22:43:45 +02:00
Teja
b2a9c392fe passing forward the image engraving parameters 2015-08-09 17:40:05 +02:00
Teja
18fc2fd68e little bugfix. text in the working area is not selectable anymore. 2015-08-07 16:37:12 +02:00
Teja
572425b52b all parameters for image engraving are now in the ui. 2015-08-07 16:28:32 +02:00
Teja
8adf72a4be images can be placed on the working area, rotated and translated. 2015-08-06 22:45:55 +02:00
Teja
4879aafb72 logging update check. 2015-08-06 17:23:49 +02:00
Teja
0d83eaf1e3 bugfix. returning now tuples. 2015-08-06 16:03:18 +02:00
Teja
493612a47f connecting to a already homed grbl works. 2015-07-17 11:34:11 +02:00
Teja
9460f78d12 code cleanup. fixed drag n drop of svgs. fixed gcode file list entries 2015-07-17 09:56:36 +02:00
Teja
1f2f29336e bugfix. detecting empty 'd' attribute now correct. 2015-07-16 11:58:52 +02:00
Teja
c70b446d65 bugfix. catching emtpy path attribute d. 2015-07-16 11:43:09 +02:00
Teja
cb512a257c fixed re-connection bug when grbl already has a position. 2015-07-16 10:03:54 +02:00
Teja
f023dc99d4 default settings for update 2015-07-15 12:45:38 +02:00
Teja
49fece1e14 return home after print done 2015-07-15 12:45:18 +02:00
Teja
131e99adbe default branch is "mrbeam-stable" instead of "master" 2015-07-15 11:54:03 +02:00
Teja
6a7a6f0ff2 instant save working on connection timeout 2015-07-15 09:56:36 +02:00
Teja
98eaab755f fixed image paths 2015-07-14 22:11:52 +02:00
Teja
79587644b4 fixed update source and deprecation warnings 2015-07-14 21:33:13 +02:00
Teja
7f5d45efdc fixed confirmation dialog. 2015-07-11 16:54:52 +02:00
Teja
7dcf2f38e2 upload button visible again. progress bar fix. 2015-07-11 16:25:32 +02:00
Teja
0ae0390dcf finally working implementation of ACC in the latest comm.py 2015-07-11 15:48:53 +02:00
Teja
0725ee23f3 cancelling print working. 2015-07-11 15:44:00 +02:00
Teja
23d29b29ba minor ui changes 2015-07-11 15:40:02 +02:00
Teja
08ab894ead support for ! and ~ commands 2015-07-11 10:10:39 +02:00
Teja
fee7b32413 basic acc attached. missing ! ~ command support. 2015-07-11 00:36:35 +02:00
Teja
64c0c0d473 just a test. inject acc to upstream comm.py 2015-07-10 23:35:56 +02:00
Teja
dffb123d0e little ui fixes. restart button removed as it was not working. 2015-07-09 18:05:01 +02:00
Teja
f842809db8 code cleanup 2015-07-09 17:02:58 +02:00
Teja
c1567b6742 enabled terminal filters per default 2015-07-09 16:59:44 +02:00
Teja
691d8e8d85 log is ignoring filtered messages. 2015-07-09 16:42:38 +02:00
Teja
7b548763f5 way faster update of laser position. 2015-07-09 16:12:54 +02:00
Teja
3b30e25e60 pause from web ui sends ! and M5 now 2015-07-08 20:56:32 +02:00
Teja
1e00eb55f9 bugfix. fix placement works better now. deprecation warnings fixed. 2015-07-08 11:56:34 +02:00
Teja
14fb9b9665 bugfix. validating NaN correct now 2015-07-08 11:25:04 +02:00
Teja
fc4f2340fe fixed limit hit warning and reconnect after. 2015-07-07 18:44:29 +02:00
Teja
4469f69cab settings fixed 2015-07-07 11:50:39 +02:00
Teja
af6310f5d3 position update works again 2015-07-06 19:36:18 +02:00
Teja
6148b82b7f focus mode works again 2015-07-06 17:11:32 +02:00
Teja
f0c5173dd1 fixed search and filter 2015-07-06 14:46:04 +02:00
Teja
31f2cbb64b files search works again. wip 2015-07-04 18:07:23 +02:00
Teja
867895ab81 terminal fixed 2015-07-04 17:06:46 +02:00
Teja
44671cfb40 WIP. slicing working again. 2015-07-04 16:19:56 +02:00
Teja
fa1bad7b7c wip 2015-07-03 17:08:15 +02:00
Teja
90b20d0be6 wip 2015-07-03 12:20:38 +02:00
Teja
a7acc7f7f4 Merge remote-tracking branch 'upstream/maintenance' into upstream_merge
Conflicts:
	requirements.txt
	src/octoprint/filemanager/__init__.py
	src/octoprint/plugins/cura/profile.py
	src/octoprint/plugins/cura/static/js/cura.js
	src/octoprint/plugins/cura/templates/cura_settings.jinja2
	src/octoprint/plugins/svgtogcode/__init__.py
	src/octoprint/printer/__init__.py
	src/octoprint/server/__init__.py
	src/octoprint/server/api/files.py
	src/octoprint/server/api/printer.py
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/appearance.js
	src/octoprint/static/js/app/viewmodels/connection.js
	src/octoprint/static/js/app/viewmodels/control.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/gcode.js
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/static/js/app/viewmodels/terminal.js
	src/octoprint/templates/dialogs/settings.jinja2
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
	src/octoprint/templates/index.jinja2
	src/octoprint/templates/navbar/settings.jinja2
	src/octoprint/templates/stylesheets.jinja2
	src/octoprint/util/comm.py
2015-07-02 22:36:30 +02:00
Gina Häußge
95c26a7850 Fix: Don't automatically persist or return _config_version
Should only ever be read or written by the plugin system itself, not
by on_settings_save or on_settings_load
(cherry picked from commit 77f7d59)
2015-07-02 15:27:35 +02:00
Gina Häußge
885e6f916c Fix: Don't persists checks when saving SWUpdate settings
(cherry picked from commit 8d10be6)
2015-07-02 15:27:27 +02:00
Gina Häußge
d7a86a4d28 Use UTF-8 for _all_ output from sarge
Lines taking from the asynchronous processing of stdout/stderr where
left as str, leading to encoding problems when utf8 characters showed
up in the stream and were being interpreted as ascii encoding.
(cherry picked from commit 9373be3)
2015-07-02 15:27:17 +02:00
Gina Häußge
7b3e0563cc SWUpdate: Only use version cache from same version of OP
When using the version cache only use the version cache if the OctoPrint
version stored within it matches the one of the currently running
instance. Otherwise we might report false positives with regards to
available updates under some circumstances.
(cherry picked from commit bb7b0cb)
2015-07-02 15:26:02 +02:00
Gina Häußge
537c205757 Use lowercase when matching extensions
(cherry picked from commit 29cee16)
2015-06-30 19:12:58 +02:00
Gina Häußge
f07b2477f5 Fixed some comments that were outdated
(cherry picked from commit 18816b6)
2015-06-30 19:12:52 +02:00
Gina Häußge
5e5531f6d8 Verify extension of uploaded language packs & plugins
Should be valid zip archives/tarballs. Also use only the extension
of an uploaded plugin archive as suffix for the temporary file that's
used for installing it.
(cherry picked from commit a1ff698)
2015-06-30 19:12:45 +02:00
Gina Häußge
eadc9ee795 Fix: We don't need the shell for pip
(cherry picked from commit 2db3228)
2015-06-30 19:12:37 +02:00
Gina Häußge
2a8eea086c Only print command of event handler to log when debug flag is present
(cherry picked from commit 49d28c5)
2015-06-30 08:28:16 +02:00
Gina Häußge
bb0bfaee56 Fix: Increase max body size for plugin archives
Closes #957
(cherry picked from commit af89097)
2015-06-29 21:01:21 +02:00
Gina Häußge
b8209e8e09 Switch to pkg_resources for compatibility check
Plugin Manager now internally uses pkg_resources.parse_version and
pkg_resources.parse_requirements to check for version compatibility
with plugins from the repository. That will allow to directly use
the OctoPrint version string once it's PEP440 compatible.
(cherry picked from commit 8eb61a9)
2015-06-29 18:24:23 +02:00
Gina Häußge
b3e547c60f Fix: Don't reload page on search form submits
Both file search and plugin repository search reloaded the page when
hitting enter in the search field. This fixes that.
(cherry picked from commit 60043cc)
2015-06-29 17:40:15 +02:00
Teja
a205c352ad made local translation text permanent 2015-06-29 17:10:31 +02:00
Teja
0cc04b9a89 better placement of the make it fit function. 2015-06-29 16:28:36 +02:00
Teja
463b0de306 bugfix. make it fit doesn't ignore local transforms anymore. 2015-06-29 15:47:34 +02:00
Teja
1c861fc1d0 local transformation displayed in mm. 2015-06-29 12:24:20 +02:00
Gina Häußge
1ead6e2d20 Fix: Ensure correct "upload date" for all added files
Local file storage implementation will now "touch" added files to set
modification date to current date, ensuring that files that are just
moved through a custom implementation of file object (e.g. through the
watched folder mechanism) will show with "now" as the upload date.
(cherry picked from commit 5f0c89c)
2015-06-29 10:35:33 +02:00
Gina Häußge
016bdd542a Fix: More flexibility when parsing plugin compatibility
If compatibility information is provided only as a version number it's
prefixed with >= for the check (so stating a compatibility of only
1.2.0 will now make the plugin compatible to all versions that follow
too).

Alternatively the compatibility information may now contain stuff like
">=1.2,<1.3" in which case the plugin will only be shown as compatible
to OctoPrint versions 1.2 and up but not 1.3 or anything above that.
(cherry picked from commit d5692d7)
2015-06-29 10:22:10 +02:00
Gina Häußge
4dc9d0a536 Fix: SD card errors shouldn't not cause disconnect
If the SD card fails to initialize with a volume.init failure, that's
not a reason to break off all diplomatic relations with the printer.
(cherry picked from commit 9caf13d)
2015-06-29 10:19:50 +02:00
Gina Häußge
4b11032567 Fix: Slicing profiles now can always be set as default
Previously depended on the slicer being already configured, which is not
really necessary.

Closes #956
(cherry picked from commit 13ac06c)
2015-06-28 02:24:57 +02:00
Gina Häußge
0c54eaf176 Fix: Use Exception, not BaseException
Custom exception should be derived from Exception, not BaseException.

Not only is this specified in the python documentation, but also
tornado will be able to handle Exceptions in requests perfectly fine
and return an HTTP 500 for them, but crash hard (as in, server shut
down follows) for BaseExceptions.
(cherry picked from commit 29b047b)
2015-06-28 02:24:47 +02:00
Teja
0a919c45d8 visualization of local transform 2015-06-27 23:10:18 +02:00
Teja
2051f7ef8b snapping to fixed angles / scales with shift key. 2015-06-26 12:07:57 +02:00
Gina Häußge
401ebcf685 Fix: Cleanly exit on SIGTERM 2015-06-25 15:18:33 +02:00
Gina Häußge
e60cdc9d0f Adjusted bundled plugins to new data folder method 2015-06-24 14:33:33 +02:00
Gina Häußge
67a0fd11dd PluginSettings.get_plugin_data_folder moved to OctoPrintPlugin.get_plugin_data_folder
That way plugins don't need to implement the SettingsPlugin mixin in order to access their data folder, which is now an injected property in OctoPrintPlugin. Plugin authors should still always use the getter since that will also make sure the folder actually does exist (lazy creation).

PluginSettings.get_plugin_data_folder has been marked as deprecated.
2015-06-24 13:59:45 +02:00
Gina Häußge
fca8becb20 More informative errors when serial connection fails 2015-06-24 08:55:27 +02:00
Gina Häußge
be423e49fd Remove dependency_links support again
Doesn't work reliably across pip versions, and adding a special rule for each and every version also isn't fun. Plugin authors will need to use a different approach for pulling in dependencies that are not on pypi during install, e.g. extra install urls or something like that. For now, I give up here ;)
2015-06-23 16:22:45 +02:00
Gina Häußge
5decb23f23 Plugin Manager: color coding call/stdout/stderr in install/uninstall logs 2015-06-23 11:37:07 +02:00
Gina Häußge
ac151d9019 Software Update: Use new PipCaller class and only provide dependency-links parameter if supported by pip version 2015-06-23 11:36:41 +02:00
Gina Häußge
71ccc47717 Plugin Manager: Use new PipCaller class and only provide dependency-links parameter if supported by pip version 2015-06-23 11:36:27 +02:00
Gina Häußge
b32f9bddd2 New util class for performing pip calls
Will lookup the correct pip command to use if not provided as constructor parameter and determine the version. Implements __lt__, __le__, __gt__ and __ge__ for "less/greater than" checks against the pip version, for dynamicalle changing call parameters provided to the execute method based on availability.

 Will allow adjusting software update and plugin manager plugins to only use --process-dependency-links for pip versions >= 1.5
2015-06-23 11:35:23 +02:00
Gina Häußge
1a7193e113 System commands with ignore set to true also ignore http errors 2015-06-22 16:55:32 +02:00
Gina Häußge
a580482c29 Allow asynchronous system commands & commands w/ ignored result
That should get rid of error messages for things like shutdown commands.
2015-06-22 14:28:05 +02:00
Gina Häußge
e230cfb3f3 Software Update fix: Use pip command line instead of module 2015-06-22 13:07:22 +02:00
Gina Häußge
030b6b4478 Software Update: version cache will be written to disk
Reduces number of requests done against (rate limited) github API, especially after consecutive server restarts. Forcing the update check still will query the API.
2015-06-22 13:05:03 +02:00
Gina Häußge
0f818a313d Software Update: Default to pkg_resources for version comparison
That's also able to cope with 0.3a and similar "non-semantic" version schemes. Semantic version comparison can still be forced by setting the compare_type in the check to "semantic". Strict equality check can be set similarly by using the value "unequal".
2015-06-22 13:03:23 +02:00
Gina Häußge
326fc943b7 Plugin Manager: Cache repository list locally
Reduces requests against github upon server restarts.
2015-06-22 13:00:29 +02:00
Gina Häußge
7e6ddaf0d6 Plugins can now have a folder for plugin related data
Path can be queried from settings.
2015-06-22 12:59:39 +02:00
Gina Häußge
22710ccfb3 Show overlay when a new server version is detected
That's more user friendly than just blindly reloading the page. Also include installed Template- and AssetPlugins in the check whether there's a new version or not.
2015-06-21 18:02:16 +02:00