2845 Commits

Author SHA1 Message Date
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
Lipu Fei
2f441ba7e1 Remove debugging log lines
CURA-4451
2017-10-26 11:36:59 +02:00
Lipu Fei
701e9a91c2 Allow using longer accent for machines in job names 2017-10-26 11:13:30 +02:00
ChrisTerBeke
f0ed3bc588 Always populate extruder stacks when creating global stack - CURA-4482 2017-10-26 11:05:35 +02:00
ChrisTerBeke
c54dc0a723 Merge branch 'master' into container_stack_improvements 2017-10-26 10:19:45 +02:00
ChrisTerBeke
8826f86b54 Remove debug logging - CURA-4451 2017-10-26 09:58:01 +02:00
ChrisTerBeke
0377edaa0f resolve conflicts 2017-10-26 09:26:18 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
2017-10-26 09:23:27 +02:00
ChrisTerBeke
88ffe0d358 correctly show not supported when any of the extruders has a not supported profile - CURA-4451 2017-10-25 15:57:53 +02:00
ChrisTerBeke
9b62b48509 WIP - CURA-4451 2017-10-25 13:27:35 +02:00
ChrisTerBeke
7bf854aa0f Remove some changes, debugging - CURA-4451 2017-10-25 09:52:14 +02:00
ChrisTerBeke
c679f4aa6b Merge branch 'master' into CURA-4451_not_support_container 2017-10-24 13:41:14 +02:00
ChrisTerBeke
c1139c5c45 Update stack error checking when switching matchines - CURA-4447 2017-10-24 13:38:14 +02:00
ChrisTerBeke
9083fe1bf0 Add not supported instance container type and qt role - CURA-4451 2017-10-24 11:53:56 +02:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
alekseisasin
b0c54bb26a Merge pull request #905 from Ultimaker/snappier_camera_animation
Make camera animation feel snappier
2017-10-24 10:36:55 +02:00
ChrisTerBeke
b50f027c83 Add not supported role to profiles model 2017-10-24 10:25:53 +02:00
ChrisTerBeke
d018e0b2bb First steps towards salvation - CURA-4451 2017-10-23 17:34:31 +02:00
ChrisTerBeke
d2ef373d19 Also apply container changes when no user interaction is required - CURA-4447 2017-10-23 15:50:42 +02:00
ChrisTerBeke
560be2931a Create empty not supported container dynamically when no qualities are found - CURA-4451 2017-10-23 15:41:45 +02:00
ChrisTerBeke
c132300fd5 start 2017-10-23 13:56:26 +02:00
ChrisTerBeke
e63616ca41 Update method description - CURA-4447 2017-10-23 11:43:15 +02:00
ChrisTerBeke
2361e96e29 Wait with updating active stack variant and material until dialog was closed - CURA-4447 2017-10-23 11:41:20 +02:00