1520 Commits

Author SHA1 Message Date
Ghostkeeper
41ee575cc1 Correct copyright year
These files were made in 2016.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
cce642a3e1 Extrapolate settings translations
It is now in one place. Or rather, two: There is another function to translate only setting names.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
f7be4831b8 Add translation for combing
Combing was made into an enum instead of a boolean.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
17f4703337 Fix self parameter
It must have access to self to get the values to store in the file.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
149e873eb6 Pass strings to writing configparser
When setting fields in configparser, it must be a string. No ints.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
aeecdd9e0e Add self to parameters of function
Yeah this was a method, not a static method.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
816e94c760 Fix multiple exceptions
Turns out that this syntax needs to be surrounded in brackets.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
ccf9796b51 Remove superfluous import
Preferences doesn't exist any more.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
724f9ce010 Return None if config file wasn't correct
This was actually specified in the original function description.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
0d553c10f1 Fix import of SettingsError
It is in a submodule.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
9bc5f97902 Implement conversion of profiles 2.1->2.2
This works more or less the same as for machine instances. The code was copied from version 2.1 of the unserialise function of profiles, and optimised a bit. The output function is written from scratch. It has some code duplication. Maybe we have to do something about that.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
00f356f06e Add translation of speed_support_lines
This setting had its key changed to speed_support_infill

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
242559bd7e Remove preferences upgrade from 2.1->2.2
No preferences will need to be upgraded.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
b643fe8fd0 Translucent translation of machine instances
Machine instances are translucently translated from version 1 to version 2. No setting changes are applied yet, nor has the format itself changed.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Ghostkeeper
2f4e63a944 Add boilerplate version upgrade plug-in
This plug-in does nothing at the moment. It merely says that it is able to upgrade configuration from version 2.1 to 2.2, but then raises exceptions when you actually try to use it. This is by design. I will now implement the functions that do the conversion.

Contributes to issue CURA-844.
2016-07-07 13:46:39 +02:00
Jaime van Kessel
b072b7935f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 13:44:19 +02:00
Jaime van Kessel
3d1bbeca38 Restarting machine check properly re-enables endstop check
CURA-1385
2016-07-07 13:43:45 +02:00
Arjen Hiemstra
d8555fe57d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
2016-07-07 11:29:18 +02:00
fieldOfView
8c22efc4dd Fix UMO Checkup button size
CURA-1385
2016-07-07 10:38:08 +02:00
fieldOfView
2ba2599d6b Remove debug statement and commented-out code
CURA-1385
2016-07-07 10:23:01 +02:00
Arjen Hiemstra
19fd2795e1 Mark XmlMaterialProfile as type "material" so the import/export code can find it
Contributes to CURA-341
2016-07-07 01:42:39 +02:00
Arjen Hiemstra
fdab77ff6a Also duplicate the base file when duplicating a material profile
This way serialization will always be correctly performed and we can
generate
a machine/variant specifc ID for the duplicate.

Contributes to CURA-341
2016-07-07 01:42:05 +02:00
Arjen Hiemstra
f21079b763 Store the base material file as a metadata property of XmlMaterialProfile
And use the base_file property to check if we should serialize or not.

