GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 14:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,391 Commits 288 Branches 260 Tags
Commit Graph

330 Commits

Author SHA1 Message Date
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server 
Contributes to issue CURA-4243.
 2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality 
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
 2017-11-28 17:30:00 +01:00
Ghostkeeper
381d9bf3f1
Log which file caused it to go wrong 
Contributes to issue CURA-4243.
 2017-11-28 16:15:20 +01:00
ChrisTerBeke
8cfaa44580 Fix resolving global stack definition when switching variant - CURA-4620 2017-11-27 16:40:23 +01:00
ChrisTerBeke
8082c092e5 Fix setting extruder definition in user changes container 2017-11-27 09:54:10 +01:00
Aleksei S
bb2be70dac Finds candidate quality profile for fdmextruder 
CURA-4620
 2017-11-25 02:25:36 +01:00
Jack Ha
3b5ed70113 CURA-4602 Fixed active custom profile selected check 2017-11-22 16:15:06 +01:00
ChrisTerBeke
532cfd8404 Fix showing correct quality changes in dropdown list after upgrading - CURA-4482 2017-11-22 10:48:21 +01:00
Lipu Fei
aeb478bb4b Should only show Keep/Discard dialog when it's needed 
CURA-4599
 2017-11-22 09:32:17 +01:00
Lipu Fei
31c859b3d7 Show Keep/Discard dialog after the containers have been changed 
CURA-4599

Or the default values will reflect those before the switch.
 2017-11-22 09:18:20 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
Ghostkeeper
839c8ccc52
Fix 'Could not get metadata of container <empty string>' 
Turns out that the side bar header was requesting the metadata before the active material was set. Now I'm just saying that if the active material was not set, it should not be compatible.

Contributes to issue CURA-4243, side-ways.
 2017-10-30 11:15:41 +01:00
Diego Prado Gesto
fb88dd6326 CURA-4492 Postponed signals are now emitted even if we need user 
interaction when changing quality profiles
 2017-10-27 13:32:51 +02:00
Lipu Fei
2f441ba7e1 Remove debugging log lines 
CURA-4451
 2017-10-26 11:36:59 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451 
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
 2017-10-26 09:23:27 +02:00
ChrisTerBeke
c1139c5c45 Update stack error checking when switching matchines - CURA-4447 2017-10-24 13:38:14 +02:00
ChrisTerBeke
d2ef373d19 Also apply container changes when no user interaction is required - CURA-4447 2017-10-23 15:50:42 +02:00
ChrisTerBeke
e63616ca41 Update method description - CURA-4447 2017-10-23 11:43:15 +02:00
ChrisTerBeke
2361e96e29 Wait with updating active stack variant and material until dialog was closed - CURA-4447 2017-10-23 11:41:20 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible 
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
 2017-10-20 15:09:45 +02:00
ChrisTerBeke
95a2559607 indent 2017-10-20 12:34:35 +02:00
ChrisTerBeke
31a04ed8da Also emit active quality changed when no dialog interaction occured - CURA-4447 2017-10-20 11:37:45 +02:00
ChrisTerBeke
70cf86c65b Remove debug print - CURA-4447 2017-10-19 14:40:56 +02:00
ChrisTerBeke
e9336b9b9e Small cleanups for discard or keep behavior - CURA-4447 2017-10-19 14:39:32 +02:00
Lipu Fei
d735921d42 Take into account the keep/discard interaction when emitting signals 
CURA-4248

When user switches to a different profile, the keep/discard dialog can
show up. Don't emit signals immediately if this interaction takes place
because it will trigger an unnecessary slice.
 2017-10-19 08:32:26 +02:00
A.Sasin
85f2a7c385 Added update to for Instance container to re calculate values and validate 
CURA-4447
 2017-10-17 15:01:49 +02:00
Lipu Fei
9b8dc9bf55 Move simple-mode settings customization check into a separate file 
CURA-4333

Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
 2017-10-16 13:18:11 +02:00
Lipu Fei
94a624e105 Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-16 11:37:55 +02:00
A.Sasin
61cdfcd3e8 Added coments and simplified "user" metadata check 
CURA-4333
 2017-10-13 16:59:29 +02:00
A.Sasin
7f5aed7ead User pyqtProperty instead of puqtSlot 
CURA-4333
 2017-10-13 16:34:49 +02:00
Mark
c2515ca7a9 Merge branch '3.0' 2017-10-13 16:21:54 +02:00
Diego Prado Gesto
3ea9c3856c CURA-4450 Updating UI after removing printer 
When removing a printer, the new one was activated but not signals were
emitted so the UI didn't update correctly. Now the printer is added and
signals are emitted.
 2017-10-13 13:06:48 +02:00
A.Sasin
16bd4430e4 Added a pyQtProperty to validate user settings (Might be wrong approach) 
CURA-4333
 2017-10-12 21:23:17 +02:00
Lipu Fei
39891551e3 Fix custom profile handling for quality slider 
CURA-4333
 2017-10-12 12:42:18 +02:00
A.Sasin
b318dc7087 Added notification icon in recomended mode. The notification icon is only 
active if one of custom settings is changed
CURA-4333
 2017-10-12 08:57:26 +02:00
Jaime van Kessel
189fc3fe94 Added missing activeStack changed signal 
This fixes some issues with the recommended view when the first machine is added.

CURA-4403
 2017-10-02 16:37:00 +02:00
Diego Prado Gesto
daa0793427 Minor code changes - CURA-4395 2017-10-02 11:15:24 +02:00
Diego Prado Gesto
4d9908364a Now empty message in materials and variants doesn't appear - CURA-4377 2017-09-29 16:28:18 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
A.Sasin
3082038261 Fixed code style and machine default name is retrieved from machine definition 
CURA-4345
 2017-09-29 13:52:00 +02:00
Diego Prado Gesto
1d61740d1a Added some comments to the code and minor changes - CURA-4386 CURA-4379 2017-09-29 11:39:52 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
alekseisasin
2a302a3e27 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-28 13:24:13 +02:00
alekseisasin
5402092bb4 During adding a new printer the printer name generated from default name and not from custom name (changed by user) 
CURA-4345
 2017-09-28 13:22:15 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
261089eed3
Fix type hinting imports 
Because circular imports. I hate our current import technique...

Contributes to issue CURA-4357.
 2017-09-22 11:53:10 +02:00
Ghostkeeper
3d921c1b4e
Add type hinting of return values 
I thought this might help find some bugs there.

Contributes to issue CURA-4357.
 2017-09-22 11:30:35 +02:00
Ghostkeeper
1596437bbd
getActiveGlobalAndContainerStacks may return None 
Change the code to reflect on this. Mostly this is to fix up the type warnings, because we were already checking for there being no global container stack but that was not thread-safe.

Contributes to issue CURA-4357.
 2017-09-22 11:17:42 +02:00
Ghostkeeper
88155d35e8
Correct signature of activeMachine 
Because there isn't always a global container stack.

Contributes to issue CURA-4357.
 2017-09-22 11:11:34 +02:00
Diego Prado Gesto
4d99fb067f After disconnect a signal, now is reconnected the correct one - CURA-4327 2017-09-20 17:19:44 +02:00