Commit graph

4111 commits

Author SHA1 Message Date
Jack Ha
a27f2e8794 Added quality_type properties to printers. 2016-08-16 13:19:03 +02:00
Jack Ha
759ef29b1d Fix keep user settings dialog. 2016-08-16 13:12:34 +02:00
Arjen Hiemstra
2969aafb6d Update profile page with the renamed functions
Contributes to CURA-2006
2016-08-11 17:51:16 +02:00
Arjen Hiemstra
a14a80be56 Document and simplify the quality/quality changes code in ContainerManager
Contributes to CURA-2006
2016-08-11 17:50:54 +02:00
Arjen Hiemstra
9f33fef4ec Use the new generator to simplify some extruder related code in MachineManager
Contributes to CURA-2006
2016-08-11 17:50:08 +02:00
Arjen Hiemstra
6049d6f3a5 Introduce a getActiveGlobalAndExtruderStacks method to ExtruderManager
It can be used to iterate over the active global and extruder stacks

Contributes to CURA-2006
2016-08-11 17:49:02 +02:00
Arjen Hiemstra
c557cd1a7a Move comment
Contributes to CURA-2006
2016-08-11 17:48:22 +02:00
Arjen Hiemstra
6778020d56 Remove duplicated code
Contributes to CURA-2006
2016-08-11 17:47:30 +02:00
Arjen Hiemstra
e1ddb878ad Fix copyright header
Contributes to CURA-2006
2016-08-11 17:47:15 +02:00
Arjen Hiemstra
be4db899a6 Change the active quality if we remove the active quality
Contributes to CURA-2006
2016-08-10 12:02:11 +02:00
Arjen Hiemstra
5edeaa1c93 Reduce the amount of QML warning showing up
Contributes to CURA-2006
2016-08-10 12:00:03 +02:00
Arjen Hiemstra
7ba49b4f88 Remove code that is obsolete and moved to ContainerManager
Contributes to CURA-2006
2016-08-10 11:58:40 +02:00
Arjen Hiemstra
2c0f0e8559 Move new_id in ContainerManager::duplicate into a general block
Saves duplication

Contributes to CURA-2006
2016-08-10 11:57:57 +02:00
Arjen Hiemstra
29c0cc3850 Fix ContainerManager::renameQuality to set a proper unique id
Contributes to CURA-2006
2016-08-10 11:57:04 +02:00
Arjen Hiemstra
2a81d25bf9 Fix removing container after rejecting a rename
Contributes to CURA-2006
2016-08-10 11:05:56 +02:00
Arjen Hiemstra
783d395fbc Use containermanager for operations on Quality
Contributes to CURA-2006
2016-08-10 11:04:15 +02:00
Arjen Hiemstra
ba2c60bb0d Implement remove, rename, duplicate quality in containermanager
Contributes to CURA-2006
2016-08-10 11:03:33 +02:00
Arjen Hiemstra
975a60bec3 Display all the extruder settings and global settings in profile manager
Contributes to CURA-2006
2016-08-10 11:03:00 +02:00
Arjen Hiemstra
03252c69dc List all the qualities and quality changes in the profiles page
Contributes to CURA-2006
2016-08-10 11:01:50 +02:00
Arjen Hiemstra
1a6b16932a Add a QualitySettingsModel that lists all quality related settings and values
Contributes to CURA-2006
2016-08-10 11:00:36 +02:00
Arjen Hiemstra
578191bb8a Expose a list of all active materials in MachineManager
Contributes to CURA-2006
2016-08-10 10:59:43 +02:00
Arjen Hiemstra
6de7d0170a Expose quality changes id and quality type and make the profile menu work correctly
Contributes to CURA-2006
2016-08-10 10:58:44 +02:00
Arjen Hiemstra
450dcac394 Fix "keep current settings" dialog so it properly clears on "No"
Contributes to CURA-2006
2016-08-10 10:57:42 +02:00
Arjen Hiemstra
e2a4aeb8ff Use the new quality_type when setting the active quality
Contributes to CURA-2006
2016-08-10 10:57:12 +02:00
Arjen Hiemstra
b894e3888c Introduce a quality_type metadata entry that can be used to distinguish qualities
Since we want the profile to be selected based on material and we have
profiles like "ABS Normal" and "PLA Normal" we need some way to make
sure we select the same.