Contributes to CURA-342
2016-07-07 01:41:00 +02:00
Jaime van Kessel
386cd40a03 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:33:07 +02:00
Jaime van Kessel
57d0ad1bd0 Made exception handling of slice info plugin way more robust
CURA-1831
2016-07-06 16:32:24 +02:00
Jack Ha
d3b8c7f8d5 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:22:28 +02:00
Jack Ha
2be8111f1b Restart timer after slicing is performed when not enabled.
CURA-1502
2016-07-06 16:21:03 +02:00
Jaime van Kessel
d42a97f036 Fixed firmware upgrade for um2+
CURA-1761
2016-07-06 13:22:09 +02:00
Jaime van Kessel
6bf10bbbb3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 11:23:16 +02:00
Jaime van Kessel
59020fd98c CHeckup action now correctly resets every time you start it
CURA-1385
2016-07-06 11:20:06 +02:00
fieldOfView
c06e5f4d39 Remove unused name/id when importing a profile from a gcode file
A unique name will be set from the filename by ContainerRegistry
CURA-1615
2016-07-05 21:58:47 +02:00
Aldo Hoeben
c865bb13ea Merge pull request #821 from thopiekar/master-CURA-1615
[CURA-1615] GCodeProfileReader/-Export: Rework
2016-07-05 21:19:37 +02:00
Thomas Karl Pietrowski
25c81ce1f8 Just a little typo 2016-07-05 18:55:13 +02:00
Arjen Hiemstra
750ecfc2e1 Remove some now-useless code relating to spool weight
Contributes to CURA-341
2016-07-05 16:51:28 +02:00
Arjen Hiemstra
2bc3a10776 Properly handle machines that have no variants
Contributes to CURA-341
2016-07-05 16:51:02 +02:00
Arjen Hiemstra
827c7b84fd Do not try to set a property of a read-only material
Contributes to CURA-341
2016-07-05 16:47:26 +02:00
Arjen Hiemstra
e80a999740 Fix up readOnly property of XmlMaterialProfile
Contributes to CURA-341
2016-07-05 16:46:52 +02:00
Jaime van Kessel
aba0392728 Saving g-code no longer crashes 2016-07-05 10:46:38 +02:00
Jaime van Kessel
fc99cac05e Removed update firmware from extensions; This is now handled by machine actions 2016-07-05 09:39:18 +02:00
Jaime van Kessel
08502b9240 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-05 09:37:27 +02:00
Jaime van Kessel
44e4fc383e Changing active extruder no longer trigger re-slice
CURA-1729
2016-07-05 09:37:01 +02:00
fieldOfView
793f7824c7 Quick fix to restore slicing
This list of zeros may have to match the number of extruders
CURA-1687
2016-07-04 19:14:48 +02:00
Jack Ha
012484a4f1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 17:35:32 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder
CURA-1687
2016-07-04 17:11:03 +02:00
U-ULTIMAKER\j.ha
84b736df07 first commit in Cura! fix CURA-1085, time estimate is reset before every slice action 2016-07-04 17:08:35 +02:00
Arjen Hiemstra
6f3fa19890 Fix up plugins that use ExtruderManager
Since it has been moved to cura.Settings
2016-07-04 13:16:04 +02:00
fieldOfView
90fa0f0564 Make Select Upgrades page look like the other pages
CURA-1385
2016-07-04 13:14:40 +02:00
Jaime van Kessel
0e098e38eb More fixes for changed setting object location 2016-07-04 13:10:29 +02:00
Arjen Hiemstra
7008e047f6 Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (76 commits)
  Added UMO upgrade selection
  Added stubs for UMO upgrade selection
  Machine action labels are now translatable
  Code style CURA-1676
  Using the correct placeholder
  SplashScreen: Using system-default fontfamily
  USBPrinting: Let's "Print via USB"
  BQ Hephestos2 - Preheating temperature fix When starting a print with the "custom" GCode by BQ, the printer resets the nozzle temperature to 210°C when printing via SD card (no matter what you set on Cura) and only preheats the nozzle to 180°C when printing via USB. So currently the printer begins to print via USB at 180°C and reaches the correct temperature eg.g while printing the brim.
  Fix warning about missing color in theme
  Automatically show the Print Monitor when starting a print
  Fix USBPrinterOutputDevice to work with the Print Monitor
  Properly prevent warning when no printer is connected.
  ZOffset decorator is now correctly copied
  Force focus instead of requesting it.
  Fix two "critical errors" on startup
  Minor check machine action GUI improvements
  Prevent warning when no printer is connected.
  Fix empty material/quality profiles when switching variants
  Disable monitor buttons when there is no job running
  Move message stack "above" the viewport overlay
  ...
2016-07-04 11:45:59 +02:00
Jaime van Kessel
1242d6bf52 Added UMO upgrade selection
CURA-1385
2016-07-04 11:24:31 +02:00