39 Commits

Author SHA1 Message Date
Joseph Lenox
add7e2c369 Add basic export option tests to cppcli. 2018-11-25 11:55:57 -06:00
Alessandro Ranellucci
0eb3ea7253 Auto-generate CLI help (includes some refactoring to ConfigDef and ConfigOptionDef) 2018-11-25 11:55:57 -06:00
Alessandro Ranellucci
3b2c9cbf7d Finish porting export_gcode() - atomic write and post-processing scripts 2018-11-25 11:55:57 -06:00
Alessandro Ranellucci
a1464a737e Validate CLI config options against min/max 2018-11-25 11:55:57 -06:00
Alessandro Ranellucci
bb29661a90 Redesigned C++ CLI 2018-11-25 11:55:57 -06:00
ElectroQuanta
f337fdcc62 FIX: check bounds for fill->min_spacing causing fill_density<100 to abort (#4524)
* FIX: check bounds for fill->min_spacing causing fill_density<100 to abort

* Added time-stamping to SVG files

* Delete .gitignore

* Revert "Added time-stamping to SVG files"

This reverts commit 625ad15b50fc0b5acc3011cfb1dfdc826ba78a4e.

* Set a sane default instead of aborting.

* Don't return status

If there's an exceptional condition, should use exceptions instead.

* Changing to not return bool.
2018-08-31 22:22:49 -05:00
ElectroQuanta
446811a426 Added print CLI options in addition to the print ones 2018-08-24 00:48:55 +01:00
Joseph Lenox
4875ce641c Cover an issue if not built with GUI and --gui is passed. 2018-08-05 20:52:18 -05:00
Joseph Lenox
e06d33180c Added primitive --help that reads DynamicPrintConfig options directly.
Should slice and generate gcode for STL files now.
2018-08-05 20:44:46 -05:00
Joseph Lenox
ee71f8b8f8 Removed duplicate slic3r.cpp (was already in utils) 2018-07-15 00:13:04 -05:00
Joseph Lenox
b69b47b8e2 Last pieces of refactor 2018-07-11 22:14:51 -05:00
Joseph Lenox
3af915719d don't build WX if it can't be found 2018-07-11 22:14:51 -05:00
Joseph Lenox
b419d06cb4 Finish renaming Config->ConfigBase in libSlic3r to make room for a Slic3r::Config that has an interface closer to the Perl version. 2018-07-11 22:14:51 -05:00
Joseph Lenox
1f40fcb322 Tab panel initializes. 2018-07-11 22:14:51 -05:00
Joseph Lenox
1f9cef4345 Stubbing out more of the UI. 2018-07-11 22:14:51 -05:00
Joseph Lenox
be580fc9ee experiment to stub out C++ only GUI 2018-07-11 22:14:51 -05:00
Joseph Lenox
7bf852201f Use input name for cut. Also use find_last_of() instead of find_first_of() to properly capture names with periods in them.
Fixes #4136
2017-09-28 23:53:56 -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
Alessandro Ranellucci
9ddc0ff451 Merge branch 'master' into utf8 2017-05-19 10:47:31 +02:00
Alessandro Ranellucci
6b68b71c78 Use C++ range-based iterations in slic3r.cpp and remove unused variables 2017-05-18 16:51:50 +02:00
Alessandro Ranellucci
31115e0369 Use UTF-8 in libslic3r. Future-proof portable solution for non-ASCII files. #2955 2017-05-18 16:50:50 +02:00
Alessandro Ranellucci
ff6baf89ae Use C++ range-based iterations in slic3r.cpp and remove unused variables 2017-05-17 21:05:14 +02:00
Alessandro Ranellucci
22ba87c3b3 Finished porting importers and read_from_file() to C++ 2017-03-01 22:19:30 +01:00
Alessandro Ranellucci
5cbdb7865d Cut by Grid also in GUI 2016-12-18 13:10:25 +01:00
Alessandro Ranellucci
d0f22196ad New --rotate-x and --rotate-y CLI options 2016-12-18 00:42:43 +01:00
Alessandro Ranellucci
27e456039c New --cut-grid command for cutting a mesh in multiple tiles according to a XY grid 2016-12-17 20:30:40 +01:00
Alessandro Ranellucci
a778cd9820 Cut along X and Y axes too 2016-12-17 19:51:29 +01:00
Alessandro Ranellucci
6575a15cf7 Bugfix: --rotate did not support decimal values and interpreted them as radians. #3460 2016-12-17 00:02:21 +01:00
Alessandro Ranellucci
cba3b19be4 Handle input file errors gracefully 2016-11-29 19:25:08 +01:00
Alessandro Ranellucci
4ac7f6e8f1 Refactoring: rename SVGExport to SLAPrint 2016-11-23 15:51:12 +01:00
Alessandro Ranellucci
68acf19c09 New --scale-to-fit option in slic3r.cpp 2016-10-18 10:22:34 +02:00
Alessandro Ranellucci
30139fd647 Port --load and --save to XS 2016-07-17 16:53:37 +02:00
Alessandro Ranellucci
c2b06b22aa Change output format for --info 2016-07-17 13:13:51 +02:00
Alessandro Ranellucci
437e9be329 Fix sizes of SVG output 2016-07-09 15:30:31 +02:00
Alessandro Ranellucci
0b79b971e8 New --export-pov option (C++ only) 2016-07-09 14:12:01 +02:00
Alessandro Ranellucci
5cfaea8a7f Ported --info to C++ 2016-07-09 10:31:52 +02:00
Alessandro Ranellucci
7f2e774584 Removed dependency on TClap 2016-07-03 10:15:46 +02:00
Alessandro Ranellucci
64da78788b Added --export-obj to slic3r.cpp. Some refactoring included 2016-06-22 17:45:10 +02:00
Kliment Yanev
d8ef6e9cc1 Mirror output SVG in X to conform to SVG and STL coordinate systems having opposite handedness
Moved standalone-specific files to /src from /xs/src so xs will not try to build them
Modified CMakeLists to match.
2016-06-01 16:16:01 +02:00