Commit graph

496 commits

Author SHA1 Message Date
Jaime van Kessel
720f37b17f Quality changes can now only be removed if they are not in use anywere
CURA-2846
2016-11-04 10:02:13 +01:00
Simon Edwards
cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730
Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730
2016-11-01 16:17:04 +01:00
Jaime van Kessel
d897392eea Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-31 15:46:31 +01:00
Jaime van Kessel
41ed9661f6 FindQUalityByName now also uses fallback generic materials if no result was found
CURA-2852
2016-10-31 15:43:53 +01:00
Simon Edwards
1fbd179aaa Merge branch '2.3' 2016-10-31 13:30:20 +01:00
Simon Edwards
e74953c8bc Internal docs.
CURA-2823 Maximum build volume not met despite disabled settings
2016-10-31 13:29:54 +01:00
Ghostkeeper
9a8a5db06e
Fix documentation for getAllExtruderSettings
Didn't complete it previously. Oops.

Contributes to issue CURA-2823.
2016-10-31 12:41:29 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Thomas Karl Pietrowski
aa92428c04 Cleanup: Remove debug print 2016-10-30 16:45:45 +01:00
Ghostkeeper
d5ba89a026
Add function to get other properties than values from all extruders
I've made sure that the behaviour of getAllExtruderValues remains the same, so that this function may still be used by other pieces of code. It is now just a special case of getAllExtruderSettings. Please suggest a better naming scheme, if you like.

Contributes to issue CURA-2823.
2016-10-28 15:20:13 +02:00
Jaime van Kessel
78ab1f1a71 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 14:50:07 +02:00
Jaime van Kessel
af10438277 Fixed blurSetting
CURA-2835
2016-10-28 14:49:42 +02:00
Ghostkeeper
d33f6d2e44
Make regex match exactly on entire string
The carot indicates start of string, the dollar the end of string. So it must match on the entire string, not a piece of it.

Contributes to issue CURA-2692.
2016-10-28 13:33:36 +02:00
Ghostkeeper
4ef2caddf5
Remove debug prints
Oops.

Contributes to issue CURA-2692.
2016-10-28 13:33:36 +02:00
Jaime van Kessel
28eb4297c6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-28 11:38:13 +02:00
Ghostkeeper
36fa4afc6c
Remove misguided attempt at representing UTF-8 encode length
It was commented out anyway. I also updated the documentation there.

Contributes to issue CURA-2692.
2016-10-28 09:55:19 +02:00
Ghostkeeper
717248bd78
Limit number of special characters
There is also a more advanced attempt that allows more, but I've commented it out because it doesn't quite work yet. Special characters now always count for 12.

Contributes to issue CURA-2652.
2016-10-27 21:55:58 +02:00
Ghostkeeper
37d1c0be36
Add validator for machine names
Currently this validator can't be used in QML due to a PyQt bug. I plan to call the validator manually upon receiving a signal that the text changed in a text box.

Contributes to issue CURA-2692.
2016-10-27 21:55:58 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff
CURA-2826
2016-10-27 14:26:43 +02:00
Jaime van Kessel
f35914299b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 15:44:19 +02:00
Jaime van Kessel
a8486f88d7 Inheritance icon is correctly shown for single extrusion printers if setting has limit_to_extruder property
CURA-2752
2016-10-26 15:43:26 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Ghostkeeper
6c3b4b7f29
Prevent race condition before global container stack is made
Just properly check if there is a global container stack.
2016-10-26 09:50:42 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Jaime van Kessel
b4339bda0e Fixed logger isuse with importing profile
CURA-2785
2016-10-25 16:26:52 +02:00
Ghostkeeper
e3ae3d50f9
Merge branch '2.3' 2016-10-25 11:50:20 +02:00
Ghostkeeper
e6c68bcdc9
Add fallback if no unit is known for layer_height
If there is no unit known, it is interpreted as there being no unit. There is currently mm, but if we changed that it is probably on purpose so we write no unit.

Contributes to issue CURA-2723.
2016-10-25 11:28:41 +02:00
Jaime van Kessel
844b9729f4 Fixed critical errors when first adding UM3 2016-10-25 11:16:54 +02:00
Jaime van Kessel
ecbe4b264a Added handling for key not found in extruder map 2016-10-25 11:02:41 +02:00
Ghostkeeper
3e3e6e6b1b
Fix call to _configureProfile
The footprint of the function changed, but the call wasn't updated, apparently. I pulled new_name up from one of the if-statements since they need to be computed for both branches now (and they are the same).

