GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,317 Commits 289 Branches 260 Tags
Commit Graph

744 Commits

Author SHA1 Message Date
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
Lipu Fei
fd2abdd9fb
Merge pull request #3507 from guillemavila/Copy-all-values-to-all-extruders 
add Copy all values to all extruders
 2018-03-22 16:16:30 +01:00
Guillem
fecbf82551 Replace all user changed values 
Removed check to change the values only if they were different
 2018-03-22 15:49:30 +01:00
Guillem
01ec20f5ce Fixed docs, removed todo, changed way to get extruder stacks, slightly faster 2018-03-22 11:39:42 +01:00
Jack Ha
a2b03a2ac1 CURA-4400 fix setting extruders_enabled_count so print_sequence for Custom FDM printer is available again 2018-03-20 13:30:48 +01:00
Diego Prado Gesto
51e7a18d1c Add high level functions for setting the variant, material and quality 
using the name, id and quality_type respectively.
 2018-03-19 17:25:49 +01:00
Guillem
faf8ed3ba6 Replace only user changed values 
removed machine_settings and settable_per_extruder_check. Not needed.
 2018-03-19 14:57:31 +01:00
Guillem
18fba5b529 Avoid replacing machine_settings and not settable_per_extruder settings 2018-03-19 14:21:45 +01:00
Lipu Fei
b13bfaa8e1 Rename setVariantGroup() -> setVariant() 
There is no such thing as VariantGroup.
 2018-03-19 12:27:15 +01:00
Lipu Fei
2aaaf106b4 Fix update material in MachineManager 
CURA-5098
 2018-03-16 15:05:37 +01:00
Lipu Fei
ee4a6dc704 Always show confirm dialog upon material diameter change 2018-03-16 13:21:51 +01:00
Diego Prado Gesto
06d028652d CURA-4870 Change code style 2018-03-16 10:58:31 +01:00
Diego Prado Gesto
99d653cea5 CURA-4870 Don't allow to connect more than one instance to the same 
group.
 2018-03-15 20:01:47 +01:00
Lipu Fei
f14ddb8711 Fix reset to default quality 2018-03-15 17:09:13 +01:00
Lipu Fei
3bb0a481f1 Simplify default quality reset 2018-03-15 17:01:05 +01:00
Jack Ha
8af82cc3f4 CURA-4400 prevent disabling last enabled extruder 2018-03-15 15:54:44 +01:00
Diego Prado Gesto
dcb68bb33e CURA-4870 Move the checkCorrectGroupName to the machine manager, where 
it must belong to.
 2018-03-15 15:13:35 +01:00
Diego Prado Gesto
cbe929242e CURA-4870 Update the names of the groups in the container stacks when 
there is temporary name after upgrading from 3.2
 2018-03-15 14:44:01 +01:00
Diego Prado Gesto
15ff4045bf CURA-4870 When removing a network connected printer, also remove all the 
other machines that were (possibly) created in the background so that
there is no orphan containers.
 2018-03-15 11:02:29 +01:00
Diego Prado Gesto
2fdd51fc23 CURA-4870 Bind the network information with the output devices changed 
signal.
 2018-03-14 16:47:01 +01:00
Lipu Fei
22573a685d Fix quality definition comparison in quality importing 
CURA-4946
 2018-03-14 14:31:30 +01:00
Lipu Fei
53626d3c67 Also force update validationState 
CURA-5048
 2018-03-14 13:02:52 +01:00
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +01:00
Lipu Fei
b83fd17038 Fix GUI update upon material data change 
CURA-5084
 2018-03-13 17:43:01 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar 
CURA-5084
 2018-03-13 17:41:15 +01:00
Jack Ha
406e546195 CURA-5048 fixed nozzle dependent settings to update after setting machine nozzle diameter in a crude way 2018-03-13 17:29:20 +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
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility 
Cura 5059 reset icon visibility
 2018-03-13 16:11:58 +01:00
Diego Prado Gesto
180139090a CURA-4870 Reuse the filter in findContainerStacks to find specific 
printers.
Allow to show configurations with empty material or variant.
 2018-03-13 15:54:00 +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
Jack Ha
0897c740b0 Fix typo in log 2018-03-13 12:57:03 +01:00
Guillem
1bb5b8ff3e add Copy all values to all extruders 
context menu option
 2018-03-13 12:31:03 +01:00
Ian Paschal
b90a9c490d Don't loop extruders before checking if there is a global extruder stack 2018-03-13 09:57:07 +01:00
Ian Paschal
69dc4fa5e0 Concerning the unfortunate crash... 
..of the morning of the 13th day of March, in the 2018th year of our lord.
 2018-03-13 09:20:42 +01:00
Ghostkeeper
a87db2d721
Always update root material even if not in QML 
Previously the _current_root_material_id and _current_root_material_name dictionaries were only updated if they are used anywhere in QML. This is unreliable. We're now directly connecting to the signal so that they are always updated, even when not in use by the GUI. This way we can rely on it in other places than the GUI.

Contributes to issue CURA-4606.
 2018-03-13 09:09:21 +01:00
Ghostkeeper
f40e9bffa9
Use extruder positions directly 
...instead of the keys in the _current_root_material_id map.

Contributes to issue CURA-4606.
 2018-03-12 17:27:55 +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
Jack Ha
c4fb15a569 CURA-4400 resolve merge conflict 2018-03-12 15:18:35 +01:00
Diego Prado Gesto
da54c93fda CURA-4870 Remove commented code 2018-03-12 15:12:27 +01:00
Diego Prado Gesto
809db6a4d9 CURA-5078 Remove material warning if the mismatch was the buildplate. 2018-03-12 15:09:56 +01:00
Jack Ha
d889795721 CURA-4400 correctly cope with quality changes that conflict with the current enabled extruders 2018-03-12 14:15:49 +01:00
Jack Ha
aa3cd8ba9d Solved merge conflict 2018-03-12 11:39:39 +01:00
Lipu Fei
2c5cc17b49 Fix build plate compatibility check 
CURA-5078
 2018-03-12 10:34:18 +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
87380e007c CURA-4870 Switch the hidden metadata entry also when switching printes 
so the active printer is correctly shown in the machines page.
 2018-03-09 16:44:46 +01:00
Lipu Fei
de72dd3455 Fix material update upon gcode flavour change 
CURA-5060
 2018-03-09 14:26:53 +01:00
Diego Prado Gesto
ebbb30a5be CURA-4870 Replace network key and connect group name metadata values 
when the connection changes.
 2018-03-09 13:37:15 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network 
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
 2018-03-09 12:42:49 +01:00