Jack Ha
5b368fbfd5
CURA-4104 added first sucky build plate selection options
2017-11-06 14:03:03 +01:00
ChrisTerBeke
d32b7f0091
Merge branch 'master' into container_stack_improvements
2017-11-06 09:49:44 +01:00
Diego Prado Gesto
a623c2ae75
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-02 09:53:36 +01:00
Diego Prado Gesto
d503283089
CURA-4509 Minor fix that avoids crashes when there is no specified
...
material (such as in UM2)
2017-11-02 09:51:57 +01:00
Ghostkeeper
e48b151d40
Express getConfigurationTypeFromSerialized as function of its parent
...
This prevents code duplication a bit and allows us to make it a classmethod.
Contributes to issue CURA-4243.
2017-11-01 16:17:26 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
...
Jogging
2017-11-01 16:15:40 +01:00
alekseisasin
db51054984
Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area
...
Cleanup save/monitor button area
2017-11-01 15:53:20 +01:00
ChrisTerBeke
e29fdbe76d
Cleanup - CURA-4482
2017-11-01 14:32:58 +01:00
ChrisTerBeke
e23e6cfa31
Fix for global quality in case of user created quality profile - CURA-4482
2017-11-01 13:59:21 +01:00
ChrisTerBeke
97421ecf58
Create container stacks when loading older project file - CURA-4482
2017-11-01 13:31:25 +01:00
Mark
3ba7db1420
Merge branch 'master' into headless_cura
2017-11-01 13:25:09 +01:00
ChrisTerBeke
957009a768
Fix finding global quality for multi extrusion machines - CURA-4482
2017-10-31 17:32:21 +01:00
ChrisTerBeke
8f41185f22
Fix extruder manager single instance from qml - CURA-4482
2017-10-31 17:18:19 +01:00
ChrisTerBeke
2e1da58570
Cleanup - CURA-4482
2017-10-31 17:06:34 +01:00
ChrisTerBeke
911f619000
Fix for getting machine extruders from manager instance - CURA-4482
2017-10-31 14:43:48 +01:00
ChrisTerBeke
f20ba4a118
Only create new extruder stack for single extrusion machine if it does not exist yet - CURA-4482
2017-10-31 14:37:58 +01:00
ChrisTerBeke
e7f1900f71
Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482
2017-10-31 14:01:15 +01:00
ChrisTerBeke
569047693e
Rename loop variable to be more explicit - CURA-4482
2017-10-31 13:55:47 +01:00
ChrisTerBeke
359514e08b
Cleanup CuraContainerRegistry.py - CURA-4482
2017-10-31 13:49:04 +01:00
ChrisTerBeke
dfe0212a41
Comment out unneeded materials fetching
2017-10-31 13:48:08 +01:00
ChrisTerBeke
6ac8163589
Cleanup CuraApplication.py - CURA-4482
2017-10-31 13:43:01 +01:00
ChrisTerBeke
bc6984a0ed
Fixes for selecting active variant, material and quality - CURA-4482
2017-10-31 13:19:28 +01:00
ChrisTerBeke
4701518404
Add default position to fdm extruder definition - CURA-4482
2017-10-31 10:23:30 +01:00
ChrisTerBeke
f36c9ffbc0
Create extruder stack for single extrusion machines when adding new machine - CURA-4482
2017-10-31 09:49:24 +01:00
Chris ter Beke
9806ec7374
Resolve merge conflicts with master - CURA-4482
2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c
Create extruder stack for single extruder machines on start - CURA-4482
2017-10-31 09:08:20 +01:00
Ghostkeeper
3a9c8d16a2
Fix remaining references to instance_container._id
...
These must've slipped through the cracks.
Contributes to issue CURA-4243.
2017-10-30 15:07:46 +01:00
Lipu Fei
e6e61e9a3c
Merge pull request #2697 from Ultimaker/feature_add_user_agreement
...
Feature add user agreement
2017-10-30 14:50:52 +01:00
Aleksei S
22aaf64b63
Simplified version for validation need to show user agreement
...
CURA-4501
2017-10-30 14:42:46 +01:00
Lipu Fei
69cd00d1c7
Do not take into account the active materials when importing a quality profile
...
CURA-4451
When importing a quality profile, it should not fail/succeed based on
which materials are activated at the moment. The imported quality
profile will be available when the user switches to a compatible
settings.
2017-10-30 13:13:54 +01:00
Lipu Fei
b6dd87081c
Add upgrade script for 3.0 to 3.1
...
CURA-4451
- Add upgrade script for 3.0. to 3.1
- Upgrade old stack files so they will use "empty_quality" as the
"Not Supported" quality profile.
- Increase SettingVersion to 4
2017-10-30 12:45:25 +01:00
fieldOfView
2d109090bc
Show material name instead of extruder number
2017-10-30 12:40:41 +01:00
Ghostkeeper
839c8ccc52
Fix 'Could not get metadata of container <empty string>'
...
Turns out that the side bar header was requesting the metadata before the active material was set. Now I'm just saying that if the active material was not set, it should not be compatible.
Contributes to issue CURA-4243, side-ways.
2017-10-30 11:15:41 +01:00
Lipu Fei
c0f1af94ab
Show Add Machine dialog after User Agreement dialog is closed
...
CURA-4501
2017-10-30 10:33:50 +01:00
Mark
5db0fc7785
Add useragreement screen on first run of Cura
...
CURA-4501
2017-10-28 15:43:01 +02:00
Diego Prado Gesto
fb88dd6326
CURA-4492 Postponed signals are now emitted even if we need user
...
interaction when changing quality profiles
2017-10-27 13:32:51 +02:00
ChrisTerBeke
b91824aab1
Move towards making extruder manager a first class citizen - CURA-4482
2017-10-26 17:54:36 +02:00
Diego Prado Gesto
92ac7c5a15
Merge branch 'CURA-4451_not_support_container'
2017-10-26 16:55:17 +02:00
Diego Prado Gesto
b9c318d432
CURA-4451 Minor changes
2017-10-26 16:53:31 +02:00
ChrisTerBeke
723f6ce226
Only get extruder settings from extruder stack - CURA-4482
2017-10-26 15:10:52 +02:00
ChrisTerBeke
38fdb5e56f
Refactor extruders model to always use extruder stacks + cleanup - CURA-4482
2017-10-26 14:45:24 +02:00
ChrisTerBeke
8378c6f3c9
Always add extruder quality changes when getting quality changes by name - CURA-4482
2017-10-26 14:30:18 +02:00
ChrisTerBeke
d6ef96a825
Add todo comment
2017-10-26 14:07:47 +02:00
ChrisTerBeke
0021dee84b
Always use extruder stacks when copying value to all extruder - CURA-4482
2017-10-26 14:04:05 +02:00
ChrisTerBeke
0b57096056
Always use extruder stacks when switching global container in machine manager - CURA-4482
2017-10-26 13:44:47 +02:00
ChrisTerBeke
7975420901
Always set active extruder index when loading active machine on start - CURA-4482
2017-10-26 13:34:59 +02:00
ChrisTerBeke
62cb5a48cb
Refactor user profiles model to always use extruder stack - CURA-4482
2017-10-26 12:42:33 +02:00
ChrisTerBeke
59580c0ade
Remove commented out code - CURA-4482
2017-10-26 11:52:58 +02:00
ChrisTerBeke
152f6f8405
More profiles model refactoring - CURA-4482
2017-10-26 11:51:24 +02:00
ChrisTerBeke
de34464e47
Update ProfilesModel to always use extruder stacks + some refactoring - CURA-4482
2017-10-26 11:38:21 +02:00
