GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,982 Commits 287 Branches 260 Tags
Commit Graph

154 Commits

Author SHA1 Message Date
Erwan MATHIEU
a96eefd8cc Fix duplicated file reloading 
CURA-11905

Instead of using the object name for reloading meshes inside a 3MF file, use a dedicated mesh ID property that is only stored internally, doesn't have to be unique (because the combination filename+ID will be) and can't be changed by the user. This should improve 3MF file reloading, and also fixes reloading of duplicated instances, because multiple meshes can now have the same mesh ID.
 2024-10-07 17:50:25 +02:00
Remco Burema
285a241eb2 Drop-to-buildplate/3MF-reading: Simplify boolean parsing. 
Avoid heavy methods like previously here for a number of reasons.
 2024-07-16 09:20:00 +02:00
Saumya Jain
55e5cd8982 adding dropto buildplate drop per model in 3mf 
CURA-10542
 2024-02-26 14:58:53 +01:00
c.lamboo
08b70252a4 Remove duplicated mime type 
CURA-11403
 2024-02-21 11:24:09 +01:00
saumya.jain
b641741e49 Added preference to show UFP saving dialog 
Changes saving to .ucp to .3mf
 2024-02-16 14:11:07 +01:00
Saumya Jain
80d7536763
Merge branch 'main' into CURA-11561_mockup_pap 2024-02-16 11:47:32 +01:00
Erwan MATHIEU
63c1eb8990 Rename to Universal Cura Project 
CURA-11561
 2024-02-05 14:15:43 +01:00
Erwan MATHIEU
733ef4d3d8 UI now displays an option to select the same profile 
CURA-11561
 2024-02-02 12:17:34 +01:00
alexandr-vladimirov
2b05a370ca Allow to set print sequence manually 2024-01-04 06:30:23 +03:00
saumya.jain
cdb2a5789d Center alligning in case of 3mf write 
Also reverting commit 7e38927a8cb76d3789fde21482aeff1e254cc636

CURA-11166
 2023-11-06 16:33:32 +05:30
Jaime van Kessel
9c38514824
Merge branch '5.5' of github.com:Ultimaker/Cura 2023-10-16 12:07:30 +02:00
Jaime van Kessel
dc66732150
Revert "Fix certain 3mf models not restoring properly" 
This reverts commit 7e38927a8cb76d3789fde21482aeff1e254cc636.
 2023-10-16 12:07:17 +02:00
Jaime van Kessel
7e38927a8c
Fix certain 3mf models not restoring properly 
CURA-11164
 2023-10-16 10:56:57 +02:00
Jaime van Kessel
67c11bf7f8
Fix certain 3mf models not restoring properly 
CURA-11164
 2023-10-16 10:56:07 +02:00
saumya.jain
7880cb5bde remove debug statement 
CURA-9755
 2023-10-13 11:29:44 +02:00
saumya.jain
277d48bd51 3mf Meshes load in correct location 
CURA-9755
 2023-10-13 09:27:57 +02:00
c.lamboo
f8b3fb3d67 Move parse/write responsibility of copy/paste to 3MFWriter/3MFReader 
CURA-7913
 2023-08-07 13:41:01 +02:00
j.spijker@ultimaker.com
ca430c80be
Change imported namespace pySavitar to Savitar 
Because we had to rename our Python bindings module from Savitar to
pySavitar we also changed our import downstream (Cura and Uranium). But
in order to limit the changes on our existing code we decided during the
review that we should just import pySavitar as Savitar.

Contributes to CURA-7924
 2022-02-28 10:44:16 +01:00
Remco Burema
7511ac843e Changes needed wrt how we build Savitar with Sip 6. 
part of CURA-7924
 2022-02-25 14:31:51 +01:00
Ghostkeeper
b815d63096
Add cura: namespace before setting keys, and store the rest in um_node.metadata 
This retains per-node metadata entries.

Contributes to issue CURA-7615.
 2021-02-08 17:37:38 +01:00
Ghostkeeper
c89a397e59
Merge branch 'master' into CURA-7615_store_metadata 2021-02-08 16:27:38 +01:00
Ghostkeeper
06086dfaaf
Fix reading per-object settings from 3MF object resources 
This metadata has been changed to contain other information. Readers of information from 3MF need to adjust their stance too to filter out the information they need from the metadata of the metadata.

Contributes to issue CURA-7615.
 2021-02-08 15:07:33 +01:00
Remco Burema
b97b7d6fa9
Set empty project hint back to false before reading. 
CURA-7996
 2021-02-04 13:04:00 +01:00
Remco Burema
6256bf3a4d
Possible to distinguish between empty and corrupt 3MF. 
Otherwise the user could infer valid, but empty workspace is corrupt.

