Commit graph

4245 commits

Author SHA1 Message Date
Gina Häußge
f20e985d0d profile => slicing_profile & removed filament 0 check
If the slicer returns values for a tool we want it in our analysis
result, even if it's zero. That way the result will be the same as
if we have our own built in gcode analyser take a look at the
file.

(cherry picked from commit 818ae92)
2017-01-11 12:04:13 +01:00
derpicknicker1
58f934e2c1 Fix issue in getting file metadata after slicing
This fixes the issue that there were no informations about filament
usage in metadata after slicing with cura plugin. Trying to call
profile.get_float("filament_diameter") ended in en exception with
message " 'module' object has no attribute 'get_float' ". So i defined
profile before using profile and now it works.
See issue #1685
Also inserted a check to determine if filament usage is > 0 to exclude
tools with no filament usage in metadata.

(cherry picked from commit c9b38bd)
2017-01-11 12:04:02 +01:00
Gina Häußge
06eae381e4 Fixed an error in the dev env setup docs 2017-01-10 19:01:23 +01:00
Gina Häußge
50965d69ce Include info about setting up dev env in CONTRIBUTING.md 2017-01-10 19:00:58 +01:00
Gina Häußge
6e474d9096 Fix model size calculation during GCODE analysis
* Properly handle G0/G1 with no X, Y, Z coordinates in relative mode
    instead of duplicating coordinates - should fix #1675
  * Only take move commands with X, Y, Z coordinates into account for
    model size calculation - this makes our internal GCODE analysis behave
    like the GCODE viewer's analysis and produce the same model size. The
    downside is that extrusions on the origin are no longer taken into account
    for checking if a model is within bounds of the print bed, but that should
    hopefully not produce any issues in the real world.
2017-01-10 12:16:33 +01:00
Gina Häußge
63c588fce9 Update command line examples in README 2017-01-09 17:07:27 +01:00
Gina Häußge
f3f60674fc Allow a retraction z hop of 0 in timelapse configuration
See comment by @markwal at
https://github.com/foosel/OctoPrint/pull/1148#pullrequestreview-14802655
2017-01-09 17:00:10 +01:00
Marc Hannappel
dc3182c872 Fix folders doesn't get listed when performing a filtering in file section, issue #1667
(cherry picked from commit 8a8b88a)
2017-01-09 16:54:55 +01:00
Gina Häußge
6c9cac0eca Merge branch 'master' into maintenance 2017-01-09 14:10:04 +01:00
Gina Häußge
101471235c Pinning Jinja to <2.9 for now
Variables defined in an outer scope can no longer be set from an inner scope (see
pallets/jinja#641). Regardless of whether that is right or wrong, we can't control if
people are using such constructs in their plugins, which versions of Jinja >= 2.9 would
now break out of the blue, regardless of OctoPrint version. That is unacceptable sadly
and requires pinning for now, until plugin authors have had a chance to adapt
accordingly.

Also see #1697.
2017-01-09 14:09:49 +01:00
Gina Häußge
84e8f8e1ca Fix terminal filter regexes & add filter for wait 2016-12-16 13:01:56 +01:00
Gina Häußge
2669e79778 Change wording of buttons in cancel confirmation
"Cancel" and "Proceed" is misleading.

Closes #1656
2016-12-16 12:31:07 +01:00
Gina Häußge
42e3922053 Don't care about common params on CLI
--basedir, --config, --verbose, --safe may now come before or after
subcommands and should still be evaluated.

For the server commands (legacy, "server" and "daemon"), the same
should now hold true for the related parameters --host, --port, --debug,
--logging, --iknowwhatimdoing and also --pid (for daemon command).

While having the parameters belong to the individual commands and only
there (which is click's basic approach) is way more cleaner, too many people
were running into issues with that strict approach after all.

I just hope the somewhat hackish approach with context injection needed to
get the less strict version to work won't backfire badly in the long run.

See also #1633 and #1657
2016-12-16 12:18:05 +01:00
Gina Häußge
e121569e40 Fix BASEDIR & CONFIGFILE eval in init script & param order
Solves #1657
2016-12-16 10:30:56 +01:00
Gina Häußge
a735bcc18d Take keyboard control setting into account for possible check
Solves #1660
2016-12-16 10:13:53 +01:00
Gina Häußge
726787e4db Merge branch 'fix-lsb-include' of https://github.com/tullo-x86/OctoPrint into pr/tullo-x86/fix-lsb-include 2016-12-14 16:15:43 +01:00
Daniel Tullemans
ce4e04cabf Include LSB above first use in init script 2016-12-13 17:51:37 -06:00
Gina Häußge
fcb0e382b5 Fix missing websocket-client dependency for octoprint client
See #1648
2016-12-13 14:55:43 +01:00
Gina Häußge
0560009204 Merge branch 'dev/supportPasswordManagers' into maintenance 2016-12-13 14:43:45 +01:00
Gina Häußge
cb9fba73a2 Move cancel confirmation checkbox up a bit 2016-12-13 14:28:44 +01:00
Gina Häußge
cbbfb4af20 Merge branch 'dev/cancelconfirm' of https://github.com/ntoff/OctoPrint into pr/ntoff/dev/cancelconfirm 2016-12-13 14:03:26 +01:00
Gina Häußge
50e55ed30d Do not have CLI interpret OCTOPRINT_VERSION env var
--version is a flag, not an actual parameter (wouldn't really make sense
too). I'm not sure why that isn't the default behaviour of the built-in
version_option decorator tbh.

See #1647
2016-12-12 10:59:22 +01:00
Gina Häußge
d0ff9cb65e Fix octoprint --daemon backwards compatibility 2016-12-12 10:05:11 +01:00
ntoff
e458e3dd18 cancel confirmation option
display or not the confirmation to cancel a print
2016-12-11 00:52:47 +10:00
Gina Häußge
6773ae221d Gracefully handle suddenly vanished files in storage listing 2016-12-09 14:34:40 +01:00
Gina Häußge
ccbf71a96a Fix file that starts with same name as a folder being perceived as in folder
Solves #1637
2016-12-09 13:40:06 +01:00
Gina Häußge
102727b122 [Docs] Fix missing docs for recursive parameter on file API
Solves #1634
2016-12-09 10:50:53 +01:00
Gina Häußge
d1f7d39ca9 Embarrassing mistake in .de translation :) 2nd try 2016-12-09 10:49:52 +01:00
Gina Häußge
81d426e5dd Merge branch 'devel' into maintenance
# Conflicts:
#	translations/de/LC_MESSAGES/messages.po
2016-12-09 10:16:57 +01:00
Gina Häußge
0e1f074634 Embarrassing mistake in .de translation :) 2016-12-08 17:11:16 +01:00
Gina Häußge
3b2b262420 Merge branch 'maintenance' into devel 2016-12-08 14:05:05 +01:00
Gina Häußge
3caac586fc Upped version numbers for branches 2016-12-08 14:04:28 +01:00
Gina Häußge
7f5d03d054 Preparing release of 1.3.0 2016-12-08 09:25:13 +01:00
Gina Häußge
558a8957f9 Fix docs for OctoPrint.upload method 2016-12-07 10:59:16 +01:00
Gina Häußge
8d2681ae3f Make OctoPrint.upload's url behave like others
So far only was interpreted relatively to the defined base url.
We want this to behave like other requests from the client lib
though, so now it does.
2016-12-07 10:54:20 +01:00
Gina Häußge
0de6718af3 Fix filesize not being defined 2016-12-07 10:53:48 +01:00
Paul de Vries
6d158cb0d0 Fix small bug on unreliable submit event + seperate onKeyUp event 2016-12-05 15:34:48 +01:00
Paul de Vries
e52fbf061d Add support to save credentials to a password manager #1607 2016-12-05 13:56:19 +01:00
Gina Häußge
229f3a2744 Preparing release of 1.3.0rc3 2016-12-02 12:39:28 +01:00
Gina Häußge
c00b3de40c Fix temperature history on server reconnect
Two problems solved:

  * Make sure to only process temperature data once we
    have printer profile information on hand to evaluate
    the heater data. If we don't have that yet, create a client
    side backlog and process that once we have the necessary
    data on hand.
  * Do not use uninitialized history cutoff values - if our cutoff
    value hasn't yet synced (no settings response arrived yet),
    just don't perform the cutoff.
