3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 01:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34356 commits 302 branches 270 tags 770 MiB
Commit graph

993 commits

Author SHA1 Message Date
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
fieldOfView
fcb45b3b82 Fix a crash when a variant has no hardware_type 2018-04-09 12:08:32 +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
dd3b49e80d
Remove check for if variant container is a variant container 
The filter on type=variant is right above it in the same function, 20 lines of code earlier. I think this check is superfluous then.

Contributes to issue CURA-5045.
 2018-03-27 14:26:05 +02:00
Ghostkeeper
bc0a3e7fe2
Show error when finding duplicated variant names 
Don't add the second variant we encounter then.

Contributes to issue CURA-5045.
 2018-03-27 14:23:54 +02:00
Ghostkeeper
727a164722
Only show error when quality is global with material/nozzle 
Don't crash. Only show an error message that indicates that there is a problem with this one.

Contributes to issue CURA-5045.
 2018-03-27 14:19:36 +02:00
Ghostkeeper
7af941541b
Check before adding quality changes node 
So you don't end up with half a node if we have to abort early. When this happens, show the configuration error message.

Contributes to issue CURA-5045.
 2018-03-27 14:15:29 +02:00
Ghostkeeper
027f4b44bb
Don't crash when finding duplicated materials 
Only report it to the user.

Contributes to issue CURA-5045.
 2018-03-27 13:57:52 +02:00
Ghostkeeper
593c80225d
Show configuration error when failing to find container in ContainerNode 
Instead of only logging it.

Contributes to issue CURA-5045.
 2018-03-27 09:54:47 +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 767789d394.
 2018-03-26 15:07:37 +02:00
Jack Ha
18e3e084a5 Revert "Check for Ultimaker printers based on manufacturer" 
This reverts commit 5b36b4fb84.
 2018-03-26 15:07:35 +02:00
Jack Ha
07ac09e878 Revert "Use set for searching" 
This reverts commit 80c2b3b7e8.
 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
d676b85289 Fix createMaterial() for non-2.85 diameter materials 
CURA-5113
 2018-03-19 11:09:07 +01:00
Lipu Fei
43ac565c20 Fix visibility preset initialization 
CURA-5088
 2018-03-16 15:45:17 +01:00
Lipu Fei
5ca4203940 Remove material types that have no fallbacks from fallback_materials_map 
CURA-5098
 2018-03-16 15:12:54 +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
Lipu Fei
22573a685d Fix quality definition comparison in quality importing 
CURA-4946
 2018-03-14 14:31:30 +01:00
Lipu Fei
3cefacdfcc Remove root_material_nod is None check in MaterialManager 
CURA-5056

This will no longer happen.
 2018-03-14 09:28:35 +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
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button 
[Feature] Sync Button
 2018-03-13 16:52:39 +01:00
Lipu Fei
c8a882849f Simplify task queue for machine error check 
CURA-5059
 2018-03-13 16:08:46 +01:00
Jack Ha
9e0a78929a CURA-5059 changed error check timer interval and added measured time in logging 2018-03-13 16:02:57 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Lipu Fei
934d297e6c Split error checking into smaller sub-tasks 
CURA-5059

Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
 2018-03-13 13:21:44 +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
Ghostkeeper
1512a8096b
Require MaterialGroup to always have a base material 
The material group is loaded lazily whenever the base material is not yet in the dictionary.

Contributes to issue CURA-4606.
 2018-03-12 15:43:42 +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