Contributes to issue CURA-2785.
2016-10-24 17:39:36 +02:00
Arjen Hiemstra
aed23ca17e Merge branch '2.3'
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
2016-10-24 17:10:41 +02:00
Arjen Hiemstra
bdaa4a5a6d Add a method to get overrides for a specified (extruder)stack
Since the main getOverrides method only accounts for the active extruder
and we sometimes need to check other extruders in case of
limit_to_extruder.

Contributes to CURA-2752
2016-10-24 17:10:26 +02:00
Arjen Hiemstra
448d7d890c Merge branch '2.3'
* 2.3:
  Set encoding to utf-8 when writing files
  Remove manually specified utf-8 encoding
  SettingInstanceManager now also watches containerchanged of extruder stacks
2016-10-24 14:30:22 +02:00
Jaime van Kessel
53f360ca1c Merge branch 'global_quality_profiles' of github.com:Ultimaker/Cura into 2.3 2016-10-24 14:23:50 +02:00
Jaime van Kessel
7b65297a31 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-24 13:51:37 +02:00
Jaime van Kessel
7f1b060ef9 SettingInstanceManager now also watches containerchanged of extruder stacks
CURA-2674
2016-10-24 13:50:49 +02:00
Arjen Hiemstra
3d63df7471 Merge branch '2.3'
* 2.3:
  Use the machine/extruder ID as base for duplicated profile ID
  Fix "critical" error when starting with no active machine
2016-10-24 13:40:57 +02:00
Arjen Hiemstra
f952b45a62 Use the machine/extruder ID as base for duplicated profile ID
Instead of using the ID of the duplicated container, which would cause
the profile ID to be the old ID with the new ID appended.

Fixes CURA-2782
2016-10-24 13:38:22 +02:00
fieldOfView
df78bc47af Fix "critical" error when starting with no active machine 2016-10-24 11:01:14 +02:00
Arjen Hiemstra
2c2bf7823f Account for empty material when switching quality changes
Contributes to CURA-2652
2016-10-24 10:57:18 +02:00
Arjen Hiemstra
78ac4ef999 Set the global variant and material to empty for multi-extrusion machines
For multi-extrusion machines, we do not want variant or material
profiles in the stack, because these are extruder specific and may cause
wrong values to be used for extruders that did not specify a value in
the extruder.

Contributes to CURA-2652
2016-10-24 10:57:18 +02:00
Arjen Hiemstra
e1dafc8288 Also properly set global profile when changing quality_changes profiles
Contributes to CURA-2652
2016-10-24 10:57:18 +02:00
Arjen Hiemstra
e82b2c0f80 Add support for global quality profiles
Instead of using one of the extruder profiles as global quality, use
proper global qualities.

Contributes to CURA-2646
2016-10-24 10:57:18 +02:00
fieldOfView
5ce237502c Fix "critical" error when starting with no active machine 2016-10-23 11:25:26 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Ghostkeeper
58dba9bcb3
Dynamically get unit of layer height
If the unit of layer height would become something else than mm eventually, it'll still be correct here.

Contributes to issue CURA-2737.
2016-10-21 14:03:28 +02:00
Ghostkeeper
c92ccee1e4
Add layer height role to profiles model
This layer height computation is rather complex, but because the items are now computed in a separate function, we can safely overwrite that and the update is made only once in the UI.

Contributes to issue CURA-2737.
2016-10-21 13:59:23 +02:00
Ghostkeeper
e02284b1f0
Expose determineQualityAndQualityChangesForQualityType
It is needed to get the quality belonging to a certain quality changes ID that is not on the global stack. We already had this function that does just that.

Contributes to issue CURA-2737.
2016-10-21 13:11:08 +02:00
Ghostkeeper
16491d8d23
Robustly get layer height even if quality has none
If the quality profile doesn't define a layer height (which it currently always has) then this should still get the proper layer height. It proceeds properly down the stack now.

Contributes to issue CURA-2737.
2016-10-21 11:51:10 +02:00