2016-12-02 11:06:01 +01:00
Gina Häußge
3d3c93c67d Fix yet another settings caching issue
That api endpoint really is a tough nut. ETag calculation now also
takes full settings dump from settings plugins into account, because
those might be providing custom keys through custom on_settings_load
implementations, for which we will not notice any changes if we are
only looking at the effective config.

Of course, the more we put into that ETag calculation, the slower it will
be and the less sense it will make. Somewhat annoying :/
2016-12-01 13:47:41 +01:00
Gina Häußge
1e84f2ee6e Fix handling of new structures in getOnlyChangedData
Not testing if oldRoot was actually set and contained the
key in question could cause issues if a completely new data
structure was sent to the backend that was not mirrored by
the default settings. Things like e.g. complex configuration
items in a by default empty object.
2016-12-01 13:46:20 +01:00
Gina Häußge
4541148aa5 Merge branch 'maintenance' into devel
# Conflicts:
#	CHANGELOG.md
2016-11-30 14:34:21 +01:00
Gina Häußge
e8a4750379 Improved (manually to run) doc test for latest release selector 2016-11-30 14:33:36 +01:00
Gina Häußge
1d0657a8eb Preparing release of 1.2.18 2016-11-30 11:24:50 +01:00
Gina Häußge
65377b396f Added note that jquery and lodash are dependencies of the js client lib 2016-11-28 11:29:17 +01:00
Gina Häußge
a66e6b603f Make sure our command line calls always exit
sarge's "wait_events" is unreliable. If an asynchronous
job is started but stops immediately and raises a sarge
Exception (inside the async thread), the associated
command's event will never be set event though the
process finished. So we'd wait indefinitely here.

We circumvent this by first waiting until the commands
are parsed and processed (p.commands contains
elements), then until said commands are started and then
making sure the command's process is actually set. Only
then do we actually have a background process running
that we'll be able to monitor further down, otherwise
the command immediately failed.
2016-11-25 15:45:43 +01:00
Gina Häußge
528e99898f Better error and subprocess handling
Removed a potential deadlock, added logging for all
raised exceptions, made _to_error more solid and
removed another potential encoding issue when
creating diffs
2016-11-25 14:58:09 +01:00
Gina Häußge
8beedce98f Slight rewording in Cura wizard 2016-11-24 12:56:00 +01:00
Gina Häußge
69412d0b8b Preparing release of 1.3.0rc2 part 2 2016-11-24 12:20:29 +01:00