2301 Commits

Author SHA1 Message Date
Lipu Fei
3aabbab11f Correctly handle IndexError for defaultColors
CURA-4072

defaultColors is a list, so it's not KeyError but IndexError.
2017-07-21 16:03:11 +02:00
Lipu Fei
3d378ebc5f Merge remote-tracking branch 'upstream/CURA-4057' 2017-07-21 14:14:27 +02:00
Lipu Fei
ed91bf816f Correct definition_changes location in 2.6 to 2.7 upgrade script
CURA-4053
2017-07-21 11:36:47 +02:00
Lipu Fei
15a6b5626d Remove useless code
CURA-4053
2017-07-21 11:32:11 +02:00
Lipu Fei
141cfe776e Fix handling old stack without definition_changes and add doc
CURA-4053
2017-07-21 11:28:47 +02:00
Jaime van Kessel
326c4cc4a4 Removed code duplication
CURA-4053
2017-07-21 10:15:20 +02:00
Jaime van Kessel
4d0c46508a Fixed incorrect naming of printcores in error messages
CURA-3734
2017-07-20 15:17:46 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used.
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
2017-07-20 13:30:57 +02:00
Lipu Fei
22c1a118a8 Fix conflict detection when there is no definition_changes
CURA-4053

An old project file doesn't have the definition_changes container in the
stacks. When this is the case, Cura should also check if the definition
changes container in an existing stack is empty or not for project file
loading conflict detection.
2017-07-20 10:28:09 +02:00
Lipu Fei
356b3cf0ca Remove unnecessary code
CURA-4053
2017-07-19 16:44:04 +02:00
Lipu Fei
9288f408e5 Correctly detect old project files for conflicts
CURA-4053

- In Cura 2.5, there is no definition_changes in the stack. This is now
  taken into account when doing conflicts detection.
- In Cura 2.5, we have empty containers named as "empty_variant" and
  such. Those are now properly handled in conflict detection.
2017-07-19 16:39:04 +02:00
Lipu Fei
7148c71877 Change extruder stacks for conflicts only if the global stack is found
CURA-4053

If the global stack is not found, we assume the machine is not there and
default to create a new one. If the machine is found and there is not
conflicts, then we check the extruders associated for conflicts.
2017-07-19 16:35:52 +02:00
Lipu Fei
3474bb0738 Fix project conflict resolving for global stack and extruder stacks
CURA-4053

- Fix that if the resolve strategy is new for machine, Cura should
  always create new global and extruder stacks
- Fix possible duplicated IDs when "Create New" machine is selected
2017-07-19 15:20:29 +02:00
Lipu Fei
834fd055b6 Fix conflict resolve strategies in project loading
CURA-4053

When loading a project file:

- Only check if the global stack exists to detect conflicts instead
  of checking the global stack and the extruder stacks. It can happen
  that the global stack exists while the extruder stacks not or the
  other way around.

- Always assign a resolve strategy to container(s). There can be
  "None" strategies and those were not handled correctly.
2017-07-19 14:48:11 +02:00
Jaime van Kessel
e45d045880 Merge branch 'mb-fix-gcodeArea' of https://github.com/smartavionics/Cura 2017-07-19 09:50:49 +02:00
Ghostkeeper
dbcf50162f
Fix spelling of combined English words
Contributes to issue CURA-3998.
2017-07-18 13:10:17 +02:00
Ghostkeeper
de8a700bd4
Fix spelling of statistics sending message
Found while working on CURA-3998.
2017-07-18 13:10:16 +02:00
Lipu Fei
024f2384e0 Fix mutable arg problem and rename arg
CURA-4049
2017-07-18 08:32:22 +02:00
Mark Burton
f66bbf0dac Fix recently broken setting of gcode area value property setting on focus loss. 2017-07-17 22:01:43 +01:00
Lipu Fei
3c663d576c Do not save setting_version when serializing an XML material
CURA-4053

setting_version is derived from the "version" tag in the XML material
schema.
2017-07-17 13:54:22 +02:00
Lipu Fei
ecdf0bbe33 Fix setting_version in metadata for XMLMaterial
CURA-4053
2017-07-17 13:40:12 +02:00
Lipu Fei
63b71b8661 Fix typo in comments 2017-07-17 13:39:03 +02:00
Jaime van Kessel
afe5f56862 If a default color is used, the layer view now correctly uses it. 2017-07-17 11:44:54 +02:00
Jaime van Kessel
53cec3bea4 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-17 11:10:42 +02:00
Jaime van Kessel
99b236c8d4 Removed "fix" that caused project files to create new instances if there was no conflict.
The overriding doesn't make any sense. The original commit mentions that it should fix something, but it doesn't acutally fix it. It seems
the original issue was fixed in the proper place, leaving this code to mess everything up.

