GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 295 Branches 268 Tags
Commit Graph

6798 Commits

Author SHA1 Message Date
Nino van Hooff
c43cdb5c63 Implement allowPositive for printhead settings 
CURA-6690
 2019-09-19 14:49:18 +02:00
Lipu Fei
472e6e88c3 Fix typing 2019-09-19 14:39:03 +02:00
Lipu Fei
d8b59c4471 Fix renamed um2 nozzles 
CURA-6599
 2019-09-19 14:26:01 +02:00
Lipu Fei
823f7e5921 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-19 14:14:29 +02:00
Nino van Hooff
17a832f52f Do not transform negative printhead min max values to positive while 
displaying

CURA-6690
 2019-09-19 13:56:37 +02:00
Ghostkeeper
8b8429d629
Merge branch 'CURA--6683_icons_per_object_settings' 2019-09-19 10:48:23 +02:00
Ghostkeeper
05de920c21
Once more with feeling 
Sorry, I didn't see the other review comment until after I pushed the previous commit.

Contributes to issue CURA-6600.
 2019-09-18 14:28:22 +02:00
Ghostkeeper
a3e9316f48
Rename all_root_materials to all_base_files 
This naming is more consistent with the naming of the metadata entry and most of the other code.

Contributes to issue CURA-6600.
 2019-09-18 14:27:04 +02:00
Nino van Hooff
53ea6ce1a7 POS: Fix: currentMeshType reference 
CURA-6683
 2019-09-18 11:39:58 +02:00
Jaime van Kessel
549eb21a5a
Simplify the machinesettings qml 2019-09-18 11:24:11 +02:00
Nino van Hooff
7d66409494 POS: Refactor settings dialog into its own file 
CURA-6683
 2019-09-18 11:23:10 +02:00
Nino van Hooff
fbba39cb63 POS: Correct label text 
CURA-6683
 2019-09-18 11:21:12 +02:00
Nino van Hooff
be7bd59e30 Code Style: camelCase for qnl properties, brackets, commas 
CURA-6683
 2019-09-18 11:21:12 +02:00
Nino van Hooff
c3bbd884b5 Use Cura.SecondaryButton for POS select settings button per design 
CURA-6683
 2019-09-18 11:07:18 +02:00
Jaime van Kessel
db0428ceec
Remove anchors that were causing qml warnings 2019-09-18 10:32:47 +02:00
Diego Prado Gesto
0b9052b068 Clean up and code style fixing 
Contributes to CURA-6683.
 2019-09-17 15:12:46 +02:00
Diego Prado Gesto
4dd6c5b03a Merge branch 'master' into CURA--6683_icons_per_object_settings 2019-09-17 14:16:51 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Ghostkeeper
eaf649023a
Fix setting default material after g-code flavour changes has_materials 
Don't use the material manager here any more.

Contributes to issue CURA-6600.
 2019-09-17 09:23:33 +02:00
Ghostkeeper
977beb8dbb
Re-build container tree if has_materials changes during runtime 
A bit of a hack and it'll be very slow. But it should work. Right now this crashes though because it still calls the Material Manager.

Contributes to issue CURA-6600.
 2019-09-17 08:55:29 +02:00
Ghostkeeper
5617784b48
Implement version upgrade for UM2 with Olsson 
Contributes to issue CURA-6775.
 2019-09-16 15:38:01 +02:00
Ghostkeeper
8d21f75c40
Merge branch 'feature_intent_container_tree' into feature_intent_upgrade 2019-09-16 15:20:41 +02:00
Ghostkeeper
9b341cf604
Remove UM2 upgrade selection machine action 
Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with.

Contributes to issue CURA-6775.
 2019-09-16 15:19:47 +02:00
Nino van Hooff
dbb9e55bc8 Fix MyPy warning in PerObjectSettingsTool 
CURA-6683
 2019-09-16 15:05:02 +02:00
Jaime van Kessel
0ff9d72c4c
Remove use of deprecated extruders property 2019-09-13 17:27:16 +02:00
Ghostkeeper
cc27392ab0
Don't use material groups to update metadata 
The material groups are not filled any more in the material manager so this fails.
This might make updating metadata of material profiles slightly slower, but when testing this I noticed no difference.

