120 Commits

Author SHA1 Message Date
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
Jaime van Kessel
770264e16e 3mf reader now flips the data points without rotation quaterion 2015-09-21 16:42:53 +02:00
Jaime van Kessel
6596945ce0 Added some logging to 3mf reader 2015-09-21 15:21:39 +02:00
Tamara Hogenhout
4a9bf2b4d6 adds/adapts translation context markers
all nescessary in folder: Cura/plugins

Contributes to: issue CURA-116
2015-09-08 15:26:49 +02:00
Arjen Hiemstra
a2ecae7d2c Port 3MFReader to ETree 2015-08-18 17:15:35 +02:00
Jaime van Kessel
a47c8f7ef6 Updated documentation 2015-08-11 16:01:12 +02:00
Jaime van Kessel
102b2e7fa0 Fixed crash when no transformation was provided in 3mf file 2015-08-11 15:09:00 +02:00
Jaime van Kessel
d0769f0ac9 Fixes for 3mf multiple object loading 2015-08-11 14:59:39 +02:00
Jaime van Kessel
f2a4091304 First implementation of 3mf reader 2015-08-10 16:38:46 +02:00