CURA-3756
2017-07-17 11:08:31 +02:00
Lipu Fei
68989f2871 Use optional arg in serialize() to exclude network auth keys
CURA-4049
2017-07-17 11:04:08 +02:00
Jaime van Kessel
82ff9dfe1b Merge branch 'feature_machine_settings_27' of https://github.com/fieldOfView/Cura 2017-07-13 13:44:34 +02:00
fieldOfView
6cb5412f91 Fix creating a new definition_changes container
global_container_stack.definitionChanges always returns a container, global_container_stack.findContainer({"type": "definition_changes"}) does not (because an empty container does not have the type "definition_changes".
2017-07-12 13:47:31 +02:00
fieldOfView
c27859ddc5 Fix spelling for consistency 2017-07-11 23:32:47 +02:00
fieldOfView
1b4bd05106 Make doubly sure that settings are changed before closing dialog 2017-07-11 23:27:31 +02:00
fieldOfView
d00bb2524e Fix layout
Dialog is now more robust against being too small
2017-07-11 22:33:05 +02:00
Jaime van Kessel
391533e939 Slice info is now sent by https 2017-07-11 17:09:59 +02:00
fieldOfView
219d1938c2 Move labels into components with the controls...
...so they are both children of the same TooltipArea
2017-07-11 16:40:05 +02:00
fieldOfView
2ba0dd094e Simplify layout 2017-07-11 15:54:21 +02:00
Ghostkeeper
d6941fef2f
Interpret material compatible 'unknown' as 'yes'
We decide whether it is unknown (or unsupported) based on the availability of profiles for it.

Contributes to issue EM-1662.
2017-07-11 13:23:51 +02:00
fieldOfView
aa7ab2e0a7 Remove unnecessary eval() construct 2017-07-10 16:49:03 +02:00
Ghostkeeper
6d2b46244f
Home printer after aborting
Otherwise the head gets left on top of the print and you'd have to manually move it aside after each abort.
2017-07-10 13:38:40 +02:00
fieldOfView
79e38407c8 Add tooltip to "Number of Extruders" control 2017-07-10 12:34:39 +02:00
fieldOfView
e2c978f88b Remove unused extruderContainerIndex property
Since the work on CuraContainerStack, the definition changes container for the extruder and for the global stack are always on the same index
2017-07-10 12:23:27 +02:00
fieldOfView
7fe674bc5b Improve test for empty containers 2017-07-10 12:19:19 +02:00
Ghostkeeper
81e07b1530
Use stack properties instead of .findContainer(type = ...)
Recently we changed the empty containers such that there is only one empty container instance and it doesn't have the proper type any more. Instead we have properties on the stack that allows us to find the container with the proper type. It's faster and easier to use.
We've had a few bugs about this so I decided to update all of them to remove those for the future, except the ones in plugins/MachineSettingsAction/MachineSettingsAction.py because we have a pending pull request that fixes those. Fixing them would give merge conflicts for fieldOfView.

It doesn't really belong to CURA-4024 but I'm sticking it under that nomer anyway to get it reviewed.
2017-07-10 10:35:03 +02:00
fieldOfView
d6ddf15e24 Fix selecting material for UM2 when switching from UltiGcode 2017-07-09 16:46:25 +02:00
fieldOfView
8c2f556616 Switch to an appropriate material when changing the material diameter
If we don't do this, the material will always override the setting in Machine Settings
2017-07-09 16:41:24 +02:00
fieldOfView
ddc94e9bec Improve readability 2017-07-09 15:44:01 +02:00
fieldOfView
b8ea762242 Override some tooltips for clarity in the context of Machine Settings 2017-07-09 14:57:51 +02:00
fieldOfView
cb7b845a32 Add tooltips to the head polygon fields 2017-07-09 14:39:55 +02:00
fieldOfView
4705ada6ef Add tooltip to gcode areas 2017-07-09 13:35:50 +02:00
fieldOfView
1eeb953072 Restructure propertyProviders to be part of setting components 2017-07-09 13:12:25 +02:00
fieldOfView
a2332ae304 Add tooltips to most fields 2017-07-09 12:32:16 +02:00
fieldOfView
de0ac5ccff Use CuraContainerStack API 2017-07-09 11:28:14 +02:00