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

58 Commits

Author SHA1 Message Date
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Jack Ha
701eba3a0e Made 3mf mesh centering more robust. 2016-12-08 12:45:38 +01:00
Jack Ha
7a35e4170b Moved translation functionality needed for 3mf into ThreeMFReader. Fix CURA-3089, impacts CURA-382 2016-12-05 11:28:06 +01:00
Jaime van Kessel
1f21957cb4 Fixed issue with per-object settings in 3mf reader 
CURA-1263 and CURA-382
 2016-11-10 11:46:13 +01:00
Jaime van Kessel
826c3edd50 Added per object setting retrieval for 3MF 
CURA-1263
 2016-11-07 13:14:45 +01:00
Jaime van Kessel
35a4fe60d0 Put the XML warning in the right spot 2016-11-04 17:12:20 +01:00
Jaime van Kessel
726b935b78 3mf reader now gives warning if it couldn't load cElementTree 2016-11-04 17:03:52 +01:00
Jaime van Kessel
fce75febef 3MF now handles loading of multiple nodes correctly 
Contributes to CURA-1263
 2016-11-03 13:31:51 +01:00
Jaime van Kessel
d8e4e11b86 3MF reader now handles object types 
CURA-382
 2016-11-02 17:27:22 +01:00
Jaime van Kessel
fc3d16e8c8 Removed the need of a _3mf root node 
This significantly decreases the issues that we had with saving files, as we no
longer need to take special cases into account CURA-382
 2016-11-01 11:16:43 +01:00
Jaime van Kessel
273b996cc1 3MF reader now correctly supports unit 
CURA-382
 2016-10-28 16:42:07 +02:00
Jaime van Kessel
c240f42b64 3MF files are now correctly loaded inside the build platform 
CURA-382
 2016-10-28 16:19:53 +02:00
Jaime van Kessel
70a33d9dc5 Fixed drop to buildplate issue with 3mf 
CURA-382
 2016-10-28 13:44:52 +02:00
Jaime van Kessel
0d9fd3b410 3mf reader now sets names of nodes 
This makes debugging a whole lot easier. CURA-382
 2016-10-28 13:18:29 +02:00
Jaime van Kessel
e1ebd3e225 3mf files are now placed in their own worldspace 
CURA-382
 2016-10-28 13:01:21 +02:00
Jaime van Kessel
8ac7558677 Apply transformation again 
CURA-382
 2016-10-07 14:31:48 +02:00
Jaime van Kessel
47870f43ef Groups with just a single item are now discarded 
CURA-382
 2016-10-07 13:51:53 +02:00
Jaime van Kessel
7c59f8f2f2 Multiple objects are now handled with right transformation 2016-10-07 12:51:51 +02:00
Jaime van Kessel
7d28f5cdf1 3mf reader now uses correct origin 2016-10-07 09:23:26 +02:00
Jaime van Kessel
dadcf45f45 Added extra checks & logging to 3mf reader 
CURA-382
 2016-10-06 10:44:38 +02:00
Jaime van Kessel
efd3fc3487 Added check to see if a SceneNode has vertices before adding it 
CURA-2460
 2016-09-26 13:13:31 +02:00
Jaime van Kessel
3f9024aeff Added selftest for all objects in 3mf file 
CURA-2460
 2016-09-26 13:03:45 +02:00
Jaime van Kessel
d7cf65258f Minor codestyle changes 2016-09-26 12:55:17 +02:00
fieldOfView
66fc85c6b2 Fix revert accident 2016-09-09 17:10:45 +02:00
fieldOfView
4de78db87a Revert "Remove "infill mesh" as a standard visible setting" 
This reverts commit 46942d7cf23e32dcdf5dbf00440aa781061f4f65.

It was not my decision to make
 2016-09-08 14:04:58 +02:00
fieldOfView
96ac27d1c3 Remove 3MF repair message 
CURA-1223
 2016-08-01 10:50:04 +02:00
Thomas Karl Pietrowski
5f540a7a78 Revert "Revert "Clean up __init__"" 
This reverts commit d99827109ab836963d523322ef00b0e6cf9675bd.
 2016-07-27 21:22:30 +02:00
Thomas Karl Pietrowski
d99827109a Revert "Clean up __init__" 
This reverts commit 44c64c4ac766fc7e085d338cb1f21c949851c9ba.
 2016-07-27 21:22:16 +02:00
Thomas Karl Pietrowski
9f280717d8 Clean up __init__ 2016-07-27 21:22:08 +02:00
Thomas Karl Pietrowski
d4861ee626 CURA-1223: Checking whether the bounding box is correct 
Adds an additional check, like suggested by @awhiemstra.

