Lipu Fei
b4c3536999
Move getAvailableMaterials() into MaterialManager
2018-03-01 15:02:57 +01:00
Lipu Fei
c21174eea8
Fix the usage of protected variables in material models
2018-03-01 11:55:29 +01:00
Lipu Fei
580244a546
Split material models into separate files
2018-03-01 11:50:55 +01:00
Lipu Fei
f485702e58
Add doc for CustomQualityProfilesModel
2018-03-01 11:41:41 +01:00
Lipu Fei
154d104f95
Fix the using of protected property in CustomQualityProfilesModel
2018-03-01 11:40:22 +01:00
Lipu Fei
50c61c9934
Document and rename getFallbackMaterialIdByMaterialType()
2018-03-01 11:31:18 +01:00
Lipu Fei
ea2b076dbd
Rename to extruder_variant_name in MaterialManager
2018-03-01 11:19:46 +01:00
Lipu Fei
b5cf6b7531
Rename selectedQualityItem and add docs
2018-03-01 11:16:22 +01:00
Lipu Fei
b8ac5b296b
Add doc for map/tree update/recreation
2018-03-01 11:10:05 +01:00
Lipu Fei
d4cb10b061
Add doc for model update
2018-03-01 11:03:42 +01:00
Lipu Fei
2dd7be1271
Add documentation for timers in Material and Quality managers
2018-03-01 10:59:39 +01:00
Lipu Fei
3e23659c79
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-28 15:29:22 +01:00
Ian Paschal
f646f11020
CURA-4890 Removed print() statement.
2018-02-28 15:16:04 +01:00
Ian Paschal
3eab99c25c
CURA-4890 Empty material no longer displayed as Unknown
...
"Get learned how to make Cura more better-er!"
2018-02-28 15:06:02 +01:00
Ghostkeeper
4757f9dc0c
Remove invalid alias
...
This alias was referring to something that didn't exist any more and this broke our application menu.
Contributes to issue CURA-5029.
2018-02-28 13:49:11 +01:00
Andreea Scorojitu
356e13c225
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-02-28 13:34:38 +01:00
Andreea Scorojitu
7881dce638
Remove_installed_plug-ins_submenu_CURA-5029
...
The Installed plugins from the Plugins menu is replaced by the browser plugin window.
2018-02-28 13:33:02 +01:00
Aleksei S
77a624d3b4
In monitor view show Finished for "wait_user_action" in printjob.status
...
CURA-4873
2018-02-28 13:04:51 +01:00
Lipu Fei
6b0095014a
Fix merge conflicts from master
2018-02-28 12:52:45 +01:00
Lipu Fei
ab4cfa5fbb
Use userChanges instead of getContainer(0)
...
CURA-4916
2018-02-28 12:49:41 +01:00
Lipu Fei
7f5bb70bee
Remove redundant setProperties
...
CURA-4916
2018-02-28 12:46:00 +01:00
Lipu Fei
741dc8b8a3
Remove ContainerGroup in favour of QualityGroup
2018-02-28 11:56:12 +01:00
Lipu Fei
37f86a43de
Fix type hinting for getQualityGroupsForMachineDefinition()
2018-02-28 11:49:03 +01:00
Lipu Fei
07824c21e1
Move getMachineDefinitionIDForQualitySearch() into QualityManager.py
2018-02-28 11:48:20 +01:00
Lipu Fei
4a202d6728
Use getMultiBuildPlateModel()
2018-02-28 11:42:26 +01:00
Lipu Fei
025239c26e
Add documentation for ContainerGroup
2018-02-28 11:24:31 +01:00
Lipu Fei
a0acf8631d
Add copyright headers
2018-02-28 11:18:01 +01:00
Lipu Fei
c143cd97c8
More accurate doc for material maps
2018-02-28 11:15:43 +01:00
Lipu Fei
c5d443109b
Split MaterialGroup and MaterialNode
2018-02-28 11:12:44 +01:00
Aleksei S
e533c4604c
Update infill scroll bar if setting is changed in custom mode
...
CURA-4916
2018-02-28 10:52:46 +01:00
Lipu Fei
615b20aa5b
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-28 09:51:26 +01:00
Ian Paschal
1eaec2ecbc
Update ISSUE_TEMPLATE.md
2018-02-28 09:17:11 +01:00
Ian Paschal
a74282a664
Update ISSUE_TEMPLATE.md
2018-02-28 09:15:53 +01:00
Jack Ha
7507ba10a9
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-27 16:33:44 +01:00
Jack Ha
01071da4c1
CURA-4606 corrected slider bar, it now updates correctly from 0 available qualities to 1 available quality
2018-02-27 16:33:37 +01:00
Lipu Fei
85e3857785
Use getters to get managers for CuraStackBuilder
2018-02-27 16:12:28 +01:00
Lipu Fei
9dcd72fb36
Remove outdated TODOs
2018-02-27 16:06:09 +01:00
Ian Paschal
62e7cb9a2d
CURA-4972 Allow reslice after setting is removed
...
The issue Andreea found was caused by the fact that the object was unsubscribed from setting validation while still having the illegal value, because the setting (and its illegal value) was removed AFTER unsubscribing. Thus the illegal value got "saved" until the next time you added that setting and set the correct value.
2018-02-27 16:05:07 +01:00
Lipu Fei
632e0469fb
Fix 3MF Reader
2018-02-27 16:01:11 +01:00
Lipu Fei
f304e7f2e7
Revert "Use userChanges instead of getTop()"
...
PerObjectContainerStacks are not CuraContainerStacks, so we cannot use "userChanges"
with it.
2018-02-27 16:01:11 +01:00
Jack Ha
85f3b7dcee
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-27 15:15:13 +01:00
Jack Ha
ae00fc2a7e
CURA-4606 change activeQualityLayerHeight to use self._current_quality(_changes)_group
2018-02-27 15:15:04 +01:00
Jack Ha
cbeaf3b287
CURA-4606 set empty quality when setting active machine when the current quality type is not in the available qualities
2018-02-27 15:14:34 +01:00
Lipu Fei
950f6708c4
Make sure to generate unique name for duplicated quality changes
2018-02-27 14:20:43 +01:00
Jack Ha
fae82ef242
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-27 13:57:37 +01:00
Jack Ha
08bfe93385
CURA-4606 CURA-5020 switching to quality changes now also checks and shows keep or discard user settings
2018-02-27 13:57:30 +01:00
Lipu Fei
2f86687320
Fix init machine for machines loaded from project files
2018-02-27 13:49:45 +01:00
Lipu Fei
a2e84bbe97
Fix set quality group in init machine
2018-02-27 13:49:20 +01:00
Lipu Fei
dfa870b6a9
Remove approximate diameter unit tests because the function/property is gone
2018-02-27 13:15:03 +01:00
Lipu Fei
75573da9dd
Fix merge conflicts with master
2018-02-27 13:08:29 +01:00