CURA-7996
 2021-02-03 09:27:58 +01:00
Jaime van Kessel
f442417ac6
Dont try to set unknown settings as per object settings when loading 3mf 
CURA-7615
 2020-12-23 16:31:25 +01:00
Jaime van Kessel
f338acd4f3
Read & write all generic metadata items from 3mf 
CURA-7615
 2020-12-23 13:49:52 +01:00
Kostas Karmas
12aa114483 Surround the addition the convexHull with try-except when loading a 3mf 
The buildplate meshes can be in .3mf format. When Cura is loading a printer, it may try to load
its mesh from a 3mf file. At the moment cura is starting up there is no build volume yet, so adding
a convexHull to the printer's 3mf buildplate mesh is not possible. By surrounding the addition of
the convexHull with a try-except, loading of 3mf buildplate meshes on startup doesn't cause issues.

Fixes https://github.com/Ultimaker/Cura/issues/8585
 2020-10-21 15:31:34 +02:00
Kostas Karmas
82fc05c915 Always add a ConvexHullDecorator to objects loaded from 3MF 
When loading from 3mf, objects outside the buildplate had no ConvexHullDecorator.

CURA-7780
 2020-10-16 11:31:32 +02:00
Jaime van Kessel
38256f7a98
Add cast so that mypy doesn't choke 2020-07-08 11:05:46 +02:00
Jaime van Kessel
91690524c0
Ensure that the 3mf reader doesn't make groups of one 2020-07-08 10:39:33 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
8f3827d5ae Convert doxygen to rst for 3MFReader/Writer and AMFReader 2020-05-08 15:14:39 +02:00
Jaime van Kessel
d49cca3b8b
Add warning for when libsavitar is not up to date 2020-04-15 12:25:00 +02:00
Nino van Hooff
e43768ebde Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"" 
This reverts commit 4f55c8d8
 2020-04-08 11:06:31 +02:00
Nino van Hooff
4f55c8d832 Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects" 
This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing
changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.
 2020-04-03 15:31:08 +02:00
Kostas Karmas
8eb48672e1 Use the node id as identifier 
Now that libSavitar allows us to read the object id from the 3mf file,
this id will be propagated as an id inside CuraSceneNodes and it will
be used as an identifier to find the object that has to be refreshed.

CURA-7333
 2020-04-03 11:05:38 +02:00
fieldOfView
469c205384 Fix typo 2020-03-20 07:42:01 +01:00
fieldOfView
65346d9200 Store/retreive SceneNode in/from <object> attribute 2020-03-20 07:28:48 +01:00
fieldOfView
ecfe9c708e Fix watching for changes in 3mf files 2020-03-05 20:13:14 +01:00
Ghostkeeper
f89f47f8d5
Get quality definition from ContainerTree rather than QualityManager 
Contributes to issue CURA-6600.
 2019-08-28 14:31:07 +02:00
Ghostkeeper
b3b59d5a5c
Add typing 2019-04-26 15:42:22 +02:00
Jaime van Kessel
4f30dffaf9 Ensure that when a corrupt 3mf file is loaded, the "failed to load" message will pop up 2018-09-11 12:58:00 +02:00
Ian Paschal
320d73c6e5 Retain 3MF mesh positions 
Contributes to CURA-5465

Fixed bug by preventing read jobs for 3mf files from being auto-arranged.

Boyscout changes:
- Fixed typo in `ThreeMFReader.py` (`splitted` → `split`)
- Fixed code style in `CuraApplication.py` (`filename` → `file_name`)
 2018-07-24 12:17:53 +02:00
Lipu Fei
9c40b1de92 Remove code that is likely for debugging 
CURA-5545
 2018-07-06 15:13:07 +02:00
Jaime van Kessel
b4f59a7822 Removed unneeded application reference in construction of meshreaders 2018-06-29 09:25:38 +02:00
Ghostkeeper
0cb6e506d2
Rewrite code style of _getScaleFromUnit 
It should be much more readable now.

Discovered while investigating #3847.
 2018-06-28 16:39:53 +02:00
Lipu Fei
7f7a195627 Fix merge conflicts from 3.4 2018-06-05 09:02:52 +02:00
Lipu Fei
39b71add07 Reader classes are responsible for adding their mime types 
CURA-5367
 2018-06-05 08:35:24 +02:00
Jack Ha
c6ac344ed5 Merge branch '3.4' 2018-06-04 11:40:03 +02:00
Aleksei S
4922988e7d Added .3mf extension to the MimeType 
CURA-5367
 2018-06-04 11:11:02 +02:00