157 Commits

Author SHA1 Message Date
Joseph Lenox
ea29a22cd6 Adds Printer config option to force the use of set-and-wait gcode semantics (if supported by firmware).
Fixes #3268
2018-04-12 21:15:23 -05:00
Merill
113308c317 gyroid infill (#4317)
* Gyroid infill type (from slic3rPE#733)

* adaptation

* debug gyroid

* Change a few comments to be doxygen comments.

* Use doxygen comments.
2018-02-24 17:54:35 -06:00
platsch
6dd400914e Removed factor 4 from layer height gradation, don't apply min/max layer height limitation after gradation. Fixes #4235 (#4241) 2017-12-21 10:39:47 -06:00
platsch
93c898f4bc apply conditional gcode parser to tool change gcode (#4229)
* apply conditional gcode parser to tool change gcode

* provide [previous_retraction] and [next_retraction] in toolchange gcode and [current_retraction] in layer change gcode
2017-12-21 10:38:17 -06:00
Joseph Lenox
3a29aeccd9 Fix label for support material interface width. 2017-10-22 23:03:16 -05:00
Can Geliş
a553d6de3d New configuration for support material interface extrusion width (#4086)
* different configuration for support material interface extrusion width

* add test for support material interface extrusion width
2017-10-21 17:16:49 -05:00
Shien Yang Lee
dc6cfffae4 Added option to manually reorder sequentially printed objects via plater (#4153)
* Added option to tell Slic3r CLI to not arrange at all.

* Implement manual override to object printing order during sequential printing.

* Undo accidental merge of pull request #4146 from alexrj/Slic3r.git
2017-10-16 23:08:13 -05:00
Joseph Lenox
e6c715cad2 Merge branch 'adaptive-slicing' into merge-adaptive
# Conflicts:
#	xs/src/libslic3r/Model.cpp
#	xs/src/libslic3r/Model.hpp
2017-09-24 13:39:28 -05:00
Joseph Lenox
29d2159e29 Increased maximum baud rate for serial connections to 500k for those of you who like to live dangerously. Fixes #4131 2017-09-24 12:52:31 -05:00
Ahmed Samir
5cd9ecbe57 [GSoC 2017] Support 3MF Format Read/Write. (#4046)
* Include Miniz library in xs/src/miniz  and update CMakeLists.txt in /src

* Save porgress before merging from Slic3r upstream

* Add CLI --export-3mf option.

* Create the TMF Class.

* call IO::TMF:write function with the read model and the output file in slic3r.cpp
Fix miniz.c error:
 * Miniz source functions were included more than once (once during TMF.cpp and once during compiling miniz.c in /xs/src/miniz.
 * Miniz is a header file library.
 * Solution was to add #define MINIZ_HEADER_FILE_ONLY to include the header part of the single header library miniz.c.

* - Create a Zip archive contating a 3dmodel.model file conatining a basic string.
- Remove #define #define MINIZ_HEADER_FILE_ONLY in the previous commit ( It's not the solution)

* Write Model metadata element to the 3MF zip file.

* Renaming miniz.c to miniz.h,  if you want to include it in other file use #define MINIZ_HEADER_FILE_ONLY before including it.

* Adding zip lib as a wrapper

* Adding zip lib files

* Fix CMakeLists.txt zip library error:
Add zip lib to target_link_libraries.

* Add 3MF Read/Write Structure.
I think this makes TMF read/write more modular.

* Fix some errors in TMF.cpp

* Write ModelMaterial according to 3MF core specification.
fix some typos and variable names.

* Add 3MF Types and OPC relationships.
* Write types in "[Content_Types].xml" at /
* Create "_rels" folder at /

* Write for each Object its mesh vertices element in 3MF Document.

* Write Model Volumes of each object in the 3MF Document.
* write <triangles> element representing the volumes of each object.

* * Refactoring removed Camel Case style.
* Adding ModelObject part number attribute (Specific to the new 3MF format).

* Write 3MF Relationships in the zip archive.

* * Remove the first extension from the exported file name.

* Add partnumber to the constructor.

* Fix ContentTypes.xml file causing 3D Builder not to load the file.
* xmlns schema link added to < Types > element.

* * Write Slic3r metadata version.
* Write ModelMaterials custom config data.

* * Write ModelObject Slic3r custom configs data.
* Some Refactoring.

* * Write ModelVolume Sli3r custom configs to the 3MF Document.

* * Write ModelInstances to the 3MF Document and small refactoring

* * Fix ModelInstance transformation matrix in < build > element. The problem was that 3MF 3d matrices were row major matrices.

* Some Refactoring:
* Add namspaces as constant map<string, string> carrying name of namspace and the link to the namespace.

* *Fix std::map namespaces. I was using [] operator to access the map values but according to c++11 I must use .at(key) to compile.

* * Write colorgroup elements in Material Extension to 3MF core specs:
	* Created color_group attribute in Model class.
	* Created material_group attribute in ModelMaterial class. It's by default 0 whuch means basematerial or AMF read material.

* * Fix CMakeLists.txt zip target link libraries.

* Add data structure for 3MF Material Extension.

* Fix slic3r.cpp whitespace issues.

* Split TMFEditor class into TMF.hpp and TMF.cpp files

* Remove color groups attribute and put all material groups in the 3MF extension into one structure.

* Fix temprory Zip lib.
Modify TMFEditor class pivate and public memebers.

* Some Refactoring.
Make remove any extension not just the last one.

* Add a unit test case for write function.
Some refactoring

* Fix some issues found in the basic 3mf unit test case for TMF::write.

* Forget to change 2 lines in 23_3mf.t

* Some Refactoring

* Remove basename function in zip.c hoping the build pass.
Refactoring in the 23_3mf.t

* Add another test case for wrting a model containing  materials.

* Add SplitPyramid.amf test file in xs/t/amf

* Add basic TMFParserContext struct for reading 3MF XML model file.

* Add Expat handlers.

* Add member functions to TMFParserContext struc: startElement, endElement, characters and stop.

* Add 3mf extension to Model::read_from_file function
Ajust comments according to Doxygen syntax

* * ad model metadata
* Extract the 3dmodel.model file to disc.
* Read the extracted file using Expat XML er.

* Read basematerials found in the 3MF core specifications.
Fix some errors in reading metadata.
Add TMFEditor::read_model() function.

* Change material data structure to include all 3MF materials including (basematerials, m:colorgroups, etc)

* Read Object vertices.
Fix errors during reading basematerial.

* Read object mesh.

* Some Refactoring in TMFParserContext and TMF::Editor

* Read Objects (Objects with meshes, and objects containing other objects -components-)

* Read Build items (ModelInstances) without applying transformations yet.

* * Read scale and translations values from the transformation affine matrix found in the component tag.
* Some refactoring

* Get the rotaion Euler angles from the transformation matrix.

* Fix to get_transformation

* Fix metadata lost due to not copying them in the copy constructor.

* Read Slic3r custom config keys for ModelObjects.
Modify write Slic3r custom configs for ModelObject

* Read Slic3r custom configs of ModelVolumes.

* Refactor applying tranformation matri

* Fix in  reading 3mf format where wrong objects are deleted from the model

* Fix in 3MF read: When reading component tags.
When adding a component to the current object we first copy the object refered by objectid in component tag, then apply transformation to the copied object
then get the mesh of that object and finally delete this object copy and add that mesh to the current object.

* Write model metadata in descending order to make title appear first.

* Refactoring: Remove all assertions in 3MF read and replace it with TMFParserContext::stop() as if assertion fails the extracted 3dmodel.model file won't be deleted.

* Read basematerials in the original model materials map.
Remove the added model material groups.

* Fix fatal error in adding volume when reading 3MF model file.
The end offset should be equal to the size of facets minus one.

* Read color groups.

* some refactoring

* * Some fixes.

* Add model instance x, y rotations and (x,y,z) scaling.(Still working on them).

* Add translation z in the model instance.
Add x, y rotation to the model instance copy constructor.

* Fixes in writing slicer:volume tag

* Remove some todos.

* Improve write materials to adopt groups

* Some Fixes

* Some Fixes

* Read Slic3r materials custom print configs.

* Add basic test for 3mf read.

* Add another test for TMF::read().

* Revert change in slic3r.pl file and removed .DS_store files

* Use initialize list in TMFEditor constructor.
Add a new line in the end of slic3r.cpp

* Add partnumber to ModelObject::swap() function called by assignment operator.

* Deleted xs/t/3mf/.DS_Store

* Removed appling 3mf translation in the z_axis to the model instances.

* Add X&Y rotations, z_translation in 3D, 3D previews and layers plater. To be applied when duplicating objects, etc.

* Add the parent object part number to the split objects.

* Initialize Model metadata.
Add 2 STL test files.
Add all 3d model test files in xs/models folder.

* Add 3mf test (convert from/to STL).
Add partnumber in Model.xsp

* Changed material groups enum to scoped enums.
Fix a typo in 23_3mf.t

* Fix in 23_3mf.test.

* Include X&Y rotation angles, scaling vector in the transformation matrix in item tag.

* Add 3MF file extension to GUI.

* Fix reading slic3r:volume tag in 3mf document.

* Add X&Y rotations, scaling vecotr in the 2D platter. Those 3mf transformation parameters are applied in 2D, 3D, 3D preview and 2D toolpaths platters.

* Remove support for 3MF materials. The materials in 3mf are found at the object level and at the triangle level but not found at the volume level. They are not really useful in our case.

* Remove some warnings and add transformation matrix test.

* Remove headers included for IDE suggestions

* Some enhancements

* Some enhancements

* Fix a bug.

* Remove hardcoded Slic3r version & some enhancements.

* Add another test to 3mf and some enhancements.

* Remove models which became not used in 3mf tests.

* Small change in apply_transformation for model instance in tmf.cpp.

* Some Refactoring to TMF.cpp

* Remove size_t in for loops and use const auto ModelObject or ModelVolume in TMFEditor::write()
Some refactoring.

* Use nullptr instead of NULL in TMFEditor.

* Initialize  TMFParserContext data memebers instead of calling std::vector clear() function.

* Fix a typo caused by refactoring

* Add Export plate with modifiers as 3MF and Export object with modifiers as 3MF options to Slic3r GUI.

* * Remove zip library.
* Add Slic3r::ZipArchive class to handle creating zip files.

* Add extract_entry function to ZipArchive class

* * Modify TMF::write to adapt the new zip wrapper.
* Improvements in ZipArchive.

* * Improve TMFEditor:write by removing to_string template function aw we are using now ofstream.

* * Split ZipArchive class to .cpp and .hpp
* Add Doxygen documentation to ZipArchive class.
* Update MANIFEST file/
* Update CMakeLists.txt file

* * Some improvements to ZipArchive.

* Fix the failing 3MF test on windows.The problem was the end line is manipulated on windows as \r\n

* Add 3mf test files to MANIFEST file.
2017-09-04 21:40:50 +02:00
Can Gelis
98e0b81445 make --has-heatbed to compatible with other cli arguments 2017-08-12 14:50:32 +03:00
Can Gelis
6d9279db72 add --bed-shape cli arg 2017-08-12 14:49:29 +03:00
Florens Wasserfall
c0dfffe0ff Merge branch 'master' into adaptive-slicing 2017-06-21 15:49:24 +02:00
Alessandro Ranellucci
2ee32bb244 Added new option for additional overlap between regions printed with distinct extruders or settings 2017-06-19 11:25:11 +02:00
eMAKER
1c74067da0 Octoprint settings functionality expanded to allow upload to RepRapFi… (#4028)
* Octoprint settings functionality expanded to allow upload to RepRapFirmware on a Duet controller.

* octoprint_host renamed to print_host to enhance code readability.

Fixes #4022
2017-06-15 20:54:27 -05:00
Joseph Lenox
375b334ad8 Bugfixes: Fix CLI definition for printer notes and remove dupe qw() 2017-06-03 19:58:18 -05:00
Joseph Lenox
e064fdf170 Added notes to beginning of output gcode.
Order is Print -> Filament -> Printer.
Empty fields should not produce any output.

Also a bugfix - Printer notes were implemented as Strings when should have been String.
2017-06-03 19:26:58 -05:00
Alessandro Ranellucci
9d1d5ccee9 Minor fixes about config and presets 2017-05-21 00:06:28 +02:00
Alessandro Ranellucci
dd6864314d Merge branch 'master' into gui3-shortcuts 2017-05-20 16:19:33 +02:00
Alessandro Ranellucci
97cf94c694 Fixed error in last commit preventing compilation 2017-05-09 23:54:05 +02:00
Alessandro Ranellucci
a06b11db8e Bugfix: gap_fill_speed didn't actually support autospeed. #3696 2017-05-09 16:05:02 +02:00
Alessandro Ranellucci
b762b38af0 Removed bad label 2017-05-04 23:40:19 +02:00
Alessandro Ranellucci
6382af2b65 Gracefully transform support_material_threshold = 0 into the default value instead of emitting an error. #3837 2017-05-01 19:09:06 +02:00
Florens Wasserfall
8e6cb40140 Add category to adaptive slicing config options 2017-04-19 10:12:01 +02:00
Florens Wasserfall
57826c9262 Merge branch 'master' into adaptive-slicing 2017-04-19 09:29:23 +02:00
Alessandro Ranellucci
19a36cfda5 Rename 'overridable' to 'shortcuts' and change semantics accordingly: options in plater update the selected preset automatically instead of overriding it 2017-04-17 20:11:17 +02:00
Florens Wasserfall
8f2ff28cd9 replace quality option with percent based scale and use option sliders 2017-04-05 11:06:17 +02:00
Alessandro Ranellucci
5d1f6a632a Make the PrintConfigDef instances const 2017-04-04 23:28:53 +02:00
Alessandro Ranellucci
bc96a1a268 New customizable G-code to be added between objects when using sequential printing. (by @lordofhyphens) #3264 #3275 2017-04-04 18:51:06 +02:00
Florens Wasserfall
f43e004f44 Merge branch 'master' into adaptive-slicing-spline
and added Spline variable to ModelObject
2017-04-03 18:01:06 +02:00
Joseph Lenox
c110a9d517 Adds printer notes item and tab. Fixes #3806 2017-04-02 23:35:20 -05:00
Alessandro Ranellucci
3271010226 Write mm^3/s to the G-code comments 2017-04-01 10:19:14 +02:00
Florens Wasserfall
f6616329a2 Ported adaptive slicing to C++
and merge branch 'slice_xs' into adaptive-slicing-spline to call adaptive slicing algorithm from _slice
2017-03-28 08:44:11 +02:00
bubnikv
cc1ddc5770 A new feature "support_material_buildplate_only" implemented.
Also a bug has been fixed for zero interface layers. Before
slic3r would put infinite number of interface layers over top surfaces,
if the number of interface layers was set to zero.
2017-03-26 13:54:03 -05:00
Alessandro Ranellucci
815141f75e Merge remote-tracking branch 'origin/master' into gui3 2017-03-26 15:06:12 +02:00
Alessandro Ranellucci
2fc8152e24 Add 57600 baud. #3782 2017-03-25 19:25:32 +01:00
Alessandro Ranellucci
93c298f7ac Include all Print options in the overridable options list. #3770 2017-03-25 19:18:41 +01:00
Alessandro Ranellucci
745911e0c8 Minor label fix 2017-03-21 21:28:05 +01:00
Alessandro Ranellucci
c2d933382a Add nice icons to the dropdown override menu 2017-03-21 21:16:14 +01:00
Alessandro Ranellucci
1fadfd6fb8 Merge remote-tracking branch 'origin/master' into gui3
Conflicts:
	lib/Slic3r/GUI.pm
	lib/Slic3r/GUI/Plater.pm
	lib/Slic3r/GUI/PresetEditor.pm
	slic3r.pl
	xs/src/libslic3r/Config.cpp
	xs/src/libslic3r/Config.hpp
2017-03-20 17:00:42 +01:00
Joseph Lenox
35be0eefef Remove boost references from Config.hpp (this does not work on Windows!) 2017-03-18 11:44:06 -05:00
Alessandro Ranellucci
e7c854c919 Ported Config::_handle_legacy() to XS 2017-03-18 11:29:48 +01:00
Alessandro Ranellucci
d8a8e0d1c1 Rename/alias --overhangs to --detect-bridging-perimeters to match better the name used in GUI. #3532 2017-03-17 21:45:36 +01:00
Alessandro Ranellucci
94ed08c14d Make width and speed options readable again in the override panel 2017-03-17 17:13:53 +01:00
Alessandro Ranellucci
a1c7b65741 Moved threads option from print settings to application preferences 2017-03-17 16:41:34 +01:00
Alessandro Ranellucci
b50417cb20 Cosmetic improvements 2017-03-17 16:03:58 +01:00
Alessandro Ranellucci
5d77c160c6 Changes to the GUI. New preset editor dialog. Option overrides in plater and between configs. More. 2017-03-17 01:22:54 +01:00
Alessandro Ranellucci
53fee67489 New experimental option z_steps_per_mm. #1827 2017-03-14 16:46:11 +01:00
Alessandro Ranellucci
4b4a0c8a5c Split external_fill_pattern into top_infill_pattern and bottom_infill_pattern. Retrocompatibile change. #945 2017-03-12 13:01:14 +01:00
Alessandro Ranellucci
795a3d06fa Only enable ooze_prevention when print uses more than one extruder. #3334 2017-03-12 11:02:34 +01:00