GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,148 Commits 293 Branches 266 Tags
Commit Graph

2845 Commits

Author SHA1 Message Date
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
Jack Ha
44537c4ef4 Added sorting by brand to MaterialsModel. 
Contributes to issue CURA-4243.
 2017-12-04 11:11:57 +01:00
ChrisTerBeke
db2c3525c4 Sidebar view and controller scaffolding 2017-12-04 11:06:10 +01:00
Ghostkeeper
72c7d2bd76
Reconstruct ID for submaterials from unique base name 
When you make the ID of the subprofile unique it doesn't get linked to the base profile any more since the '#2' gets put at the end.

Contributes to issue CURA-4243.
 2017-12-04 11:04:28 +01:00
ChrisTerBeke
1934bdfb99 Add sidebar view object 2017-12-04 10:52:40 +01:00
ChrisTerBeke
a52889a601 Update 3D viewer build volume when relevant machine settings are changed - CURA-4659 2017-12-01 16:29:42 +01:00
Ghostkeeper
083a4a8024
Rewrite cloning of materials 
The original was based on reading the original file back, but that won't work if the files are provided by an arbitrary container provider. Instead we'll actually make a copy of all the profiles that need to be copied. It's much faster as well.

Contributes to issue CURA-4243.
 2017-12-01 16:19:58 +01:00
Ghostkeeper
f045b85db3
Merge branch '3.1' 2017-12-01 10:19:36 +01:00
Lipu Fei
14c84d835a Make quality switching clear 
CURA-4650
 2017-12-01 09:55:38 +01:00
Diego Prado Gesto
7e4ed8a257 CURA-4646 Fix save containers also for the extruders 2017-11-30 17:37:16 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1' 2017-11-30 16:57:01 +01:00
ChrisTerBeke
3abf067d25 Fix loading .curaproject files with stack setups from earlier versions - CURA-4646 2017-11-30 15:24:51 +01:00
Ruben D
d29d73413f
Remove unused function 
Contributes to issue CURA-4243.
 2017-11-30 01:11:10 +01:00
Ruben D
f9c59c7e1e
Don't update model if extruders haven't all been loaded yet 
This model is created while the extruder stacks have not yet been filled in. You can't connect yet. When the extruder is ready, _extrudersChanged will be called again and then the new extruder will also get connected.

Contributes to issue CURA-4243.
 2017-11-30 00:33:10 +01:00
Lipu Fei
320330b788 Take DebugMode flag from CuraVersion 
CURA-4539
 2017-11-29 14:36:00 +01:00
Ghostkeeper
838e49f3da
Pass just metadata through quality manager instead of full containers 
Where we only need metadata, we should pass metadata instead of full containers.
Also add some type hinting.

Contributes to issue CURA-4243.
 2017-11-29 14:33:04 +01:00
Lipu Fei
b7fed81fc1 Pass "is_debug_mode" flag to Application 
CURA-4539
 2017-11-29 14:01:19 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types 
Improved mesh type UX (Per Model Settings)
 2017-11-29 13:24:38 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server 
Contributes to issue CURA-4243.
 2017-11-29 13:06:08 +01:00
Diego Prado Gesto
e5ac33a929 CURA-4641 Minor changes 2017-11-29 11:19:11 +01:00
ChrisTerBeke
16e07fc461 Update color indicators for extruders when changing material color - CURA-4641 2017-11-29 10:47:39 +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
Ghostkeeper
56d6664c8c
Guard against materials not having a definition 
The empty container has no definition.

Contributes to issue CURA-4243.
 2017-11-28 15:33:21 +01:00