3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
11685 commits 342 branches 300 tags 748 MiB
Commit graph

2653 commits

Author SHA1 Message Date
Lipu Fei
248fe37ed9 setDefinition() takes the ID instead of the container 
CURA-4713
 2017-12-15 14:54:26 +01:00
Lipu Fei
f26872ec1f Apply fix for single extrusion machines when a new global stack is added 
CURA-4713

Now the machines are not all loaded in the beginning, so the old way of
adding extruder stacks for old single-extrusion machines don't work.
With this fix, it now happens whenever a global stack is added to the
registry.
 2017-12-15 14:51:48 +01:00
Aleksei S
2c18127cc1 Tests: Removed python circular import dependency and added empty containers 
CURA-4687
 2017-12-15 09:43:02 +01:00
Jack Ha
4519f9b46a CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling 2017-12-13 14:04:02 +01:00
Jack Ha
80afda1912 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-13 13:53:35 +01:00
Jack Ha
bae2193bfb Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-13 13:39:22 +01:00
Jack Ha
19b56404c6 Fix empty quality slider on start. 
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple

Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.

CURA-4707
 2017-12-13 13:33:05 +01:00
Ghostkeeper
9ea0119011
Rename 'exception' to 'error' 
Error is a less technical term, so it's more user friendly.
 2017-12-13 12:58:24 +01:00
Lipu Fei
6e6dc493f1 Fix material loading for unknown names 2017-12-13 12:27:55 +01:00
Jack Ha
f28846acb9 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-12 15:43:32 +01:00
Aleksei S
3516d01f3d Move back machine selection 
CURA-4234
 2017-12-12 15:30:19 +01:00
Aleksei S
6968c089db Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar 
CURA-4234
 2017-12-12 11:26:17 +01:00
Aleksei S
fb91edd7eb Solve arrange and multiply models issue 
CURA-4703
 2017-12-12 10:43:19 +01:00
Ghostkeeper
097cc72d89
Document why we're only returning full profiles 
It's a limitation of the quality manager that would require major refactoring there to fix.

Contributes to issue CURA-4243.
 2017-12-11 09:44:56 +01:00
Ghostkeeper
430f3dad27
Use GlobalContainerStack.definition instead of .getBottom 
If we know it's a CuraContainerStack we can use .definition safely.

Contributes to issue CURA-4243.
 2017-12-08 16:57:48 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Diego Prado Gesto
012b8aef62 Merge branch 'feature_sidebar_plugin_target' 2017-12-08 09:45:52 +01:00
ChrisTerBeke
9bf954643c Use new method of setting active stage when needing to switch to monitor 2017-12-07 11:56:52 +01:00
Jack Ha
79d5282b36 Added quality_changes to ContainerRegistry, rename saveStack to saveContainer. 
Contributes to issue CURA-4243.
 2017-12-07 10:39:13 +01:00
ChrisTerBeke
ee643610e5 Fix sidebar loading and unloading depending on active stage 2017-12-06 17:46:18 +01:00
Jack Ha
4245847dab Moved saveSettings and saveStack to Uraniums ContainerRegistry. 
Contributes to issue CURA-4342.
 2017-12-06 16:39:59 +01:00
Diego Prado Gesto
9561827bda CURA-4680 Checking if there is global stack in the ExtruderManager. 
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
 2017-12-06 14:12:51 +01:00
Jack Ha
f0c3aaf532 Add built-in profiles to profiles screen. 
Contributes to issue CURA-4243.
 2017-12-06 14:05:09 +01:00
ChrisTerBeke
a57a5aab6b Make sidebar view working for active stage 2017-12-06 12:23:41 +01:00
Lipu Fei
c0a502f99c Check if there is an active machine before doing anything else 
CURA-4680
 2017-12-06 11:48:14 +01:00
