3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
18800 commits 340 branches 299 tags 734 MiB
Commit graph

4854 commits

Author SHA1 Message Date
Thomas Karl Pietrowski
00a77da9d4 COM: Adding missing argument for DCOM 2017-12-08 15:19:28 +01:00
Jaime van Kessel
ae629e2968 Fixed camera for legacy UM3 printer again 
CL-541
 2017-12-08 14:59:14 +01:00
Jaime van Kessel
9ccd643f64 Repaired the monitor icon not being updated 
CL-541
 2017-12-08 14:36:53 +01:00
Jaime van Kessel
c28c20dbd7 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-08 10:22:16 +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
Jaime van Kessel
4ba551a3af Prevent crash when switching away from monitor tab 
CL-541
 2017-12-06 17:02:35 +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
Jaime van Kessel
77e3965fc7 Added videostream to cluster again 
CL-541
 2017-12-06 14:59:20 +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
Jaime van Kessel
aba8bd89c3 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-06 13:33:20 +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
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