Contributes to CURA-1223
 2016-07-27 20:21:35 +02:00
Thomas Karl Pietrowski
4dbe895c15 3MF_Reader: Optionally use cElementTree 
This should make reading the XML faster
 2016-07-27 20:16:12 +02:00
Thomas Karl Pietrowski
d96ce760f8 CURA-1223: 3MFReader: Doing selftest and fail on broken files 
This commit adds a selftest before the "result" gets returned.
It should break on this/these functions and popup a message about using
the online repair tool.
I compared the content of both files for a long time, googled about the
format, but wasn't able to find a proper fix.
More routines will likely need to be added here, but with those I have
it is working so far very well.

Sadly it is not possible to override the default message, so two
messages will appear. Additionally, the URL of the link is not
clickable/executable from the UX. Just acting like normal text.

Contributes to CURA-1223
 2016-07-26 20:21:00 +02:00
Jaime van Kessel
6ec69d523b Fixed reloading meshes for 3mf 
CURA-1622
 2016-07-20 13:05:45 +02:00
Jaime van Kessel
25d13969ee Filename is now correctly set for 3mf 
CURA-1622
 2016-07-08 15:58:33 +02:00
Jaime van Kessel
19933cb4e7 Improved robustness of Platform physics by checking if the hulls are calculated before trying to intersect them. 
fixes CURA-1827
 2016-07-08 15:17:28 +02:00
Jaime van Kessel
1ced206c5d Codestyle 2016-07-08 14:12:44 +02:00
Simon Edwards
47de254f97 Fixed up the 3MF reader to use the changed MeshBuilder and MeshData. 
CURA-1633 OverflowError: cannot convert float infinity to integer (loading larger models)
 2016-06-28 11:43:02 +02:00
Ghostkeeper
0684cee681 Merge branch '2.1' 
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
 2016-04-04 18:49:09 +02:00
Jaime van Kessel
d3a6f63d1f 3MF no longer fails when there is no transformation matrix 2016-03-24 16:41:25 +01:00
Jaime van Kessel
c1af2c4ae0 3mf reader now uses correct coordinate frame 2016-03-24 09:46:28 +01:00
Thomas-Karl Pietrowski
2a104bc6da Remove unused imports and replace object with entry 
"object" is also a built-in function of python
 2016-03-14 15:47:17 +01:00
Thomas-Karl Pietrowski
cbc7f0c1de Remove unneeded line 
This variable gets redefined later...
 2016-03-14 15:45:02 +01:00
Kurt Loeffler
447fdc8fbc Made changed from code review and updated MeshReader plugins to support changes made to Uranium branch MeshReaderDialog. This branch now must be paired with that Uranium branch. 2015-12-31 09:46:57 +01:00
Arjen Hiemstra
9267b517d6 Fix coding style issues 2015-11-27 16:53:32 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00
Arjen Hiemstra
751f58fb02 Merge branch '15.10' 
* 15.10: (39 commits)
  Remove unused import in StartSliceJob
  conforming to code style
  fix typo's..
  Adjust initial view to be slightly from the side
  uses a different method to check whether a machine name excists
  Sets the languageComboBox to the default language
  Remove per-group settings for now
  Make sure to send all settings when an object overrides the profile
  Properly emit writeStarted in RemovableDriveOutputDevice
  Add xy_offset setting to list of settings that trigger a disallowed area update
  Properly trigger a reslice when the active instance is changed
  Wizardpages without hack
  Only hides the window when there are no more pages
  Only add layer data node after all processing
  Also account for "xy_offset" setting for the disallowed areas
  JSON: workaround for stutter in spiralize vase: set travel speed to printing speed
  Adds a color for the error-messages
  Shows an error message when a user tries to add a printer with a name that already excists.
  JSON: support bottom stair step height defaults changed so that the bottom distance to the model isn't violated too much
  Try to use Protobuf CPP implementation if it is available
  ...
 2015-11-13 11:31:29 +01:00
Arjen Hiemstra
0b2f0b2604 Add thread yields to several long running and heavy processing jobs 
Contributes to CURA-358
 2015-11-04 14:13:45 +01:00
Ghostkeeper
da1d59ff98 Merge branch 15.10 into master 
Where automatic merging failed, the version of 15.10 was used.
 2015-10-16 16:56:59 +02:00
Arjen Hiemstra
463fbae9aa Fail loading the 3MF file if no meshes were found 
This way we indicate loading the 3MF file failed instead of indicating
success but not actually loading anything.

CURA-236
 2015-10-13 18:42:01 +02:00