Jack Ha
20500b5c51 Merge branch 'feature_local_container_server' of github.com:Ultimaker/Cura into feature_local_container_server 2017-12-06 11:03:47 +01:00
Jack Ha
eb171231c2 Fix removeMaterial. 
The base_file must be removed first, or it gets loaded halfway during remove containers.

Contributes to issue CURA-4243.
 2017-12-06 11:02:50 +01:00
Ghostkeeper
ec36424a4d
Update UserProfilesModel when metadata of materials changes 
The metadata may influence which profiles are being shown.

Contributes to issue CURA-4243.
 2017-12-06 10:42:02 +01:00
Ghostkeeper
80f4c9181d
Correct variant name when duplicating materials 
It needs to be the variant name (swapping spaces for underscores) to be consistent with the deserialize functions.

Contributes to issue CURA-4243.
 2017-12-06 10:40:58 +01:00
Ghostkeeper
3e2e133682
Add type hinting for getMachineManager 
I like it when my IDE can give me hints, so return types are important.

Contributes to issue CURA-4243.
 2017-12-06 10:37:06 +01:00
ChrisTerBeke
0e1c9146cf Implement stage model in top bar 2017-12-06 09:58:50 +01:00
ChrisTerBeke
f1b9a17611 Remove sidebar controller implementation in favor of stages 2017-12-06 09:44:30 +01:00
ChrisTerBeke
84ba486d57 Add plugins for prepare and monitor stages 2017-12-06 09:34:09 +01:00
ChrisTerBeke
840e80a1fb Add missing init 2017-12-06 09:29:09 +01:00
ChrisTerBeke
44c66e2ad2 Get named view in CuraStage 2017-12-06 09:26:37 +01:00
ChrisTerBeke
ab5449b01e Add CuraStage 2017-12-06 09:10:19 +01:00
ChrisTerBeke
a6a3602840 View default view selected in view menu 2017-12-05 12:27:13 +01:00
ChrisTerBeke
e33288b7c8 Move sidebar target for plugins to only middle section 2017-12-05 10:56:59 +01:00
Jack Ha
ce78bddfbb Prefer a read-only material in findDefaultMaterial. 
Contributes to CURA-4243.
 2017-12-05 09:51:57 +01:00
ChrisTerBeke
caf56587fe Implement switching sidebar views 2017-12-04 19:37:03 +01:00
Jack Ha
41cde7c7f4 Fix connecting material name change signal on startup. Contributes to CURA-4243. 2017-12-04 17:07:37 +01:00
Jack Ha
3b25191949 Undo a fix that causes Cura to crash when starting up clean. 
Contributes to issue CURA-4243.
 2017-12-04 17:00:43 +01:00
Jack Ha
90e8256f46 Fix that renaming a custom material also updates the selected material. 
The namechanged signal was not connected at startup, so the update would only work if you change material first before renaming.

Contributes to CURA-4243.
 2017-12-04 16:30:21 +01:00
Jack Ha
c52451217b Use timer instead of calling _update directly. 
Speeds up when the signal is called very often in a small period.

Contributes to issue CURA-4243.
 2017-12-04 16:29:21 +01:00
ChrisTerBeke
3c863fc388 Get default settings view to work as sidebar component 2017-12-04 16:28:35 +01:00
Jack Ha
ac97d0d83f Sort materials by brand, material, name, color_name. 
Contributes to issue CURA-4243.
 2017-12-04 13:23:30 +01:00
ChrisTerBeke
5eeb98bbcf Move sidebar controller init 2017-12-04 13:20:16 +01:00
ChrisTerBeke
4ef39ca313 Add sidebar views menu item and expose model to QML 2017-12-04 12:47:08 +01:00
ChrisTerBeke
713055e320 Get meta data per sidebar view in sidebar view model 2017-12-04 12:37:29 +01:00
ChrisTerBeke
f2b4cbe182 Register sidebar controller in application, start with default sidebar view 2017-12-04 11:37:49 +01:00