Contributes to CURA-2006
2016-08-10 10:55:25 +02:00
Arjen Hiemstra
4a02a9d1e3 Fix updating changed state for all stacks
Contributes to CURA-2006
2016-08-04 18:11:36 +02:00
Arjen Hiemstra
bc8c55f8fb Properly return True in updateQualityChanges
Since it is declared as returning bool

Contributes to CURA-2006
2016-08-04 18:05:45 +02:00
Arjen Hiemstra
7b9c982c62 Properly fix machinemanager access
Contributes to CURA-2006
2016-08-04 18:04:32 +02:00
Arjen Hiemstra
324d1415d7 Fix updating active quality
Contributes to CURA-2006
2016-08-04 17:55:16 +02:00
Arjen Hiemstra
354a467d8e Fix circular import bullcrap
Contributes to CURA-2006
2016-08-04 17:51:43 +02:00
Arjen Hiemstra
d150acb79c Change setActiveQuality to set quality of extruders & global and also set change containers
Contributes to CURA-2006
2016-08-04 17:41:01 +02:00
Arjen Hiemstra
e2045cdb7f Remove obsolete container switcheroo
Contributes to CURA-2006
2016-08-04 17:40:16 +02:00
Arjen Hiemstra
5361efcf2c Return the name/id of the quality changes container if it is set for activeQuality
Contributes to CURA-2006
2016-08-04 17:39:52 +02:00
Arjen Hiemstra
10de07c08e Remove some code that was moved to ContainerManager
Contributes to CURA-2006
2016-08-04 17:39:09 +02:00
Arjen Hiemstra
6d49fb87af Use ContainerManager::createQualityChanges when creating a quality from current settings
Contributes to CURA-2006
2016-08-04 17:38:19 +02:00
Arjen Hiemstra
2ee2bc7348 Properly implement ContainerManager::createQualityChanges
Contributes to CURA-2006
2016-08-04 17:37:15 +02:00
Arjen Hiemstra
b76ebbb850 Ensure we have an empty quality changes container in the extruder stack
Contributes to CURA-2006
2016-08-04 17:36:39 +02:00
Arjen Hiemstra
70dee38c95 Show quality_changes instance containers for custom containers in the profile menu
Contributes to CURA-2006
2016-08-04 17:35:33 +02:00
Arjen Hiemstra
9d0acf5b03 Properly send global settings to the global stack
Contributes to CURA-2006
2016-08-04 17:35:01 +02:00
Arjen Hiemstra
7613274686 Properly hide link icon if setting is not settable per extruder
Contributes to CURA-2006
2016-08-04 17:34:41 +02:00
Arjen Hiemstra
ec383b46b9 Emit blurSettings for ContainerManager::merge/clear user containers
Contributes to CURA-2006
2016-08-04 17:33:35 +02:00
Arjen Hiemstra
b6d0c40852 Store "quality_changes" type containers in the quality directory
Contributes to CURA-2006
2016-08-04 17:32:38 +02:00
Arjen Hiemstra
4eb4a90ded Call the new clearUserContainers/updateQualityChanges from the relevant actions
Contributes to CURA-2006
2016-08-04 02:13:24 +02:00
Arjen Hiemstra
9ef709962f Start implementing a createQualityChanges method in ContainerManager
It will be used to create the quality change containers from the
existing user containers.

Contributes to CURA-2006
2016-08-04 02:12:32 +02:00
Arjen Hiemstra
0934ae70a8 Introduce clearUserContainers and updateQualityChanges methods in ContainerManager
They are moved from MachineManager which is really getting too large and
complicated.

Contributes to CURA-2006
2016-08-04 02:11:35 +02:00
Arjen Hiemstra
95c3aa8251 Split ContainerManager::mergeContainer into a checking bit and a function that does the actual work
Contributes to CURA-2006
2016-08-04 02:10:28 +02:00
Arjen Hiemstra
6eed25f145 Only write property changes to extruder stack if we actually should
Now global settings are once again stored in the global stack

Contributes to CURA-2006
2016-08-04 02:09:02 +02:00
Arjen Hiemstra
4de4053490 Properly implement "set as active extruder" menu entry
Contributes to CURA-2006
2016-08-04 02:08:06 +02:00
Arjen Hiemstra
aa8561fec7 Remove globalPropertyChanged
There should be no need for this if we properly store settings where
they should be stored.

Contributes to CURA-2006
2016-08-04 02:05:12 +02:00
Arjen Hiemstra
d42f390ed6 Add the new empty quality_changes container to new machines
Contributes to CURA-2006
2016-08-04 02:03:57 +02:00