GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 14:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 289 Branches 260 Tags
Commit Graph

406 Commits

Author SHA1 Message Date
Diego Prado Gesto
5cd464c5de CURA-5330 Fix some typing issues in QualityProfilesDropDownMenuModel and 
SettingInheritanceManager.
 2018-06-12 16:35:46 +02:00
Diego Prado Gesto
2dfedf3ae4 CURA-5330 Add typing in CuraContainerRegistry and 
QualityProfilesDropDownMenuModel
 2018-06-08 17:02:59 +02:00
Lipu Fei
bddd32a5b6 Fix branded materials model binding 
CURA-5336

When the global stack gets changed, the model should update itself
so it refers to the correct extruder stack.
 2018-06-07 15:50:08 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so 
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
 2018-06-01 12:58:08 +02:00
Diego Prado Gesto
43657010ba CURA-5164 The Preferences is not a singleton class anymore since in some point 
several instances need to be created.

- In the ThreeMFWorkspaceReader we need to create some temporal
instances of Preferences that makes it not singleton anymore.

- The current preferences are kept in the Application class and so all
the calls to the preferences are changed to get the preferences from
Application.

- The method getInstance in Preferences is kept as deprecated since some
external plugins.
 2018-05-11 08:50:42 +02:00
Ghostkeeper
c49f912276
Merge branch '3.3' 2018-04-18 10:43:31 +02:00
Lipu Fei
1d4a70e839 Show all quality_changes on the quality management page 
CURA-5218
 2018-04-18 10:35:53 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Lipu Fei
7eba73adc5 Handle excluded_materials in getAvailableMaterials() 
CURA-5223

Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
 2018-04-12 16:12:07 +02:00
Jack Ha
c9dc429b2b CURA-5045 solve merge conflicts 2018-03-29 09:22:19 +02:00
Ghostkeeper
4f56221126
Remove catch of RuntimeError 
The error is no longer thrown and the function has its own error message.

Contributes to issue CURA-5045.
 2018-03-27 14:28:17 +02:00
Ghostkeeper
74a0da14bf
Don't crash if showing this before any machine is added 
There must be no quality profiles then.

Contributes to issue CURA-5045.
 2018-03-27 09:37:04 +02:00
Aleksei S
2240c38fd7 Exclude HIPS and PETG material for UM 
CURA-5149
 2018-03-26 17:11:38 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None 
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
 2018-03-26 15:48:03 +02:00
Jack Ha
38e15f009f CURA-5149 add possibility to exclude specific items from materials list 2018-03-26 15:20:31 +02:00
Jack Ha
2a39d81a3c Revert "Filter generic list for Ultimaker printers." 
This reverts commit 767789d394c4ebd15607f01c9fad2a0e3aa81d2b.
 2018-03-26 15:07:37 +02:00
Jack Ha
18e3e084a5 Revert "Check for Ultimaker printers based on manufacturer" 
This reverts commit 5b36b4fb845cd1468f6539fb401b8d9782472322.
 2018-03-26 15:07:35 +02:00
Jack Ha
07ac09e878 Revert "Use set for searching" 
This reverts commit 80c2b3b7e8f21aac026fb01b80cc5ca23a5be462.
 2018-03-26 15:07:27 +02:00
Lipu Fei
80c2b3b7e8 Use set for searching 
CURA-5149
 2018-03-26 14:40:25 +02:00
Lipu Fei
5b36b4fb84 Check for Ultimaker printers based on manufacturer 
CURA-5149
 2018-03-26 14:40:25 +02:00
Aleksei S
767789d394 Filter generic list for Ultimaker printers. 
CURA-5149
 2018-03-26 13:51:37 +02:00
Lipu Fei
f0dc138b37 Fix visibilty preset update 
CURA-5088
 2018-03-19 14:14:22 +01:00
Lipu Fei
43ac565c20 Fix visibility preset initialization 
CURA-5088
 2018-03-16 15:45:17 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
1f2602a2f4 Move SettingVisibilityPresetsModel to Machines.Models 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
496c8f2f79 Cleanup MachineManagementModel 2018-03-15 10:44:02 +01:00
Jack Ha
98b0559c9a Merge branch 'master' into speedup 2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d CURA-5090 speedups by using qtimers on updating mostly visual elements 2018-03-14 16:09:59 +01:00
Lipu Fei
241611546e Fix quality details view 
CURA-5054
 2018-03-14 14:41:44 +01:00
Ghostkeeper
9f89678e42
Update when switching printers 
I confused globalContainerChanged with activeStackChanged.

Contributes to issue CURA-4606.
 2018-03-14 08:26:12 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Diego Prado Gesto
fa2b5f141c CURA-4870 Remove dinamic connections to the signals in the machine 
model. The model is still updated when the container changed.
 2018-03-13 10:35:48 +01:00
Ghostkeeper
1db8c967f2
More specific exception catching 
So that we can still find programming errors in this code.

Contributes to issue CURA-4606.
 2018-03-12 17:10:17 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int 
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.

Contributes to issue CURA-4606.
 2018-03-12 17:08:13 +01:00
Ian Paschal
8db4396ee7
Merge pull request #3436 from Ultimaker/feature_enable_disable_extruder 
CURA-4400 Feature enable disable extruder
 2018-03-12 16:42:25 +01:00
Ghostkeeper
f08407cf97
Document Available role 
Contributes to issue CURA-4606.
 2018-03-12 16:32:10 +01:00
Ghostkeeper
5afcf2beac
Don't update brand and generic materials models upon switching active extruder 
Because the list of materials can't change by that action.

Contributes to issue CURA-4606.
 2018-03-12 16:28:41 +01:00
Ghostkeeper
0078340175
Only update NozzleModel when machine changes 
The available nozzles only change upon changing machines.

Contributes to issue CURA-4606.
 2018-03-12 16:19:47 +01:00
Lipu Fei
220e4a64c6 Fix VariantManager.getVariant() and simplify NozzleModel 
CURA-4606
 2018-03-12 15:25:29 +01:00
Jack Ha
81d036d5e4 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 15:15:27 +01:00
Ghostkeeper
bb7fccbd48
Add logging for every setting model update 
You can clearly see that some models are updated 4 times or so now.

Contributes to issue CURA-4606.
 2018-03-12 14:48:56 +01:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
Diego Prado Gesto
472ae8e044 CURA-4870 Create a custom model for the machines in order to show the 
printers grouped by local or networked.
 2018-03-09 16:35:23 +01:00
Ghostkeeper
d8853b8a98
Sort profile models case-insensitively 
Cast every sorting key to uppercase before doing this. Don't cast to lowercase or there will be problems with characters that don't have lowercase and with Turkish dotted i vs. undotted i.

Fixes #3460.
 2018-03-09 11:40:33 +01:00
Lipu Fei
3550ef80e0 Fix quality management page QML 
CURA-5063
 2018-03-09 11:00:39 +01:00
Jack Ha
859ac88357 Merge branch 'master' into feature_enable_disable_extruder 2018-03-07 12:59:40 +01:00
Lipu Fei
6cae5c2e35 Remove unnecessary signal connection in MaterialsModel 
CURA-5052
 2018-03-07 10:39:23 +01:00