Commit graph

3426 commits

Author SHA1 Message Date
ChrisTerBeke
97421ecf58 Create container stacks when loading older project file - CURA-4482 2017-11-01 13:31:25 +01:00
Diego Prado Gesto
c85e10f4c5 CURA-4062 Minor changes 2017-11-01 13:31:17 +01:00
ChrisTerBeke
ce896177cb Cleanup 3mf workspace reader - CURA-4482 2017-10-31 16:32:04 +01:00
ChrisTerBeke
7a8d562234 Merge branch 'master' into container_stack_improvements 2017-10-31 16:24:05 +01:00
ChrisTerBeke
8676792ef8 Disable annoying debug message about not found printer definition 2017-10-31 16:23:45 +01:00
ChrisTerBeke
c59e4bb3e1 Cleanup machine settings action - CURA-4482 2017-10-31 16:20:25 +01:00
ChrisTerBeke
cc6be48a79 Always use extruder stack when updating material diameter - CURA-4482 2017-10-31 16:19:16 +01:00
ChrisTerBeke
b8757b46b3 Always use extruder stack in machine settings action plugin, keep support for older project files - CURA-4482 2017-10-31 16:16:51 +01:00
ChrisTerBeke
f421166b18 Clarify 3mf saving multi extrusion setting - CURA-4482 2017-10-31 16:11:27 +01:00
ChrisTerBeke
52782b8d13 Always use the extruder stacks to determine model color in solid view - CURA-4482 2017-10-31 16:08:59 +01:00
ChrisTerBeke
a7383b42d5 Always use extruder stack when adding settings per object - CURA-4482 2017-10-31 16:04:06 +01:00
ChrisTerBeke
77cd10374c Always set the active extruder stack when loading project file settings - CURA-4482 2017-10-31 16:00:22 +01:00
ChrisTerBeke
c23c031152 Always use extruder stacks in slice info - CURA-4482 2017-10-31 14:51:31 +01:00
ChrisTerBeke
cc267646e7 Always use extruder stacks when building slicer message and deprecate otherwise - CURA-4482 2017-10-31 14:48:52 +01:00
Diego Prado Gesto
d7b75cab2e CURA-4502 Minor changes 2017-10-31 11:42:46 +01:00
Lipu Fei
22e36ff3af Fix not supported quality profile list
CURA-4451
2017-10-31 11:21:34 +01:00
Ghostkeeper
a08875c5eb
Remove redundant setting of name
It's just copied along with the rest of the metadata now.

Contributes to issue CURA-4243.
2017-10-31 11:11:56 +01:00
Andreea Scorojitu
e36cefedf6
Update ChangeLog.txt 2017-10-31 10:47:57 +01:00
alekseisasin
055b6ebaab
Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog
Cleaner open project dialog & redering on partial pixels fixes
2017-10-31 09:58:52 +01:00
Ghostkeeper
92cf76b30b
Merge branch '3.0' 2017-10-31 09:57:42 +01:00
Andreea Scorojitu
d7b0583640 Update changelog to the current 3.0.4 version 2017-10-31 09:52:30 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
Ghostkeeper
d24fa3bc3b
Set name directly in metadata when clearing
Because the setName function checks if the name is equal to the previous name, but at that point the previous name doesn't exist.

Contributes to issue CURA-4243.
2017-10-31 08:23:57 +01:00
Ghostkeeper
8eaec149fa
Make sure the ID stays in the metadata when clearing it
Previously the ID was also exempted from the clear.

Contributes to issue CURA-4243.
2017-10-30 15:54:26 +01:00
Aleksei S
7f02ddd6e9 Simplified version for validation need to show user agreement
CURA-4501
2017-10-30 15:43:40 +01:00
Lipu Fei
aab601927c Show Add Machine dialog after User Agreement dialog is closed
CURA-4501
2017-10-30 15:43:40 +01:00
Lipu Fei
b5904cd239 Fix code style
CURA-4501
2017-10-30 15:43:40 +01:00
Mark
ca8127c047 Fixed code comments
CURA-4501
2017-10-30 15:43:39 +01:00
Mark
9aebb395ab Refactor and cleanup
CURA-4501
2017-10-30 15:43:39 +01:00
Mark
b45e44b388 Add useragreement screen on first run of Cura
CURA-4501
2017-10-30 15:43:39 +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
fieldOfView
7a9dda4022 Disable jogging for UM3
NetworkPrinterOutputDevice does not have the API to control jogging
2017-10-30 14:46:31 +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
0096fe0de3 Fix project loading to handle "Not Supported" quality profiles
CURA-4451
2017-10-30 12:54:21 +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
Lipu Fei
c0f1af94ab Show Add Machine dialog after User Agreement dialog is closed
CURA-4501
2017-10-30 10:33:50 +01:00
Lipu Fei
85f7b1ac03 Fix code style
CURA-4501
2017-10-30 10:32:46 +01:00
Mark
0bdc1aad00 Fixed code comments
CURA-4501
2017-10-29 09:04:23 +01:00
Mark
8bfd10f9aa Refactor and cleanup
CURA-4501
2017-10-28 20:29:26 +02:00
Mark
910386eaf7 remove unused import 2017-10-28 15:43:26 +02:00
Mark
5db0fc7785 Add useragreement screen on first run of Cura
CURA-4501
2017-10-28 15:43:01 +02:00
Ghostkeeper
8bbb6c1af5
Load and serialize container ID and name properly: not in metadata
We shouldn't write the name or ID, who are now in the metadata.
Also we should load the name and ID properly from the file.

Contributes to issue CURA-4243.
2017-10-27 16:50:13 +02:00
Ghostkeeper
a31c39b225
Use setters and getters for name and ID
Because their implementation changed, these would have been implemented in some other way. Instead I use the getters and setters which are inherited from the parent class and therefore are already updated.

Contributes to issue CURA-4243.
2017-10-27 16:35:58 +02:00
Ghostkeeper
7ac3c1446b
Make ignored metadata keys a set
It needs to be a set now for Uranium.

Contributes to issue CURA-4243.
2017-10-27 16:25:52 +02:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Lipu Fei
fe70e19089 Reset extruder numbers whose values are no longer valid
CURA-4176

After the user changes the number of extruders for a machine, some
extruder number settings may not have valid values any more. These
settings need to be reset.`
2017-10-27 10:59:03 +02:00
ChrisTerBeke
152f6f8405 More profiles model refactoring - CURA-4482 2017-10-26 11:51:24 +02:00
ChrisTerBeke
c54dc0a723 Merge branch 'master' into container_stack_improvements 2017-10-26 10:19:45 +02:00
Diego Prado Gesto
87ba4056ee CURA-4485 Minor changes 2017-10-25 13:55:30 +02:00