The function becomes a lot simpler though. And it works again.

Contributes to issue CURA-6600.
 2019-09-13 14:42:27 +02:00
Ghostkeeper
bb0c9c80dc
Don't use material groups to find just the root container 
Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well.

Contributes to issue CURA-6600.
 2019-09-13 14:42:27 +02:00
Ghostkeeper
882e60bf95
Fix typing of application 
Because CuraApplication has the getMachineManager() function and such, not UM.Application.

Discovered during work on CURA-6600.
 2019-09-13 14:42:26 +02:00
Nino van Hooff
d6872a65bd Fix infillOnlyCheckbox not representing mesh type 
Not a bug but a feature: When the overlays button is clicked, the infill
mesh type is set and the checkbox checked

CURA-6683
 2019-09-13 13:36:30 +02:00
Remco Burema
756c21cd19 Remove extra empty lines in ChangeAtZ-scipt output. 2019-09-13 13:33:06 +02:00
Nino van Hooff
44fbcaeb3a Fix Settings lines positioning for Per Object Settings 
CURA-6683
 2019-09-13 13:26:00 +02:00
Nino van Hooff
667e5f8e18 Fix reference error in POS 
CURA-6683
 2019-09-13 13:26:00 +02:00
Nino van Hooff
606faf54c2 Remove unnecessary component initialization 
CURA-6683
 2019-09-13 13:26:00 +02:00
Nino van Hooff
fe0e1e5aba Remove unnecessary ; line endings in QML 
CURA-6683
 2019-09-13 13:26:00 +02:00
Nino van Hooff
90fefac37f Remove redundant rows from POS QML 
CuRA-6683
 2019-09-13 13:26:00 +02:00
Nino van Hooff
184a72f7ab Bind current_mesh_type to UM.ActiveTool.properties.getValue("MeshType") 
CURA-6683
 2019-09-13 13:26:00 +02:00
Remco Burema
ef0f5988a2 Fix 3MF-workspace-reading: Variants where not loaded properly. 
part of CURA-6600
 2019-09-13 12:59:54 +02:00
ChrisTerBeke
55cdb07c1c Fix loading popup image on windows 2019-09-13 11:12:13 +02:00
ChrisTerBeke
5dfb8216df Fix loading popup image on windows 2019-09-13 11:06:34 +02:00
Lipu Fei
bbde75491d Fix version number in upgrade from 4.1 to 4.2 2019-09-13 10:52:41 +02:00
ChrisTerBeke
e8b48a299b Store in preferences if the user wants to hide the message 2019-09-13 10:45:42 +02:00
Lipu Fei
fa8213c601 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-13 10:31:11 +02:00
Jaime van Kessel
febe953226
Don't assert if there are already 7 containers in stack 
CURA-6599

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2019-09-13 09:29:49 +02:00
Diego Prado Gesto
bca68c6db0 Merge branch 'feature_intent' into feature_intent_container_tree 2019-09-13 09:02:51 +02:00
Diego Prado Gesto
d38e60ce06 Merge branch 'master' into feature_intent 2019-09-13 09:02:30 +02:00
Ghostkeeper
9c47fc8e70
Use container tree to get quality definition of printer 
Contributes to issue CURA-6600.
 2019-09-12 16:15:40 +02:00
Ghostkeeper
b8ab04df4a
Correct type of logged item 2019-09-12 15:58:09 +02:00
Ghostkeeper
3a3aeb92a9
Log errors rather than printing them 
This way we can debug them if a user sends us the logs.
 2019-09-12 15:45:10 +02:00
Ghostkeeper
2d2bf9e279
Use logger for errors instead of printing them to stdout 
This way they will show up in users' logs.
 2019-09-12 15:25:01 +02:00
Jaime van Kessel
5db122aff6
Merge branch 'master' of github.com:Ultimaker/Cura into CURA--6683_icons_per_object_settings 2019-09-12 15:01:11 +02:00