Fix modulo by size of lines

All lines have size 2, which is why it was never a problem, but in theory if the polygon has a different line size it will now work correctly.

Contributes to issue CURA-329.

.gitignore

@@ -11,26 +11,11 @@ NUL
 build/*
 *.pyc
 *.exe
-*.a
 *.o
 CuraEngine
 _bin
 _obj
 
-## CMake files
-cmake_install.cmake         
-CMakeCache.txt
-CMakeFiles/
-CPackSourceConfig.cmake
-
-# Visual Studio files generated by CMake
-*.vcxproj
-*.vcxproj.filters
-CuraEngine.sln
-
-# Makefile generated by CMake
-Makefile
-
 ## IDE project files.
 CuraEngine.layout
 CuraEngine.cbp
@@ -47,4 +32,3 @@ documentation/latex/*
 
 ## Test results.
 tests/output.xml
-callgrind.out.*

CMakeLists.txt

@@ -2,14 +2,7 @@ project(CuraEngine)
 
 cmake_minimum_required(VERSION 2.8.12)
 
-option (ENABLE_ARCUS
-    "Enable support for ARCUS" ON)
-
-if (ENABLE_ARCUS)
-    message(STATUS "Building with Arcus")
-    find_package(Arcus REQUIRED)
-    add_definitions(-DARCUS)
-endif ()
+find_package(Arcus REQUIRED)
 
 if(NOT ${CMAKE_VERSION} VERSION_LESS 3.1)
     set(CMAKE_CXX_STANDARD 11)
@@ -28,11 +21,9 @@ set(CURA_ENGINE_VERSION "master" CACHE STRING "Version name of Cura")
 option(BUILD_TESTS OFF)
 
 # Add a compiler flag to check the output for insane values if we are in debug mode.
-if(CMAKE_BUILD_TYPE MATCHES DEBUG OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-    message(STATUS "Building debug release of CuraEngine.")
-    add_definitions(-DASSERT_INSANE_OUTPUT)
-    add_definitions(-DUSE_CPU_TIME)
-    add_definitions(-DDEBUG)
+if(CMAKE_BUILD_TYPE MATCHES DEBUG)
+	message(STATUS "Building debug release of CuraEngine.")
+	add_definitions(-DASSERT_INSANE_OUTPUT)
 endif()
 
 # Add warnings
@@ -48,17 +39,15 @@ add_library(clipper STATIC libs/clipper/clipper.cpp)
 
 set(engine_SRCS # Except main.cpp.
     src/bridge.cpp
+    src/comb.cpp
     src/commandSocket.cpp
-    src/ConicalOverhang.cpp
-    src/ExtruderTrain.cpp
     src/FffGcodeWriter.cpp
     src/FffPolygonGenerator.cpp
     src/FffProcessor.cpp
     src/gcodeExport.cpp
-    src/GCodePathConfig.cpp
     src/gcodePlanner.cpp
     src/infill.cpp
-    src/WallsComputation.cpp
+    src/inset.cpp
     src/layerPart.cpp
     src/LayerPlanBuffer.cpp
     src/MergeInfillLines.cpp
@@ -66,16 +55,17 @@ set(engine_SRCS # Except main.cpp.
     src/MeshGroup.cpp
     src/multiVolumes.cpp
     src/pathOrderOptimizer.cpp
-    src/Preheat.cpp
     src/PrimeTower.cpp
+    src/Progress.cpp
     src/raft.cpp
+    src/settingRegistry.cpp
+    src/settings.cpp
     src/skin.cpp
-    src/SkirtBrim.cpp
+    src/skirt.cpp
     src/sliceDataStorage.cpp
     src/slicer.cpp
     src/support.cpp
     src/timeEstimate.cpp
-    src/WallsComputation.cpp
     src/wallOverlap.cpp
     src/Weaver.cpp
     src/Wireframe2gcode.cpp
@@ -86,55 +76,25 @@ set(engine_SRCS # Except main.cpp.
     src/infill/ZigzagConnectorProcessorEndPieces.cpp
     src/infill/ZigzagConnectorProcessorNoEndPieces.cpp
 
-    src/pathPlanning/Comb.cpp
-    src/pathPlanning/LinePolygonsCrossings.cpp
-
-    src/progress/Progress.cpp
-    src/progress/ProgressStageEstimator.cpp
-
-    src/settings/SettingConfig.cpp
-    src/settings/SettingContainer.cpp
-    src/settings/SettingRegistry.cpp
-    src/settings/settings.cpp
-
-    src/utils/AABB.cpp
-    src/utils/AABB3D.cpp
-    src/utils/Date.cpp
     src/utils/gettime.cpp
-    src/utils/LinearAlg2D.cpp
-    src/utils/ListPolyIt.cpp
     src/utils/logoutput.cpp
-    src/utils/PolygonProximityLinker.cpp
     src/utils/polygonUtils.cpp
     src/utils/polygon.cpp
-    src/utils/ProximityPointLink.cpp
 )
 
 # List of tests. For each test there must be a file tests/${NAME}.cpp and a file tests/${NAME}.h.
 set(engine_TEST
-    GCodePlannerTest
-)
-set(engine_TEST_INFILL
-)
-set(engine_TEST_UTILS
-    SparseGridTest
+	GCodePlannerTest
     LinearAlg2DTest
-    PolygonUtilsTest
-    PolygonTest
-    StringTest
+    TravellingSalesmanTest
 )
 
-# Generating ProtoBuf protocol
-if (ENABLE_ARCUS)
+# Generating ProtoBuf protocol.
 protobuf_generate_cpp(engine_PB_SRCS engine_PB_HEADERS Cura.proto)
-endif ()
 
 # Compiling CuraEngine itself.
 add_library(_CuraEngine ${engine_SRCS} ${engine_PB_SRCS}) #First compile all of CuraEngine as library, allowing this to be re-used for tests.
-target_link_libraries(_CuraEngine clipper)
-if (ENABLE_ARCUS)
-    target_link_libraries(_CuraEngine Arcus)
-endif ()
+target_link_libraries(_CuraEngine clipper Arcus)
 
 set_target_properties(_CuraEngine PROPERTIES COMPILE_DEFINITIONS "VERSION=\"${CURA_ENGINE_VERSION}\"")
 
@@ -153,24 +113,9 @@ if (BUILD_TESTS)
         target_link_libraries(${test} _CuraEngine cppunit)
         add_test(${test} ${test})
     endforeach()
-    foreach (test ${engine_TEST_INFILL})
-        add_executable(${test} tests/main.cpp tests/infill/${test}.cpp)
-        target_link_libraries(${test} _CuraEngine cppunit)
-        add_test(${test} ${test})
-    endforeach()
-    foreach (test ${engine_TEST_UTILS})
-        add_executable(${test} tests/main.cpp tests/utils/${test}.cpp)
-        target_link_libraries(${test} _CuraEngine cppunit)
-        add_test(${test} ${test})
-    endforeach()
 endif()
 
-
-add_custom_command(TARGET CuraEngine POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                       ${CMAKE_SOURCE_DIR}/resources $<TARGET_FILE_DIR:CuraEngine>)
-
 # Installing CuraEngine.
 include(GNUInstallDirs)
 install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR})
-include(CPackConfig.cmake)
+include(CPackConfig.cmake)

Cura.proto

@@ -2,27 +2,20 @@ syntax = "proto3";
 
 package cura.proto;
 
-message ObjectList
+
+message ObjectList 
 {
     repeated Object objects = 1;
-    repeated Setting settings = 2; // meshgroup settings (for one-at-a-time printing)
+    repeated Setting settings = 2;
 }
 
+// typeid 1
 message Slice
 {
-    repeated ObjectList object_lists = 1; // The meshgroups to be printed one after another
-    SettingList global_settings = 2; // The global settings used for the whole print job
-    repeated Extruder extruders = 3; // The settings sent to each extruder object
-    repeated SettingExtruder limit_to_extruder = 4; // From which stack the setting would inherit if not defined per object
+    repeated ObjectList object_lists = 1;
 }
 
-message Extruder
-{
-    int32 id = 1;
-    SettingList settings = 2;
-}
-
-message Object
+message Object 
 {
     int64 id = 1;
     bytes vertices = 2; //An array of 3 floats.
@@ -31,17 +24,32 @@ message Object
     repeated Setting settings = 5; // Setting override per object, overruling the global settings.
 }
 
-message Progress
+// typeid 3
+message Progress 
 {
     float amount = 1;
 }
 
+// typeid 2
+message SlicedObjectList 
+{
+    repeated SlicedObject objects = 1;
+}
+
+message SlicedObject 
+{
+    int64 id = 1;
+
+    repeated Layer layers = 2;
+}
+
 message Layer {
     int32 id = 1;
-    float height = 2; // Z position
-    float thickness = 3; // height of a single layer
 
-    repeated Polygon polygons = 4; // layer data
+    float height = 2;
+    float thickness = 3;
+
+    repeated Polygon polygons = 4;
 }
 
 message Polygon {
@@ -56,69 +64,41 @@ message Polygon {
         SupportInfillType = 7;
         MoveCombingType = 8;
         MoveRetractionType = 9;
-        SupportInterfaceType = 10;
     }
-    Type type = 1; // Type of move
-    bytes points = 2; // The points of the polygon, or two points if only a line segment (Currently only line segments are used)
-    float line_width = 3; // The width of the line being laid down
+    Type type = 1;
+    bytes points = 2;
+    float line_width = 3;
 }
 
-message LayerOptimized {
-    int32 id = 1;
-    float height = 2; // Z position
-    float thickness = 3; // height of a single layer
-
-    repeated PathSegment path_segment = 4; // layer data
-}
-
-
-message PathSegment {
-    int32 extruder = 1; // The extruder used for this path segment
-    enum PointType {
-        Point2D = 0;
-        Point3D = 1;
-    }
-    PointType point_type = 2;
-    bytes points = 3; // The points defining the line segments, bytes of float[2/3] array of length N+1
-    bytes line_type = 4; // Type of line segment as an unsigned char array of length 1 or N, where N is the number of line segments in this path
-    bytes line_width = 5; // The widths of the line segments as bytes of a float array of length 1 or N
-}
-
-
+// typeid 4
 message GCodeLayer {
+    int64 id = 1;
     bytes data = 2;
 }
 
-
-message PrintTimeMaterialEstimates { // The print time for the whole print and material estimates for the extruder
-    float time = 1; // Total time estimate
-    repeated MaterialEstimates materialEstimates = 2; // materialEstimates data
-}
-
-message MaterialEstimates {
+// typeid 5
+message ObjectPrintTime {
     int64 id = 1;
-    float material_amount = 2; // material used in the extruder
+    float time = 2;
+    float material_amount = 3;
 }
 
+// typeid 6
 message SettingList {
     repeated Setting settings = 1;
 }
 
 message Setting {
-    string name = 1; // Internal key to signify a setting
+    string name = 1;
 
-    bytes value = 2; // The value of the setting
-}
-
-message SettingExtruder {
-    string name = 1; //The setting key.
-
-    int32 extruder = 2; //From which extruder stack the setting should inherit.
+    bytes value = 2;
 }
 
+// typeid 7
 message GCodePrefix {
-    bytes data = 2; //Header string to be prepended before the rest of the g-code sent from the engine.
+    bytes data = 2;
 }
 
+// typeid 8
 message SlicingFinished {
 }

Doxyfile

@@ -178,7 +178,7 @@ JAVADOC_AUTOBRIEF      = NO
 # requiring an explicit \brief command for a brief description.)
 # The default value is: NO.
 
-QT_AUTOBRIEF           = YES
+QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
 # multi-line C++ special comment block (i.e. a block of //! or /// comments) as
@@ -832,7 +832,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = docs/assets
+IMAGE_PATH             = documentation/assets
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program

README.md

@@ -19,54 +19,46 @@ But in general it boils down to: You need to share the source of any CuraEngine
 How to Install
 ==============
 1. Clone the repository from https://github.com/Ultimaker/CuraEngine.git (the URL at the right hand side of this page).
-2. Install Protobuf >= 3.0.0 (see below)
+2. Install Protobuf (see below)
 3. Install libArcus (see https://github.com/Ultimaker/libArcus)
 
 In order to compile CuraEngine, either use CMake or start a project in your preferred IDE. 
 CMake compilation:
 
 1. Navigate to the CuraEngine directory and execute the following commands
-2. ```$ mkdir build && cd build```
-3. ```$ cmake ..```
-4. ```$ make```
+2. $ mkdir build && cd build
+3. $ cmake ..
+4. $ make
 
 Project files generation:
-
 1. Navigate to the CuraEngine directory and execute the following commands
-2. ```cmake . -G "CodeBlocks - Unix Makefiles"```
+2. cmake . -G "CodeBlocks - Unix Makefiles"
 3. (for a list of supported IDE's see http://www.cmake.org/Wiki/CMake_Generator_Specific_Information#Code::Blocks_Generator)
 
 Installing Protobuf
 -------------------
 1. Be sure to have libtool installed.
-2. Download protobuf from https://github.com/google/protobuf/releases (download ZIP and unZIP at desired location, or clone the repo). The protocol buffer is used for communication between the CuraEngine and the GUI.
-3. Run ```autogen.sh``` from the protobuf directory: 
-   ```$ ./autogen.sh```
-4. ```$ ./configure```
-5. ```$ make```
-6. ```# make install```  
-   (Please note the ```#```. It indicates the need of superuser, as known as root, priviliges.)
-7. (In case the shared library cannot be loaded, you can try ```sudo ldconfig``` on Linux systems)
+2. Download protobuf from https://github.com/google/protobuf/ (download ZIP and unZIP at desired location, or clone the repo) The protocol buffer is used for communication between the CuraEngine and the GUI.
+3. Before installing protobuf, change autogen.sh : comment line 18 to line 38 using '#'s. This removes the dependency on gtest-1.7.0.
+4. Run autogen.sh from the protobuf directory: 
+   $ ./autogen.sh
+5. $ ./configure
+6. $ make
+7. $ make install     # Requires superused priviliges.
+8. (In case the shared library cannot be loaded, you can try "sudo ldconfig" on Linux systems)
 
 Running
 =======
 Other than running CuraEngine from a frontend, such as Ultimaker/Cura, one can run CuraEngine from the command line.
 For that one needs a settings JSON file, which can be found in the Ultimaker/Cura repository.
-Note that the structure of the json files has changed since 2.1. In the corresponding branch of the Cura repository you can find how the json files used to be structured.
-
 An example run for an UM2 machine looks as follows:
 * Navigate to the CuraEngine directory and execute the following
 ```
-./build/CuraEngine slice -v -j ../Cura/resources/definitions/dual_extrusion_printer.def.json -o "output/test.gcode" -e1 -s infill_line_distance=0 -e0 -l "/model_1.stl" -e1 -l "fully_filled_model.stl" 
+./build/CuraEngine slice -v -j ../Cura/resources/machines/dual_extrusion_printer.json -o "output/test.gcode" -e1 -s infill_line_distance=0 -e0 -l "/model_1.stl" -e1 -l "fully_filled_model.stl" 
 ```
 
 Run `CuraEngine help` for a general description of how to use the CuraEngine tool.
 
-[Set the environment variable](https://help.ubuntu.com/community/EnvironmentVariables) CURA_ENGINE_SEARCH_PATH to the appropriate paths, delimited by a colon e.g.
-```
-CURA_ENGINE_SEARCH_PATH=/path/to/Cura/resources/definitions:/user/defined/path
-```
-
 Internals
 =========
 

documentation/Link_to_index.html

@@ -0,0 +1 @@
+html/index.html

documentation/mainpage.md

@@ -7,4 +7,4 @@ This is the documentation for CuraEngine, the back-end slicer of Cura.
 
 [Glossary](documentation/glossary.md)
 
-[Code Conventions](https://github.com/Ultimaker/Meta/blob/master/code_conventions.md)
+[Code Conventions](documentation/code_conventions.md)

libs/clipper/License.txt

@@ -1,24 +1,26 @@
+The Clipper Library (including Delphi, C++ & C# source code, other accompanying
+code, examples and documentation), hereafter called "the Software", has been 
+released under the following license, terms and conditions:
+
 Boost Software License - Version 1.0 - August 17th, 2003
 http://www.boost.org/LICENSE_1_0.txt
 
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
+Permission is hereby granted, free of charge, to any person or organization 
+obtaining a copy of the Software covered by this license to use, reproduce, 
+display, distribute, execute, and transmit the Software, and to prepare 
+derivative works of the Software, and to permit third-parties to whom the 
+Software is furnished to do so, all subject to the following:
 
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
+The copyright notices in the Software and this entire statement, including the 
+above license grant, this restriction and the following disclaimer, must be 
+included in all copies of the Software, in whole or in part, and all derivative 
+works of the Software, unless such copies or derivative works are solely in the 
+form of machine-executable object code generated by a source language processor.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL 
+THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY 
+DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.

libs/clipper/README

@@ -1,39 +1,8 @@
 =====================================================================
 Clipper Change Log
 =====================================================================
-v6.2.1 (31 October 2014) Rev 482
-* Bugfix in ClipperOffset.Execute where the Polytree.IsHole property 
-  was returning incorrect values with negative offsets
-* Very minor improvement to join rounding in ClipperOffset
-* Fixed CPP OpenGL demo.
 
-v6.2.0 (17 October 2014) Rev 477
-* Numerous minor bugfixes, too many to list. 
-  (See revisions 454-475 in Sourceforge Repository)
-* The ZFillFunction (custom callback function) has had its parameters 
-  changed. 
-* Curves demo removed (temporarily).
-* Deprecated functions have been removed. 
-
-v6.1.5 (26 February 2014) Rev 460
-* Improved the joining of output polygons sharing a common edge 
-  when those common edges are horizontal.
-* Fixed a bug in ClipperOffset.AddPath() which would produce
-  incorrect solutions when open paths were added before closed paths.
-* Minor code tidy and performance improvement
-
-v6.1.4 (6 February 2014)
-* Fixed bugs in MinkowskiSum
-* Fixed minor bug when using Clipper.ForceSimplify.
-* Modified use_xyz callback so that all 4 vertices around an
-  intersection point are now passed to the callback function.
-
-v6.1.3a (22 January 2014) Rev 453
-* Fixed buggy PointInPolygon function (C++ and C# only). 
-  Note this bug only affected the newly exported function, the 
-  internal PointInPolygon function used by Clipper was OK.
- 
-v6.1.3 (19 January 2014) Rev 452
+v6.1.3 (19 January 2014)
 * Fixed potential endless loop condition when adding open 
   paths to Clipper.
 * Fixed missing implementation of SimplifyPolygon function 
@@ -44,11 +13,11 @@ v6.1.3 (19 January 2014) Rev 452
 * Overloaded MinkowskiSum function to accommodate multi-contour 
   paths.  
 
-v6.1.2 (15 December 2013) Rev 444
+v6.1.2 (15 December 2013)
 * Fixed broken C++ header file.
 * Minor improvement to joining polygons.
 
-v6.1.1 (13 December 2013) Rev 441
+v6.1.1 (13 December 2013)
 * Fixed a couple of bugs affecting open paths that could 
   raise unhandled exceptions.
   

libs/clipper/clipper.hpp

@@ -1,8 +1,8 @@
 /*******************************************************************************
 *                                                                              *
 * Author    :  Angus Johnson                                                   *
-* Version   :  6.2.1                                                           *
-* Date      :  31 October 2014                                                 *
+* Version   :  6.1.3a                                                          *
+* Date      :  22 January 2014                                                 *
 * Website   :  http://www.angusj.com                                           *
 * Copyright :  Angus Johnson 2010-2014                                         *
 *                                                                              *
@@ -34,7 +34,7 @@
 #ifndef clipper_hpp
 #define clipper_hpp
 
-#define CLIPPER_VERSION "6.2.0"
+#define CLIPPER_VERSION "6.1.3"
 
 //use_int32: When enabled 32bit ints are used instead of 64bit ints. This
 //improve performance but coordinate values are limited to the range +/- 46340
@@ -46,8 +46,9 @@
 //use_lines: Enables line clipping. Adds a very minor cost to performance.
 //#define use_lines
   
-//use_deprecated: Enables temporary support for the obsolete functions
-//#define use_deprecated  
+//use_deprecated: Enables support for the obsolete OffsetPaths() function
+//which has been replace with the ClipperOffset class.
+#define use_deprecated  
 
 #include <vector>
 #include <set>
@@ -56,7 +57,6 @@
 #include <cstdlib>
 #include <ostream>
 #include <functional>
-#include <queue>
 
 namespace ClipperLib {
 
@@ -69,16 +69,11 @@ enum PolyType { ptSubject, ptClip };
 enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative };
 
 #ifdef use_int32
-  typedef int cInt;
-  static cInt const loRange = 0x7FFF;
-  static cInt const hiRange = 0x7FFF;
+typedef int cInt;
+typedef unsigned int cUInt;
 #else
-  typedef signed long long cInt;
-  static cInt const loRange = 0x3FFFFFFF;
-  static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL;
-  typedef signed long long long64;     //used by Int128 class
-  typedef unsigned long long ulong64;
-
+typedef signed long long cInt;
+typedef unsigned long long cUInt;
 #endif
 
 struct IntPoint {
@@ -122,12 +117,15 @@ struct DoublePoint
 //------------------------------------------------------------------------------
 
 #ifdef use_xyz
-typedef void (*ZFillCallback)(IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt);
+typedef void (*TZFillCallback)(IntPoint& z1, IntPoint& z2, IntPoint& pt);
 #endif
 
 enum InitOptions {ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4};
 enum JoinType {jtSquare, jtRound, jtMiter};
 enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound};
+#ifdef use_deprecated
+  enum EndType_ {etClosed, etButt = 2, etSquare, etRound};
+#endif
 
 class PolyNode;
 typedef std::vector< PolyNode* > PolyNodes;
@@ -136,7 +134,6 @@ class PolyNode
 { 
 public:
     PolyNode();
-    virtual ~PolyNode(){};
     Path Contour;
     PolyNodes Childs;
     PolyNode* Parent;
@@ -171,6 +168,11 @@ bool Orientation(const Path &poly);
 double Area(const Path &poly);
 int PointInPolygon(const IntPoint &pt, const Path &path);
 
+#ifdef use_deprecated
+  void OffsetPaths(const Paths &in_polys, Paths &out_polys,
+    double delta, JoinType jointype, EndType_ endtype, double limit = 0);
+#endif
+
 void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
 void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
 void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
@@ -181,7 +183,8 @@ void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.
 void CleanPolygons(Paths& polys, double distance = 1.415);
 
 void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed);
-void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed);
+void MinkowskiSum(const Path& pattern, const Paths& paths, 
+  Paths& solution, PolyFillType pathFillType, bool pathIsClosed);
 void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution);
 
 void PolyTreeToPaths(const PolyTree& polytree, Paths& paths);
@@ -199,7 +202,7 @@ enum EdgeSide { esLeft = 1, esRight = 2};
 //forward declarations (for stuff used internally) ...
 struct TEdge;
 struct IntersectNode;
-struct LocalMinimum;
+struct LocalMinima;
 struct Scanbeam;
 struct OutPt;
 struct OutRec;
@@ -210,6 +213,7 @@ typedef std::vector < TEdge* > EdgeList;
 typedef std::vector < Join* > JoinList;
 typedef std::vector < IntersectNode* > IntersectList;
 
+
 //------------------------------------------------------------------------------
 
 //ClipperBase is the ancestor to the Clipper class. It should not be
@@ -232,14 +236,12 @@ protected:
   void PopLocalMinima();
   virtual void Reset();
   TEdge* ProcessBound(TEdge* E, bool IsClockwise);
+  void InsertLocalMinima(LocalMinima *newLm);
   void DoMinimaLML(TEdge* E1, TEdge* E2, bool IsClosed);
   TEdge* DescendToMin(TEdge *&E);
   void AscendToMax(TEdge *&E, bool Appending, bool IsClosed);
-
-  typedef std::vector<LocalMinimum> MinimaList;
-  MinimaList::iterator m_CurrentLM;
-  MinimaList           m_MinimaList;
-
+  LocalMinima      *m_CurrentLM;
+  LocalMinima      *m_MinimaList;
   bool              m_UseFullRange;
   EdgeList          m_edges;
   bool             m_PreserveCollinear;
@@ -266,7 +268,7 @@ public:
   void StrictlySimple(bool value) {m_StrictSimple = value;};
   //set the callback function for z value filling on intersections (otherwise Z is 0)
 #ifdef use_xyz
-  void ZFillFunction(ZFillCallback zFillFunc);
+  void ZFillFunction(TZFillCallback zFillFunc);
 #endif
 protected:
   void Reset();
@@ -277,8 +279,7 @@ private:
   JoinList          m_GhostJoins;
   IntersectList     m_IntersectList;
   ClipType          m_ClipType;
-  typedef std::priority_queue<cInt> ScanbeamList;
-  ScanbeamList      m_Scanbeam;
+  std::set< cInt, std::greater<cInt> > m_Scanbeam;
   TEdge           *m_ActiveEdges;
   TEdge           *m_SortedEdges;
   bool             m_ExecuteLocked;
@@ -288,7 +289,7 @@ private:
   bool             m_UsingPolyTree; 
   bool             m_StrictSimple;
 #ifdef use_xyz
-  ZFillCallback   m_ZFill; //custom callback 
+  TZFillCallback   m_ZFill; //custom callback 
 #endif
   void SetWindingCount(TEdge& edge);
   bool IsEvenOddFillType(const TEdge& edge) const;
@@ -307,19 +308,21 @@ private:
   bool IsTopHorz(const cInt XPos);
   void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2);
   void DoMaxima(TEdge *e);
+  void PrepareHorzJoins(TEdge* horzEdge, bool isTopOfScanbeam);
   void ProcessHorizontals(bool IsTopOfScanbeam);
   void ProcessHorizontal(TEdge *horzEdge, bool isTopOfScanbeam);
   void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
   OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
   OutRec* GetOutRec(int idx);
   void AppendPolygon(TEdge *e1, TEdge *e2);
-  void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt);
+  void IntersectEdges(TEdge *e1, TEdge *e2,
+    const IntPoint &pt, bool protect = false);
   OutRec* CreateOutRec();
   OutPt* AddOutPt(TEdge *e, const IntPoint &pt);
   void DisposeAllOutRecs();
   void DisposeOutRec(PolyOutList::size_type index);
-  bool ProcessIntersections(const cInt topY);
-  void BuildIntersectList(const cInt topY);
+  bool ProcessIntersections(const cInt botY, const cInt topY);
+  void BuildIntersectList(const cInt botY, const cInt topY);
   void ProcessIntersectList();
   void ProcessEdgesAtTopOfScanbeam(const cInt topY);
   void BuildResult(Paths& polys);
@@ -341,7 +344,7 @@ private:
   void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec);
   void FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec);
 #ifdef use_xyz
-  void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2);
+  void SetZ(IntPoint& pt, TEdge& e);
 #endif
 };
 //------------------------------------------------------------------------------

meta/HOWTO.txt

@@ -1,19 +0,0 @@
-find engine setting literals
-
-
-cd ~/Development/CuraEngine/output/reflection/
-
-~/bin/substitute.pl y 'while(/getSetting\w+\("(\w+)"\)/gsm) { print "$1\n"; }' ../../src/ | sort | uniq > engineSettingLiterals.txt
-
-
-run setting inheritance reflection
-
-cd ~/Development/CuraEngine
-./build/CuraEngine analyse ../Cura/resources/definitions/fdmprinter.def.json meta/refl_ff.gv output/reflection/engineSettingLiterals.txt -piew
-
-dot meta/refl_ff.gv -Tpng > meta/rafl_ff_dotted.png
-
-
-green block = used in engine
-red edge = inherit function only
-black edge = parent-child relation

src/ConicalOverhang.cpp

@@ -1,35 +0,0 @@
-/** Copyright (C) 2016 Tim Kuipers - Released under terms of the AGPLv3 License */
-#include "ConicalOverhang.h"
-
-
-namespace cura {
-
-
-void ConicalOverhang::apply(Slicer* slicer, double angle, int layer_thickness)
-{
-    double tanAngle = tan(angle);  // the XY-component of the angle
-    int max_dist_from_lower_layer = tanAngle * layer_thickness; // max dist which can be bridged
-
-    for (unsigned int layer_nr = slicer->layers.size() - 2; static_cast<int>(layer_nr) >= 0; layer_nr--)
-    {
-        SlicerLayer& layer = slicer->layers[layer_nr];
-        SlicerLayer& layer_above = slicer->layers[layer_nr + 1];
-        if (std::abs(max_dist_from_lower_layer) < 5)
-        { // magically nothing happens when max_dist_from_lower_layer == 0
-            // below magic code solves that
-            int safe_dist = 20;
-            Polygons diff = layer_above.polygons.difference(layer.polygons.offset(-safe_dist));
-            layer.polygons = layer.polygons.unionPolygons(diff);
-            layer.polygons = layer.polygons.smooth(safe_dist);
-            layer.polygons.simplify(safe_dist, safe_dist * safe_dist / 4);
-            // somehow layer.polygons get really jagged lines with a lot of vertices
-            // without the above steps slicing goes really slow
-        }
-        else
-        {
-            layer.polygons = layer.polygons.unionPolygons(layer_above.polygons.offset(-max_dist_from_lower_layer));
-        }
-    }
-}
-
-}//namespace cura

src/ConicalOverhang.h

@@ -1,30 +0,0 @@
-/** Copyright (C) 2016 Tim Kuipers - Released under terms of the AGPLv3 License */
-#ifndef CONICAL_OVERHANG_H
-#define CONICAL_OVERHANG_H
-
-#include "slicer.h"
-
-
-namespace cura {
-
-
-/*!
- * A class for changing the geometry of a model such that it is printable without support -
- * Or at least with at least support as possible
- */
-class ConicalOverhang
-{
-public:
-    /*!
-     * Change the slice data such that the model becomes more printable
-     * 
-     * \param[in,out] slicer The slice data
-     * \param angle The maximum angle which can be printed without generating support (or at least generating least support)
-     * \param layer_thickness The general layer thickness
-     */
-    static void apply(Slicer* slicer, double angle, int layer_thickness);
-};
-
-}//namespace cura
-
-#endif // CONICAL_OVERHANG_H

src/ExtruderTrain.cpp

@@ -1,27 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#include "ExtruderTrain.h"
-
-namespace cura 
-{
-int ExtruderTrain::getExtruderNr()
-{
-    return extruder_nr;
-}
-ExtruderTrain::ExtruderTrain(SettingsBaseVirtual* settings, int extruder_nr)
-: SettingsBase(settings)
-, extruder_nr(extruder_nr)
-{
-}
-
-bool ExtruderTrain::getIsUsed() const
-{
-    return is_used;
-}
-
-void ExtruderTrain::setIsUsed(bool used)
-{
-    is_used = used;
-}
-
-
-}//namespace cura

src/ExtruderTrain.h

@@ -1,8 +1,7 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
 #ifndef EXTRUDER_TRAIN_H
 #define EXTRUDER_TRAIN_H
 
-#include "settings/settings.h"
+#include "settings.h"
 
 namespace cura 
 {
@@ -10,15 +9,14 @@ namespace cura
 class ExtruderTrain : public SettingsBase
 {
     int extruder_nr;
-    bool is_used = false; //!< whether this extruder train is (probably) used during printing the current meshgroup
 public:
-    int getExtruderNr();
-
-    bool getIsUsed() const; //!< return whether this extruder train is (probably) used during printing the current meshgroup
-    void setIsUsed(bool used); //!< set whether this extruder train is (probably) used during printing the current meshgroup
-
-    ExtruderTrain(SettingsBaseVirtual* settings, int extruder_nr);
-
+    int getExtruderNr() { return extruder_nr; }
+    
+    ExtruderTrain(SettingsBaseVirtual* settings, int extruder_nr)
+    : SettingsBase(settings)
+    , extruder_nr(extruder_nr)
+    { }
+    
 };
 
 }//namespace cura

src/FanSpeedLayerTime.h

@@ -1,7 +1,7 @@
 #ifndef FAN_SPEED_LAYER_TIME_H
 #define FAN_SPEED_LAYER_TIME_H
 
-#include "settings/settings.h"
+#include "settings.h"
 
 namespace cura 
 {
@@ -11,7 +11,6 @@ struct FanSpeedLayerTimeSettings
 public:
     double cool_min_layer_time;
     double cool_min_layer_time_fan_speed_max;
-    double cool_fan_speed_0;
     double cool_fan_speed_min;
     double cool_fan_speed_max;
     double cool_min_speed;

src/FffGcodeWriter.h

@@ -37,36 +37,23 @@ class FffGcodeWriter : public SettingsMessenger, NoCopy
 {
     friend class FffProcessor; // cause WireFrame2Gcode uses the member [gcode] (TODO)
 private:
-    int max_object_height; //!< The maximal height of all previously sliced meshgroups, used to avoid collision when moving to the next meshgroup to print.
-
-    /*
-     * Buffer for all layer plans (of type GCodePlanner)
-     * 
-     * The layer plans are buffered so that we can start heating up a nozzle several layers before it needs to be used.
-     * Another reason is to perform Auto Temperature.
-     */
-    LayerPlanBuffer layer_plan_buffer; 
-
-    /*!
-     * The class holding the current state of the gcode being written.
-     * 
-     * It holds information such as the last written position etc.
-     */
+    int max_object_height;
+    int meshgroup_number; //!< used for sequential printing of objects
+    
+    LayerPlanBuffer layer_plan_buffer;
+    
     GCodeExport gcode;
-
-    /*!
-     * The gcode file to write to when using CuraEngine as command line tool.
-     */
     std::ofstream output_file;
-
+    
     /*!
-     * Whether the skirt or brim polygons have been processed into planned paths
-     * for each extruder train.
+     * Layer number of the last layer in which a prime tower has been printed per extruder train.  
+     * 
+     * This is recorded per extruder to account for a prime tower per extruder, instead of the mixed prime tower.
      */
-    bool skirt_brim_is_processed[MAX_EXTRUDERS];
-
-    std::vector<FanSpeedLayerTimeSettings> fan_speed_layer_time_settings_per_extruder; //!< The settings used relating to minimal layer time and fan speeds. Configured for each extruder.
-
+    int last_prime_tower_poly_printed[MAX_EXTRUDERS]; 
+    
+    FanSpeedLayerTimeSettings fan_speed_layer_time_settings;
+    
     Point last_position_planned; //!< The position of the head before planning the next layer
     int current_extruder_planned; //!< The extruder train in use before planning the next layer
 public:
@@ -74,18 +61,16 @@ public:
     : SettingsMessenger(settings_)
     , layer_plan_buffer(this, gcode)
     , last_position_planned(no_point)
-    , current_extruder_planned(0) // changed somewhere early in FffGcodeWriter::writeGCode
+    , current_extruder_planned(0) // TODO: make configurable
     {
+        meshgroup_number = 1;
         max_object_height = 0;
     }
+    void resetFileNumber()
+    {
+        meshgroup_number = 1;
+    }
 
-    /*!
-     * Set the target to write gcode to: to a file.
-     * 
-     * Used when CuraEngine is used as command line tool.
-     * 
-     * \param filename The filename of the file to which to write the gcode.
-     */
     bool setTargetFile(const char* filename)
     {
         output_file.open(filename);
@@ -96,179 +81,101 @@ public:
         }
         return false;
     }
-
-    /*!
-     * Set the target to write gcode to: an output stream.
-     * 
-     * Used when CuraEngine is NOT used as command line tool.
-     * 
-     * \param stream The stream to write gcode to.
-     */
+    
     void setTargetStream(std::ostream* stream)
     {
         gcode.setOutputStream(stream);
     }
-
-    /*!
-     * Get the total extruded volume for a specific extruder in mm^3
-     * 
-     * Retractions and unretractions don't contribute to this.
-     * 
-     * \param extruder_nr The extruder number for which to get the total netto extruded volume
-     * \return total filament printed in mm^3
-     */
-    double getTotalFilamentUsed(int extruder_nr)
+    
+    double getTotalFilamentUsed(int e)
     {
-        return gcode.getTotalFilamentUsed(extruder_nr);
+        return gcode.getTotalFilamentUsed(e);
     }
 
-    /*!
-     * Get the total estimated print time in seconds
-     * 
-     * \return total print time in seconds
-     */
     double getTotalPrintTime()
     {
         return gcode.getTotalPrintTime();
     }
 
-    /*!
-     * Write all the gcode for the current meshgroup.
-     * This is the primary function of this class.
-     * 
-     * \param[in] storage The data storage from which to get the polygons to print and the areas to fill.
-     * \param timeKeeper The stop watch to see how long it takes for each of the stages in the slicing process.
-     */
     void writeGCode(SliceDataStorage& storage, TimeKeeper& timeKeeper);
-
+    
 private:
-    /*!
-     * Set the FffGcodeWriter::fan_speed_layer_time_settings by retrieving all settings from the global/per-meshgroup settings.
-     * 
-     * \param[out] storage The data storage to which to save the configuration
-     */
-    void setConfigFanSpeedLayerTime(SliceDataStorage& storage);
-
-    /*!
-     * Create and set the SliceDataStorage::coasting_config for each extruder.
-     * 
-     * \param[out] storage The data storage to which to save the configuration
-     */
+    void setConfigFanSpeedLayerTime();
+    
     void setConfigCoasting(SliceDataStorage& storage);
 
-    /*!
-     * Set the retraction config globally, per extruder and per mesh.
-     * 
-     * \param[out] storage The data storage to which to save the configurations
-     */
+    //Setup the retraction parameters.
     void setConfigRetraction(SliceDataStorage& storage);
     
     /*!
-     * Initialize the GcodePathConfig config parameters which don't change over
-     * all layers, for each feature.
-     * 
-     * The features are: skirt or brim, support and for each mesh: outer wall,
-     * inner walls, skin, infill (and combined infill).
-     * 
-     * \param[out] storage The data storage to which to save the configurations.
+     * initialize GcodePathConfig config parameters which don't change over all layers
      */
     void initConfigs(SliceDataStorage& storage);
     
     /*!
      * Set temperatures and perform initial priming.
-     * 
-     * Write a stub header if CuraEngine is in command line tool mode. (Cause writing the header afterwards would entail moving all gcode down.)
-     * 
-     * \param[in] storage where the slice data is stored.
+     * \param storage Input: where the slice data is stored.
      */
     void processStartingCode(SliceDataStorage& storage);
 
     /*!
-     * Move up and over the already printed meshgroups to print the next meshgroup.
-     * 
-     * \param[in] storage where the slice data is stored.
+     * Move up and over the just printed model to print the next model.
+     * \param storage Input: where the slice data is stored.
      */
     void processNextMeshGroupCode(SliceDataStorage& storage);
     
     /*!
-     * Add raft layer plans onto the FffGcodeWriter::layer_plan_buffer
-     * 
-     * \param[in,out] storage where the slice data is stored.
+     * Add raft gcode.
+     * \param storage Input: where the slice data is stored.
      * \param total_layers The total number of layers.
      */
     void processRaft(SliceDataStorage& storage, unsigned int total_layers);
-
-    /*!
-     * Convert the polygon data of a layer into a layer plan on the FffGcodeWriter::layer_plan_buffer
-     * 
-     * In case of negative layer numbers, create layers only containing the data from
-     * the helper parts (support etc) to fill up the gap between the raft and the model.
-     * 
-     * \param[in] storage where the slice data is stored.
-     * \param layer_nr The index of the layer to write the gcode of.
-     * \param total_layers The total number of layers.
-     */
-    void processLayer(SliceDataStorage& storage, int layer_nr, unsigned int total_layers);
-
-    /*!
-     * Plan priming of all used extruders which haven't been primed yet
-     * \param[in] storage where the slice data is stored.
-     * \param layer_plan The initial planning of the g-code of the layer.
-     * \param layer_nr The index of the layer to write the gcode of.
-     */
-    void ensureAllExtrudersArePrimed(SliceDataStorage& storage, GCodePlanner& layer_plan, const int layer_nr);
-
-    /*!
-     * Add the skirt or the brim to the layer plan \p gcodeLayer.
-     * 
-     * \param Storage where the slice data is stored.
-     * \param gcodeLayer The initial planning of the g-code of the layer.
-     * \param extruder_nr The extruder train for which to process the skirt or
-     * brim.
-     */
-    void processSkirtBrim(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int extruder_nr);
     
     /*!
-     * Adds the ooze shield to the layer plan \p gcodeLayer.
-     * 
-     * \param[in] storage where the slice data is stored.
+     * Add a layer to the gcode.
+     * \param storage Input: where the slice data is stored.
+     * \param layer_nr The index of the layer to write the gcode of.
+     * \param total_layers The total number of layers.
+     * \param has_raft Whether a raft is used for this print.
+     */
+    void processLayer(SliceDataStorage& storage, unsigned int layer_nr, unsigned int total_layers, bool has_raft);
+    
+    /*!
+     * Add the skirt to the gcode.
+     * \param storage Input: where the slice data is stored.
+     * \param gcodeLayer The initial planning of the gcode of the layer.
+     * \param extruder_nr The extrudewr train for which to process the skirt
+     */
+    void processSkirt(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int extruder_nr);
+    
+    /*!
+     * Adds the ooze shield to the print.
+     * \param storage Input: where the slice data is stored.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
      */
     void processOozeShield(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int layer_nr);
     
     /*!
-     * Adds the draft protection screen to the layer plan \p gcodeLayer.
-     * 
-     * \param[in] storage where the slice data is stored.
+     * Adds the draft protection screen to the print.
+     * \param storage Input: where the slice data is stored.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
      */
     void processDraftShield(SliceDataStorage& storage, GCodePlanner& gcodeLayer, unsigned int layer_nr);
-
+    
     /*!
-     * Calculate in which order to plan the extruders
-     * 
-     * \param[in] storage where the slice data is stored.
+     * Calculate in which order to print the meshes.
+     * \param storage Input: where the slice data is stored.
      * \param current_extruder The current extruder with which we last printed
-     * \return A vector of pairs of extruder numbers coupled with the mesh indices ordered on print order for that extruder.
+     * \return A vector of mesh indices ordered on print order.
      */
-    std::vector<int> calculateExtruderOrder(SliceDataStorage& storage, int current_extruder);
-
+    std::vector<unsigned int> calculateMeshOrder(SliceDataStorage& storage, int current_extruder);
+        
     /*!
-     * Calculate in which order to plan the meshes of a specific extruder
-     * 
-     * \param[in] storage where the slice data is stored.
-     * \param extruder_nr The extruder for which to determine the order
-     * \return A vector of pairs of extruder numbers coupled with the mesh indices ordered on print order for that extruder.
-     */
-    std::vector<unsigned int> calculateMeshOrder(SliceDataStorage& storage, int extruder_nr);
-
-    /*!
-     * Add a single layer from a single mesh-volume to the layer plan \p gcodeLayer in mesh surface mode.
-     * 
-     * \param[in] storage where the slice data is stored.
-     * \param mesh The mesh to add to the layer plan \p gcodeLayer.
+     * Add a single layer from a single mesh-volume to the GCode in mesh surface mode.
+     * \param storage Input: where the slice data is stored.
+     * \param mesh The mesh to add to the gcode.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
      * 
@@ -276,10 +183,9 @@ private:
     void addMeshLayerToGCode_meshSurfaceMode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcodeLayer, int layer_nr);
     
     /*!
-     * Add the open polylines from a single layer from a single mesh-volume to the layer plan \p gcodeLayer for mesh the surface modes.
-     * 
-     * \param[in] storage where the slice data is stored.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
+     * Add the open polylines from a single layer from a single mesh-volume to the GCode for mesh surface mode.
+     * \param storage Input: where the slice data is stored.
+     * \param mesh The mesh for which to add to the gcode.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
      * 
@@ -287,10 +193,9 @@ private:
     void addMeshOpenPolyLinesToGCode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcode_layer, int layer_nr);
     
     /*!
-     * Add a single layer from a single mesh-volume to the layer plan \p gcodeLayer.
-     * 
-     * \param[in] storage where the slice data is stored.
-     * \param mesh The mesh to add to the layer plan \p gcodeLayer.
+     * Add a single layer from a single mesh-volume to the GCode.
+     * \param storage Input: where the slice data is stored.
+     * \param mesh The mesh to add to the gcode.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
      * 
@@ -298,34 +203,35 @@ private:
     void addMeshLayerToGCode(SliceDataStorage& storage, SliceMeshStorage* mesh, GCodePlanner& gcodeLayer, int layer_nr);
     
     /*!
-     * Add thicker (multiple layers) sparse infill for a given part in a layer plan.
-     * 
+     * Add thicker (multiple layers) sparse infill for a given part in a layer.
      * \param gcodeLayer The initial planning of the gcode of the layer.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
+     * \param mesh The mesh for which to add to the gcode.
      * \param part The part for which to create gcode
      * \param layer_nr The current layer number.
      * \param infill_line_distance The distance between the infill lines
-     * \param infill_overlap The distance by which the infill overlaps with the wall insets.
+     * \param infill_overlap The fraction of the extrusion width by which the infill overlaps with the wall insets.
      * \param fillAngle The angle in the XY plane at which the infill is generated.
+     * \param extrusionWidth extrusionWidth
      */
-    void processMultiLayerInfill(GCodePlanner& gcodeLayer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, int infill_overlap, int fillAngle); 
+    void processMultiLayerInfill(GCodePlanner& gcodeLayer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, double infill_overlap, int fillAngle, int extrusionWidth); 
     
     /*!
      * Add normal sparse infill for a given part in a layer.
      * \param gcodeLayer The initial planning of the gcode of the layer.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
+     * \param mesh The mesh for which to add to the gcode.
      * \param part The part for which to create gcode
      * \param layer_nr The current layer number.
      * \param infill_line_distance The distance between the infill lines
-     * \param infill_overlap The distance by which the infill overlaps with the wall insets.
+     * \param infill_overlap The fraction of the extrusion width by which the infill overlaps with the wall insets.
      * \param fillAngle The angle in the XY plane at which the infill is generated.
+     * \param extrusionWidth extrusionWidth
      */
-    void processSingleLayerInfill(GCodePlanner& gcodeLayer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, int infill_overlap, int fillAngle);
+    void processSingleLayerInfill(GCodePlanner& gcodeLayer, SliceMeshStorage* mesh, SliceLayerPart& part, unsigned int layer_nr, int infill_line_distance, double infill_overlap, int fillAngle, int extrusionWidth);
     
     /*!
      * Generate the insets for the walls of a given layer part.
      * \param gcodeLayer The initial planning of the gcode of the layer.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
+     * \param mesh The mesh for which to add to the gcode.
      * \param part The part for which to create gcode
      * \param layer_nr The current layer number.
      * \param z_seam_type dir3ective for where to start the outer paerimeter of a part
@@ -336,45 +242,45 @@ private:
     /*!
      * Add the gcode of the top/bottom skin of the given part.
      * \param gcodeLayer The initial planning of the gcode of the layer.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
+     * \param mesh The mesh for which to add to the gcode.
      * \param part The part for which to create gcode
      * \param layer_nr The current layer number.
-     * \param skin_overlap The distance by which the skin overlaps with the wall insets.
+     * \param infill_overlap The fraction of the extrusion width by which the infill overlaps with the wall insets.
      * \param fillAngle The angle in the XY plane at which the infill is generated.
+     * \param extrusionWidth extrusionWidth
      */
-    void processSkin(cura::GCodePlanner& gcode_layer, cura::SliceMeshStorage* mesh, cura::SliceLayerPart& part, unsigned int layer_nr, int skin_overlap, int infill_angle);
-
+    void processSkin(cura::GCodePlanner& gcode_layer, cura::SliceMeshStorage* mesh, cura::SliceLayerPart& part, unsigned int layer_nr, double infill_overlap, int infill_angle, int extrusion_width);
+    
     /*!
-     * Add the support to the layer plan \p gcodeLayer of the current layer for all support parts with the given \p extruder_nr.
-     * \param[in] storage where the slice data is stored.
+     * Add the support to the gcode of the current layer.
+     * \param storage Input: where the slice data is stored.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
-     * \return whether any support was added to the layer plan
+     * \param extruder_nr_before The extruder number at the start of the layer (before other print parts aka the rest)
+     * \param before_rest Whether the function has been called before adding the rest to the gcode, or after.
      */
-    bool addSupportToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr, int extruder_nr);
+    void addSupportToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr, int extruder_nr_before, bool before_rest);
     /*!
-     * Add the support lines/walls to the layer plan \p gcodeLayer of the current layer.
-     * \param[in] storage where the slice data is stored.
+     * Add the support lines/walls to the gcode of the current layer.
+     * \param storage Input: where the slice data is stored.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
-     * \return whether any support infill was added to the layer plan
      */
-    bool addSupportInfillToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr);
+    void addSupportLinesToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr);
     /*!
-     * Add the support skins to the layer plan \p gcodeLayer of the current layer.
-     * \param[in] storage where the slice data is stored.
+     * Add the support roofs to the gcode of the current layer.
+     * \param storage Input: where the slice data is stored.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
-     * \return whether any support skin was added to the layer plan
      */
-    bool addSupportRoofsToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr);
+    void addSupportRoofsToGCode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, int layer_nr);
     
     /*!
      * Change to a new extruder, and add the prime tower instructions if the new extruder is different from the last.
      * 
      * On layer 0 this function adds the skirt for the nozzle it switches to, instead of the prime tower.
      * 
-     * \param[in] storage where the slice data is stored.
+     * \param storage Input: where the slice data is stored.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
      * \param extruder_nr The extruder to which to switch
@@ -383,7 +289,7 @@ private:
     
     /*!
      * Add the prime tower gcode for the current layer.
-     * \param[in] storage where the slice data is stored.
+     * \param storage Input: where the slice data is stored.
      * \param gcodeLayer The initial planning of the gcode of the layer.
      * \param layer_nr The index of the layer to write the gcode of.
      * \param prev_extruder The current extruder with which we last printed.

src/FffPolygonGenerator.cpp

@@ -1,10 +1,7 @@
 #include "FffPolygonGenerator.h"
 
 #include <algorithm>
-#include <map> // multimap (ordered map allowing duplicate keys)
 
-#include "utils/math.h"
-#include "utils/algorithm.h"
 #include "slicer.h"
 #include "utils/gettime.h"
 #include "utils/logoutput.h"
@@ -12,25 +9,24 @@
 #include "support.h"
 #include "multiVolumes.h"
 #include "layerPart.h"
-#include "WallsComputation.h"
-#include "SkirtBrim.h"
+#include "inset.h"
+#include "skirt.h"
 #include "skin.h"
 #include "infill.h"
 #include "raft.h"
-#include "progress/Progress.h"
+#include "debug.h"
+#include "Progress.h"
 #include "PrintFeature.h"
-#include "ConicalOverhang.h"
-#include "progress/ProgressEstimator.h"
-#include "progress/ProgressStageEstimator.h"
-#include "progress/ProgressEstimatorLinear.h"
-
 
 namespace cura
 {
 
-
+    
 bool FffPolygonGenerator::generateAreas(SliceDataStorage& storage, MeshGroup* meshgroup, TimeKeeper& timeKeeper)
 {
+    if (CommandSocket::isInstantiated())
+        CommandSocket::getInstance()->beginSendSlicedObject();
+    
     if (!sliceModel(meshgroup, timeKeeper, storage)) 
     {
         return false;
@@ -41,22 +37,6 @@ bool FffPolygonGenerator::generateAreas(SliceDataStorage& storage, MeshGroup* me
     return true;
 }
 
-unsigned int FffPolygonGenerator::getDraftShieldLayerCount(const unsigned int total_layers) const
-{
-    if (!getSettingBoolean("draft_shield_enabled"))
-    {
-        return 0;
-    }
-    switch (getSettingAsDraftShieldHeightLimitation("draft_shield_height_limitation"))
-    {
-        default:
-        case DraftShieldHeightLimitation::FULL:
-            return total_layers;
-        case DraftShieldHeightLimitation::LIMITED:
-            return std::max(0, (getSettingInMicrons("draft_shield_height") - getSettingInMicrons("layer_height_0")) / getSettingInMicrons("layer_height") + 1);
-    }
-}
-
 bool FffPolygonGenerator::sliceModel(MeshGroup* meshgroup, TimeKeeper& timeKeeper, SliceDataStorage& storage) /// slices the model
 {
     Progress::messageProgressStage(Progress::Stage::SLICING, &timeKeeper);
@@ -66,22 +46,27 @@ bool FffPolygonGenerator::sliceModel(MeshGroup* meshgroup, TimeKeeper& timeKeepe
     storage.model_size = storage.model_max - storage.model_min;
 
     log("Slicing model...\n");
-    int initial_layer_thickness = getSettingInMicrons("layer_height_0");
+    int initial_layer_thickness = meshgroup->getSettingInMicrons("layer_height_0");
     if(initial_layer_thickness <= 0) //Initial layer height of 0 is not allowed. Negative layer height is nonsense.
     {
-        logError("Initial layer height %i is disallowed.\n", initial_layer_thickness);
+        logError("Initial layer height %i is disallowed.",initial_layer_thickness);
         return false;
     }
-    int layer_thickness = getSettingInMicrons("layer_height");
+    int layer_thickness = meshgroup->getSettingInMicrons("layer_height");
     if(layer_thickness <= 0) //Layer height of 0 is not allowed. Negative layer height is nonsense.
     {
-        logError("Layer height %i is disallowed.\n", layer_thickness);
+        logError("Layer height %i is disallowed.",layer_thickness);
         return false;
     }
+    if (meshgroup->getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT) 
+    { 
+        initial_layer_thickness = layer_thickness; 
+    }
     int initial_slice_z = initial_layer_thickness - layer_thickness / 2;
-    int slice_layer_count = (storage.model_max.z - initial_slice_z) / layer_thickness + 1;
-    if (slice_layer_count <= 0) //Model is shallower than layer_height_0, so not even the first layer is sliced. Return an empty model then.
+    int layer_count = (storage.model_max.z - initial_slice_z) / layer_thickness + 1;
+    if(layer_count <= 0) //Model is shallower than layer_height_0, so not even the first layer is sliced. Return an empty model then.
     {
+        Progress::messageProgressStage(Progress::Stage::INSET,&timeKeeper); //Continue directly with the inset stage, which will also immediately stop.
         return true; //This is NOT an error state!
     }
 
@@ -89,7 +74,7 @@ bool FffPolygonGenerator::sliceModel(MeshGroup* meshgroup, TimeKeeper& timeKeepe
     for(unsigned int mesh_idx = 0; mesh_idx < meshgroup->meshes.size(); mesh_idx++)
     {
         Mesh& mesh = meshgroup->meshes[mesh_idx];
-        Slicer* slicer = new Slicer(&mesh, initial_slice_z, layer_thickness, slice_layer_count, mesh.getSettingBoolean("meshfix_keep_open_polygons"), mesh.getSettingBoolean("meshfix_extensive_stitching"));
+        Slicer* slicer = new Slicer(&mesh, initial_slice_z, layer_thickness, layer_count, mesh.getSettingBoolean("meshfix_keep_open_polygons"), mesh.getSettingBoolean("meshfix_extensive_stitching"));
         slicerList.push_back(slicer);
         /*
         for(SlicerLayer& layer : slicer->layers)
@@ -101,411 +86,182 @@ bool FffPolygonGenerator::sliceModel(MeshGroup* meshgroup, TimeKeeper& timeKeepe
         */
         Progress::messageProgress(Progress::Stage::SLICING, mesh_idx + 1, meshgroup->meshes.size());
     }
+    
+    log("Layer count: %i\n", layer_count);
 
     meshgroup->clear();///Clear the mesh face and vertex data, it is no longer needed after this point, and it saves a lot of memory.
 
-
+    Progress::messageProgressStage(Progress::Stage::PARTS, &timeKeeper);
+    //carveMultipleVolumes(storage.meshes);
+    generateMultipleVolumesOverlap(slicerList, getSettingInMicrons("multiple_mesh_overlap"));
+    
+    storage.meshes.reserve(slicerList.size()); // causes there to be no resize in meshes so that the pointers in sliceMeshStorage._config to retraction_config don't get invalidated.
     for(unsigned int meshIdx=0; meshIdx < slicerList.size(); meshIdx++)
     {
-        Mesh& mesh = storage.meshgroup->meshes[meshIdx];
-        if (mesh.getSettingBoolean("conical_overhang_enabled") && !mesh.getSettingBoolean("anti_overhang_mesh"))
-        {
-            ConicalOverhang::apply(slicerList[meshIdx], mesh.getSettingInAngleRadians("conical_overhang_angle"), layer_thickness);
-        }
-    }
-
-    Progress::messageProgressStage(Progress::Stage::PARTS, &timeKeeper);
-
-    if (storage.getSettingBoolean("carve_multiple_volumes"))
-    {
-        carveMultipleVolumes(slicerList, storage.getSettingBoolean("alternate_carve_order"));
-    }
-    generateMultipleVolumesOverlap(slicerList);
-
-    storage.print_layer_count = 0;
-    for (unsigned int meshIdx = 0; meshIdx < slicerList.size(); meshIdx++)
-    {
-        Mesh& mesh = storage.meshgroup->meshes[meshIdx];
-        Slicer* slicer = slicerList[meshIdx];
-        if (!mesh.getSettingBoolean("anti_overhang_mesh") && !mesh.getSettingBoolean("infill_mesh"))
-        {
-            storage.print_layer_count = std::max(storage.print_layer_count, (unsigned int)slicer->layers.size());
-        }
-    }
-    storage.support.supportLayers.resize(storage.print_layer_count);
-
-    storage.meshes.reserve(slicerList.size()); // causes there to be no resize in meshes so that the pointers in sliceMeshStorage._config to retraction_config don't get invalidated.
-    for (unsigned int meshIdx = 0; meshIdx < slicerList.size(); meshIdx++)
-    {
-        Slicer* slicer = slicerList[meshIdx];
-        Mesh& mesh = storage.meshgroup->meshes[meshIdx];
-
-        // always make a new SliceMeshStorage, so that they have the same ordering / indexing as meshgroup.meshes
-        storage.meshes.emplace_back(&meshgroup->meshes[meshIdx], slicer->layers.size()); // new mesh in storage had settings from the Mesh
+        storage.meshes.emplace_back(&meshgroup->meshes[meshIdx]); // new mesh in storage had settings from the Mesh
         SliceMeshStorage& meshStorage = storage.meshes.back();
-
-        if (mesh.getSettingBoolean("anti_overhang_mesh"))
-        {
-            for (unsigned int layer_nr = 0; layer_nr < slicer->layers.size(); layer_nr++)
-            {
-                SupportLayer& support_layer = storage.support.supportLayers[layer_nr];
-                SlicerLayer& slicer_layer = slicer->layers[layer_nr];
-                support_layer.anti_overhang = support_layer.anti_overhang.unionPolygons(slicer_layer.polygons);
-            }
-            continue;
-        }
-        if (mesh.getSettingBoolean("support_mesh"))
-        {
-            for (unsigned int layer_nr = 0; layer_nr < slicer->layers.size(); layer_nr++)
-            {
-                SupportLayer& support_layer = storage.support.supportLayers[layer_nr];
-                SlicerLayer& slicer_layer = slicer->layers[layer_nr];
-                support_layer.support_mesh.add(slicer_layer.polygons);
-            }
-            continue;
-        }
-
-        createLayerParts(meshStorage, slicer, mesh.getSettingBoolean("meshfix_union_all"), mesh.getSettingBoolean("meshfix_union_all_remove_holes"));
+        Mesh& mesh = storage.meshgroup->meshes[meshIdx];
+        createLayerParts(meshStorage, slicerList[meshIdx], mesh.getSettingBoolean("meshfix_union_all"), mesh.getSettingBoolean("meshfix_union_all_remove_holes"));
         delete slicerList[meshIdx];
 
-        bool has_raft = getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT;
+        bool has_raft = meshStorage.getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT;
         //Add the raft offset to each layer.
         for(unsigned int layer_nr=0; layer_nr<meshStorage.layers.size(); layer_nr++)
         {
             SliceLayer& layer = meshStorage.layers[layer_nr];
             meshStorage.layers[layer_nr].printZ += 
-                getSettingInMicrons("layer_height_0")
+                meshStorage.getSettingInMicrons("layer_height_0")
                 - initial_slice_z;
             if (has_raft)
             {
-                ExtruderTrain* train = storage.meshgroup->getExtruderTrain(getSettingAsIndex("adhesion_extruder_nr"));
                 layer.printZ += 
-                    Raft::getTotalThickness(storage)
-                    + train->getSettingInMicrons("raft_airgap")
-                    - train->getSettingInMicrons("layer_0_z_overlap"); // shift all layers (except 0) down
-                if (layer_nr == 0)
-                {
-                    layer.printZ += train->getSettingInMicrons("layer_0_z_overlap"); // undo shifting down of first layer
-                }
+                    meshStorage.getSettingInMicrons("raft_base_thickness") 
+                    + meshStorage.getSettingInMicrons("raft_interface_thickness") 
+                    + meshStorage.getSettingAsCount("raft_surface_layers") * getSettingInMicrons("raft_surface_thickness")
+                    + meshStorage.getSettingInMicrons("raft_airgap");
             }
-
+    
+ 
             if (layer.parts.size() > 0 || (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::NORMAL && layer.openPolyLines.size() > 0) )
             {
                 meshStorage.layer_nr_max_filled_layer = layer_nr; // last set by the highest non-empty layer
             } 
+                
+            if (CommandSocket::isInstantiated())
+            {
+                CommandSocket::getInstance()->sendLayerInfo(layer_nr, layer.printZ, layer_nr == 0? meshStorage.getSettingInMicrons("layer_height_0") : meshStorage.getSettingInMicrons("layer_height"));
+            }
         }
-
+        
         Progress::messageProgress(Progress::Stage::PARTS, meshIdx + 1, slicerList.size());
     }
+    
+    Progress::messageProgressStage(Progress::Stage::INSET, &timeKeeper);
     return true;
 }
 
 void FffPolygonGenerator::slices2polygons(SliceDataStorage& storage, TimeKeeper& time_keeper)
 {
-    // compute layer count and remove first empty layers
-    // there is no separate progress stage for removeEmptyFisrtLayer (TODO)
-    unsigned int slice_layer_count = 0;
+    size_t total_layers = 0;
     for (SliceMeshStorage& mesh : storage.meshes)
     {
-        if (!mesh.getSettingBoolean("infill_mesh") && !mesh.getSettingBoolean("anti_overhang_mesh"))
-        {
-            slice_layer_count = std::max<unsigned int>(slice_layer_count, mesh.layers.size());
-        }
+        total_layers = std::max<unsigned int>(total_layers, mesh.layers.size());
     }
-
-    // handle meshes
-    std::vector<double> mesh_timings;
-    for (unsigned int mesh_idx = 0; mesh_idx < storage.meshes.size(); mesh_idx++)
-    {
-        mesh_timings.push_back(1.0); // TODO: have a more accurate estimate of the relative time it takes per mesh, based on the height and number of polygons
-    }
-    ProgressStageEstimator inset_skin_progress_estimate(mesh_timings);
-
-    Progress::messageProgressStage(Progress::Stage::INSET_SKIN, &time_keeper);
-    std::vector<unsigned int> mesh_order;
-    { // compute mesh order
-        std::multimap<int, unsigned int> order_to_mesh_indices;
-        for (unsigned int mesh_idx = 0; mesh_idx < storage.meshes.size(); mesh_idx++)
-        {
-            order_to_mesh_indices.emplace(storage.meshes[mesh_idx].getSettingAsIndex("infill_mesh_order"), mesh_idx);
-        }
-        for (std::pair<const int, unsigned int>& order_and_mesh_idx : order_to_mesh_indices)
-        {
-            mesh_order.push_back(order_and_mesh_idx.second);
-        }
-    }
-    for (unsigned int mesh_order_idx(0); mesh_order_idx < mesh_order.size(); ++mesh_order_idx)
-    {
-        processBasicWallsSkinInfill(storage, mesh_order_idx, mesh_order, inset_skin_progress_estimate);
-        Progress::messageProgress(Progress::Stage::INSET_SKIN, mesh_order_idx + 1, storage.meshes.size());
-    }
-
-    for (unsigned int layer_nr = 0; layer_nr < slice_layer_count; layer_nr++)
-    {
-        SliceLayer* layer = nullptr;
-        for (unsigned int mesh_idx = 0; mesh_idx < storage.meshes.size(); mesh_idx++)
-        { // find first mesh which has this layer
-            SliceMeshStorage& mesh = storage.meshes[mesh_idx];
-            if (int(layer_nr) <= mesh.layer_nr_max_filled_layer)
-            {
-                layer = &mesh.layers[layer_nr];
-                break;
-            }
-        }
-        if (layer != nullptr)
-        {
-            if (CommandSocket::isInstantiated())
-            { // send layer info
-                CommandSocket::getInstance()->sendOptimizedLayerInfo(layer_nr, layer->printZ, layer_nr == 0? getSettingInMicrons("layer_height_0") : getSettingInMicrons("layer_height"));
-            }
-        }
-    }
-
-    log("Layer count: %i\n", storage.print_layer_count);
-
+    
     //layerparts2HTML(storage, "output/output.html");
-
-    Progress::messageProgressStage(Progress::Stage::SUPPORT, &time_keeper);
-
-    AreaSupport::generateSupportAreas(storage, storage.print_layer_count);
-
-    // we need to remove empty layers after we have procesed the insets
-    // processInsets might throw away parts if they have no wall at all (cause it doesn't fit)
-    // brim depends on the first layer not being empty
-    // only remove empty layers if we haven't generate support, because then support was added underneath the model.
-    //   for some materials it's better to print on support than on the buildplate.
-    removeEmptyFirstLayers(storage, getSettingInMicrons("layer_height"), storage.print_layer_count); // changes storage.print_layer_count!
-    if (storage.print_layer_count == 0)
+    for(unsigned int layer_number = 0; layer_number < total_layers; layer_number++)
     {
-        log("Stopping process because there are no non-empty layers.\n");
+        processInsets(storage, layer_number);
+        
+        Progress::messageProgress(Progress::Stage::INSET, layer_number+1, total_layers);
+    }
+    
+    removeEmptyFirstLayers(storage, getSettingInMicrons("layer_height"), total_layers);
+    
+    if (total_layers < 1)
+    {
+        log("Stopping process because there are no layers.\n");
         return;
     }
     
+    Progress::messageProgressStage(Progress::Stage::SUPPORT, &time_keeper);  
+            
+    AreaSupport::generateSupportAreas(storage, total_layers);
     /*
     if (storage.support.generated)
     {
-        for (unsigned int layer_idx = 0; layer_idx < storage.print_layer_count; layer_idx++)
+        for (unsigned int layer_idx = 0; layer_idx < total_layers; layer_idx++)
         {
             Polygons& support = storage.support.supportLayers[layer_idx].supportAreas;
-            ExtruderTrain* infill_extr = storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("support_infill_extruder_nr"));
-            CommandSocket::sendPolygons(PrintFeatureType::Infill, support, 100); // infill_extr->getSettingInMicrons("support_line_width"));
+            if (CommandSocket::isInstantiated()) 
+            {
+                CommandSocket::getInstance()->sendPolygons(PrintFeatureType::Infill, layer_idx, support, 100); //getSettingInMicrons("support_line_width"));
+            }
         }
     }
     */
-
-    computePrintHeightStatistics(storage);
-
-    // handle helpers
-    storage.primeTower.generatePaths(storage);
     
-    logDebug("Processing ooze shield\n");
-    processOozeShield(storage);
-
-    logDebug("Processing draft shield\n");
-    processDraftShield(storage);
-
-    logDebug("Processing platform adhesion\n");
-    processPlatformAdhesion(storage);
-    
-    // meshes post processing
-    for (SliceMeshStorage& mesh : storage.meshes)
-    {
-        processDerivedWallsSkinInfill(mesh);
-    }
-}
-
-void FffPolygonGenerator::processBasicWallsSkinInfill(SliceDataStorage& storage, unsigned int mesh_order_idx, std::vector<unsigned int>& mesh_order, ProgressStageEstimator& inset_skin_progress_estimate)
-{
-    unsigned int mesh_idx = mesh_order[mesh_order_idx];
-    SliceMeshStorage& mesh = storage.meshes[mesh_idx];
-    size_t mesh_layer_count = mesh.layers.size();
-    if (mesh.getSettingBoolean("infill_mesh"))
-    {
-        processInfillMesh(storage, mesh_order_idx, mesh_order);
-    }
-    
-    // TODO: make progress more accurate!!
-    // note: estimated time for     insets : skins = 22.953 : 48.858
-    std::vector<double> walls_vs_skin_timing({22.953, 48.858});
-    ProgressStageEstimator* mesh_inset_skin_progress_estimator = new ProgressStageEstimator(walls_vs_skin_timing);
-    
-    inset_skin_progress_estimate.nextStage(mesh_inset_skin_progress_estimator); // the stage of this function call
-    
-    ProgressEstimatorLinear* inset_estimator = new ProgressEstimatorLinear(mesh_layer_count);
-    mesh_inset_skin_progress_estimator->nextStage(inset_estimator);
-    
-    
-    // walls
-    for (unsigned int layer_number = 0; layer_number < mesh.layers.size(); layer_number++)
-    {
-        logDebug("Processing insets for layer %i of %i\n", layer_number, mesh_layer_count);
-        processInsets(mesh, layer_number);
-        double progress = inset_skin_progress_estimate.progress(layer_number);
-        Progress::messageProgress(Progress::Stage::INSET_SKIN, progress * 100, 100);
-    }
-
-    ProgressEstimatorLinear* skin_estimator = new ProgressEstimatorLinear(mesh_layer_count);
-    mesh_inset_skin_progress_estimator->nextStage(skin_estimator);
-
-    bool process_infill = mesh.getSettingInMicrons("infill_line_distance") > 0;
-    if (!process_infill)
-    { // do process infill anyway if it's modified by modifier meshes
-        for (unsigned int other_mesh_order_idx(mesh_order_idx + 1); other_mesh_order_idx < mesh_order.size(); ++other_mesh_order_idx)
-        {
-            unsigned int other_mesh_idx = mesh_order[other_mesh_order_idx];
-            SliceMeshStorage& other_mesh = storage.meshes[other_mesh_idx];
-            if (other_mesh.getSettingBoolean("infill_mesh"))
-            {
-                AABB3D aabb = storage.meshgroup->meshes[mesh_idx].getAABB();
-                AABB3D other_aabb = storage.meshgroup->meshes[other_mesh_idx].getAABB();
-                if (aabb.hit(other_aabb))
-                {
-                    process_infill = true;
-                }
-            }
-        }
-    }
-    // skin & infill
-//     Progress::messageProgressStage(Progress::Stage::SKIN, &time_keeper);
+    Progress::messageProgressStage(Progress::Stage::SKIN, &time_keeper);
     int mesh_max_bottom_layer_count = 0;
-    if (mesh.getSettingBoolean("magic_spiralize"))
+    if (getSettingBoolean("magic_spiralize"))
     {
-        mesh_max_bottom_layer_count = std::max(mesh_max_bottom_layer_count, mesh.getSettingAsCount("bottom_layers"));
-    }
-    for (unsigned int layer_number = 0; layer_number < mesh.layers.size(); layer_number++)
-    {
-        logDebug("Processing skins and infill layer %i of %i\n", layer_number, mesh_layer_count);
-        if (!mesh.getSettingBoolean("magic_spiralize") || static_cast<int>(layer_number) < mesh_max_bottom_layer_count)    //Only generate up/downskin and infill for the first X layers when spiralize is choosen.
+        for(SliceMeshStorage& mesh : storage.meshes)
         {
-            processSkinsAndInfill(mesh, layer_number, process_infill);
+            mesh_max_bottom_layer_count = std::max(mesh_max_bottom_layer_count, mesh.getSettingAsCount("bottom_layers"));
+        }
+    }
+    for(unsigned int layer_number = 0; layer_number < total_layers; layer_number++)
+    {
+        if (!getSettingBoolean("magic_spiralize") || static_cast<int>(layer_number) < mesh_max_bottom_layer_count)    //Only generate up/downskin and infill for the first X layers when spiralize is choosen.
+        {
+            processSkinsAndInfill(storage, layer_number);
+        }
+        Progress::messageProgress(Progress::Stage::SKIN, layer_number+1, total_layers);
+    }
+    
+    unsigned int combined_infill_layers = storage.getSettingInMicrons("infill_sparse_thickness") / std::max(storage.getSettingInMicrons("layer_height"),1); //How many infill layers to combine to obtain the requested sparse thickness.
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        combineInfillLayers(mesh,combined_infill_layers);
+    }
+
+    storage.primeTower.computePrimeTowerMax(storage);
+    storage.primeTower.generatePaths(storage, total_layers);
+    
+    processOozeShield(storage, total_layers);
+        
+    processDraftShield(storage, total_layers);
+    
+    processPlatformAdhesion(storage);
+
+    
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        if (mesh.getSettingBoolean("magic_fuzzy_skin_enabled"))
+        {
+            processFuzzyWalls(mesh);
         }
-        double progress = inset_skin_progress_estimate.progress(layer_number);
-        Progress::messageProgress(Progress::Stage::INSET_SKIN, progress * 100, 100);
     }
 }
 
-void FffPolygonGenerator::processInfillMesh(SliceDataStorage& storage, unsigned int mesh_order_idx, std::vector<unsigned int>& mesh_order)
+void FffPolygonGenerator::processInsets(SliceDataStorage& storage, unsigned int layer_nr) 
 {
-    unsigned int mesh_idx = mesh_order[mesh_order_idx];
-    SliceMeshStorage& mesh = storage.meshes[mesh_idx];
-    mesh.layer_nr_max_filled_layer = -1;
-    for (unsigned int layer_idx = 0; layer_idx < mesh.layers.size(); layer_idx++)
+    for(SliceMeshStorage& mesh : storage.meshes)
     {
-        SliceLayer& layer = mesh.layers[layer_idx];
-        std::vector<PolygonsPart> new_parts;
-
-        for (unsigned int other_mesh_idx : mesh_order)
-        { // limit the infill mesh's outline to within the infill of all meshes with lower order
-            if (other_mesh_idx == mesh_idx)
+        SliceLayer* layer = &mesh.layers[layer_nr];
+        if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::SURFACE)
+        {
+            int inset_count = mesh.getSettingAsCount("wall_line_count");
+            if (mesh.getSettingBoolean("magic_spiralize") && static_cast<int>(layer_nr) < mesh.getSettingAsCount("bottom_layers") && layer_nr % 2 == 1)//Add extra insets every 2 layers when spiralizing, this makes bottoms of cups watertight.
+                inset_count += 5;
+            int line_width_x = mesh.getSettingInMicrons("wall_line_width_x");
+            int line_width_0 = mesh.getSettingInMicrons("wall_line_width_0");
+            if (mesh.getSettingBoolean("alternate_extra_perimeter"))
+                inset_count += layer_nr % 2; 
+            generateInsets(layer, mesh.getSettingInMicrons("machine_nozzle_size"), line_width_0, line_width_x, inset_count, mesh.getSettingBoolean("remove_overlapping_walls_0_enabled"), mesh.getSettingBoolean("remove_overlapping_walls_x_enabled"));
+        }
+        if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::NORMAL)
+        {
+            for (PolygonRef polyline : layer->openPolyLines)
             {
-                break; // all previous meshes have been processed
-            }
-            SliceMeshStorage& other_mesh = storage.meshes[other_mesh_idx];
-            if (layer_idx >= other_mesh.layers.size())
-            { // there can be no interaction between the infill mesh and this other non-infill mesh
-                continue;
-            }
-
-            SliceLayer& other_layer = other_mesh.layers[layer_idx];
-
-            for (SliceLayerPart& part : layer.parts)
-            {
-                for (SliceLayerPart& other_part : other_layer.parts)
-                { // limit the outline of each part of this infill mesh to the infill of parts of the other mesh with lower infill mesh order
-                    if (!part.boundaryBox.hit(other_part.boundaryBox))
-                    { // early out
-                        continue;
-                    }
-                    Polygons new_outline = part.outline.intersection(other_part.getOwnInfillArea());
-                    if (new_outline.size() == 1)
-                    { // we don't have to call splitIntoParts, because a single polygon can only be a single part
-                        PolygonsPart outline_part_here;
-                        outline_part_here.add(new_outline[0]);
-                        new_parts.push_back(outline_part_here);
-                    }
-                    else if (new_outline.size() > 1)
-                    { // we don't know whether it's a multitude of parts because of newly introduced holes, or because the polygon has been split up
-                        std::vector<PolygonsPart> new_parts_here = new_outline.splitIntoParts();
-                        for (PolygonsPart& new_part_here : new_parts_here)
-                        {
-                            new_parts.push_back(new_part_here);
-                        }
-                    }
-                    // change the infill area of the non-infill mesh which is to be filled with e.g. lines
-                    other_part.infill_area_own = other_part.getOwnInfillArea().difference(part.outline);
-                    // note: don't change the part.infill_area, because we change the structure of that area, while the basic area in which infill is printed remains the same
-                    //       the infill area remains the same for combing
+                Polygons segments;
+                for (unsigned int point_idx = 1; point_idx < polyline.size(); point_idx++)
+                {
+                    PolygonRef segment = segments.newPoly();
+                    segment.add(polyline[point_idx-1]);
+                    segment.add(polyline[point_idx]);
                 }
             }
         }
-        
-        layer.parts.clear();
-        for (PolygonsPart& part : new_parts)
-        {
-            layer.parts.emplace_back();
-            layer.parts.back().outline = part;
-            layer.parts.back().boundaryBox.calculate(part);
-        }
-
-        if (layer.parts.size() > 0 || (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::NORMAL && layer.openPolyLines.size() > 0) )
-        {
-            mesh.layer_nr_max_filled_layer = layer_idx; // last set by the highest non-empty layer
-        } 
-    }
-    
-}
-
-void FffPolygonGenerator::processDerivedWallsSkinInfill(SliceMeshStorage& mesh)
-{
-    // create gradual infill areas
-    SkinInfillAreaComputation::generateGradualInfill(mesh, mesh.getSettingInMicrons("gradual_infill_step_height"), mesh.getSettingAsCount("gradual_infill_steps"));
-
-    // combine infill
-    unsigned int combined_infill_layers = std::max(1U, round_divide(mesh.getSettingInMicrons("infill_sparse_thickness"), std::max(getSettingInMicrons("layer_height"), 1))); //How many infill layers to combine to obtain the requested sparse thickness.
-    combineInfillLayers(mesh,combined_infill_layers);
-
-    // fuzzy skin
-    if (mesh.getSettingBoolean("magic_fuzzy_skin_enabled"))
-    {
-        processFuzzyWalls(mesh);
     }
 }
 
-void FffPolygonGenerator::processInsets(SliceMeshStorage& mesh, unsigned int layer_nr) 
-{
-    SliceLayer* layer = &mesh.layers[layer_nr];
-    if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") != ESurfaceMode::SURFACE)
-    {
-        int inset_count = mesh.getSettingAsCount("wall_line_count");
-        if (mesh.getSettingBoolean("magic_spiralize") && static_cast<int>(layer_nr) < mesh.getSettingAsCount("bottom_layers") && ((layer_nr % 2) + 2) % 2 == 1)//Add extra insets every 2 layers when spiralizing, this makes bottoms of cups watertight.
-            inset_count += 5;
-        int line_width_x = mesh.getSettingInMicrons("wall_line_width_x");
-        int line_width_0 = mesh.getSettingInMicrons("wall_line_width_0");
-        if (mesh.getSettingBoolean("alternate_extra_perimeter"))
-        {
-            inset_count += ((layer_nr % 2) + 2) % 2;
-        }
-        bool recompute_outline_based_on_outer_wall = mesh.getSettingBoolean("support_enable");
-        WallsComputation walls_computation(mesh.getSettingInMicrons("wall_0_inset"), line_width_0, line_width_x, inset_count, recompute_outline_based_on_outer_wall);
-        walls_computation.generateInsets(layer);
-    }
-}
-
-void FffPolygonGenerator::removeEmptyFirstLayers(SliceDataStorage& storage, const int layer_height, unsigned int& total_layers)
-{
+void FffPolygonGenerator::removeEmptyFirstLayers(SliceDataStorage& storage, int layer_height, unsigned int total_layers)
+{ 
     int n_empty_first_layers = 0;
     for (unsigned int layer_idx = 0; layer_idx < total_layers; layer_idx++)
     { 
         bool layer_is_empty = true;
-        if (storage.support.generated && layer_idx < storage.support.supportLayers.size())
-        {
-            SupportLayer& support_layer = storage.support.supportLayers[layer_idx];
-            if (support_layer.supportAreas.size() > 0 || support_layer.skin.size() > 0)
-            {
-                layer_is_empty = false;
-                break;
-            }
-        }
         for (SliceMeshStorage& mesh : storage.meshes)
         {
             SliceLayer& layer = mesh.layers[layer_idx];
@@ -536,166 +292,118 @@ void FffPolygonGenerator::removeEmptyFirstLayers(SliceDataStorage& storage, cons
             {
                 layer.printZ -= n_empty_first_layers * layer_height;
             }
-            mesh.layer_nr_max_filled_layer -= n_empty_first_layers;
         }
         total_layers -= n_empty_first_layers;
-        storage.support.layer_nr_max_filled_layer -= n_empty_first_layers;
-        std::vector<SupportLayer>& support_layers = storage.support.supportLayers;
-        support_layers.erase(support_layers.begin(), support_layers.begin() + n_empty_first_layers);
     }
 }
   
-void FffPolygonGenerator::processSkinsAndInfill(SliceMeshStorage& mesh, unsigned int layer_nr, bool process_infill) 
+void FffPolygonGenerator::processSkinsAndInfill(SliceDataStorage& storage, unsigned int layer_nr) 
 {
-    if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") == ESurfaceMode::SURFACE) 
-    { 
-        return;
-    }
-
-    const int wall_line_count = mesh.getSettingAsCount("wall_line_count");
-    const int innermost_wall_line_width = (wall_line_count == 1) ? mesh.getSettingInMicrons("wall_line_width_0") : mesh.getSettingInMicrons("wall_line_width_x");
-    generateSkins(layer_nr, mesh, mesh.getSettingAsCount("bottom_layers"), mesh.getSettingAsCount("top_layers"), wall_line_count, innermost_wall_line_width, mesh.getSettingAsCount("skin_outline_count"), mesh.getSettingBoolean("skin_no_small_gaps_heuristic"));
-
-    if (process_infill)
-    { // process infill when infill density > 0
-        // or when other infill meshes want to modify this infill
-        int infill_skin_overlap = 0;
-        bool infill_is_dense = mesh.getSettingInMicrons("infill_line_distance") < mesh.getSettingInMicrons("infill_line_width") + 10;
-        if (!infill_is_dense && mesh.getSettingAsFillMethod("infill_pattern") != EFillMethod::CONCENTRIC)
+    for(SliceMeshStorage& mesh : storage.meshes)
+    {
+        if (mesh.getSettingAsSurfaceMode("magic_mesh_surface_mode") == ESurfaceMode::SURFACE) { continue; }
+        
+        int wall_line_count = mesh.getSettingAsCount("wall_line_count");
+        int skin_extrusion_width = mesh.getSettingInMicrons("skin_line_width");
+        int innermost_wall_extrusion_width = (wall_line_count == 1)? mesh.getSettingInMicrons("wall_line_width_0") : mesh.getSettingInMicrons("wall_line_width_x");
+        generateSkins(layer_nr, mesh, skin_extrusion_width, mesh.getSettingAsCount("bottom_layers"), mesh.getSettingAsCount("top_layers"), wall_line_count, innermost_wall_extrusion_width, mesh.getSettingAsCount("skin_outline_count"), mesh.getSettingBoolean("skin_no_small_gaps_heuristic"), mesh.getSettingBoolean("remove_overlapping_walls_0_enabled"), mesh.getSettingBoolean("remove_overlapping_walls_x_enabled"));
+        if (mesh.getSettingInMicrons("infill_line_distance") > 0)
         {
-            infill_skin_overlap = innermost_wall_line_width / 2;
-        }
-        generateInfill(layer_nr, mesh, innermost_wall_line_width, infill_skin_overlap, wall_line_count);
-    }
-}
-
-void FffPolygonGenerator::computePrintHeightStatistics(SliceDataStorage& storage)
-{
-    int extruder_count = storage.meshgroup->getExtruderCount();
-
-    std::vector<int>& max_print_height_per_extruder = storage.max_print_height_per_extruder;
-    assert(max_print_height_per_extruder.size() == 0 && "storage.max_print_height_per_extruder shouldn't have been initialized yet!");
-    max_print_height_per_extruder.resize(extruder_count, -1); //Initialize all as -1.
-    { // compute max_object_height_per_extruder
-        //Height of the meshes themselves.
-        for (SliceMeshStorage& mesh : storage.meshes)
-        {
-            if (mesh.getSettingBoolean("anti_overhang_mesh") || mesh.getSettingBoolean("support_mesh"))
+            int infill_skin_overlap = 0;
+            bool infill_is_dense = mesh.getSettingInMicrons("infill_line_distance") < mesh.getSettingInMicrons("infill_line_width") + 10;
+            if (!infill_is_dense && mesh.getSettingAsFillMethod("infill_pattern") != EFillMethod::CONCENTRIC)
             {
-                continue; //Special type of mesh that doesn't get printed.
+                infill_skin_overlap = skin_extrusion_width / 2;
+            }
+            generateInfill(layer_nr, mesh, innermost_wall_extrusion_width, infill_skin_overlap, wall_line_count);
+            if (mesh.getSettingAsFillPerimeterGapMode("fill_perimeter_gaps") == FillPerimeterGapMode::SKIN)
+            {
+                generatePerimeterGaps(layer_nr, mesh, skin_extrusion_width, mesh.getSettingAsCount("bottom_layers"), mesh.getSettingAsCount("top_layers"));
+            }
+            else if (mesh.getSettingAsFillPerimeterGapMode("fill_perimeter_gaps") == FillPerimeterGapMode::EVERYWHERE)
+            {
+                generatePerimeterGaps(layer_nr, mesh, skin_extrusion_width, 0, 0);
             }
-            const unsigned int extr_nr = mesh.getSettingAsIndex("extruder_nr");
-            max_print_height_per_extruder[extr_nr] = std::max(max_print_height_per_extruder[extr_nr], mesh.layer_nr_max_filled_layer);
         }
-
-        //Height of where the support reaches.
-        const unsigned int support_infill_extruder_nr = storage.getSettingAsIndex("support_infill_extruder_nr"); // TODO: support extruder should be configurable per object
-        max_print_height_per_extruder[support_infill_extruder_nr] =
-            std::max(max_print_height_per_extruder[support_infill_extruder_nr],
-                     storage.support.layer_nr_max_filled_layer);
-        const unsigned int support_skin_extruder_nr = storage.getSettingAsIndex("support_interface_extruder_nr"); // TODO: support skin extruder should be configurable per object
-        max_print_height_per_extruder[support_skin_extruder_nr] =
-            std::max(max_print_height_per_extruder[support_skin_extruder_nr],
-                     storage.support.layer_nr_max_filled_layer);
-
-        //Height of where the platform adhesion reaches.
-        if (storage.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::NONE)
-        {
-            const unsigned int adhesion_extruder_nr = storage.getSettingAsIndex("adhesion_extruder_nr");
-            max_print_height_per_extruder[adhesion_extruder_nr] =
-                std::max(0, max_print_height_per_extruder[adhesion_extruder_nr]);
-        }
-    }
-
-    storage.max_print_height_order = order(max_print_height_per_extruder);
-    if (extruder_count >= 2)
-    {
-        int second_highest_extruder = storage.max_print_height_order[extruder_count - 2];
-        storage.max_print_height_second_to_last_extruder = max_print_height_per_extruder[second_highest_extruder];
-    }
-    else
-    {
-        storage.max_print_height_second_to_last_extruder = -1;
     }
 }
 
-
-void FffPolygonGenerator::processOozeShield(SliceDataStorage& storage)
+void FffPolygonGenerator::processOozeShield(SliceDataStorage& storage, unsigned int total_layers)
 {
     if (!getSettingBoolean("ooze_shield_enabled"))
     {
         return;
     }
-
-    const int ooze_shield_dist = getSettingInMicrons("ooze_shield_dist");
-
-    for (int layer_nr = 0; layer_nr <= storage.max_print_height_second_to_last_extruder; layer_nr++)
+    
+    int ooze_shield_dist = getSettingInMicrons("ooze_shield_dist");
+    
+    for(unsigned int layer_nr=0; layer_nr<total_layers; layer_nr++)
     {
-        storage.oozeShield.push_back(storage.getLayerOutlines(layer_nr, true).offset(ooze_shield_dist, ClipperLib::jtRound));
+        storage.oozeShield.push_back(storage.getLayerOutlines(layer_nr, true).offset(ooze_shield_dist));
     }
-
-    double angle = getSettingInAngleDegrees("ooze_shield_angle");
-    if (angle <= 89)
+    
+    int largest_printed_radius = MM2INT(1.0); // TODO: make var a parameter, and perhaps even a setting?
+    for(unsigned int layer_nr=0; layer_nr<total_layers; layer_nr++)
     {
-        int allowed_angle_offset = tan(getSettingInAngleRadians("ooze_shield_angle")) * getSettingInMicrons("layer_height"); // Allow for a 60deg angle in the oozeShield.
-        for (int layer_nr = 1; layer_nr <= storage.max_print_height_second_to_last_extruder; layer_nr++)
-        {
-            storage.oozeShield[layer_nr] = storage.oozeShield[layer_nr].unionPolygons(storage.oozeShield[layer_nr - 1].offset(-allowed_angle_offset));
-        }
-        for (int layer_nr = storage.max_print_height_second_to_last_extruder; layer_nr > 0; layer_nr--)
-        {
-            storage.oozeShield[layer_nr - 1] = storage.oozeShield[layer_nr - 1].unionPolygons(storage.oozeShield[layer_nr].offset(-allowed_angle_offset));
-        }
+        storage.oozeShield[layer_nr] = storage.oozeShield[layer_nr].offset(-largest_printed_radius).offset(largest_printed_radius); 
     }
-
-    const float largest_printed_area = 1.0; // TODO: make var a parameter, and perhaps even a setting?
-    for (int layer_nr = 0; layer_nr <= storage.max_print_height_second_to_last_extruder; layer_nr++)
+    int allowed_angle_offset = tan(getSettingInAngleRadians("ooze_shield_angle")) * getSettingInMicrons("layer_height");//Allow for a 60deg angle in the oozeShield.
+    for(unsigned int layer_nr=1; layer_nr<total_layers; layer_nr++)
     {
-        storage.oozeShield[layer_nr].removeSmallAreas(largest_printed_area);
+        storage.oozeShield[layer_nr] = storage.oozeShield[layer_nr].unionPolygons(storage.oozeShield[layer_nr-1].offset(-allowed_angle_offset));
+    }
+    for(unsigned int layer_nr=total_layers-1; layer_nr>0; layer_nr--)
+    {
+        storage.oozeShield[layer_nr-1] = storage.oozeShield[layer_nr-1].unionPolygons(storage.oozeShield[layer_nr].offset(-allowed_angle_offset));
     }
 }
 
-void FffPolygonGenerator::processDraftShield(SliceDataStorage& storage)
+void FffPolygonGenerator::processDraftShield(SliceDataStorage& storage, unsigned int total_layers)
 {
-    const unsigned int draft_shield_layers = getDraftShieldLayerCount(storage.print_layer_count);
-    if (draft_shield_layers <= 0)
+    int draft_shield_height = getSettingInMicrons("draft_shield_height");
+    int draft_shield_dist = getSettingInMicrons("draft_shield_dist");
+    int layer_height_0 = getSettingInMicrons("layer_height_0");
+    int layer_height = getSettingInMicrons("layer_height");
+    
+    if (draft_shield_height < layer_height_0)
     {
         return;
     }
-    const int layer_height = getSettingInMicrons("layer_height");
-
-    const unsigned int layer_skip = 500 / layer_height + 1;
-
+    
+    unsigned int max_screen_layer = (draft_shield_height - layer_height_0) / layer_height + 1;
+    
+    int layer_skip = 500 / layer_height + 1;
+    
     Polygons& draft_shield = storage.draft_protection_shield;
-    for (unsigned int layer_nr = 0; layer_nr < storage.print_layer_count && layer_nr < draft_shield_layers; layer_nr += layer_skip)
+    for (unsigned int layer_nr = 0; layer_nr < total_layers && layer_nr < max_screen_layer; layer_nr += layer_skip)
     {
         draft_shield = draft_shield.unionPolygons(storage.getLayerOutlines(layer_nr, true));
     }
-
-    const int draft_shield_dist = getSettingInMicrons("draft_shield_dist");
-    storage.draft_protection_shield = draft_shield.approxConvexHull(draft_shield_dist);
+    
+    storage.draft_protection_shield = draft_shield.convexHull(draft_shield_dist);
 }
 
 void FffPolygonGenerator::processPlatformAdhesion(SliceDataStorage& storage)
 {
-    SettingsBaseVirtual* train = storage.meshgroup->getExtruderTrain(getSettingBoolean("adhesion_extruder_nr"));
     switch(getSettingAsPlatformAdhesion("adhesion_type"))
     {
     case EPlatformAdhesion::SKIRT:
-        {
-            constexpr bool outside_polygons_only = true;
-            SkirtBrim::generate(storage, train->getSettingInMicrons("skirt_gap"), train->getSettingAsCount("skirt_line_count"), outside_polygons_only);
+        if (getSettingInMicrons("draft_shield_height") == 0)
+        { // draft screen replaces skirt
+            generateSkirt(storage, getSettingInMicrons("skirt_gap"), getSettingAsCount("skirt_line_count"), getSettingInMicrons("skirt_minimal_length"));
         }
         break;
     case EPlatformAdhesion::BRIM:
-        SkirtBrim::generate(storage, 0, train->getSettingAsCount("brim_line_count"), train->getSettingBoolean("brim_outside_only"));
+        generateSkirt(storage, 0, getSettingAsCount("brim_line_count"), getSettingInMicrons("skirt_minimal_length"));
         break;
     case EPlatformAdhesion::RAFT:
-        Raft::generate(storage, train->getSettingInMicrons("raft_margin"));
-        break;
-    case EPlatformAdhesion::NONE:
+        generateRaft(storage, getSettingInMicrons("raft_margin"));
         break;
     }
+    
+    Polygons skirt_sent = storage.skirt[0];
+    for (int extruder = 1; extruder < storage.meshgroup->getExtruderCount(); extruder++)
+        skirt_sent.add(storage.skirt[extruder]);
 }
 
 
@@ -731,7 +439,7 @@ void FffPolygonGenerator::processFuzzyWalls(SliceMeshStorage& mesh)
                     for (int64_t p0pa_dist = dist_left_over; p0pa_dist < p0p1_size; p0pa_dist += min_dist_between_points + rand() % range_random_point_dist)
                     {
                         int r = rand() % (fuzziness * 2) - fuzziness;
-                        Point perp_to_p0p1 = turn90CCW(p0p1);
+                        Point perp_to_p0p1 = crossZ(p0p1);
                         Point fuzz = normal(perp_to_p0p1, r);
                         Point pa = *p0 + normal(p0p1, p0pa_dist) + fuzz;
                         result.add(pa);

src/FffPolygonGenerator.h

@@ -6,12 +6,10 @@
 #include "utils/polygonUtils.h"
 #include "utils/NoCopy.h"
 #include "utils/gettime.h"
-#include "settings/settings.h"
+#include "settings.h"
 #include "sliceDataStorage.h"
 #include "commandSocket.h"
 #include "PrintFeature.h"
-#include "progress/ProgressEstimator.h"
-#include "progress/ProgressStageEstimator.h"
 
 namespace cura
 {
@@ -46,19 +44,7 @@ public:
     bool generateAreas(SliceDataStorage& storage, MeshGroup* object, TimeKeeper& timeKeeper);
   
 private:
-    /*!
-     * \brief Helper function to get the actual height of the draft shield.
-     *
-     * The draft shield is the height of the print if we've set the draft shield
-     * limitation to FULL. Otherwise the height is set to the height limit
-     * setting. If the draft shield is disabled, the height is always 0.
-     *
-     * \param total_layers The total number of layers in the print (the height
-     * of the draft shield if the limit is FULL.
-     * \return The actual height of the draft shield.
-     */
-    unsigned int getDraftShieldLayerCount(unsigned int total_layers) const;
-
+    
     /*!
      * Slice the \p object and store the outlines in the \p storage.
      * 
@@ -78,97 +64,58 @@ private:
      */
     void slices2polygons(SliceDataStorage& storage, TimeKeeper& timeKeeper);
     
-    /*!
-     * Processes the outline information as stored in the \p storage: generates inset perimeter polygons, skin and infill
-     * 
-     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
-     * \param mesh_order_idx The index of the mesh_idx in \p mesh_order to process in the vector of meshes in \p storage
-     * \param mesh_order The order in which the meshes are processed (used for infill meshes)
-     * \param inset_skin_progress_estimate The progress stage estimate calculator
-     */
-    void processBasicWallsSkinInfill(SliceDataStorage& storage, unsigned int mesh_order_idx, std::vector<unsigned int>& mesh_order, ProgressStageEstimator& inset_skin_progress_estimate);
-    
-    /*!
-     * Process the mesh to be an infill mesh: limit all outlines to within the infill of normal meshes and subtract their volume from the infill of those meshes
-     * 
-     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
-     * \param mesh_order_idx The index of the mesh_idx in \p mesh_order to process in the vector of meshes in \p storage
-     * \param mesh_order The order in which the meshes are processed
-     */
-    void processInfillMesh(SliceDataStorage& storage, unsigned int mesh_order_idx, std::vector<unsigned int>& mesh_order);
-    
-    /*!
-     * Process features which are derived from the basic walls, skin, and infill:
-     * fuzzy skin, infill combine
-     * 
-     * \param mesh Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
-     */
-    void processDerivedWallsSkinInfill(SliceMeshStorage& mesh);
-    
     /*!
      * Remove all bottom layers which are empty.
-     * 
-     * \warning Changes \p total_layers
-     * 
      * \param storage Input and Ouput parameter: stores all layers
      * \param layer_height The height of each layer
      * \param total_layers The total number of layers
      */
-    void removeEmptyFirstLayers(SliceDataStorage& storage, const int layer_height, unsigned int& total_layers);
-
-    /*!
-     * Set \ref SliceDataStorage::max_print_height_per_extruder and \ref SliceDataStorage::max_print_height_order and \ref SliceDataStorage::max_print_height_second_to_last_extruder
-     * 
-     * \param[in,out] storage Where to retrieve mesh and support etc settings from and where the print height statistics are saved.
-     */
-    void computePrintHeightStatistics(SliceDataStorage& storage);
-
+    void removeEmptyFirstLayers(SliceDataStorage& storage, int layer_height, unsigned int total_layers);
+    
     /*!
      * Generate the inset polygons which form the walls.
-     * \param mesh Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
      * \param layer_nr The layer for which to generate the insets.
      */
-    void processInsets(SliceMeshStorage& mesh, unsigned int layer_nr);
+    void processInsets(SliceDataStorage& storage, unsigned int layer_nr);
 
     /*!
      * Generate the outline of the ooze shield.
      * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param total_layers The total number of layers 
      */
-    void processOozeShield(SliceDataStorage& storage);
+    void processOozeShield(SliceDataStorage& storage, unsigned int total_layers);
     
     /*!
      * Generate the skin areas.
-     * \param mesh Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
      * \param layer_nr The layer for which to generate the skin areas.
-     * \param process_infill Generate infill areas
      */
-    void processSkinsAndInfill(SliceMeshStorage& mesh, unsigned int layer_nr, bool process_infill); 
+    void processSkinsAndInfill(SliceDataStorage& storage, unsigned int layer_nr); 
 
     /*!
      * Generate the polygons where the draft screen should be.
      * 
      * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
+     * \param total_layers The total number of layers 
      */
-    void processDraftShield(SliceDataStorage& storage);
-
+    void processDraftShield(SliceDataStorage& storage, unsigned int total_layers);
     /*!
      * Generate the skirt/brim/raft areas/insets.
      * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
      */
     void processPlatformAdhesion(SliceDataStorage& storage);
-
+    
+    
+    
     /*!
      * Make the outer wall 'fuzzy'
-     * 
-     * Introduce new vertices and move existing vertices in or out by a random distance, based on the fuzzy skin settings.
-     * 
-     * This only changes the outer wall.
-     * 
-     * \param[in,out] mesh where the outer wall is retrieved and stored in.
      */
     void processFuzzyWalls(SliceMeshStorage& mesh);
+    
+    
 
-
+    
 };
 }//namespace cura
 #endif // FFF_AREA_GENERATOR_H

src/FffProcessor.cpp

@@ -5,18 +5,6 @@ namespace cura
 
 FffProcessor FffProcessor::instance; // definition must be in cpp
 
-FffProcessor::FffProcessor()
-: polygon_generator(this)
-, gcode_writer(this)
-, meshgroup_number(0)
-{
-}
-
-int FffProcessor::getMeshgroupNr()
-{
-    return meshgroup_number;
-}
-
 
 std::string FffProcessor::getAllSettingsString(MeshGroup& meshgroup, bool first_meshgroup)
 {
@@ -39,38 +27,50 @@ std::string FffProcessor::getAllSettingsString(MeshGroup& meshgroup, bool first_
     for (unsigned int mesh_idx = 0; mesh_idx < meshgroup.meshes.size(); mesh_idx++)
     {
         Mesh& mesh = meshgroup.meshes[mesh_idx];
-        sstream << " -e" << mesh.getSettingAsIndex("extruder_nr") << " -l \"" << mesh_idx << "\"" << mesh.getAllLocalSettingsString();
+        sstream << " -e" << mesh.getSettingAsCount("extruder_nr") << " -l \"" << mesh_idx << "\"" << mesh.getAllLocalSettingsString();
     }
     sstream << "\n";
     return sstream.str();
 }
 
+bool FffProcessor::processFiles(const std::vector< std::string >& files)
+{
+    time_keeper.restart();
+    MeshGroup* meshgroup = new MeshGroup(this);
+    
+    for(std::string filename : files)
+    {
+        log("Loading %s from disk...\n", filename.c_str());
+
+        FMatrix3x3 matrix;
+        if (!loadMeshIntoMeshGroup(meshgroup, filename.c_str(), matrix))
+        {
+            logError("Failed to load model: %s\n", filename.c_str());
+            return false;
+        }
+    }
+    
+    meshgroup->finalize();
+
+    log("Loaded from disk in %5.3fs\n", time_keeper.restart());
+    return processMeshGroup(meshgroup);
+}
+
 bool FffProcessor::processMeshGroup(MeshGroup* meshgroup)
 {
-    if (SHOW_ALL_SETTINGS) { logWarning(getAllSettingsString(*meshgroup, meshgroup_number == 0).c_str()); }
+    if (SHOW_ALL_SETTINGS) { logWarning(getAllSettingsString(*meshgroup, first_meshgroup).c_str()); }
     time_keeper.restart();
     if (!meshgroup)
         return false;
 
     TimeKeeper time_keeper_total;
-
-    polygon_generator.setParent(meshgroup);
-    gcode_writer.setParent(meshgroup);
-
-    bool empty = true;
-    for (Mesh& mesh : meshgroup->meshes)
-    {
-        if (!mesh.getSettingBoolean("infill_mesh") && !mesh.getSettingBoolean("anti_overhang_mesh"))
-        {
-            empty = false;
-        }
-    }
-    if (empty)
+    
+    if (meshgroup->meshes.empty())
     {
         Progress::messageProgress(Progress::Stage::FINISH, 1, 1); // 100% on this meshgroup
         log("Total time elapsed %5.2fs.\n", time_keeper_total.restart());
 
-        profile_string += getAllSettingsString(*meshgroup, meshgroup_number == 0);
+        profile_string += getAllSettingsString(*meshgroup, first_meshgroup);
         return true;
     }
     
@@ -103,16 +103,12 @@ bool FffProcessor::processMeshGroup(MeshGroup* meshgroup)
     if (CommandSocket::isInstantiated())
     {
         CommandSocket::getInstance()->flushGcode();
-        CommandSocket::getInstance()->sendOptimizedLayerData();
+        CommandSocket::getInstance()->endSendSlicedObject();
     }
     log("Total time elapsed %5.2fs.\n", time_keeper_total.restart());
 
-    profile_string += getAllSettingsString(*meshgroup, meshgroup_number == 0);
-    meshgroup_number++;
-
-    polygon_generator.setParent(this); // otherwise consequent getSetting calls (e.g. for finalize) will refer to non-existent meshgroup
-    gcode_writer.setParent(this); // otherwise consequent getSetting calls (e.g. for finalize) will refer to non-existent meshgroup
-
+    profile_string += getAllSettingsString(*meshgroup, first_meshgroup);
+    first_meshgroup = false;
     return true;
 }
 

src/FffProcessor.h

@@ -1,13 +1,13 @@
 #ifndef FFF_PROCESSOR_H
 #define FFF_PROCESSOR_H
 
-#include "settings/settings.h"
+#include "settings.h"
 #include "FffGcodeWriter.h"
 #include "FffPolygonGenerator.h"
 #include "commandSocket.h"
 #include "Weaver.h"
 #include "Wireframe2gcode.h"
-#include "progress/Progress.h"
+#include "Progress.h"
 #include "utils/gettime.h"
 #include "utils/NoCopy.h"
 
@@ -19,145 +19,67 @@ namespace cura {
 class FffProcessor : public SettingsBase , NoCopy
 {
 private:
-    /*!
-     * The FffProcessor used for the (current) slicing (The instance of this singleton)
-     */
     static FffProcessor instance; 
     
-    FffProcessor();
+    FffProcessor()
+    : polygon_generator(this)
+    , gcode_writer(this)
+    , first_meshgroup(true)
+    {
+    }
 public:
-    /*!
-     * Get the instance
-     * \return The instance
-     */
     static FffProcessor* getInstance() 
     { 
         return &instance; 
     }
-
-    /*!
-     * Get the index of the meshgroup currently being processed, starting at zero.
-     */
-    int getMeshgroupNr();
-
+    
 private:
-    /*!
-     * The polygon generator, which slices the models and generates all polygons to be printed and areas to be filled.
-     */
     FffPolygonGenerator polygon_generator;
-
-    /*!
-     * The gcode writer, which generates paths in layer plans in a buffer, which converts these paths into gcode commands.
-     */
     FffGcodeWriter gcode_writer;
-
-    /*!
-     * The index of the meshgroup currently being processed, starting at zero.
-     */
-    int meshgroup_number;
-
-    /*!
-     * A string containing all setting values passed to the engine in the format by which CuraEngine is called via the command line.
-     * 
-     * Used in debugging.
-     */
+    
+    bool first_meshgroup;
+    
     std::string profile_string = "";
-
-    /*!
-     * Get all settings for the current meshgroup in the format by which CuraEngine is called via the command line.
-     * 
-     * Also includes all global settings if this is the first meshgroup.
-     * 
-     * Used in debugging.
-     * 
-     * \param meshgroup The meshgroup for which to stringify all settings
-     * \param first_meshgroup Whether this is the first meshgroup and all global settigns should be included as well
-     */
+    
     std::string getAllSettingsString(MeshGroup& meshgroup, bool first_meshgroup);
-
+    
 public:
-    /*!
-     * Get a string containing all setting values passed to the engine in the format by which CuraEngine is called via the command line.
-     * 
-     * \return A string containing all setting values passed to the engine in the format by which CuraEngine is called via the command line.
-     */
     std::string getProfileString() { return profile_string; }
-
-    /*!
-     * The stop watch used to time how long the different stages take to compute.
-     */
+    
     TimeKeeper time_keeper; // TODO: use singleton time keeper
-
-    /*!
-     * Reset the meshgroup number to the first meshgroup to start a new slicing.
-     */
-    void resetMeshGroupNumber()
+    
+    void resetFileNumber()
     {
-        meshgroup_number = 0;
+        gcode_writer.resetFileNumber();
     }
 
-    /*!
-     * Set the target to write gcode to: to a file.
-     * 
-     * Used when CuraEngine is used as command line tool.
-     * 
-     * \param filename The filename of the file to which to write the gcode.
-     */
     bool setTargetFile(const char* filename)
     {
         return gcode_writer.setTargetFile(filename);
     }
-
-    /*!
-     * Set the target to write gcode to: an output stream.
-     * 
-     * Used when CuraEngine is NOT used as command line tool.
-     * 
-     * \param stream The stream to write gcode to.
-     */
+    
     void setTargetStream(std::ostream* stream)
     {
         return gcode_writer.setTargetStream(stream);
     }
 
-    /*!
-     * Get the total extruded volume for a specific extruder in mm^3
-     * 
-     * Retractions and unretractions don't contribute to this.
-     * 
-     * \param extruder_nr The extruder number for which to get the total netto extruded volume
-     * \return total filament printed in mm^3
-     */
-    double getTotalFilamentUsed(int extruder_nr)
+    double getTotalFilamentUsed(int e)
     {
-        return gcode_writer.getTotalFilamentUsed(extruder_nr);
+        return gcode_writer.getTotalFilamentUsed(e);
     }
 
-    /*!
-     * Get the total estimated print time in seconds
-     * 
-     * \return total print time in seconds
-     */
     double getTotalPrintTime()
     {
         return gcode_writer.getTotalPrintTime();
     }
-
-    /*!
-     * Add the end gcode and set all temperatures to zero.
-     */
+    
     void finalize()
     {
         gcode_writer.finalize();
     }
 
-    /*!
-     * Generate gcode for a given \p meshgroup
-     * The primary function of this class.
-     * 
-     * \param meshgroup The meshgroup for which to generate gcode
-     * \return Whether this function succeeded
-     */
+    bool processFiles(const std::vector<std::string> &files);
+    
     bool processMeshGroup(MeshGroup* meshgroup);
 };
 

src/GCodePathConfig.cpp

@@ -1,111 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-
-#include "utils/intpoint.h" // INT2MM
-#include "GCodePathConfig.h"
-
-namespace cura 
-{
-
-GCodePathConfig::BasicConfig::BasicConfig()
-: speed(0)
-, acceleration(0)
-, jerk(0)
-, line_width(0)
-, flow(100)
-{
-}
-
-
-GCodePathConfig::BasicConfig::BasicConfig(double speed, double acceleration, double jerk, int line_width, double flow)
-: speed(speed)
-, acceleration(acceleration)
-, jerk(jerk)
-, line_width(line_width)
-, flow(flow)
-{
-}
-
-void GCodePathConfig::BasicConfig::set(double speed, double acceleration, double jerk, int line_width, double flow)
-{
-    this->speed = speed;
-    this->acceleration = acceleration;
-    this->jerk = jerk;
-    this->line_width = line_width;
-    this->flow = flow;
-}
-
-
-GCodePathConfig::GCodePathConfig(PrintFeatureType type)
-: extrusion_mm3_per_mm(0.0)
-, type(type)
-{
-}
-
-void GCodePathConfig::init(double speed, double acceleration, double jerk, int line_width, double flow)
-{
-    iconic_config.set(speed, acceleration, jerk, line_width, flow);
-    current_config = iconic_config;
-}
-
-void GCodePathConfig::setLayerHeight(int layer_height)
-{
-    this->layer_thickness = layer_height;
-    calculateExtrusion();
-}
-
-void GCodePathConfig::smoothSpeed(GCodePathConfig::BasicConfig first_layer_config, int layer_nr, double max_speed_layer) 
-{
-    current_config.speed = (iconic_config.speed * layer_nr) / max_speed_layer + (first_layer_config.speed * (max_speed_layer - layer_nr) / max_speed_layer);
-    current_config.acceleration = (iconic_config.acceleration * layer_nr) / max_speed_layer + (first_layer_config.acceleration * (max_speed_layer - layer_nr) / max_speed_layer);
-    current_config.jerk = (iconic_config.jerk * layer_nr) / max_speed_layer + (first_layer_config.jerk * (max_speed_layer - layer_nr) / max_speed_layer);
-}
-
-void GCodePathConfig::setSpeedIconic()
-{
-    current_config.speed = iconic_config.speed;
-    current_config.acceleration = iconic_config.acceleration;
-    current_config.jerk = iconic_config.jerk;
-}
-
-double GCodePathConfig::getExtrusionMM3perMM()
-{
-    return extrusion_mm3_per_mm;
-}
-
-double GCodePathConfig::getSpeed()
-{
-    return current_config.speed;
-}
-
-double GCodePathConfig::getAcceleration()
-{
-    return current_config.acceleration;
-}
-
-double GCodePathConfig::getJerk()
-{
-    return current_config.jerk;
-}
-
-int GCodePathConfig::getLineWidth()
-{
-    return current_config.line_width;
-}
-
-bool GCodePathConfig::isTravelPath()
-{
-    return current_config.line_width == 0;
-}
-
-double GCodePathConfig::getFlowPercentage()
-{
-    return current_config.flow;
-}
-
-void GCodePathConfig::calculateExtrusion()
-{
-    extrusion_mm3_per_mm = INT2MM(current_config.line_width) * INT2MM(layer_thickness) * double(current_config.flow) / 100.0;
-}
-
-
-}//namespace cura

src/GCodePathConfig.h

@@ -1,112 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#ifndef G_CODE_PATH_CONFIG_H
-#define G_CODE_PATH_CONFIG_H
-
-#include "RetractionConfig.h"
-#include "PrintFeature.h"
-
-namespace cura 
-{
-
-/*!
- * The GCodePathConfig is the configuration for moves/extrusion actions. This defines at which width the line is printed and at which speed.
- */
-class GCodePathConfig
-{
-    friend class GCodePlannerTest;
-public:
-    /*!
-     * The path config settings which may change from layer to layer
-     */
-    struct BasicConfig
-    {
-        double speed; //!< movement speed (mm/s)
-        double acceleration; //!< acceleration of head movement (mm/s^2)
-        double jerk; //!< jerk of the head movement (around stand still) (mm/s^3)
-        int line_width; //!< width of the line extruded
-        double flow; //!< extrusion flow modifier in %
-        BasicConfig(); //!< basic contructor initializing with inaccurate values
-        BasicConfig(double speed, double acceleration, double jerk, int line_width, double flow); //!< basic contructor initializing all values
-        void set(double speed, double acceleration, double jerk, int line_width, double flow); //!< Set all config values
-    };
-private:
-    BasicConfig iconic_config; //!< The basic path configuration iconic to this print feature type
-    BasicConfig current_config; //!< The current path configuration for the current layer
-    int layer_thickness; //!< current layer height in micron
-    double extrusion_mm3_per_mm;//!< current mm^3 filament moved per mm line traversed
-public:
-    const PrintFeatureType type; //!< name of the feature type
-
-    /*!
-     * Basic constructor.
-     */
-    GCodePathConfig(PrintFeatureType type);
-    
-    /*!
-     * Initialize some of the member variables.
-     * 
-     * \warning GCodePathConfig::setLayerHeight still has to be called before this object can be used.
-     * 
-     * \param speed The regular speed with which to print this feature
-     * \param line_width The line width for this feature
-     * \param flow The flow modifier to apply to the extruded filament when printing this feature
-     */
-    void init(double speed, double acceleration, double jerk, int line_width, double flow);
-
-    /*!
-     * Set the layer height and (re)compute the extrusion_per_mm
-     */
-    void setLayerHeight(int layer_height);
-
-    /*!
-     * Set the speed to somewhere between the speed of @p first_layer_config and the iconic speed.
-     * 
-     * \warning This functions should not be called with @p layer_nr > @p max_speed_layer !
-     * 
-     * \param first_layer_config The speed settings at layer zero
-     * \param layer_nr The layer number 
-     * \param max_speed_layer The layer number for which the speed_iconic should be used.
-     */
-    void smoothSpeed(BasicConfig first_layer_config, int layer_nr, double max_speed_layer);
-
-    /*!
-     * Set the speed config to the iconic speed config, i.e. the normal speed of the feature type for which this is a config.
-     * 
-     * Does the same for acceleration and jerk.
-     */
-    void setSpeedIconic();
-
-    /*!
-     * Can only be called after the layer height has been set (which is done while writing the gcode!)
-     */
-    double getExtrusionMM3perMM();
-
-    /*!
-     * Get the movement speed in mm/s
-     */
-    double getSpeed();
-
-    /*!
-     * Get the current acceleration of this config
-     */
-    double getAcceleration();
-
-    /*!
-     * Get the current jerk of this config
-     */
-    double getJerk();
-
-    int getLineWidth();
-
-    bool isTravelPath();
-
-    double getFlowPercentage();
-
-private:
-    void calculateExtrusion();
-};
-
-
-}//namespace cura
-
-#endif // G_CODE_PATH_CONFIG_H

src/LayerPlanBuffer.cpp

@@ -3,7 +3,6 @@
 #include "LayerPlanBuffer.h"
 #include "gcodeExport.h"
 #include "utils/logoutput.h"
-#include "FffProcessor.h"
 
 namespace cura {
 
@@ -13,15 +12,13 @@ void LayerPlanBuffer::flush()
 {
     if (buffer.size() > 0)
     {
-        insertTempCommands(); // insert preheat commands of the very last layer
+        insertPreheatCommands(); // insert preheat commands of the very last layer
     }
     while (!buffer.empty())
     {
-        buffer.front().writeGCode(gcode);
+        buffer.front().writeGCode(gcode, getSettingBoolean("cool_lift_head"), buffer.front().getLayerNr() > 0 ? getSettingInMicrons("layer_height") : getSettingInMicrons("layer_height_0"));
         if (CommandSocket::isInstantiated())
-        {
             CommandSocket::getInstance()->flushGcode();
-        }
         buffer.pop_front();
     }
     
@@ -30,324 +27,185 @@ void LayerPlanBuffer::flush()
 void LayerPlanBuffer::insertPreheatCommand(ExtruderPlan& extruder_plan_before, double time_after_extruder_plan_start, int extruder, double temp)
 {
     double acc_time = 0.0;
-    for (unsigned int path_idx = extruder_plan_before.paths.size() - 1; int(path_idx) != -1 ; path_idx--)
+    for (unsigned int path_idx = 0; path_idx < extruder_plan_before.paths.size(); path_idx++)
     {
         GCodePath& path = extruder_plan_before.paths[path_idx];
-        const double time_this_path = path.estimates.getTotalTime();
-        acc_time += time_this_path;
+        acc_time += path.estimates.getTotalTime();
         if (acc_time > time_after_extruder_plan_start)
         {
-            const double time_before_path_end = acc_time - time_after_extruder_plan_start;
-            bool wait = false;
-            extruder_plan_before.insertCommand(path_idx, extruder, temp, wait, time_this_path - time_before_path_end);
+//                 logError("Inserting %f\t seconds too early!\n", acc_time - time_after_extruder_plan_start);
+            extruder_plan_before.insertCommand(path_idx, extruder, temp, false, acc_time - time_after_extruder_plan_start);
             return;
         }
     }
-    bool wait = false;
-    unsigned int path_idx = 0;
-    extruder_plan_before.insertCommand(path_idx, extruder, temp, wait); // insert at start of extruder plan if time_after_extruder_plan_start > extruder_plan.time
+    extruder_plan_before.insertCommand(extruder_plan_before.paths.size(), extruder, temp, false); // insert at end of extruder plan if time_after_extruder_plan_start > extruder_plan.time 
+    // = special insert after all extruder plans
 }
 
-Preheat::WarmUpResult LayerPlanBuffer::timeBeforeExtruderPlanToInsert(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx)
+double LayerPlanBuffer::timeBeforeExtruderPlanToInsert(std::vector<GCodePlanner*>& layers, unsigned int layer_plan_idx, unsigned int extruder_plan_idx)
 {
-    ExtruderPlan& extruder_plan = *extruder_plans[extruder_plan_idx];
+    ExtruderPlan& extruder_plan = layers[layer_plan_idx]->extruder_plans[extruder_plan_idx];
     int extruder = extruder_plan.extruder;
-    double initial_print_temp = extruder_plan.initial_printing_temperature;
-
+    double required_temp = extruder_plan.required_temp;
+    
+    unsigned int extruder_plan_before_idx = extruder_plan_idx - 1;
+    bool first_it = true;
     double in_between_time = 0.0;
-    for (unsigned int extruder_plan_before_idx = extruder_plan_idx - 1; int(extruder_plan_before_idx) >= 0; extruder_plan_before_idx--)
-    { // find a previous extruder plan where the same extruder is used to see what time this extruder wasn't used
-        ExtruderPlan& extruder_plan_before = *extruder_plans[extruder_plan_before_idx];
-        if (extruder_plan_before.extruder == extruder)
+    for (unsigned int layer_idx = layer_plan_idx; int(layer_idx) >= 0; layer_idx--)
+    {
+        GCodePlanner& layer = *layers[layer_idx];
+        if (!first_it)
         {
-            double temp_before = preheat_config.getFinalPrintTemp(extruder);
-            if (temp_before == 0)
-            {
-                temp_before = extruder_plan_before.printing_temperature;
-            }
-            constexpr bool during_printing = false;
-            Preheat::WarmUpResult warm_up = preheat_config.getWarmUpPointAfterCoolDown(in_between_time, extruder, temp_before, preheat_config.getStandbyTemp(extruder), initial_print_temp, during_printing);
-            warm_up.heating_time = std::min(in_between_time, warm_up.heating_time + extra_preheat_time);
-            return warm_up;
+            extruder_plan_before_idx = layer.extruder_plans.size() - 1;
         }
-        in_between_time += extruder_plan_before.estimates.getTotalTime();
+        for ( ; int(extruder_plan_before_idx) >= 0; extruder_plan_before_idx--)
+        {
+            ExtruderPlan& extruder_plan = layer.extruder_plans[extruder_plan_before_idx];
+            if (extruder_plan.extruder == extruder)
+            {
+                return preheat_config.timeBeforeEndToInsertPreheatCommand_coolDownWarmUp(in_between_time, extruder, required_temp);
+            }
+            in_between_time += extruder_plan.estimates.getTotalTime();
+        }
+        first_it = false;
     }
     // The last extruder plan with the same extruder falls outside of the buffer
     // assume the nozzle has cooled down to strandby temperature already.
-    Preheat::WarmUpResult warm_up;
-    warm_up.total_time_window = in_between_time;
-    warm_up.lowest_temperature = preheat_config.getStandbyTemp(extruder);
-    constexpr bool during_printing = false;
-    warm_up.heating_time = preheat_config.getTimeToGoFromTempToTemp(extruder, warm_up.lowest_temperature, initial_print_temp, during_printing);
-    if (warm_up.heating_time > in_between_time)
-    {
-        warm_up.heating_time = in_between_time;
-        warm_up.lowest_temperature = in_between_time / preheat_config.getTimeToHeatup1Degree(extruder, during_printing);
-    }
-    warm_up.heating_time = warm_up.heating_time + extra_preheat_time;
-    return warm_up;
+    return preheat_config.timeBeforeEndToInsertPreheatCommand_warmUp(preheat_config.getStandbyTemp(extruder), extruder, required_temp, false);
     
 }
 
 void LayerPlanBuffer::insertPreheatCommand_singleExtrusion(ExtruderPlan& prev_extruder_plan, int extruder, double required_temp)
 {
     // time_before_extruder_plan_end is halved, so that at the layer change the temperature will be half way betewen the two requested temperatures
-    constexpr bool during_printing = true;
-    double time_before_extruder_plan_end = 0.5 * preheat_config.getTimeToGoFromTempToTemp(extruder, prev_extruder_plan.printing_temperature, required_temp, during_printing);
-    time_before_extruder_plan_end = std::min(prev_extruder_plan.estimates.getTotalTime(), time_before_extruder_plan_end);
-
-    insertPreheatCommand(prev_extruder_plan, time_before_extruder_plan_end, extruder, required_temp);
-}
-
-
-void LayerPlanBuffer::handleStandbyTemp(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx, double standby_temp)
-{
-    ExtruderPlan& extruder_plan = *extruder_plans[extruder_plan_idx];
-    int extruder = extruder_plan.extruder;
-    for (unsigned int extruder_plan_before_idx = extruder_plan_idx - 2; int(extruder_plan_before_idx) >= 0; extruder_plan_before_idx--)
+    double time_before_extruder_plan_end = 0.5 * preheat_config.timeBeforeEndToInsertPreheatCommand_warmUp(prev_extruder_plan.required_temp, extruder, required_temp, true);
+    double time_after_extruder_plan_start = prev_extruder_plan.estimates.getTotalTime() - time_before_extruder_plan_end;
+    if (time_after_extruder_plan_start < 0)
     {
-        if (extruder_plans[extruder_plan_before_idx]->extruder == extruder)
-        {
-            extruder_plans[extruder_plan_before_idx + 1]->prev_extruder_standby_temp = standby_temp;
-            return;
-        }
+        time_after_extruder_plan_start = 0; // don't override the extruder plan with same extruder of the previous layer
     }
-    logWarning("Warning: Couldn't find previous extruder plan so as to set the standby temperature. Inserting temp command in earliest available layer.\n");
-    ExtruderPlan& earliest_extruder_plan = *extruder_plans[0];
-    constexpr bool wait = false;
-    earliest_extruder_plan.insertCommand(0, extruder, standby_temp, wait);
+        
+    insertPreheatCommand(prev_extruder_plan, time_after_extruder_plan_start, extruder, required_temp);
 }
 
-void LayerPlanBuffer::insertPreheatCommand_multiExtrusion(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx)
+void LayerPlanBuffer::insertPreheatCommand_multiExtrusion(std::vector<GCodePlanner*>& layers, unsigned int layer_plan_idx, unsigned int extruder_plan_idx)
 {
-    ExtruderPlan& extruder_plan = *extruder_plans[extruder_plan_idx];
+    ExtruderPlan& extruder_plan = layers[layer_plan_idx]->extruder_plans[extruder_plan_idx];
     int extruder = extruder_plan.extruder;
-    double initial_print_temp = extruder_plan.initial_printing_temperature;
+    double required_temp = extruder_plan.required_temp;
     
-    Preheat::WarmUpResult heating_time_and_from_temp = timeBeforeExtruderPlanToInsert(extruder_plans, extruder_plan_idx);
-
-    if (heating_time_and_from_temp.total_time_window < preheat_config.getMinimalTimeWindow(extruder))
+    extruder_plan.insertCommand(0, extruder, required_temp, true); // just after the extruder switch, wait for the destination temperature to be reached
+    
+    double time_before_extruder_plan_to_insert = timeBeforeExtruderPlanToInsert(layers, layer_plan_idx, extruder_plan_idx);
+    
+    unsigned int extruder_plan_before_idx = extruder_plan_idx - 1;
+    bool first_it = true; // Whether it's the first iteration of the for loop below
+    for (unsigned int layer_idx = layer_plan_idx; int(layer_idx) >= 0; layer_idx--)
     {
-        handleStandbyTemp(extruder_plans, extruder_plan_idx, initial_print_temp);
-        return; // don't insert preheat command and just stay on printing temperature
-    }
-    else
-    {
-        handleStandbyTemp(extruder_plans, extruder_plan_idx, heating_time_and_from_temp.lowest_temperature);
-    }
-
-    // handle preheat command
-    double time_before_extruder_plan_to_insert = heating_time_and_from_temp.heating_time;
-    for (unsigned int extruder_plan_before_idx = extruder_plan_idx - 1; int(extruder_plan_before_idx) >= 0; extruder_plan_before_idx--)
-    {
-        ExtruderPlan& extruder_plan_before = *extruder_plans[extruder_plan_before_idx];
-        assert (extruder_plan_before.extruder != extruder);
-
-        double time_here = extruder_plan_before.estimates.getTotalTime();
-        if (time_here >= time_before_extruder_plan_to_insert)
+        GCodePlanner& layer = *layers[layer_idx];
+        if (!first_it)
         {
-            insertPreheatCommand(extruder_plan_before, time_before_extruder_plan_to_insert, extruder, initial_print_temp);
-            return;
+            extruder_plan_before_idx = layer.extruder_plans.size() - 1;
         }
-        time_before_extruder_plan_to_insert -= time_here;
+        for ( ; int(extruder_plan_before_idx) >= 0; extruder_plan_before_idx--)
+        {
+            ExtruderPlan& extruder_plan_before = layer.extruder_plans[extruder_plan_before_idx];
+            assert (extruder_plan_before.extruder != extruder);
+            
+            double time_here = extruder_plan_before.estimates.getTotalTime();
+            if (time_here > time_before_extruder_plan_to_insert)
+            {
+                insertPreheatCommand(extruder_plan_before, time_here - time_before_extruder_plan_to_insert, extruder, required_temp);
+                return;
+            }
+            time_before_extruder_plan_to_insert -= time_here;
+            
+        }
+        first_it = false;
     }
-
+    
     // time_before_extruder_plan_to_insert falls before all plans in the buffer
-    bool wait = false;
-    unsigned int path_idx = 0;
-    extruder_plans[0]->insertCommand(path_idx, extruder, initial_print_temp, wait); // insert preheat command at verfy beginning of buffer
+    ExtruderPlan& first_extruder_plan = layers[0]->extruder_plans[0];
+    first_extruder_plan.insertCommand(0, extruder, required_temp, false); // insert preheat command at verfy beginning of buffer
 }
 
-void LayerPlanBuffer::insertTempCommands(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx)
+void LayerPlanBuffer::insertPreheatCommand(std::vector<GCodePlanner*>& layers, unsigned int layer_plan_idx, unsigned int extruder_plan_idx)
 {   
-    ExtruderPlan& extruder_plan = *extruder_plans[extruder_plan_idx];
+    ExtruderPlan& extruder_plan = layers[layer_plan_idx]->extruder_plans[extruder_plan_idx];
     int extruder = extruder_plan.extruder;
+    double required_temp = extruder_plan.required_temp;
     
     
-    ExtruderPlan* prev_extruder_plan = extruder_plans[extruder_plan_idx - 1];
+    ExtruderPlan* prev_extruder_plan = nullptr;
+    if (extruder_plan_idx == 0)
+    {
+        if (layer_plan_idx == 0)
+        { // the very first extruder plan
+            for (int extruder_idx = 0; extruder_idx < getSettingAsCount("machine_extruder_count"); extruder_idx++)
+            { // set temperature of the first nozzle, turn other nozzles down
+                if (extruder_idx == extruder)
+                {
+//                     extruder_plan.insertCommand(0, extruder, required_temp, true);
+                    // the first used extruder should already be set to the required temp in the start gcode
+                }
+                else 
+                {
+                    extruder_plan.insertCommand(0, extruder_idx, preheat_config.getStandbyTemp(extruder_idx), false);
+                }
+            }
+            return;
+        }
+        prev_extruder_plan = &layers[layer_plan_idx - 1]->extruder_plans.back();
+    }
+    else 
+    {
+        prev_extruder_plan = &layers[layer_plan_idx]->extruder_plans[extruder_plan_idx - 1];
+    }
+    assert(prev_extruder_plan != nullptr);
     
     int prev_extruder = prev_extruder_plan->extruder;
     
     if (prev_extruder != extruder)
     { // set previous extruder to standby temperature
-        extruder_plan.prev_extruder_standby_temp = preheat_config.getStandbyTemp(prev_extruder);
+        prev_extruder_plan->insertCommand(prev_extruder_plan->paths.size(), prev_extruder, preheat_config.getStandbyTemp(prev_extruder), false);
     }
     
     if (prev_extruder == extruder)
     {
-        insertPreheatCommand_singleExtrusion(*prev_extruder_plan, extruder, extruder_plan.printing_temperature);
-        prev_extruder_plan->printing_temperature_command = --prev_extruder_plan->inserts.end();
+        if (preheat_config.usesFlowDependentTemp(extruder))
+        {
+            insertPreheatCommand_singleExtrusion(*prev_extruder_plan, extruder, required_temp);
+        }
     }
     else 
     {
-        insertPreheatCommand_multiExtrusion(extruder_plans, extruder_plan_idx);
-        insertFinalPrintTempCommand(extruder_plans, extruder_plan_idx - 1);
-        insertPrintTempCommand(extruder_plan);
+        insertPreheatCommand_multiExtrusion(layers, layer_plan_idx, extruder_plan_idx);
     }
+    
 }
 
-void LayerPlanBuffer::insertPrintTempCommand(ExtruderPlan& extruder_plan)
-{
-    unsigned int extruder = extruder_plan.extruder;
-    double print_temp = extruder_plan.printing_temperature;
-
-    double heated_pre_travel_time = 0;
-    if (preheat_config.getInitialPrintTemp(extruder) != 0)
-    { // handle heating from initial_print_temperature to printing_tempreature
-        unsigned int path_idx;
-        for (path_idx = 0; path_idx < extruder_plan.paths.size(); path_idx++)
-        {
-            GCodePath& path = extruder_plan.paths[path_idx];
-            heated_pre_travel_time += path.estimates.getTotalTime();
-            if (!path.isTravelPath())
-            {
-                break;
-            }
-        }
-        bool wait = false;
-        extruder_plan.insertCommand(path_idx, extruder, print_temp, wait);
-    }
-    extruder_plan.heated_pre_travel_time = heated_pre_travel_time;
-}
-
-void LayerPlanBuffer::insertFinalPrintTempCommand(std::vector<ExtruderPlan*>& extruder_plans, unsigned int last_extruder_plan_idx)
-{
-    ExtruderPlan& last_extruder_plan = *extruder_plans[last_extruder_plan_idx];
-    int extruder = last_extruder_plan.extruder;
-
-    double final_print_temp = preheat_config.getFinalPrintTemp(extruder);
-    if (final_print_temp == 0)
-    {
-        return;
-    }
-
-    double heated_post_travel_time = 0; // The time after the last extrude move toward the end of the extruder plan during which the nozzle is stable at the final print temperature
-    { // compute heated_post_travel_time
-        unsigned int path_idx;
-        for (path_idx = last_extruder_plan.paths.size() - 1; int(path_idx) >= 0; path_idx--)
-        {
-            GCodePath& path = last_extruder_plan.paths[path_idx];
-            if (!path.isTravelPath())
-            {
-                break;
-            }
-            heated_post_travel_time += path.estimates.getTotalTime();
-        }
-    }
-
-    double time_window = 0; // The time window within which the nozzle needs to heat from the initial print temp to the printing temperature and then back to the final print temp; i.e. from the first to the last extrusion move with this extruder
-    double weighted_average_print_temp = 0; // The average of the normal printing temperatures of the extruder plans (which might be different due to flow dependent temp or due to initial layer temp) Weighted by time
-    double initial_print_temp = -1; // The initial print temp of the first extruder plan with this extruder
-    { // compute time window and print temp statistics
-        double heated_pre_travel_time = -1; // The time before the first extrude move from the start of the extruder plan during which the nozzle is stable at the initial print temperature
-        for (unsigned int prev_extruder_plan_idx = last_extruder_plan_idx; (int)prev_extruder_plan_idx >= 0; prev_extruder_plan_idx--)
-        {
-            ExtruderPlan& prev_extruder_plan = *extruder_plans[prev_extruder_plan_idx];
-            if (prev_extruder_plan.extruder != extruder)
-            {
-                break;
-            }
-            double prev_extruder_plan_time = prev_extruder_plan.estimates.getTotalTime();
-            time_window += prev_extruder_plan_time;
-            heated_pre_travel_time = prev_extruder_plan.heated_pre_travel_time;
-
-            if (prev_extruder_plan.estimates.getTotalUnretractedTime() > 0 && prev_extruder_plan.estimates.getMaterial() > 0)
-            { // handle temp statistics
-                assert(prev_extruder_plan.printing_temperature != -1 && "Previous extruder plan should already have a temperature planned");
-                weighted_average_print_temp += prev_extruder_plan.printing_temperature * prev_extruder_plan_time;
-                initial_print_temp = prev_extruder_plan.initial_printing_temperature;
-            }
-        }
-        weighted_average_print_temp /= time_window;
-        time_window -= heated_pre_travel_time + heated_post_travel_time;
-        assert(heated_pre_travel_time != -1 && "heated_pre_travel_time must have been computed; there must have been an extruder plan!");
-    }
-
-    assert((time_window >= 0 || last_extruder_plan.estimates.getMaterial() == 0) && "Time window should always be positive if we actually extrude");
-
-    //          ,layer change                                                                                   .
-    //          :     ,precool command                   ,layer change                                          .
-    //          : ____:                                  :     ,precool command                                 .
-    //          :/    \                             _____:_____:                                                .
-    //     _____/      \                           /           \                                                .
-    //    /             \                         /             \                                               .
-    //   /                                       /                                                              .
-    //  /                                       /                                                               .
-    //                                                                                                          .
-    // approximate ^               by                   ^                                                       .
-    // This approximation is quite ok since it only determines where to insert the precool temp command,
-    // which means the stable temperature of the previous extruder plan and the stable temperature of the next extruder plan couldn't be reached
-    constexpr bool during_printing = true;
-    Preheat::CoolDownResult warm_cool_result = preheat_config.getCoolDownPointAfterWarmUp(time_window, extruder, initial_print_temp, weighted_average_print_temp, final_print_temp, during_printing);
-    double cool_down_time = warm_cool_result.cooling_time;
-    assert(cool_down_time >= 0);
-
-    // find extruder plan in which to insert cooling command
-    ExtruderPlan* precool_extruder_plan = &last_extruder_plan;
-    {
-        for (unsigned int precool_extruder_plan_idx = last_extruder_plan_idx; (int)precool_extruder_plan_idx >= 0; precool_extruder_plan_idx--)
-        {
-            precool_extruder_plan = extruder_plans[precool_extruder_plan_idx];
-            if (precool_extruder_plan->printing_temperature_command)
-            { // the precool command ends up before the command to go to the print temperature of the next extruder plan, so remove that print temp command
-                precool_extruder_plan->inserts.erase(*precool_extruder_plan->printing_temperature_command);
-            }
-            double time_here = precool_extruder_plan->estimates.getTotalTime();
-            if (cool_down_time < time_here)
-            {
-                break;
-            }
-            cool_down_time -= time_here;
-        }
-    }
-
-    // at this point cool_down_time is what time is left if cool down time of extruder plans after precool_extruder_plan (up until last_extruder_plan) are already taken into account
-
-    { // insert temp command in precool_extruder_plan
-        double extrusion_time_seen = 0;
-        unsigned int path_idx;
-        for (path_idx = precool_extruder_plan->paths.size() - 1; int(path_idx) >= 0; path_idx--)
-        {
-            GCodePath& path = precool_extruder_plan->paths[path_idx];
-            extrusion_time_seen += path.estimates.getTotalTime();
-            if (extrusion_time_seen >= cool_down_time)
-            {
-                break;
-            }
-        }
-        bool wait = false;
-        double time_after_path_start = extrusion_time_seen - cool_down_time;
-        precool_extruder_plan->insertCommand(path_idx, extruder, final_print_temp, wait, time_after_path_start);
-    }
-}
-
-
-void LayerPlanBuffer::insertTempCommands()
+void LayerPlanBuffer::insertPreheatCommands()
 {
     if (buffer.back().extruder_plans.size() == 0 || (buffer.back().extruder_plans.size() == 1 && buffer.back().extruder_plans[0].paths.size() == 0))
     { // disregard empty layer
         buffer.pop_back();
         return;
     }
-
-    std::vector<ExtruderPlan*> extruder_plans;
-    extruder_plans.reserve(buffer.size() * 2);
+    
+    std::vector<GCodePlanner*> layers;
+    layers.reserve(buffer.size());
     for (GCodePlanner& layer_plan : buffer)
     {
-        for (ExtruderPlan& extr_plan : layer_plan.extruder_plans)
-        {
-            extruder_plans.push_back(&extr_plan);
-        }
+        layers.push_back(&layer_plan);
     }
-
+    
+    unsigned int layer_idx = layers.size() - 1;
 
     // insert commands for all extruder plans on this layer
-    GCodePlanner& layer_plan = buffer.back();
+    GCodePlanner& layer_plan = *layers[layer_idx];
     for (unsigned int extruder_plan_idx = 0; extruder_plan_idx < layer_plan.extruder_plans.size(); extruder_plan_idx++)
     {
-        unsigned int overall_extruder_plan_idx = extruder_plans.size() - layer_plan.extruder_plans.size() + extruder_plan_idx;
         ExtruderPlan& extruder_plan = layer_plan.extruder_plans[extruder_plan_idx];
-        int extruder = extruder_plan.extruder;
         double time = extruder_plan.estimates.getTotalUnretractedTime();
         if (time <= 0.0 
             || extruder_plan.estimates.getMaterial() == 0.0 // extruder plan only consists of moves (when an extruder switch occurs at the beginning of a layer)
@@ -355,51 +213,10 @@ void LayerPlanBuffer::insertTempCommands()
         {
             continue;
         }
+        double avg_flow = extruder_plan.estimates.getMaterial() / time; // TODO: subtract retracted travel time
+        extruder_plan.required_temp = preheat_config.getTemp(extruder_plan.extruder, avg_flow);
         
-        double avg_flow = extruder_plan.estimates.getMaterial() / time;
-        extruder_plan.printing_temperature = preheat_config.getTemp(extruder, avg_flow, extruder_plan.is_initial_layer);
-        extruder_plan.initial_printing_temperature = preheat_config.getInitialPrintTemp(extruder);
-        if (extruder_plan.initial_printing_temperature == 0
-            || !extruder_used_in_meshgroup[extruder]
-            || (overall_extruder_plan_idx > 0 && extruder_plans[overall_extruder_plan_idx - 1]->extruder == extruder)
-        )
-        {
-            extruder_plan.initial_printing_temperature = extruder_plan.printing_temperature;
-            extruder_used_in_meshgroup[extruder] = true;
-        }
-        assert(extruder_plan.printing_temperature != -1 && "extruder_plan.printing_temperature should now have been set");
-
-        if (buffer.size() == 1 && extruder_plan_idx == 0)
-        { // the very first extruder plan of the current meshgroup
-            int extruder = extruder_plan.extruder;
-            for (int extruder_idx = 0; extruder_idx < getSettingAsCount("machine_extruder_count"); extruder_idx++)
-            { // set temperature of the first nozzle, turn other nozzles down
-                if (FffProcessor::getInstance()->getMeshgroupNr() == 0)
-                {
-                    // override values from GCodeExport::setInitialTemps
-                    // the first used extruder should be set to the required temp in the start gcode
-                    // see  FffGcodeWriter::processStartingCode
-                    if (extruder_idx == extruder)
-                    {
-                        gcode.setInitialTemp(extruder_idx, extruder_plan.printing_temperature);
-                    }
-                    else 
-                    {
-                        gcode.setInitialTemp(extruder_idx, preheat_config.getStandbyTemp(extruder_idx));
-                    }
-                }
-                else
-                {
-                    if (extruder_idx != extruder)
-                    { // TODO: do we need to do this?
-                        extruder_plan.prev_extruder_standby_temp = preheat_config.getStandbyTemp(extruder_idx);
-                    }
-                }
-            }
-            continue;
-        }
-
-        insertTempCommands(extruder_plans, overall_extruder_plan_idx);
+        insertPreheatCommand(layers, layer_idx, extruder_plan_idx);
     }
 }
 

src/LayerPlanBuffer.h

@@ -1,10 +1,9 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
 #ifndef LAYER_PLAN_BUFFER_H
 #define LAYER_PLAN_BUFFER_H
 
 #include <list>
 
-#include "settings/settings.h"
+#include "settings.h"
 #include "commandSocket.h"
 
 #include "gcodeExport.h"
@@ -16,19 +15,6 @@
 namespace cura 
 {
 
-/*!
- * Class for buffering multiple layer plans (\ref GCodePlanner) / extruder plans within those layer plans, so that temperature commands can be inserted in earlier layer plans.
- * 
- * This class handles where to insert temperature commands for:
- * - initial layer temperature
- * - flow dependent temperature
- * - starting to heat up from the standby temperature
- * - initial printing temperature | printing temperature | final printing temperature
- * 
- * \image html assets/precool.png "Temperature Regulation" width=10cm
- * \image latex assets/precool.png "Temperature Regulation" width=10cm
- * 
- */
 class LayerPlanBuffer : SettingsMessenger
 {
     GCodeExport& gcode;
@@ -37,17 +23,13 @@ class LayerPlanBuffer : SettingsMessenger
     
     static constexpr unsigned int buffer_size = 5; // should be as low as possible while still allowing enough time in the buffer to heat up from standby temp to printing temp // TODO: hardcoded value
     // this value should be higher than 1, cause otherwise each layer is viewed as the first layer and no temp commands are inserted.
-
-    static constexpr const double extra_preheat_time = 1.0; //!< Time to start heating earlier than computed to avoid accummulative discrepancy between actual heating times and computed ones.
-
-    std::vector<bool> extruder_used_in_meshgroup; //!< For each extruder whether it has already been planned once in this meshgroup. This is used to see whether we should heat to the initial_print_temp or to the printing_temperature
+    
 public:
     std::list<GCodePlanner> buffer; //!< The buffer containing several layer plans (GCodePlanner) before writing them to gcode.
     
     LayerPlanBuffer(SettingsBaseVirtual* settings, GCodeExport& gcode)
     : SettingsMessenger(settings)
     , gcode(gcode)
-    , extruder_used_in_meshgroup(MAX_EXTRUDERS, false)
     { }
     
     void setPreheatConfig(MeshGroup& settings)
@@ -64,16 +46,14 @@ public:
     {
         if (buffer.size() > 0)
         {
-            insertTempCommands(); // insert preheat commands of the just completed layer plan (not the newly emplaced one)
+            insertPreheatCommands(); // insert preheat commands of the just completed layer plan (not the newly emplaced one)
         }
         buffer.emplace_back(constructor_args...);
         if (buffer.size() > buffer_size)
         {
-            buffer.front().writeGCode(gcode);
+            buffer.front().writeGCode(gcode, getSettingBoolean("cool_lift_head"), buffer.front().getLayerNr() > 0 ? getSettingInMicrons("layer_height") : getSettingInMicrons("layer_height_0"));
             if (CommandSocket::isInstantiated())
-            {
                 CommandSocket::getInstance()->flushGcode();
-            }
             buffer.pop_front();
         }
         return buffer.back();
@@ -83,27 +63,27 @@ public:
      * Write all remaining layer plans (GCodePlanner) to gcode and empty the buffer.
      */
     void flush();
-
-private:
+    
     /*!
      * Insert the preheat command for @p extruder into @p extruder_plan_before
      * 
      * \param extruder_plan_before An extruder plan before the extruder plan for which the temperature is computed, in which to insert the preheat command
-     * \param time_before_extruder_plan_end The time before the end of the extruder plan, before which to insert the preheat command
+     * \param time_after_extruder_plan_start The time after the start of the extruder plan, before which to insert the preheat command
      * \param extruder The extruder for which to set the temperature
      * \param temp The temperature of the preheat command
      */
-    void insertPreheatCommand(ExtruderPlan& extruder_plan_before, double time_before_extruder_plan_end, int extruder, double temp);
+    void insertPreheatCommand(ExtruderPlan& extruder_plan_before, double time_after_extruder_plan_start, int extruder, double temp);
     
     /*!
      * Compute the time needed to preheat, based either on the time the extruder has been on standby 
      * or based on the temp of the previous extruder plan which has the same extruder nr.
      * 
-     * \param extruder_plans The extruder plans in the buffer, moved to a temporary vector (from lower to upper layers)
-     * \param extruder_plan_idx The index of the extruder plan in \p extruder_plans for which to find the preheat time needed
-     * \return the time needed to preheat and the temperature from which heating starts
+     * \param layers The layers in the buffer, moved to a vector
+     * \param layer_plan_idx The index into @p layers in which to find the extruder plan
+     * \param extruder_plan_idx The index of the extruder plan in the layer corresponding to @p layer_plan_idx for which to find the preheat time needed
+     * \return the time needed to preheat
      */
-    Preheat::WarmUpResult timeBeforeExtruderPlanToInsert(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx);
+    double timeBeforeExtruderPlanToInsert(std::vector<GCodePlanner*>& layers, unsigned int layer_plan_idx, unsigned int extruder_plan_idx);
     
     /*!
      * For two consecutive extruder plans of the same extruder (so on different layers), 
@@ -123,55 +103,25 @@ private:
      * and compute at what time the preheat command needs to be inserted.
      * Then insert the preheat command in the right extruder plan.
      * 
-     * \param extruder_plans The extruder plans in the buffer, moved to a temporary vector (from lower to upper layers)
-     * \param extruder_plan_idx The index of the extruder plan in \p extruder_plans for which to find the preheat time needed
+     * \param layers The layers in the buffer, moved to a vector
+     * \param layer_plan_idx The index into @p layers in which to find the extruder plan
+     * \param extruder_plan_idx The index of the extruder plan in the layer corresponding to @p layer_plan_idx for which to find the preheat time needed
      */
-    void insertPreheatCommand_multiExtrusion(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx);
+    void insertPreheatCommand_multiExtrusion(std::vector<GCodePlanner*>& layers, unsigned int layer_plan_idx, unsigned int extruder_plan_idx);
     
     /*!
      * Insert the preheat command for the extruder plan corersponding to @p extruder_plan_idx of the layer corresponding to @p layer_plan_idx.
      * 
-     * \param extruder_plans The extruder plans in the buffer, moved to a temporary vector (from lower to upper layers)
-     * \param extruder_plan_idx The index of the extruder plan in \p extruder_plans for which to generate the preheat command
+     * \param layers The layers of the buffer, moved to a temporary vector (from lower to upper layers)
+     * \param layer_plan_idx The index of the layer plan for which to generate a preheat command
+     * \param extruder_plan_idx The index of the extruder plan in the layer corresponding to @p layer_plan_idx for which to generate the preheat command
      */
-    void insertTempCommands(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx);
-
-    /*!
-     * Insert the temperature command to heat from the initial print temperature to the printing temperature
-     * 
-     * The temperature command is insert at the start of the very first extrusion move
-     * 
-     * \param extruder_plan The extruder plan in which to insert the heat up command
-     */
-    void insertPrintTempCommand(ExtruderPlan& extruder_plan);
-
-    /*!
-     * Insert the temp command to start cooling from the printing temperature to the final print temp
-     * 
-     * The print temp is inserted before the last extrusion move of the extruder plan corresponding to \p last_extruder_plan_idx
-     * 
-     * The command is inserted at a timed offset before the end of the last extrusion move
-     * 
-     * \param extruder_plans The extruder plans in the buffer, moved to a temporary vector (from lower to upper layers)
-     * \param last_extruder_plan_idx The index of the last extruder plan in \p extruder_plans with the same extruder as previous extruder plans
-     */
-    void insertFinalPrintTempCommand(std::vector<ExtruderPlan*>& extruder_plans, unsigned int last_extruder_plan_idx);
+    void insertPreheatCommand(std::vector<GCodePlanner*>& layers, unsigned int layer_plan_idx, unsigned int extruder_plan_idx);
 
     /*!
      * Insert the preheat commands for the last added layer (unless that layer was empty)
      */
-    void insertTempCommands();
-
-    /*!
-     * Reconfigure the standby temperature during which we didn't print with this extruder.
-     * Find the previous extruder plan with the same extruder as layers[layer_plan_idx].extruder_plans[extruder_plan_idx]
-     * Set the prev_extruder_standby_temp in the next extruder plan
-     * 
-     * \param extruder_plans The extruder plans in the buffer, moved to a temporary vector (from lower to upper layers)
-     * \param extruder_plan_idx The index of the extruder plan in \p extruder_plans before which to reconfigure the standby temperature
-     * \param standby_temp The temperature to which to cool down when the extruder is in standby mode.
-     */
-    void handleStandbyTemp(std::vector<ExtruderPlan*>& extruder_plans, unsigned int extruder_plan_idx, double standby_temp);
+    void insertPreheatCommands();
 };
 
 

src/MergeInfillLines.cpp

@@ -11,18 +11,14 @@ void MergeInfillLines::writeCompensatedMove(Point& to, double speed, GCodePath&
 {
     double old_line_width = INT2MM(last_path.config->getLineWidth());
     double new_line_width_mm = INT2MM(new_line_width);
+    double speed_mod = old_line_width / new_line_width_mm;
     double extrusion_mod = new_line_width_mm / old_line_width;
-    double new_speed = speed;
-    if (speed_equalize_flow_enabled)
-    {
-        double speed_mod = old_line_width / new_line_width_mm;
-        new_speed = std::min(speed * speed_mod, speed_equalize_flow_max);
-    }
-    sendLineTo(last_path.config->type, to, last_path.getLineWidth());
+    double new_speed = std::min(speed * speed_mod, 150.0); // TODO: hardcoded value: max extrusion speed is 150 mm/s = 9000 mm/min
+    sendPolygon(last_path.config->type, gcode.getPositionXY(), to, last_path.getLineWidth());
     gcode.writeMove(to, new_speed, last_path.getExtrusionMM3perMM() * extrusion_mod);
 }
     
-bool MergeInfillLines::mergeInfillLines(unsigned int& path_idx)
+bool MergeInfillLines::mergeInfillLines(double speed, unsigned int& path_idx)
 { //Check for lots of small moves and combine them into one large line
     Point prev_middle;
     Point last_middle;
@@ -35,12 +31,12 @@ bool MergeInfillLines::mergeInfillLines(unsigned int& path_idx)
             GCodePath& move_path = paths[path_idx];
             for(unsigned int point_idx = 0; point_idx < move_path.points.size() - 1; point_idx++)
             {
-                gcode.writeMove(move_path.points[point_idx], move_path.config->getSpeed() * extruder_plan.getTravelSpeedFactor(), move_path.getExtrusionMM3perMM());
+                gcode.writeMove(move_path.points[point_idx], speed, move_path.getExtrusionMM3perMM());
             }
             gcode.writeMove(prev_middle, travelConfig.getSpeed(), 0);
             GCodePath& last_path = paths[path_idx + 3];
             
-            writeCompensatedMove(last_middle, last_path.config->getSpeed() * extruder_plan.getExtrudeSpeedFactor(), last_path, line_width);
+            writeCompensatedMove(last_middle, speed, last_path, line_width);
         }
         
         path_idx += 2;
@@ -49,7 +45,7 @@ bool MergeInfillLines::mergeInfillLines(unsigned int& path_idx)
         {
             extruder_plan.handleInserts(path_idx, gcode);
             GCodePath& last_path = paths[path_idx + 3];
-            writeCompensatedMove(last_middle, last_path.config->getSpeed() * extruder_plan.getExtrudeSpeedFactor(), last_path, line_width);
+            writeCompensatedMove(last_middle, speed, last_path, line_width);
         }
         path_idx = path_idx + 1; // means that the next path considered is the travel path after the converted extrusion path corresponding to the updated path_idx
         extruder_plan.handleInserts(path_idx, gcode);
@@ -145,7 +141,7 @@ bool MergeInfillLines::isConvertible(const Point& a, const Point& b, const Point
                     (a + b) / 2;
     second_middle = (c + d) / 2;
     
-    Point dir_vector_perp = turn90CCW(second_middle - first_middle);
+    Point dir_vector_perp = crossZ(second_middle - first_middle);
     int64_t dir_vector_perp_length = vSize(dir_vector_perp); // == dir_vector_length
     if (dir_vector_perp_length == 0)
     {
@@ -171,7 +167,7 @@ bool MergeInfillLines::isConvertible(const Point& a, const Point& b, const Point
 
     // check whether two lines are adjacent (note: not 'line segments' but 'lines')
     Point ac = c - first_middle;
-    Point infill_vector_perp = turn90CCW(infill_vector);
+    Point infill_vector_perp = crossZ(infill_vector);
     int64_t perp_proj = dot(ac, infill_vector_perp);
     int64_t infill_vector_perp_length = vSize(infill_vector_perp);
     if (std::abs(std::abs(perp_proj) / infill_vector_perp_length - line_width) > 20) // it should be the case that dot(ac, infill_vector_perp) / |infill_vector_perp| == line_width
@@ -231,4 +227,4 @@ void MergeInfillLines::merge(Point& from, Point& p0, Point& p1)
      
      
      
-}//namespace cura
+}//namespace cura

src/MergeInfillLines.h

@@ -4,7 +4,6 @@
 #include "utils/intpoint.h"
 #include "gcodeExport.h"
 #include "gcodePlanner.h"
-#include "GCodePathConfig.h"
 
 namespace cura
 {
@@ -19,8 +18,6 @@ class MergeInfillLines
     
     GCodePathConfig& travelConfig; //!< The travel settings used to see whether a path is a travel path or an extrusion path
     int64_t nozzle_size; //!< The diameter of the hole in the nozzle
-    bool speed_equalize_flow_enabled; //!< Should the speed be varied with extrusion width
-    double speed_equalize_flow_max; //!< Maximum speed when adjusting speed for flow
 
     /*!
      * Whether the next two extrusion paths are convertible to a single line segment, starting from the end point the of the last travel move at \p path_idx_first_move
@@ -64,8 +61,8 @@ public:
     /*!
      * Simple constructor only used by MergeInfillLines::isConvertible to easily convey the environment
      */
-    MergeInfillLines(GCodeExport& gcode, int layer_nr, std::vector<GCodePath>& paths, ExtruderPlan& extruder_plan, GCodePathConfig& travelConfig, int64_t nozzle_size, bool speed_equalize_flow_enabled, double speed_equalize_flow_max) 
-    : gcode(gcode), layer_nr(layer_nr), paths(paths), extruder_plan(extruder_plan), travelConfig(travelConfig), nozzle_size(nozzle_size), speed_equalize_flow_enabled(speed_equalize_flow_enabled), speed_equalize_flow_max(speed_equalize_flow_max) { }
+    MergeInfillLines(GCodeExport& gcode, int layer_nr, std::vector<GCodePath>& paths, ExtruderPlan& extruder_plan, GCodePathConfig& travelConfig, int64_t nozzle_size) 
+    : gcode(gcode), layer_nr(layer_nr), paths(paths), extruder_plan(extruder_plan), travelConfig(travelConfig), nozzle_size(nozzle_size) { }
     
     /*!
      * Check for lots of small moves and combine them into one large line.
@@ -75,19 +72,28 @@ public:
      * \param paths The paths currently under consideration
      * \param travelConfig The travel settings used to see whether a path is a travel path or an extrusion path
      * \param nozzle_size The diameter of the hole in the nozzle
+     * \param speed A factor used to scale the movement speed
      * \param path_idx Input/Output parameter: The current index in \p paths where to start combining and the current index after combining as output parameter.
      * \return Whether lines have been merged and normal path-to-gcode generation can be skipped for the current resulting \p path_idx .
      */
-    bool mergeInfillLines(unsigned int& path_idx);
+    bool mergeInfillLines(double speed, unsigned int& path_idx);
     
     /*!
-     * send a line segment through the command socket from the previous point to the given point \p to
+     * send a polygon through the command socket from the previous point to the given point
      */
-    void sendLineTo(PrintFeatureType print_feature_type, Point to, int line_width)
+    void sendPolygon(PrintFeatureType print_feature_type, Point from, Point to, int line_width)
     {
-        CommandSocket::sendLineTo(print_feature_type, to, line_width);
+        if (CommandSocket::isInstantiated()) 
+        {
+            // we should send this travel as a non-retraction move
+            cura::Polygons pathPoly;
+            PolygonRef path = pathPoly.newPoly();
+            path.add(from);
+            path.add(to);
+            CommandSocket::getInstance()->sendPolygons(print_feature_type, layer_nr, pathPoly, line_width);
+        }
     }
 };
 
 }//namespace cura
-#endif // MERGE_INFILL_LINES_H
+#endif // MERGE_INFILL_LINES_H

src/MeshGroup.cpp

@@ -4,12 +4,9 @@
 #include <stdio.h>
 
 #include "MeshGroup.h"
-#include "utils/gettime.h"
 #include "utils/logoutput.h"
 #include "utils/string.h"
 
-#include "settings/SettingRegistry.h" // loadExtruderJSONsettings
-
 namespace cura
 {
 
@@ -31,164 +28,7 @@ void* fgets_(char* ptr, size_t len, FILE* f)
     return nullptr;
 }
 
-MeshGroup::MeshGroup(SettingsBaseVirtual* settings_base)
-: SettingsBase(settings_base)
-, extruder_count(-1)
-{}
-
-MeshGroup::~MeshGroup()
-{
-    for (unsigned int extruder = 0; extruder < MAX_EXTRUDERS; extruder++)
-    {
-        if (extruders[extruder])
-        {
-            delete extruders[extruder];
-        }
-    }
-}
-
-int MeshGroup::getExtruderCount() const
-{
-    if (extruder_count == -1)
-    {
-        extruder_count = getSettingAsCount("machine_extruder_count");
-    }
-    return extruder_count;
-}
-
-ExtruderTrain* MeshGroup::createExtruderTrain(unsigned int extruder_nr)
-{
-    if (!extruders[extruder_nr])
-    {
-        extruders[extruder_nr] = new ExtruderTrain(this, extruder_nr);
-        int err = SettingRegistry::getInstance()->loadExtruderJSONsettings(extruder_nr, extruders[extruder_nr]);
-        if (err)
-        {
-            logError("Couldn't load extruder.def.json for extruder %i\n", extruder_nr);
-            std::exit(1);
-        }
-    }
-    return extruders[extruder_nr];
-}
-
-ExtruderTrain* MeshGroup::getExtruderTrain(unsigned int extruder_nr)
-{
-    assert(extruders[extruder_nr]);
-    return extruders[extruder_nr];
-}
-
-const ExtruderTrain* MeshGroup::getExtruderTrain(unsigned int extruder_nr) const
-{
-    assert(extruders[extruder_nr]);
-    return extruders[extruder_nr];
-}
-
-Point3 MeshGroup::min() const
-{
-    if (meshes.size() < 1)
-    {
-        return Point3(0, 0, 0);
-    }
-    Point3 ret = meshes[0].min();
-    for(unsigned int i=1; i<meshes.size(); i++)
-    {
-        Point3 v = meshes[i].min();
-        ret.x = std::min(ret.x, v.x);
-        ret.y = std::min(ret.y, v.y);
-        ret.z = std::min(ret.z, v.z);
-    }
-    return ret;
-}
-
-Point3 MeshGroup::max() const
-{
-    if (meshes.size() < 1)
-    {
-        return Point3(0, 0, 0);
-    }
-    Point3 ret = meshes[0].max();
-    for(unsigned int i=1; i<meshes.size(); i++)
-    {
-        Point3 v = meshes[i].max();
-        ret.x = std::max(ret.x, v.x);
-        ret.y = std::max(ret.y, v.y);
-        ret.z = std::max(ret.z, v.z);
-    }
-    return ret;
-}
-
-void MeshGroup::clear()
-{
-    for(Mesh& m : meshes)
-    {
-        m.clear();
-    }
-}
-
-void MeshGroup::finalize()
-{
-    extruder_count = getSettingAsCount("machine_extruder_count");
-
-    for (int extruder_nr = 0; extruder_nr < extruder_count; extruder_nr++)
-    {
-        createExtruderTrain(extruder_nr); // create it if it didn't exist yet
-
-        if (getSettingAsIndex("adhesion_extruder_nr") == extruder_nr && getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::NONE)
-        {
-            getExtruderTrain(extruder_nr)->setIsUsed(true);
-            continue;
-        }
-
-        for (const Mesh& mesh : meshes)
-        {
-            if (mesh.getSettingBoolean("support_enable")
-                && (
-                    getSettingAsIndex("support_infill_extruder_nr") == extruder_nr
-                    || getSettingAsIndex("support_extruder_nr_layer_0") == extruder_nr
-                    || (getSettingBoolean("support_interface_enable") && getSettingAsIndex("support_interface_extruder_nr") == extruder_nr)
-                    )
-                )
-            {
-                getExtruderTrain(extruder_nr)->setIsUsed(true);
-                break;
-            }
-        }
-    }
-
-    for (const Mesh& mesh : meshes)
-    {
-        if (!mesh.getSettingBoolean("anti_overhang_mesh")
-            && !mesh.getSettingBoolean("support_mesh")
-        )
-        {
-            getExtruderTrain(mesh.getSettingAsIndex("extruder_nr"))->setIsUsed(true);
-        }
-    }
-
-    //If the machine settings have been supplied, offset the given position vertices to the center of vertices (0,0,0) is at the bed center.
-    Point3 meshgroup_offset(0, 0, 0);
-    if (!getSettingBoolean("machine_center_is_zero"))
-    {
-        meshgroup_offset.x = getSettingInMicrons("machine_width") / 2;
-        meshgroup_offset.y = getSettingInMicrons("machine_depth") / 2;
-    }
-    
-    // If a mesh position was given, put the mesh at this position in 3D space. 
-    for(Mesh& mesh : meshes)
-    {
-        Point3 mesh_offset(mesh.getSettingInMicrons("mesh_position_x"), mesh.getSettingInMicrons("mesh_position_y"), mesh.getSettingInMicrons("mesh_position_z"));
-        if (mesh.getSettingBoolean("center_object"))
-        {
-            Point3 object_min = mesh.min();
-            Point3 object_max = mesh.max();
-            Point3 object_size = object_max - object_min;
-            mesh_offset += Point3(-object_min.x - object_size.x / 2, -object_min.y - object_size.y / 2, -object_min.z);
-        }
-        mesh.offset(mesh_offset + meshgroup_offset);
-    }
-}
-
-bool loadMeshSTL_ascii(Mesh* mesh, const char* filename, const FMatrix3x3& matrix)
+bool loadMeshSTL_ascii(Mesh* mesh, const char* filename, FMatrix3x3& matrix)
 {
     FILE* f = fopen(filename, "rt");
     char buffer[1024];
@@ -221,7 +61,7 @@ bool loadMeshSTL_ascii(Mesh* mesh, const char* filename, const FMatrix3x3& matri
     return true;
 }
 
-bool loadMeshSTL_binary(Mesh* mesh, const char* filename, const FMatrix3x3& matrix)
+bool loadMeshSTL_binary(Mesh* mesh, const char* filename, FMatrix3x3& matrix)
 {
     FILE* f = fopen(filename, "rb");
 
@@ -274,7 +114,7 @@ bool loadMeshSTL_binary(Mesh* mesh, const char* filename, const FMatrix3x3& matr
     return true;
 }
 
-bool loadMeshSTL(Mesh* mesh, const char* filename, const FMatrix3x3& matrix)
+bool loadMeshSTL(Mesh* mesh, const char* filename, FMatrix3x3& matrix)
 {
     FILE* f = fopen(filename, "r");
     if (f == nullptr)
@@ -328,10 +168,8 @@ bool loadMeshSTL(Mesh* mesh, const char* filename, const FMatrix3x3& matrix)
     return loadMeshSTL_binary(mesh, filename, matrix);
 }
 
-bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, const FMatrix3x3& transformation, SettingsBaseVirtual* object_parent_settings)
+bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, FMatrix3x3& transformation, SettingsBaseVirtual* object_parent_settings)
 {
-    TimeKeeper load_timer;
-
     const char* ext = strrchr(filename, '.');
     if (ext && (strcmp(ext, ".stl") == 0 || strcmp(ext, ".STL") == 0))
     {
@@ -339,11 +177,10 @@ bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, const FMa
         if(loadMeshSTL(&mesh,filename,transformation)) //Load it! If successful...
         {
             meshgroup->meshes.push_back(mesh);
-            log("loading '%s' took %.3f seconds\n",filename,load_timer.restart());
             return true;
         }
     }
     return false;
 }
 
-}//namespace cura
+}//namespace cura

src/MeshGroup.h

@@ -18,31 +18,118 @@ namespace cura
 class MeshGroup : public SettingsBase, NoCopy
 {
     ExtruderTrain* extruders[MAX_EXTRUDERS] = {nullptr};
-    mutable int extruder_count; //!< The number of extruders. (mutable because of lazy evaluation)
+    int extruder_count;
 public:
-    int getExtruderCount() const;
+    int getExtruderCount()
+    {
+        if (extruder_count == -1)
+        {
+            extruder_count = getSettingAsCount("machine_extruder_count");
+        }
+        return extruder_count;
+    }
 
-    MeshGroup(SettingsBaseVirtual* settings_base);
+    MeshGroup(SettingsBaseVirtual* settings_base)
+    : SettingsBase(settings_base)
+    , extruder_count(-1)
+    {}
     
-    ~MeshGroup();
+    ~MeshGroup() 
+    {
+        for (unsigned int extruder = 0; extruder < MAX_EXTRUDERS; extruder++)
+        {
+            if (extruders[extruder])
+            {
+                delete extruders[extruder];
+            }
+        }
+    }
     
     /*!
      * Create a new extruder train for the @p extruder_nr, or return the one which already exists.
      */
-    ExtruderTrain* createExtruderTrain(unsigned int extruder_nr);
-
-    ExtruderTrain* getExtruderTrain(unsigned int extruder_nr);
-
-    const ExtruderTrain* getExtruderTrain(unsigned int extruder_nr) const;
-
+    ExtruderTrain* createExtruderTrain(unsigned int extruder_nr)
+    {
+        if (!extruders[extruder_nr])
+        {
+            extruders[extruder_nr] = new ExtruderTrain(this, extruder_nr);
+        }
+        return extruders[extruder_nr];
+    }
+    
+    ExtruderTrain* getExtruderTrain(unsigned int extruder_nr)
+    {
+        assert(extruders[extruder_nr]);
+        return extruders[extruder_nr];
+    }
+    
     std::vector<Mesh> meshes;
 
-    Point3 min() const; //! minimal corner of bounding box
-    Point3 max() const; //! maximal corner of bounding box
+    Point3 min() //! minimal corner of bounding box
+    {
+        if (meshes.size() < 1)
+        {
+            return Point3(0, 0, 0);
+        }
+        Point3 ret = meshes[0].min();
+        for(unsigned int i=1; i<meshes.size(); i++)
+        {
+            Point3 v = meshes[i].min();
+            ret.x = std::min(ret.x, v.x);
+            ret.y = std::min(ret.y, v.y);
+            ret.z = std::min(ret.z, v.z);
+        }
+        return ret;
+    }
+    Point3 max() //! maximal corner of bounding box
+    {
+        if (meshes.size() < 1)
+        {
+            return Point3(0, 0, 0);
+        }
+        Point3 ret = meshes[0].max();
+        for(unsigned int i=1; i<meshes.size(); i++)
+        {
+            Point3 v = meshes[i].max();
+            ret.x = std::max(ret.x, v.x);
+            ret.y = std::max(ret.y, v.y);
+            ret.z = std::max(ret.z, v.z);
+        }
+        return ret;
+    }
 
-    void clear();
+    void clear()
+    {
+        for(Mesh& m : meshes)
+        {
+            m.clear();
+        }
+    }
 
-    void finalize();
+    void finalize()
+    {
+        //If the machine settings have been supplied, offset the given position vertices to the center of vertices (0,0,0) is at the bed center.
+        Point3 meshgroup_offset(0, 0, 0);
+        if (!getSettingBoolean("machine_center_is_zero"))
+        {
+            meshgroup_offset.x = getSettingInMicrons("machine_width") / 2;
+            meshgroup_offset.y = getSettingInMicrons("machine_depth") / 2;
+        }
+        
+        // If a mesh position was given, put the mesh at this position in 3D space. 
+        for(Mesh& mesh : meshes)
+        {
+            Point3 mesh_offset(mesh.getSettingInMicrons("mesh_position_x"), mesh.getSettingInMicrons("mesh_position_y"), mesh.getSettingInMicrons("mesh_position_z"));
+            if (mesh.getSettingBoolean("center_object"))
+            {
+                Point3 object_min = mesh.min();
+                Point3 object_max = mesh.max();
+                Point3 object_size = object_max - object_min;
+                mesh_offset += Point3(-object_min.x - object_size.x / 2, -object_min.y - object_size.y / 2, -object_min.z);
+            }
+            mesh.offset(mesh_offset + meshgroup_offset);
+        }
+    }
 };
 
 /*!
@@ -54,7 +141,7 @@ public:
  * \param object_parent_settings (optional) The parent settings object of the new mesh. Defaults to \p meshgroup if none is given.
  * \return whether the file could be loaded
  */
-bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, const FMatrix3x3& transformation, SettingsBaseVirtual* object_parent_settings = nullptr);
+bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, FMatrix3x3& transformation, SettingsBaseVirtual* object_parent_settings = nullptr);
 
 }//namespace cura
 #endif//MESH_GROUP_H

src/Preheat.cpp

@@ -1,195 +0,0 @@
-#include "Preheat.h"
-
-namespace cura 
-{
-
-void Preheat::setConfig(const MeshGroup& meshgroup)
-{
-    for (int extruder_nr = 0; extruder_nr < meshgroup.getExtruderCount(); extruder_nr++)
-    {
-        assert(meshgroup.getExtruderTrain(extruder_nr) != nullptr);
-        const ExtruderTrain& extruder_train = *meshgroup.getExtruderTrain(extruder_nr);
-        config_per_extruder.emplace_back();
-        Config& config = config_per_extruder.back();
-        double machine_nozzle_cool_down_speed = extruder_train.getSettingInSeconds("machine_nozzle_cool_down_speed");
-        double machine_nozzle_heat_up_speed = extruder_train.getSettingInSeconds("machine_nozzle_heat_up_speed");
-        double material_extrusion_cool_down_speed = extruder_train.getSettingInSeconds("material_extrusion_cool_down_speed");
-        assert(material_extrusion_cool_down_speed < machine_nozzle_heat_up_speed && "The extrusion cooldown speed must be smaller than the heat up speed; otherwise the printing temperature cannot be reached!");
-        config.time_to_cooldown_1_degree[0] = 1.0 / machine_nozzle_cool_down_speed;
-        config.time_to_heatup_1_degree[0] = 1.0 / machine_nozzle_heat_up_speed;
-        config.time_to_cooldown_1_degree[1] = 1.0 / (machine_nozzle_cool_down_speed + material_extrusion_cool_down_speed);
-        config.time_to_heatup_1_degree[1] = 1.0 / (machine_nozzle_heat_up_speed - material_extrusion_cool_down_speed);
-        config.standby_temp = extruder_train.getSettingInSeconds("material_standby_temperature");
-
-        config.min_time_window = extruder_train.getSettingInSeconds("machine_min_cool_heat_time_window");
-
-        config.material_print_temperature = extruder_train.getSettingInDegreeCelsius("material_print_temperature");
-        config.material_print_temperature_layer_0 = extruder_train.getSettingInDegreeCelsius("material_print_temperature_layer_0");
-        config.material_initial_print_temperature = extruder_train.getSettingInDegreeCelsius("material_initial_print_temperature");
-        config.material_final_print_temperature = extruder_train.getSettingInDegreeCelsius("material_final_print_temperature");
-
-        config.flow_dependent_temperature = extruder_train.getSettingBoolean("material_flow_dependent_temperature"); 
-
-        config.flow_temp_graph = extruder_train.getSettingAsFlowTempGraph("material_flow_temp_graph"); // [[0.1,180],[20,230]]
-    }
-}
-
-double Preheat::getTimeToGoFromTempToTemp(int extruder, double temp_before, double temp_after, bool during_printing)
-{
-    Config& config = config_per_extruder[extruder];
-    double time;
-    if (temp_after > temp_before)
-    {
-        time = (temp_after - temp_before) * config.time_to_heatup_1_degree[during_printing];
-    }
-    else
-    {
-        time = (temp_before - temp_after) * config.time_to_cooldown_1_degree[during_printing];
-    }
-    return std::max(0.0, time);
-}
-
-double Preheat::getTemp(unsigned int extruder, double flow, bool is_initial_layer)
-{
-    if (is_initial_layer && config_per_extruder[extruder].material_print_temperature_layer_0 != 0)
-    {
-        return config_per_extruder[extruder].material_print_temperature_layer_0;
-    }
-    return config_per_extruder[extruder].flow_temp_graph.getTemp(flow, config_per_extruder[extruder].material_print_temperature, config_per_extruder[extruder].flow_dependent_temperature);
-}
-
-Preheat::WarmUpResult Preheat::getWarmUpPointAfterCoolDown(double time_window, unsigned int extruder, double temp_start, double temp_mid, double temp_end, bool during_printing)
-{
-    WarmUpResult result;
-    const Config& config = config_per_extruder[extruder];
-    double time_to_cooldown_1_degree = config.time_to_cooldown_1_degree[during_printing];
-    double time_to_heatup_1_degree = config.time_to_heatup_1_degree[during_printing];
-    result.total_time_window = time_window;
-
-    //                    ,temp_end
-    //                   /                                    .
-    //     ,temp_start  /                                     .
-    //      \ ' ' ' ' '/ ' ' '> outer_temp                    .
-    //       \________/                                       .
-    //               "-> temp_mid
-    //      ^^^^^^^^^^
-    //      limited_time_window
-    double outer_temp;
-    double limited_time_window;
-    if (temp_start < temp_end)
-    { // extra time needed during heating
-        double extra_heatup_time = (temp_end - temp_start) * time_to_heatup_1_degree;
-        result.heating_time = extra_heatup_time;
-        limited_time_window = time_window - extra_heatup_time;
-        outer_temp = temp_start;
-        if (limited_time_window < 0.0)
-        {
-            result.heating_time = 0.0;
-            result.lowest_temperature = temp_start;
-            return result;
-        }
-    }
-    else
-    {
-        double extra_cooldown_time = (temp_start - temp_end) * time_to_cooldown_1_degree;
-        result.heating_time = 0;
-        limited_time_window = time_window - extra_cooldown_time;
-        outer_temp = temp_end;
-        if (limited_time_window < 0.0)
-        {
-            result.heating_time = 0.0;
-            result.lowest_temperature = temp_end;
-            return result;
-        }
-    }
-    double time_ratio_cooldown_heatup = time_to_cooldown_1_degree / time_to_heatup_1_degree;
-    double time_to_heat_from_standby_to_print_temp = getTimeToGoFromTempToTemp(extruder, temp_mid, outer_temp, during_printing);
-    double time_needed_to_reach_standby_temp = time_to_heat_from_standby_to_print_temp * (1.0 + time_ratio_cooldown_heatup);
-    if (time_needed_to_reach_standby_temp < limited_time_window)
-    {
-        result.heating_time += time_to_heat_from_standby_to_print_temp;
-        result.lowest_temperature = temp_mid;
-    }
-    else 
-    {
-        result.heating_time += limited_time_window * time_to_heatup_1_degree / (time_to_cooldown_1_degree + time_to_heatup_1_degree);
-        result.lowest_temperature = std::max(temp_mid, temp_end - result.heating_time / time_to_heatup_1_degree);
-    }
-
-    if (result.heating_time > time_window || result.heating_time < 0.0)
-    {
-        logWarning("getWarmUpPointAfterCoolDown returns result outside of the time window!");
-    }
-    return result;
-}
-
-Preheat::CoolDownResult Preheat::getCoolDownPointAfterWarmUp(double time_window, unsigned int extruder, double temp_start, double temp_mid, double temp_end, bool during_printing)
-{
-    CoolDownResult result;
-    const Config& config = config_per_extruder[extruder];
-    double time_to_cooldown_1_degree = config.time_to_cooldown_1_degree[during_printing];
-    double time_to_heatup_1_degree = config.time_to_heatup_1_degree[during_printing];
-
-    assert(temp_start != -1 && temp_mid != -1 && temp_end != -1 && "temperatures must be initialized!");
-
-    result.total_time_window = time_window;
-
-    //      limited_time_window
-    //     :^^^^^^^^^^^^:
-    //     :  ________. : . . .> temp_mid
-    //     : /        \ :                                     .
-    //     :/ . . . . .\:. . .> outer_temp                    .
-    //     ^temp_start  \                                     .
-    //                   \                                    .
-    //                    ^temp_end
-    double outer_temp;
-    double limited_time_window;
-    if (temp_start < temp_end)
-    { // extra time needed during heating
-        double extra_heatup_time = (temp_end - temp_start) * time_to_heatup_1_degree;
-        result.cooling_time = 0;
-        limited_time_window = time_window - extra_heatup_time;
-        outer_temp = temp_end;
-        if (limited_time_window < 0.0)
-        {
-            result.cooling_time = 0.0;
-            result.highest_temperature = temp_end;
-            return result;
-        }
-    }
-    else
-    {
-        double extra_cooldown_time = (temp_start - temp_end) * time_to_cooldown_1_degree;
-        result.cooling_time = extra_cooldown_time;
-        limited_time_window = time_window - extra_cooldown_time;
-        outer_temp = temp_start;
-        if (limited_time_window < 0.0)
-        {
-            result.cooling_time = 0.0;
-            result.highest_temperature = temp_start;
-            return result;
-        }
-    }
-    double time_ratio_cooldown_heatup = time_to_cooldown_1_degree / time_to_heatup_1_degree;
-    double cool_down_time = getTimeToGoFromTempToTemp(extruder, temp_mid, outer_temp, during_printing);
-    double time_needed_to_reach_temp1 = cool_down_time * (1.0 + time_ratio_cooldown_heatup);
-    if (time_needed_to_reach_temp1 < limited_time_window)
-    {
-        result.cooling_time += cool_down_time;
-        result.highest_temperature = temp_mid;
-    }
-    else 
-    {
-        result.cooling_time += limited_time_window * time_to_heatup_1_degree / (time_to_cooldown_1_degree + time_to_heatup_1_degree);
-        result.highest_temperature = std::min(temp_mid, temp_end + result.cooling_time / time_to_cooldown_1_degree);
-    }
-
-    if (result.cooling_time > time_window || result.cooling_time < 0.0)
-    {
-        logWarning("getCoolDownPointAfterWarmUp returns result outside of the time window!");
-    }
-    return result;
-}
-
-
-}//namespace cura

src/Preheat.h

@@ -26,21 +26,15 @@ class Preheat
     class Config
     {
     public:
-        double time_to_heatup_1_degree[2]; //!< average time it takes to heat up one degree (in the range of normal print temperatures and standby temperature), while not-printing and while printing
-        double time_to_cooldown_1_degree[2]; //!< average time it takes to cool down one degree (in the range of normal print temperatures and standby temperature), while not-printing and while printing
+        double time_to_heatup_1_degree; //!< average time it takes to heat up one degree (in the range of normal print temperatures and standby temperature)
+        double time_to_cooldown_1_degree; //!< average time it takes to cool down one degree (in the range of normal print temperatures and standby temperature)
+        
+        double heatup_cooldown_time_mod_while_printing; //!< The time to be added to Preheat::time_to_heatup_1_degree and subtracted from Preheat::time_to_cooldown_1_degree to get the timings while printing
 
         double standby_temp; //!< The temperature at which the nozzle rests when it is not printing.
 
-        double min_time_window; //!< Minimal time (in seconds) to allow an extruder to cool down and then warm up again.
-
         double material_print_temperature; //!< default print temp (backward compatilibily)
-
-        double material_print_temperature_layer_0; //!< initial layer print temp
-
-        double material_initial_print_temperature; //!< print temp when first starting to extrude after a layer switch
-
-        double material_final_print_temperature; //!< print temp at the end of all extrusion moves of an extruder to which it's cooled down just before - during the extrusion
-
+        
         bool flow_dependent_temperature; //!< Whether to make the temperature dependent on flow
     
         FlowTempGraph flow_temp_graph; //!< The graph linking flows to corresponding temperatures
@@ -48,26 +42,6 @@ class Preheat
 
     std::vector<Config> config_per_extruder;//!< the nozzle and material temperature settings for each extruder train.
 public:
-    /*!
-     * The type of result when computing when to start heating up a nozzle before it's going to be used again.
-     */
-    struct WarmUpResult
-    {
-        double total_time_window; //!< The total time in which cooling and heating takes place.
-        double heating_time; //!< The total time needed to heat to the required temperature.
-        double lowest_temperature; //!< The lower temperature from which heating starts.
-    };
-
-    /*!
-     * The type of result when computing when to start cooling down a nozzle before it's not going to be used again.
-     */
-    struct CoolDownResult
-    {
-        double total_time_window; //!< The total time in which heating and cooling takes place.
-        double cooling_time; //!< The total time needed to cool down to the required temperature.
-        double highest_temperature; //!< The upper temperature from which cooling starts.
-    };
-
     /*!
      * Get the standby temperature of an extruder train
      * \param extruder the extruder train for which to get the standby tmep
@@ -77,125 +51,126 @@ public:
     {
         return config_per_extruder[extruder].standby_temp;
     }
-
-    /*!
-     * Get the time it takes to heat up one degree celsius
-     * 
-     * \param extruder the extruder train for which to get time it takes to heat up one degree celsius
-     * \param during_printing whether the heating takes time during printing or when idle
-     * \return the time it takes to heat up one degree celsius
-     */
-    double getTimeToHeatup1Degree(int extruder, bool during_printing)
-    {
-        return config_per_extruder[extruder].time_to_heatup_1_degree[during_printing];
-    }
-
-    /*!
-     * Get the initial print temperature when starting to extrude.
-     * \param during_printing whether the heating takes time during printing or when idle
-     */
-    double getInitialPrintTemp(int extruder)
-    {
-        return config_per_extruder[extruder].material_initial_print_temperature;
-    }
-
-    /*!
-     * Get the final print temperature at the end of all extrusion moves with the current extruder
-     */
-    double getFinalPrintTemp(int extruder)
-    {
-        return config_per_extruder[extruder].material_final_print_temperature;
-    }
-
+    
     /*!
      * Set the nozzle and material temperature settings for each extruder train.
-     * \param meshgroup Where to get settings from
      */
-    void setConfig(const MeshGroup& meshgroup);
-
+    void setConfig(MeshGroup& settings)
+    {
+        for (int extruder_nr = 0; extruder_nr < settings.getExtruderCount(); extruder_nr++)
+        {
+            assert(settings.getExtruderTrain(extruder_nr) != nullptr);
+            ExtruderTrain& extruder_train = *settings.getExtruderTrain(extruder_nr);
+            config_per_extruder.emplace_back();
+            Config& config = config_per_extruder.back();
+            config.time_to_cooldown_1_degree = 1.0 / extruder_train.getSettingInSeconds("machine_nozzle_cool_down_speed"); // 0.5
+            config.time_to_heatup_1_degree = 1.0 / extruder_train.getSettingInSeconds("machine_nozzle_heat_up_speed"); // 0.5
+            config.heatup_cooldown_time_mod_while_printing = 1.0 / extruder_train.getSettingInSeconds("material_extrusion_cool_down_speed"); // 0.1
+            config.standby_temp = extruder_train.getSettingInSeconds("material_standby_temperature"); // 150
+            
+            config.material_print_temperature = extruder_train.getSettingInDegreeCelsius("material_print_temperature"); // 220
+            
+            config.flow_dependent_temperature = extruder_train.getSettingBoolean("material_flow_dependent_temperature"); 
+            
+            config.flow_temp_graph = extruder_train.getSettingAsFlowTempGraph("material_flow_temp_graph"); // [[0.1,180],[20,230]]
+        }
+    }
+    
     bool usesFlowDependentTemp(int extruder_nr)
     {
         return config_per_extruder[extruder_nr].flow_dependent_temperature;
     }
-public:
+private:
     /*!
-     * Get the optimal temperature corresponding to a given average flow,
-     * or the initial layer temperature.
+     * Calculate time to heat up from standby temperature to a given temperature.
+     * Assumes @p temp is higher than the standby temperature.
      * 
-     * \param extruder The extruder train
-     * \param flow The flow for which to get the optimal temperature
-     * \param is_initial_layer Whether the initial layer temperature should be returned instead of flow-based temperature
-     * \return The corresponding optimal temperature
+     * \param extruder The extruder for which to get the time
+     * \param temp The temperature to be reached
      */
-    double getTemp(unsigned int extruder, double flow, bool is_initial_layer);
-
-    /*!
-     * Return the minimal time window of a specific extruder for letting an unused extruder cool down and warm up again
-     * \param extruder The extruder for which to get the minimal time window
-     * \return the minimal time window of a specific extruder for letting an unused extruder cool down and warm up again
-     */
-    double getMinimalTimeWindow(unsigned int extruder)
+    double timeToHeatFromStandbyToPrintTemp(unsigned int extruder, double temp)
     {
-        return config_per_extruder[extruder].min_time_window;
+        return (temp - config_per_extruder[extruder].standby_temp) * config_per_extruder[extruder].time_to_heatup_1_degree; 
     }
 
+public:
+    
     /*!
-     * Decide when to start warming up again after starting to cool down towards \p temp_mid.
+     * Get the optimal temperature corresponding to a given average flow.
+     * \param extruder The extruder train
+     * \param flow The flow for which to get the optimal temperature
+     * \return The corresponding optimal temperature
+     */
+    double getTemp(unsigned int extruder, double flow)
+    {
+        return config_per_extruder[extruder].flow_temp_graph.getTemp(flow, config_per_extruder[extruder].material_print_temperature, config_per_extruder[extruder].flow_dependent_temperature);
+    }
+    
+    /*!
+     * Decide when to start warming up again after starting to cool down towards the standby temperature.
      * Two cases are considered: 
      * the case where the standby temperature is reached  \__/    .
      * and the case where it isn't  \/    .
      * 
-     * \warning it is assumed that \p temp_mid is lower than both \p temp_start and \p temp_end. If not somewhat weird results may follow.
+     * IT is assumed that the printer is not printing during this cool down and warm up time.
+     * 
+     * Assumes from_temp is approximately the same as @p temp
      * 
-    //                    ,temp_end
-    //                   /                                    .
-    //     ,temp_start  /                                     .
-    //      \          /                                      .
-    //       \________/                                       .
-    //               "-> temp_mid
      * \param window_time The time window within which the cooldown and heat up must take place.
      * \param extruder The extruder used
-     * \param temp_start The temperature from which to start cooling down
-     * \param temp_mid The temeprature to which we try to cool down
-     * \param temp_end The temperature to which we need to have heated up at the end of the \p time_window
-     * \param during_printing Whether the warming up and cooling down is performed during printing
-     * \return The time before the end of the @p time_window to insert the preheat command and the temperature from which the heating starts
+     * \param temp The temperature to which to heat
+     * \return The time before the end of the @p time_window to insert the preheat command
      */
-    WarmUpResult getWarmUpPointAfterCoolDown(double time_window, unsigned int extruder, double temp_start, double temp_mid, double temp_end, bool during_printing);
-
+    double timeBeforeEndToInsertPreheatCommand_coolDownWarmUp(double time_window, unsigned int extruder, double temp)
+    {
+        double time_ratio_cooldown_heatup = config_per_extruder[extruder].time_to_cooldown_1_degree / config_per_extruder[extruder].time_to_heatup_1_degree;
+        double time_to_heat_from_standby_to_print_temp = timeToHeatFromStandbyToPrintTemp(extruder, temp);
+        double time_needed_to_reach_standby_temp = time_to_heat_from_standby_to_print_temp * (1.0 + time_ratio_cooldown_heatup);
+        if (time_needed_to_reach_standby_temp < time_window)
+        {
+            return time_to_heat_from_standby_to_print_temp;
+        }
+        else 
+        {
+            return time_window * config_per_extruder[extruder].time_to_heatup_1_degree / (config_per_extruder[extruder].time_to_cooldown_1_degree + config_per_extruder[extruder].time_to_heatup_1_degree);
+        }
+    }
     /*!
-     * Decide when to start cooling down again after starting to warm up towards the \p temp_mid
-     * Two cases are considered: 
-     * the case where the temperature is reached  /"""\    .
-     * and the case where it isn't  /\    .
+     * Calculate time needed to warm up the nozzle from a given temp to a given temp.
+     * If the printer is printing in the mean time the warming up will take longer.
      * 
-     * \warning it is assumed that \p temp_mid is higher than both \p temp_start and \p temp_end. If not somewhat weird results may follow.
      * 
-    //               _> temp_mid
-    //       /""""""""\                                       .
-    //      /          \                                      .
-    //     ^temp_start  \                                     .
-    //                   \                                    .
-    //                    ^temp_end
-     * \param window_time The time window within which the cooldown and heat up must take place.
+     * \param from_temp The temperature at which the nozzle was before
      * \param extruder The extruder used
-     * \param temp_start The temperature from which to start heating up
-     * \param temp_mid The temeprature to which we try to heat up
-     * \param temp_end The temperature to which we need to have cooled down after \p time_window time
-     * \param during_printing Whether the warming up and cooling down is performed during printing
-     * \return The time before the end of the \p time_window to insert the preheat command and the temperature from which the cooling starts
+     * \param temp The temperature to which to heat
+     * \param printing Whether the printer is printing in the time to heat up the nozzle
+     * \return The time needed to reach the desired temperature (@p temp)
      */
-    CoolDownResult getCoolDownPointAfterWarmUp(double time_window, unsigned int extruder, double temp_start, double temp_mid, double temp_end, bool during_printing);
-
-    /*!
-     * Get the time to go from one temperature to another temperature
-     * \param extruder The extruder number for which to perform the heatup / cooldown
-     * \param temp_before The before temperature
-     * \param temp_after The after temperature
-     * \param during_printing Whether the planned cooldown / warmup occurs during printing or while in standby mode
-     * \return The time needed
-     */
-    double getTimeToGoFromTempToTemp(int extruder, double temp_before, double temp_after, bool during_printing);
+    double timeBeforeEndToInsertPreheatCommand_warmUp(double from_temp, unsigned int extruder, double temp, bool printing)
+    {
+        if (temp > from_temp)
+        {
+            if (printing)
+            {
+                return (temp - from_temp) * (config_per_extruder[extruder].time_to_heatup_1_degree + config_per_extruder[extruder].heatup_cooldown_time_mod_while_printing); 
+            }
+            else 
+            {
+                return (temp - from_temp) * config_per_extruder[extruder].time_to_heatup_1_degree; 
+            }
+        }
+        else 
+        {
+            if (printing)
+            {
+                return (from_temp - temp) * config_per_extruder[extruder].time_to_cooldown_1_degree; 
+            }
+            else 
+            {
+                return (from_temp - temp) * std::max(0.0, config_per_extruder[extruder].time_to_cooldown_1_degree - config_per_extruder[extruder].heatup_cooldown_time_mod_while_printing); 
+            }
+        }
+    }
 };
 
 } // namespace cura 

src/PrimeTower.cpp

@@ -1,7 +1,5 @@
 #include "PrimeTower.h"
 
-#include <limits>
-
 #include "ExtruderTrain.h"
 #include "sliceDataStorage.h"
 #include "gcodeExport.h"
@@ -11,39 +9,34 @@
 
 namespace cura 
 {
-
+    
+    
 PrimeTower::PrimeTower()
-: is_hollow(false)
-, wipe_from_middle(false)
-, current_pre_wipe_location_idx(0)
 {
-    for (int extruder_nr = 0; extruder_nr < MAX_EXTRUDERS; extruder_nr++)
-    {
-        last_prime_tower_poly_printed[extruder_nr] = -1;
-    }
 }
 
 
 
-void PrimeTower::initConfigs(const MeshGroup* meshgroup)
+void PrimeTower::initConfigs(MeshGroup* meshgroup, std::vector<RetractionConfig>& retraction_config_per_extruder)
 {
-    extruder_count = meshgroup->getExtruderCount();
-
+    extruder_count = meshgroup->getSettingAsCount("machine_extruder_count");
+    
     for (int extr = 0; extr < extruder_count; extr++)
     {
-        config_per_extruder.emplace_back(PrintFeatureType::Support);// so that visualization in the old Cura still works (TODO)
+        config_per_extruder.emplace_back(&retraction_config_per_extruder[extr], PrintFeatureType::Support);// so that visualization in the old Cura still works (TODO)
     }
     for (int extr = 0; extr < extruder_count; extr++)
     {
-        const ExtruderTrain* train = meshgroup->getExtruderTrain(extr);
-        config_per_extruder[extr].init(train->getSettingInMillimetersPerSecond("speed_prime_tower"), train->getSettingInMillimetersPerSecond("acceleration_prime_tower"), train->getSettingInMillimetersPerSecond("jerk_prime_tower"), train->getSettingInMicrons("prime_tower_line_width"), train->getSettingInPercentage("prime_tower_flow"));
+        ExtruderTrain* train = meshgroup->getExtruderTrain(extr);
+        config_per_extruder[extr].init(train->getSettingInMillimetersPerSecond("speed_prime_tower"), train->getSettingInMicrons("prime_tower_line_width"), train->getSettingInPercentage("prime_tower_flow"));
     }
 }
 
-void PrimeTower::setConfigs(const MeshGroup* meshgroup, const int layer_thickness)
+void PrimeTower::setConfigs(MeshGroup* meshgroup, int layer_thickness)
 {
-    extruder_count = meshgroup->getExtruderCount();
-
+    
+    extruder_count = meshgroup->getSettingAsCount("machine_extruder_count");
+    
     for (int extr = 0; extr < extruder_count; extr++)
     {
         GCodePathConfig& conf = config_per_extruder[extr];
@@ -51,83 +44,163 @@ void PrimeTower::setConfigs(const MeshGroup* meshgroup, const int layer_thicknes
     }
 }
 
-void PrimeTower::generateGroundpoly(const SliceDataStorage& storage)
-{
-    extruder_count = storage.meshgroup->getExtruderCount();
+    
 
-    int64_t prime_tower_wall_thickness = storage.getSettingInMicrons("prime_tower_wall_thickness");
-    int64_t tower_size = storage.getSettingInMicrons("prime_tower_size");
-
-    if (prime_tower_wall_thickness * 2 < tower_size)
-    {
-        is_hollow = true;
+void PrimeTower::computePrimeTowerMax(SliceDataStorage& storage)
+{ // compute storage.max_object_height_second_to_last_extruder, which is used to determine the highest point in the prime tower
+        
+    extruder_count = storage.getSettingAsCount("machine_extruder_count");
+    
+    int max_object_height_per_extruder[extruder_count]; 
+    std::fill_n(max_object_height_per_extruder, extruder_count, -1); // unitialize all as -1
+    { // compute max_object_height_per_extruder
+        for (SliceMeshStorage& mesh : storage.meshes)
+        {
+            unsigned int extr_nr = mesh.getSettingAsIndex("extruder_nr");
+            max_object_height_per_extruder[extr_nr] = 
+                std::max(   max_object_height_per_extruder[extr_nr]
+                        ,   mesh.layer_nr_max_filled_layer  ); 
+        }
+        int support_extruder_nr = storage.getSettingAsIndex("support_extruder_nr"); // TODO: support extruder should be configurable per object
+        max_object_height_per_extruder[support_extruder_nr] = 
+        std::max(   max_object_height_per_extruder[support_extruder_nr]
+                ,   storage.support.layer_nr_max_filled_layer  ); 
+        int support_roof_extruder_nr = storage.getSettingAsIndex("support_roof_extruder_nr"); // TODO: support roof extruder should be configurable per object
+        max_object_height_per_extruder[support_roof_extruder_nr] = 
+        std::max(   max_object_height_per_extruder[support_roof_extruder_nr]
+                ,   storage.support.layer_nr_max_filled_layer  ); 
     }
+    { // // compute max_object_height_second_to_last_extruder
+        int extruder_max_object_height = 0;
+        for (int extruder_nr = 1; extruder_nr < extruder_count; extruder_nr++)
+        {
+            if (max_object_height_per_extruder[extruder_nr] > max_object_height_per_extruder[extruder_max_object_height])
+            {
+                extruder_max_object_height = extruder_nr;
+            }
+        }
+        int extruder_second_max_object_height = -1;
+        for (int extruder_nr = 0; extruder_nr < extruder_count; extruder_nr++)
+        {
+            if (extruder_nr == extruder_max_object_height) { continue; }
+            if (extruder_second_max_object_height == -1 || max_object_height_per_extruder[extruder_nr] > max_object_height_per_extruder[extruder_second_max_object_height])
+            {
+                extruder_second_max_object_height = extruder_nr;
+            }
+        }
+        if (extruder_second_max_object_height < 0)
+        {
+            storage.max_object_height_second_to_last_extruder = -1;
+        }
+        else 
+        {
+            storage.max_object_height_second_to_last_extruder = max_object_height_per_extruder[extruder_second_max_object_height];
+        }
+    }
+       
+}
 
-    PolygonRef p = ground_poly.newPoly();
-    int tower_distance = 0; 
+void PrimeTower::generateGroundpoly(SliceDataStorage& storage) 
+{
+    PolygonRef p = storage.primeTower.ground_poly.newPoly();
+    int tower_size = storage.getSettingInMicrons("prime_tower_size");
+    int tower_distance = 0; //storage.getSettingInMicrons("prime_tower_distance");
     int x = storage.getSettingInMicrons("prime_tower_position_x"); // storage.model_max.x
     int y = storage.getSettingInMicrons("prime_tower_position_y"); // storage.model_max.y
     p.add(Point(x + tower_distance, y + tower_distance));
     p.add(Point(x + tower_distance, y + tower_distance + tower_size));
     p.add(Point(x + tower_distance - tower_size, y + tower_distance + tower_size));
     p.add(Point(x + tower_distance - tower_size, y + tower_distance));
-    middle = Point(x - tower_size / 2, y + tower_size / 2);
 
-    if (is_hollow)
-    {
-        ground_poly = ground_poly.difference(ground_poly.offset(-prime_tower_wall_thickness));
-    }
-
-    post_wipe_point = Point(x + tower_distance - tower_size / 2, y + tower_distance + tower_size / 2);
+    storage.wipePoint = Point(x + tower_distance - tower_size / 2, y + tower_distance + tower_size / 2);   
 }
 
-void PrimeTower::generatePaths(const SliceDataStorage& storage)
+void PrimeTower::generatePaths(SliceDataStorage& storage, unsigned int total_layers)
 {
-    enabled = storage.max_print_height_second_to_last_extruder >= 0
-            && storage.getSettingBoolean("prime_tower_enable")
-            && storage.getSettingInMicrons("prime_tower_wall_thickness") > 10
-            && storage.getSettingInMicrons("prime_tower_size") > 10;
-    if (enabled)
+    if (storage.max_object_height_second_to_last_extruder >= 0 
+//         && storage.getSettingInMicrons("prime_tower_distance") > 0 
+        && storage.getSettingInMicrons("prime_tower_size") > 0)
     {
-        generatePaths_denseInfill(storage);
-        generateWipeLocations(storage);
+        generatePaths3(storage);
     }
 }
-
-void PrimeTower::generatePaths_denseInfill(const SliceDataStorage& storage)
+void PrimeTower::generatePaths_OLD(SliceDataStorage& storage, unsigned int total_layers)
 {
+    
+    if (storage.max_object_height_second_to_last_extruder >= 0 && storage.getSettingInMicrons("prime_tower_distance") > 0 && storage.getSettingInMicrons("prime_tower_size") > 0)
+    {
+        PolygonRef p = storage.primeTower.ground_poly.newPoly();
+        int tower_size = storage.getSettingInMicrons("prime_tower_size");
+        int tower_distance = 0; //storage.getSettingInMicrons("prime_tower_distance");
+        int x = storage.getSettingInMicrons("prime_tower_position_x"); // storage.model_max.x
+        int y = storage.getSettingInMicrons("prime_tower_position_y"); // storage.model_max.y
+        p.add(Point(x + tower_distance, y + tower_distance));
+        p.add(Point(x + tower_distance, y + tower_distance + tower_size));
+        p.add(Point(x + tower_distance - tower_size, y + tower_distance + tower_size));
+        p.add(Point(x + tower_distance - tower_size, y + tower_distance));
+
+        storage.wipePoint = Point(x + tower_distance - tower_size / 2, y + tower_distance + tower_size / 2);
+    }
+}
+    
+    
+void PrimeTower::generatePaths2(SliceDataStorage& storage) // half baked attempt at spiral shaped prime tower pattern
+{
+//     extruder_count = storage.getSettingAsCount("machine_extruder_count");
+//     
+//     int64_t line_dists[extruder_count + 1]; // distance between the lines of different extruders, and half the line dist for beginning and ending
+//     int64_t total_width = 0;
+//     {
+//         int64_t last_line_width = 0;
+//         for (int extr = 0; extr < extruder_count; extr++)
+//         {
+//             int64_t line_width = config_per_extruder[extr].getLineWidth();
+//             line_dists[extr] = (line_width + last_line_width) / 2;
+//             total_width += line_width;
+//             last_line_width = line_width;
+//         }
+//         line_dists[extruder_count] = last_line_width / 2;
+//     }
+//     
+    
+    
+}
+
+void PrimeTower::generatePaths3(SliceDataStorage& storage)
+{
+        
     int n_patterns = 2; // alternating patterns between layers
-    int infill_overlap = 60; // so that it can't be zero; EDIT: wtf?
-    int extra_infill_shift = 0;
-
+    double infill_overlap = 15; // so that it can't be zero; EDIT: wtf?
+    
     generateGroundpoly(storage);
-
-    int64_t z = 0; // (TODO) because the prime tower stores the paths for each extruder for once instead of generating each layer, we don't know the z position
-
+    
     for (int extruder = 0; extruder < extruder_count; extruder++)
     {
         int line_width = storage.meshgroup->getExtruderTrain(extruder)->getSettingInMicrons("prime_tower_line_width");
         patterns_per_extruder.emplace_back(n_patterns);
-        std::vector<ExtrusionMoves>& patterns = patterns_per_extruder.back();
-        patterns.resize(n_patterns);
+        std::vector<Polygons>& patterns = patterns_per_extruder.back();
         for (int pattern_idx = 0; pattern_idx < n_patterns; pattern_idx++)
         {
-            patterns[pattern_idx].polygons = ground_poly.offset(-line_width / 2);
-            Polygons& result_lines = patterns[pattern_idx].lines;
-            int outline_offset = -line_width;
+            Polygons result_polygons; // should remain empty, since we generate lines pattern!
+            Polygons* in_between = nullptr;
+            bool avoidOverlappingPerimeters = false;
+            int outline_offset = -line_width/2;
             int line_distance = line_width;
             double fill_angle = 45 + pattern_idx * 90;
-            Polygons result_polygons; // should remain empty, since we generate lines pattern!
-            Infill infill_comp(EFillMethod::LINES, ground_poly, outline_offset, line_width, line_distance, infill_overlap, fill_angle, z, extra_infill_shift);
-            infill_comp.generate(result_polygons, result_lines);
+            Polygons& result_lines = patterns[pattern_idx];
+            Infill infill_comp(EFillMethod::LINES, ground_poly, outline_offset, avoidOverlappingPerimeters, line_width, line_distance, infill_overlap, fill_angle);
+            infill_comp.generate(result_polygons, result_lines, in_between);
         }
     }
 }
 
+    
 
-void PrimeTower::addToGcode(const SliceDataStorage& storage, GCodePlanner& gcodeLayer, const GCodeExport& gcode, const int layer_nr, const int prev_extruder, const int new_extruder)
+void PrimeTower::addToGcode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed)
 {
-    if (!enabled)
+    if (!( storage.max_object_height_second_to_last_extruder >= 0 
+//         && storage.getSettingInMicrons("prime_tower_distance") > 0 
+        && storage.getSettingInMicrons("prime_tower_size") > 0) )
     {
         return;
     }
@@ -140,160 +213,99 @@ void PrimeTower::addToGcode(const SliceDataStorage& storage, GCodePlanner& gcode
     { // don't print the prime tower if it has been printed already
         return;
     }
+    
+    if (prev_extruder == gcodeLayer.getExtruder())
+    {
+        wipe = false;
+    }
+    addToGcode3(storage, gcodeLayer, gcode, layer_nr, prev_extruder, prime_tower_dir_outward, wipe, last_prime_tower_poly_printed);
+}
 
-    if (layer_nr > storage.max_print_height_second_to_last_extruder + 1)
+void PrimeTower::addToGcode3(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed)
+{
+    if (layer_nr > storage.max_object_height_second_to_last_extruder + 1)
     {
         return;
     }
+    
+    int new_extruder = gcodeLayer.getExtruder();
 
-    bool pre_wipe = storage.meshgroup->getExtruderTrain(new_extruder)->getSettingBoolean("dual_pre_wipe");
-    bool post_wipe = storage.meshgroup->getExtruderTrain(prev_extruder)->getSettingBoolean("prime_tower_wipe_enabled");
-
-    if (prev_extruder == new_extruder)
-    {
-        pre_wipe = false;
-        post_wipe = false;
-    }
-    // pre-wipe:
-    if (pre_wipe)
-    {
-        preWipe(storage, gcodeLayer, new_extruder);
-    }
-
-    addToGcode_denseInfill(storage, gcodeLayer, gcode, layer_nr, prev_extruder, new_extruder);
-
-    // post-wipe:
-    if (post_wipe)
-    { //Make sure we wipe the old extruder on the prime tower.
-        gcodeLayer.addTravel(post_wipe_point - gcode.getExtruderOffset(prev_extruder) + gcode.getExtruderOffset(new_extruder));
-    }
-}
-
-void PrimeTower::addToGcode_denseInfill(const SliceDataStorage& storage, GCodePlanner& gcodeLayer, const GCodeExport& gcode, const int layer_nr, const int prev_extruder, const int new_extruder)
-{
-    ExtrusionMoves& pattern = patterns_per_extruder[new_extruder][((layer_nr % 2) + 2) % 2]; // +2) %2 to handle negative layer numbers
+    
+    Polygons& pattern = patterns_per_extruder[new_extruder][layer_nr % 2];
 
+    
     GCodePathConfig& config = config_per_extruder[new_extruder];
-
-    gcodeLayer.addPolygonsByOptimizer(pattern.polygons, &config);
-    gcodeLayer.addLinesByOptimizer(pattern.lines, &config, SpaceFillType::Lines);
-
+    int start_idx = 0; // TODO: figure out which idx is closest to the far right corner
+    gcodeLayer.addPolygon(ground_poly.back(), start_idx, &config);
+    gcodeLayer.addLinesByOptimizer(pattern, &config, SpaceFillType::Lines);
+    
     last_prime_tower_poly_printed[new_extruder] = layer_nr;
+
+    if (CommandSocket::isInstantiated())
+    {
+        CommandSocket::getInstance()->sendPolygons(PrintFeatureType::Support, layer_nr, pattern, config.getLineWidth());
+    }
+
+    if (wipe)
+    { //Make sure we wipe the old extruder on the prime tower.
+        gcodeLayer.addTravel(storage.wipePoint - gcode.getExtruderOffset(prev_extruder) + gcode.getExtruderOffset(new_extruder));
+    }
 }
 
-Point PrimeTower::getLocationBeforePrimeTower(const SliceDataStorage& storage)
+void PrimeTower::addToGcode_OLD(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed)
 {
-    Point ret(0, 0);
-    int absolute_starting_points = 0;
-    for (int extruder_nr = 0; extruder_nr < storage.meshgroup->getExtruderCount(); extruder_nr++)
+    if (layer_nr > storage.max_object_height_second_to_last_extruder + 1)
     {
-        ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(0);
-        if (train.getSettingBoolean("machine_extruder_start_pos_abs"))
-        {
-            ret += Point(train.getSettingInMicrons("machine_extruder_start_pos_x"), train.getSettingInMicrons("machine_extruder_start_pos_y"));
-            absolute_starting_points++;
-        }
+        return;
     }
-    if (absolute_starting_points > 0)
-    { // take the average over all absolute starting positions
-        ret /= absolute_starting_points;
-    }
-    else
-    { // use the middle of the bed
-        if (!storage.getSettingBoolean("machine_center_is_zero"))
-        {
-            ret = Point(storage.getSettingInMicrons("machine_width"), storage.getSettingInMicrons("machine_depth")) / 2;
-        }
-        // otherwise keep (0, 0)
-    }
-    return ret;
-}
+    
+    int new_extruder = gcodeLayer.getExtruder();
 
-void PrimeTower::generateWipeLocations(const SliceDataStorage& storage)
-{
-    wipe_from_middle = is_hollow;
-    // only wipe from the middle of the prime tower if we have a z hop already on the first move after the layer switch
-    for (int extruder_nr = 0; extruder_nr < storage.meshgroup->getExtruderCount(); extruder_nr++)
-    {
-        const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(extruder_nr);
-        wipe_from_middle &= train.getSettingBoolean("retraction_hop_enabled") 
-                        && (!train.getSettingBoolean("retraction_hop_only_when_collides") || train.getSettingBoolean("retraction_hop_after_extruder_switch"));
-    }
-
-    PolygonsPointIndex segment_start; // from where to start the sequence of wipe points
-    PolygonsPointIndex segment_end; // where to end the sequence of wipe points
-
-    if (wipe_from_middle)
-    {
-        // take the same start as end point so that the whole poly os covered.
-        // find the inner polygon.
-        segment_start = segment_end = PolygonUtils::findNearestVert(middle, ground_poly);
-    }
-    else
-    {
-        // take the closer corner of the wipe tower and generate wipe locations on that side only:
-        //
-        //     |
-        //     |
-        //     +-----
-        //  .
-        //  ^ nozzle switch location
-        Point from = getLocationBeforePrimeTower(storage);
-
-        // find the single line segment closest to [from] pointing most toward [from]
-        PolygonsPointIndex closest_vert = PolygonUtils::findNearestVert(from, ground_poly);
-        PolygonsPointIndex prev = closest_vert.prev();
-        PolygonsPointIndex next = closest_vert.next();
-        int64_t prev_dot_score = dot(from - closest_vert.p(), turn90CCW(prev.p() - closest_vert.p()));
-        int64_t next_dot_score = dot(from - closest_vert.p(), turn90CCW(closest_vert.p() - next.p()));
-        if (prev_dot_score > next_dot_score)
-        {
-            segment_start = prev;
-            segment_end = closest_vert;
-        }
+    int64_t offset = -config_per_extruder[new_extruder].getLineWidth(); 
+    if (layer_nr > 0)
+        offset *= 2;
+    
+    //If we changed extruder, print the wipe/prime tower for this nozzle;
+    std::vector<Polygons> insets;
+    { // generate polygons
+        if ((layer_nr % 2) == 1)
+            insets.push_back(storage.primeTower.ground_poly.offset(offset / 2));
         else
+            insets.push_back(storage.primeTower.ground_poly);
+        while(true)
         {
-            segment_start = closest_vert;
-            segment_end = next;
+            Polygons new_inset = insets[insets.size() - 1].offset(offset);
+            if (new_inset.size() < 1)
+                break;
+            insets.push_back(new_inset);
         }
     }
-
-    PolygonUtils::spreadDots(segment_start, segment_end, number_of_pre_wipe_locations, pre_wipe_locations);
-}
-
-void PrimeTower::preWipe(const SliceDataStorage& storage, GCodePlanner& gcode_layer, const int extruder_nr)
-{
-    const ClosestPolygonPoint wipe_location = pre_wipe_locations[current_pre_wipe_location_idx];
-    current_pre_wipe_location_idx = (current_pre_wipe_location_idx + pre_wipe_location_skip) % number_of_pre_wipe_locations;
-
-    ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(extruder_nr);
-    const int inward_dist = train.getSettingInMicrons("machine_nozzle_size") * 3 / 2 ;
-    const int start_dist = train.getSettingInMicrons("machine_nozzle_size") * 2;
-    const Point end = PolygonUtils::moveInsideDiagonally(wipe_location, inward_dist);
-    const Point outward_dir = wipe_location.location - end;
-    const Point start = wipe_location.location + normal(outward_dir, start_dist);
-    if (wipe_from_middle)
+    
+    
+    for(unsigned int n=0; n<insets.size(); n++)
     {
-        // for hollow wipe tower:
-        // start from above
-        // go to wipe start
-        // go to the Z height of the previous/current layer
-        // wipe
-        // go to normal layer height (automatically on the next extrusion move)...
-        GCodePath& toward_middle = gcode_layer.addTravel(middle);
-        toward_middle.perform_z_hop = true;
-        gcode_layer.forceNewPathStart();
-        GCodePath& toward_wipe_start = gcode_layer.addTravel_simple(start);
-        toward_wipe_start.perform_z_hop = false;
-        toward_wipe_start.retract = true;
+        GCodePathConfig& config = config_per_extruder[new_extruder];
+        gcodeLayer.addPolygonsByOptimizer(insets[(prime_tower_dir_outward)? insets.size() - 1 - n : n], &config);
     }
-    else
-    {
-        gcode_layer.addTravel(start);
+    last_prime_tower_poly_printed[new_extruder] = layer_nr;
+    
+    if (wipe)
+    { //Make sure we wipe the old extruder on the prime tower.
+        gcodeLayer.addTravel(storage.wipePoint - gcode.getExtruderOffset(prev_extruder) + gcode.getExtruderOffset(new_extruder));
     }
-    float flow = 0.0001; // force this path being interpreted as an extrusion path, so that no Z hop will occur (TODO: really separately handle travel and extrusion moves)
-    gcode_layer.addExtrusionMove(end, &config_per_extruder[extruder_nr], SpaceFillType::None, flow);
-}
-
-
-}//namespace cura
+};
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+}//namespace cura

src/PrimeTower.h

@@ -1,12 +1,9 @@
 #ifndef PRIME_TOWER_H
 #define PRIME_TOWER_H
 
-#include <vector>
-
-#include "GCodePathConfig.h"
+#include "gcodeExport.h" // GCodePathConfig
 #include "MeshGroup.h"
 #include "utils/polygon.h" // Polygons
-#include "utils/polygonUtils.h"
 
 namespace cura 
 {
@@ -16,143 +13,51 @@ class SliceDataStorage;
 class GCodePlanner;
 class GCodeExport;
 
-/*!
- * Class for everything to do with the prime tower:
- * - generating the areas
- * - checking up till which height the prime tower has to be printed
- * - generating the paths and adding them to the layer plan
- */
+typedef std::vector<IntPoint> PolyLine;
+
 class PrimeTower
 {
 private:
-    struct ExtrusionMoves
+    int extruder_count;
+    std::vector<GCodePathConfig> config_per_extruder;
+
+    class WallInfill
     {
-        Polygons polygons;
-        Polygons lines;
+        
     };
-    bool enabled; //!< Whether the prime tower is enabled
-
-    int extruder_count; //!< number of extruders
-    std::vector<GCodePathConfig> config_per_extruder; //!< Path config for prime tower for each extruder
-
-    bool is_hollow; //!< Whether the prime tower is hollow
-
-    bool wipe_from_middle; //!< Whether to wipe on the inside of the hollow prime tower
-    Point middle; //!< The middle of the prime tower
-
-    Point post_wipe_point; //!< location to post-wipe the unused nozzle off on
-
-    std::vector<ClosestPolygonPoint> pre_wipe_locations; //!< The differernt locations where to pre-wipe the active nozzle
-    const unsigned int pre_wipe_location_skip = 13; //!< How big the steps are when stepping through \ref PrimeTower::wipe_locations
-    const unsigned int number_of_pre_wipe_locations = 21; //!< The required size of \ref PrimeTower::wipe_locations
-    // note that the above are two consecutive numbers in the Fibonacci sequence
-    int current_pre_wipe_location_idx; //!< Index into \ref PrimeTower::wipe_locations of where to pre-wipe the nozzle
-
 public:
-    Polygons ground_poly; //!< The outline of the prime tower to be used for each layer
-
-    std::vector<std::vector<ExtrusionMoves>> patterns_per_extruder; //!< for each extruder a vector of patterns to alternate between, over the layers
-
-    /*!
-     * Initialize \ref PrimeTower::config_per_extruder with speed and line width settings.
-     * 
-     * \param meshgroup Where to retrieve the setttings for each extruder
-     */
-    void initConfigs(const MeshGroup* meshgroup);
-
-    /*!
-     * Complete the \ref PrimeTower::config_per_extruder by settings the layer height.
-     * 
-     * \param meshgroup Where to retrieve the setttings for each extruder
-     * \param layer_thickness The current layer thickness
-     */
-    void setConfigs(const MeshGroup* meshgroup, const int layer_thickness);
-
-    /*!
-     * Generate the prime tower area to be used on each layer
-     * 
-     * Fills \ref PrimeTower::ground_poly and sets \ref PrimeTower::middle
-     * 
-     * \param storage Where to retrieve prime tower settings from
-     */
-    void generateGroundpoly(const SliceDataStorage& storage);
+    void initConfigs(MeshGroup* meshgroup, std::vector<RetractionConfig>& retraction_config_per_extruder);
+    void setConfigs(MeshGroup* configs, int layer_thickness);
+    
+    Polygons ground_poly;
+    
+    std::vector<PolyLine> extruder_paths;
+    
+    
+    void generateGroundpoly(SliceDataStorage& storage);
 
+    std::vector<std::vector<Polygons>> patterns_per_extruder; //!< for each extruder a vector of patterns to alternate between, over the layers
+    
+    void generatePaths3(SliceDataStorage& storage);
+    
+    void generatePaths2(SliceDataStorage& storage);
     /*!
      * Generate the area where the prime tower should be.
      * 
-     * \param storage where to get settings from
+     * \param storage Input and Output parameter: fetches the outline information (see SliceLayerPart::outline) and generates the other reachable field of the \p storage
      * \param total_layers The total number of layers 
      */
-    void generatePaths(const SliceDataStorage& storage);
+    void generatePaths(SliceDataStorage& storage, unsigned int total_layers);
+    void generatePaths_OLD(SliceDataStorage& storage, unsigned int total_layers);
 
-    PrimeTower(); //!< basic constructor
+    void computePrimeTowerMax(SliceDataStorage& storage);
+    
+    PrimeTower();
 
-    /*!
-     * Add path plans for the prime tower to the \p gcode_layer
-     * 
-     * \param storage where to get settings from; where to get the maximum height of the prime tower from
-     * \param[in,out] gcode_layer Where to get the current extruder from; where to store the generated layer paths
-     * \param layer_nr The layer for which to generate the prime tower paths
-     * \param prev_extruder The previous extruder with which paths were planned; from which extruder a switch was made
-     * \param new_extruder The switched to extruder with which the prime tower paths should be generated.
-     */
-    void addToGcode(const SliceDataStorage& storage, GCodePlanner& gcode_layer, const GCodeExport& gcode, const int layer_nr, const int prev_extruder, const int new_extruder);
-private:
-    /*!
-     * Layer number of the last layer in which a prime tower has been printed per extruder train.  
-     * 
-     * This is recorded per extruder to account for a prime tower per extruder, instead of the mixed prime tower.
-     */
-    int last_prime_tower_poly_printed[MAX_EXTRUDERS];
+    void addToGcode(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed);
+    void addToGcode_OLD(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed);
+    void addToGcode3(SliceDataStorage& storage, GCodePlanner& gcodeLayer, GCodeExport& gcode, int layer_nr, int prev_extruder, bool prime_tower_dir_outward, bool wipe, int* last_prime_tower_poly_printed);
 
-    /*!
-     * Find an approriate representation for the point representing the location before going to the prime tower
-     * 
-     * \warning This is not the actual position each time before the wipe tower
-     * 
-     * \param storage where to get settings from
-     * \return that location
-     */
-    Point getLocationBeforePrimeTower(const SliceDataStorage& storage);
-
-    /*!
-     * \param storage where to get settings from
-     * Depends on ground_poly being generated
-     */
-    void generateWipeLocations(const SliceDataStorage& storage);
-
-    /*!
-     * \see WipeTower::generatePaths
-     * 
-     * Generate the extrude paths for each extruder on even and odd layers
-     * Fill the ground poly with dense infill.
-     * 
-     * \param storage where to get settings from
-     * \param total_layers The total number of layers 
-     */
-    void generatePaths_denseInfill(const SliceDataStorage& storage);
-
-    /*!
-     * \see PrimeTower::addToGcode
-     * 
-     * Add path plans for the prime tower to the \p gcode_layer
-     * 
-     * \param storage where to get settings from; where to get the maximum height of the prime tower from
-     * \param[in,out] gcode_layer Where to get the current extruder from; where to store the generated layer paths
-     * \param layer_nr The layer for which to generate the prime tower paths
-     * \param prev_extruder The previous extruder with which paths were planned; from which extruder a switch was made
-     * \param new_extruder The switched to extruder with which the prime tower paths should be generated.
-     */
-    void addToGcode_denseInfill(const SliceDataStorage& storage, GCodePlanner& gcode_layer, const GCodeExport& gcode, const int layer_nr, const int prev_extruder, const int new_extruder);
-
-    /*!
-     * Plan the moves for wiping the current nozzles oozed material before starting to print the prime tower.
-     * 
-     * \param storage where to get settings from
-     * \param[out] gcode_layer where to add the planned paths for wiping
-     * \param extruder_nr The current extruder
-     */
-    void preWipe(const SliceDataStorage& storage, GCodePlanner& gcode_layer, const int extruder_nr);
 };
 
 

src/PrintFeature.h

@@ -4,19 +4,18 @@
 namespace cura
 {
 
-enum class PrintFeatureType: unsigned char
+enum class PrintFeatureType
 {
-    NoneType, // used to mark unspecified jumps in polygons. libArcus depends on it
+    NoneType, // unused, but libArcus depends on it
     OuterWall,
     InnerWall,
     Skin,
     Support,
-    SkirtBrim,
+    Skirt,
     Infill,
     SupportInfill,
     MoveCombing,
-    MoveRetraction,
-    SupportInterface
+    MoveRetraction
 };
 
 
@@ -24,4 +23,4 @@ enum class PrintFeatureType: unsigned char
 
 } // namespace cura
 
-#endif // PRINT_FEATURE
+#endif // PRINT_FEATURE

src/Progress.cpp

@@ -1,28 +1,30 @@
 /** Copyright (C) 2015 Ultimaker - Released under terms of the AGPLv3 License */
 #include "Progress.h"
 
-#include "../commandSocket.h"
-#include "../utils/gettime.h"
+#include "commandSocket.h"
+#include "utils/gettime.h"
 
 namespace cura {
     
 double Progress::times [] = 
 { 
-    0.0,    // START   = 0, 
-    5.269,  // SLICING = 1, 
-    1.533,  // PARTS   = 2, 
-    71.811, // INSET_SKIN = 3
-    51.009, // SUPPORT = 4, 
-    154.62, // EXPORT  = 5, 
-    0.1     // FINISH  = 6
+    0.0, 
+    5.269, 
+    1.533, 
+    22.953,
+    51.009, 
+    48.858, 
+    154.62, 
+    0.1 
 };
 std::string Progress::names [] = 
 {
     "start",
     "slice",
     "layerparts",
-    "inset+skin",
+    "inset",
     "support",
+    "skin",
     "export",
     "process"
 };
@@ -37,8 +39,9 @@ const Progress::Stage Progress::stages[] =
     Progress::Stage::START, 
     Progress::Stage::SLICING, 
     Progress::Stage::PARTS, 
-    Progress::Stage::INSET_SKIN, 
+    Progress::Stage::INSET, 
     Progress::Stage::SUPPORT, 
+    Progress::Stage::SKIN, 
     Progress::Stage::EXPORT, 
     Progress::Stage::FINISH 
 };

src/Progress.h

@@ -4,14 +4,14 @@
 
 #include <string>
 
-#include "../utils/logoutput.h"
-#include "../utils/gettime.h"
+#include "utils/logoutput.h"
+#include "utils/gettime.h"
 
 namespace cura {
 
 class CommandSocket;
 
-#define N_PROGRESS_STAGES 7
+#define N_PROGRESS_STAGES 8
 
 /*!
  * Class for handling the progress bar and the progress logging.
@@ -30,10 +30,11 @@ public:
         START   = 0, 
         SLICING = 1, 
         PARTS   = 2, 
-        INSET_SKIN = 3, 
+        INSET   = 3, 
         SUPPORT = 4, 
-        EXPORT  = 5, 
-        FINISH  = 6
+        SKIN    = 5, 
+        EXPORT  = 6, 
+        FINISH  = 7
     };
 private:
     static double times [N_PROGRESS_STAGES]; //!< Time estimates per stage

src/RetractionConfig.h

@@ -1,28 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#ifndef RETRACTION_CONFIG_H
-#define RETRACTION_CONFIG_H
-
-
-namespace cura 
-{
-
-/*!
- * The retraction configuration used in the GCodePathConfig of each feature (and the travel config)
- */
-class RetractionConfig
-{
-public:
-    double distance; //!< The distance retracted (in mm)
-    double speed; //!< The speed with which to retract (in mm/s)
-    double primeSpeed; //!< the speed with which to unretract (in mm/s)
-    double prime_volume; //!< the amount of material primed after unretracting (in mm^3)
-    int zHop; //!< the amount with which to lift the head during a retraction-travel
-    int retraction_min_travel_distance; //!< Minimal distance traversed to even consider retracting (in micron)
-    double retraction_extrusion_window; //!< Window of mm extruded filament in which to limit the amount of retractions
-    int retraction_count_max; //!< The maximum amount of retractions allowed to occur in the RetractionConfig::retraction_extrusion_window
-};
-
-
-}//namespace cura
-
-#endif // RETRACTION_CONFIG_H

src/SkirtBrim.cpp

@@ -1,187 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include "SkirtBrim.h"
-#include "support.h"
-
-namespace cura 
-{
-
-void SkirtBrim::getFirstLayerOutline(SliceDataStorage& storage, const unsigned int primary_line_count, const int primary_extruder_skirt_brim_line_width, const bool is_skirt, const bool outside_only, Polygons& first_layer_outline)
-{
-    bool external_only = is_skirt; // whether to include holes or not
-    const int layer_nr = 0;
-    if (is_skirt)
-    {
-        const bool include_helper_parts = true;
-        first_layer_outline = storage.getLayerOutlines(layer_nr, include_helper_parts, external_only);
-        first_layer_outline = first_layer_outline.approxConvexHull();
-    }
-    else
-    { // add brim underneath support by removing support where there's brim around the model
-        const bool include_helper_parts = false; // include manually below
-        first_layer_outline = storage.getLayerOutlines(layer_nr, include_helper_parts, external_only);
-        Polygons first_layer_empty_holes;
-        if (outside_only)
-        {
-            first_layer_empty_holes = first_layer_outline.getEmptyHoles();
-            first_layer_outline = first_layer_outline.removeEmptyHoles();
-        }
-        if (storage.support.generated && primary_line_count > 0)
-        { // remove model-brim from support
-            // avoid gap in the middle
-            //    V
-            //  +---+     +----+
-            //  |+-+|     |+--+|
-            //  || ||     ||[]|| > expand to fit an extra brim line
-            //  |+-+|     |+--+|
-            //  +---+     +----+ 
-            Polygons model_brim_covered_area = first_layer_outline.offset(primary_extruder_skirt_brim_line_width * (primary_line_count + primary_line_count % 2), ClipperLib::jtRound); // always leave a gap of an even number of brim lines, so that it fits if it's generating brim from both sides
-            if (outside_only)
-            { // don't remove support within empty holes where no brim is generated.
-                model_brim_covered_area.add(first_layer_empty_holes);
-            }
-            SupportLayer& support_layer = storage.support.supportLayers[0];
-            support_layer.supportAreas = support_layer.supportAreas.difference(model_brim_covered_area);
-            first_layer_outline.add(support_layer.supportAreas);
-            first_layer_outline.add(support_layer.skin);
-        }
-        first_layer_outline.add(storage.primeTower.ground_poly); // don't remove parts of the prime tower, but make a brim for it
-    }
-    constexpr int join_distance = 20;
-    first_layer_outline = first_layer_outline.offset(join_distance).offset(-join_distance); // merge adjacent models into single polygon
-    constexpr int smallest_line_length = 200;
-    constexpr int largest_error_of_removed_point = 50;
-    first_layer_outline.simplify(smallest_line_length, largest_error_of_removed_point); // simplify for faster processing of the brim lines
-}
-
-int SkirtBrim::generatePrimarySkirtBrimLines(SliceDataStorage& storage, int start_distance, unsigned int primary_line_count, const int primary_extruder_skirt_brim_line_width, const int64_t primary_extruder_minimal_length, const Polygons& first_layer_outline, Polygons& skirt_brim_primary_extruder)
-{
-
-    int offset_distance = start_distance - primary_extruder_skirt_brim_line_width / 2;
-    for (unsigned int skirt_brim_number = 0; skirt_brim_number < primary_line_count; skirt_brim_number++)
-    {
-        offset_distance += primary_extruder_skirt_brim_line_width;
-
-        Polygons outer_skirt_brim_line = first_layer_outline.offset(offset_distance, ClipperLib::jtRound);
-
-        //Remove small inner skirt and brim holes. Holes have a negative area, remove anything smaller then 100x extrusion "area"
-        for (unsigned int n = 0; n < outer_skirt_brim_line.size(); n++)
-        {
-            double area = outer_skirt_brim_line[n].area();
-            if (area < 0 && area > -primary_extruder_skirt_brim_line_width * primary_extruder_skirt_brim_line_width * 100)
-            {
-                outer_skirt_brim_line.remove(n--);
-            }
-        }
-
-        skirt_brim_primary_extruder.add(outer_skirt_brim_line);
-
-        int length = skirt_brim_primary_extruder.polygonLength();
-        if (skirt_brim_number + 1 >= primary_line_count && length > 0 && length < primary_extruder_minimal_length) //Make brim or skirt have more lines when total length is too small.
-        {
-            primary_line_count++;
-        }
-    }
-    return offset_distance;
-}
-
-void SkirtBrim::generate(SliceDataStorage& storage, int start_distance, unsigned int primary_line_count, bool outside_only)
-{
-    const bool is_skirt = start_distance > 0;
-
-    const int adhesion_extruder_nr = storage.getSettingAsIndex("adhesion_extruder_nr");
-    const ExtruderTrain* adhesion_extruder = storage.meshgroup->getExtruderTrain(adhesion_extruder_nr);
-    const int primary_extruder_skirt_brim_line_width = adhesion_extruder->getSettingInMicrons("skirt_brim_line_width");
-    const int64_t primary_extruder_minimal_length = adhesion_extruder->getSettingInMicrons("skirt_brim_minimal_length");
-
-    Polygons& skirt_brim_primary_extruder = storage.skirt_brim[adhesion_extruder_nr];
-
-    Polygons first_layer_outline;
-    getFirstLayerOutline(storage, primary_line_count, primary_extruder_skirt_brim_line_width, is_skirt, outside_only, first_layer_outline);
-
-    const bool has_ooze_shield = storage.oozeShield.size() > 0 && storage.oozeShield[0].size() > 0;
-    const bool has_draft_shield = storage.draft_protection_shield.size() > 0;
-
-    if (is_skirt && (has_ooze_shield || has_draft_shield))
-    { // make sure we don't generate skirt through draft / ooze shield
-        first_layer_outline = first_layer_outline.offset(start_distance - primary_extruder_skirt_brim_line_width / 2, ClipperLib::jtRound).unionPolygons(storage.draft_protection_shield);
-        if (has_ooze_shield)
-        {
-            first_layer_outline = first_layer_outline.unionPolygons(storage.oozeShield[0]);
-        }
-        first_layer_outline = first_layer_outline.approxConvexHull();
-        start_distance = primary_extruder_skirt_brim_line_width / 2;
-    }
-
-    int offset_distance = generatePrimarySkirtBrimLines(storage, start_distance, primary_line_count, primary_extruder_skirt_brim_line_width, primary_extruder_minimal_length, first_layer_outline, skirt_brim_primary_extruder);
-
-
-    // generate brim for ooze shield and draft shield
-    if (!is_skirt && (has_ooze_shield || has_draft_shield))
-    {
-        // generate areas where to make extra brim for the shields
-        // avoid gap in the middle
-        //    V
-        //  +---+     +----+
-        //  |+-+|     |+--+|
-        //  || ||     ||[]|| > expand to fit an extra brim line
-        //  |+-+|     |+--+|
-        //  +---+     +----+ 
-        const int64_t primary_skirt_brim_width = (primary_line_count + primary_line_count % 2) * primary_extruder_skirt_brim_line_width; // always use an even number, because we will fil the area from both sides
-
-        Polygons shield_brim;
-        if (has_ooze_shield)
-        {
-            shield_brim = storage.oozeShield[0].difference(storage.oozeShield[0].offset(-primary_skirt_brim_width - primary_extruder_skirt_brim_line_width));
-        }
-        if (has_draft_shield)
-        {
-            shield_brim = shield_brim.unionPolygons(storage.draft_protection_shield.difference(storage.draft_protection_shield.offset(-primary_skirt_brim_width - primary_extruder_skirt_brim_line_width)));
-        }
-        const Polygons outer_primary_brim = first_layer_outline.offset(offset_distance, ClipperLib::jtRound);
-        shield_brim = shield_brim.difference(outer_primary_brim.offset(primary_extruder_skirt_brim_line_width));
-
-        // generate brim within shield_brim
-        skirt_brim_primary_extruder.add(shield_brim);
-        while (shield_brim.size() > 0)
-        {
-            shield_brim = shield_brim.offset(-primary_extruder_skirt_brim_line_width);
-            skirt_brim_primary_extruder.add(shield_brim);
-        }
-
-        // update parameters to generate secondary skirt around
-        first_layer_outline = outer_primary_brim;
-        if (has_draft_shield)
-        {
-            first_layer_outline = first_layer_outline.unionPolygons(storage.draft_protection_shield);
-        }
-        if (has_ooze_shield)
-        {
-            first_layer_outline = first_layer_outline.unionPolygons(storage.oozeShield[0]);
-        }
-
-        offset_distance = 0;
-    }
-
-    { // process other extruders' brim/skirt (as one brim line around the old brim)
-        int last_width = primary_extruder_skirt_brim_line_width;
-        for (int extruder = 0; extruder < storage.meshgroup->getExtruderCount(); extruder++)
-        {
-            if (extruder == adhesion_extruder_nr || !storage.meshgroup->getExtruderTrain(extruder)->getIsUsed())
-            {
-                continue;
-            }
-            const ExtruderTrain* train = storage.meshgroup->getExtruderTrain(extruder);
-            const int width = train->getSettingInMicrons("skirt_brim_line_width");
-            const int64_t minimal_length = train->getSettingInMicrons("skirt_brim_minimal_length");
-            offset_distance += last_width / 2 + width/2;
-            last_width = width;
-            while (storage.skirt_brim[extruder].polygonLength() < minimal_length)
-            {
-                storage.skirt_brim[extruder].add(first_layer_outline.offset(offset_distance, ClipperLib::jtRound));
-                offset_distance += width;
-            }
-        }
-    }
-}
-
-}//namespace cura

src/SkirtBrim.h

@@ -1,59 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef SKIRT_BRIM_H
-#define SKIRT_BRIM_H
-
-#include "sliceDataStorage.h"
-
-namespace cura 
-{
-
-class SkirtBrim
-{
-public:
-    /*!
-     * Generate skirt or brim (depending on parameters).
-     * 
-     * When \p distance > 0 and \p count == 1 a skirt is generated, which has
-     * slightly different configuration. Otherwise, a brim is generated.
-     * 
-     * \param storage Storage containing the parts at the first layer.
-     * \param distance The distance of the first outset from the parts at the first
-     * layer.
-     * \param primary_line_count Number of outsets / brim lines of the primary extruder.
-     * \param outside_only Whether to only generate a brim on the outside, rather than also in holes
-     */
-    static void generate(SliceDataStorage& storage, int distance, unsigned int primary_line_count, bool outside_only);
-
-private:
-    /*!
-     * Get the reference outline of the first layer around which to generate the first brim/skirt line.
-     * 
-     * This function may change the support polygons in the first layer
-     * in order to meet criteria for putting brim around the model as well as around the support.
-     * 
-     * \param storage Storage containing the parts at the first layer.
-     * \param primary_line_count Number of outsets / brim lines of the primary extruder.
-     * \param primary_extruder_skirt_brim_line_width Line widths of the initial skirt/brim lines
-     * \param is_skirt Whether a skirt is being generated vs a brim
-     * \param outside_only Whether to only generate a brim on the outside, rather than also in holes
-     * \param[out] first_layer_outline The resulting reference polygons
-     */
-    static void getFirstLayerOutline(SliceDataStorage& storage, const unsigned int primary_line_count, const int primary_extruder_skirt_brim_line_width, const bool is_skirt, const bool outside_only, Polygons& first_layer_outline);
-
-    /*!
-     * Generate the skirt/brim lines around the model
-     * 
-     * \param storage Storage containing the parts at the first layer.
-     * \param start_distance The distance of the first outset from the parts at the first
-     * \param primary_line_count Number of outsets / brim lines of the primary extruder.
-     * \param primary_extruder_skirt_brim_line_width Line widths of the initial skirt/brim lines
-     * \param primary_extruder_minimal_length The minimal total length of the skirt/brim lines of the primary extruder
-     * \param first_layer_outline The reference polygons from which to offset outward to generate skirt/brim lines
-     * \param[out] skirt_brim_primary_extruder Where to store the resulting brim/skirt lines in
-     * \return The offset of the last brim/skirt line from the reference polygon \p first_layer_outline
-     */
-    static int generatePrimarySkirtBrimLines(SliceDataStorage& storage, int start_distance, unsigned int primary_line_count, const int primary_extruder_skirt_brim_line_width, const int64_t primary_extruder_minimal_length, const Polygons& first_layer_outline, Polygons& skirt_brim_primary_extruder);
-};
-}//namespace cura
-
-#endif //SKIRT_BRIM_H

src/WallsComputation.cpp

@@ -1,80 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include "WallsComputation.h"
-#include "utils/polygonUtils.h"
-namespace cura {
-
-WallsComputation::WallsComputation(int wall_0_inset, int line_width_0, int line_width_x, int insetCount, bool recompute_outline_based_on_outer_wall)
-: wall_0_inset(wall_0_inset)
-, line_width_0(line_width_0)
-, line_width_x(line_width_x)
-, insetCount(insetCount)
-, recompute_outline_based_on_outer_wall(recompute_outline_based_on_outer_wall)
-{
-}
-
-void WallsComputation::generateInsets(SliceLayerPart* part)
-{
-    if (insetCount == 0)
-    {
-        part->insets.push_back(part->outline);
-        part->print_outline = part->outline;
-        return;
-    }
-    
-    for(int i=0; i<insetCount; i++)
-    {
-        part->insets.push_back(Polygons());
-        if (i == 0)
-        {
-            part->insets[0] = part->outline.offset(-line_width_0 / 2 - wall_0_inset);
-        } else if (i == 1)
-        {
-            part->insets[1] = part->insets[0].offset(-line_width_0 / 2 + wall_0_inset - line_width_x / 2);
-        } else
-        {
-            part->insets[i] = part->insets[i-1].offset(-line_width_x);
-        }
-        
-        
-        //Finally optimize all the polygons. Every point removed saves time in the long run.
-        part->insets[i].simplify();
-        part->insets[i].removeDegenerateVerts();
-        if (i == 0)
-        {
-            if (recompute_outline_based_on_outer_wall)
-            {
-                part->print_outline = part->insets[0].offset(line_width_0 / 2);
-            }
-            else
-            {
-                part->print_outline = part->outline;
-            }
-        }
-        if (part->insets[i].size() < 1)
-        {
-            part->insets.pop_back();
-            break;
-        }
-    }
-}
-
-void WallsComputation::generateInsets(SliceLayer* layer)
-{
-    for(unsigned int partNr = 0; partNr < layer->parts.size(); partNr++)
-    {
-        generateInsets(&layer->parts[partNr]);
-    }
-    
-    //Remove the parts which did not generate an inset. As these parts are too small to print,
-    // and later code can now assume that there is always minimal 1 inset line.
-    for(unsigned int partNr = 0; partNr < layer->parts.size(); partNr++)
-    {
-        if (layer->parts[partNr].insets.size() < 1)
-        {
-            layer->parts.erase(layer->parts.begin() + partNr);
-            partNr -= 1;
-        }
-    }
-}
-
-}//namespace cura

src/WallsComputation.h

@@ -1,69 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef WALLS_COMPUTATION_H
-#define WALLS_COMPUTATION_H
-
-#include "sliceDataStorage.h"
-
-namespace cura 
-{
-
-/*!
- * Function container for computing the outer walls / insets / perimeters polygons of a layer
- */
-class WallsComputation
-{
-public:
-    /*!
-     * The offset applied to the outer wall
-     */
-    int wall_0_inset;
-    /*!
-     * line width of the outer wall
-     */
-    int line_width_0;
-    /*!
-     * line width of other walls
-     */
-    int line_width_x;
-    /*!
-     * The number of insets to to generate
-     */
-    int insetCount;
-    /*!
-     * Whether to compute a more accurate poly representation of the printed outlines, based on the outer wall
-     */
-    bool recompute_outline_based_on_outer_wall;
-
-    /*!
-     * Basic constructor initializing the parameters with which to perform the walls computation
-     * 
-     * \param wall_0_inset The offset applied to the outer wall
-     * \param line_width_0 line width of the outer wall
-     * \param line_width_x line width of other walls
-     * \param insetCount The number of insets to to generate
-     * \param recompute_outline_based_on_outer_wall Whether to compute a more accurate poly representation of the printed outlines, based on the outer wall
-     */
-    WallsComputation(int wall_0_inset, int line_width_0, int line_width_x, int insetCount, bool recompute_outline_based_on_outer_wall);
-
-    /*!
-     * Generates the insets / perimeters for all parts in a layer.
-     * 
-     * Note that the second inset gets offsetted by WallsComputation::line_width_0 instead of the first, 
-     * which leads to better results for a smaller WallsComputation::line_width_0 than WallsComputation::line_width_x and when printing the outer wall last.
-     * 
-     * \param layer The layer for which to generate the insets.
-     */ 
-    void generateInsets(SliceLayer* layer);
-
-private:
-    /*!
-     * Generates the insets / perimeters for a single layer part.
-     * 
-     * \param part The part for which to generate the insets.
-     */
-    void generateInsets(SliceLayerPart* part);
-
-};
-}//namespace cura
-
-#endif//WALLS_COMPUTATION_H

src/Weaver.cpp

@@ -4,7 +4,7 @@
 #include <fstream> // debug IO
 #include <unistd.h>
 
-#include "progress/Progress.h"
+#include "Progress.h"
 #include "weaveDataStorage.h"
 #include "PrintFeature.h"
 
@@ -19,7 +19,7 @@ void Weaver::weave(MeshGroup* meshgroup)
 
     int layer_count = (maxz - initial_layer_thickness) / connectionHeight + 1;
 
-    std::cerr << "Layer count: " << layer_count << "\n";
+    DEBUG_SHOW(layer_count);
 
     std::vector<cura::Slicer*> slicerList;
 
@@ -35,14 +35,14 @@ void Weaver::weave(MeshGroup* meshgroup)
         {
             Polygons parts;
             for (cura::Slicer* slicer : slicerList)
-                parts.add(slicer->layers[starting_layer_idx].polygons);  
+                parts.add(slicer->layers[starting_layer_idx].polygonList);  
             
             if (parts.size() > 0)
                 break;
         }
         if (starting_layer_idx > 0)
         {
-            logWarning("First %i layers are empty!\n", starting_layer_idx);
+            logError("First %i layers are empty!\n", starting_layer_idx);
         }
     }
     
@@ -51,9 +51,10 @@ void Weaver::weave(MeshGroup* meshgroup)
     {
         int starting_z = -1;
         for (cura::Slicer* slicer : slicerList)
-            wireFrame.bottom_outline.add(slicer->layers[starting_layer_idx].polygons);
+            wireFrame.bottom_outline.add(slicer->layers[starting_layer_idx].polygonList);
         
-        CommandSocket::sendPolygons(PrintFeatureType::OuterWall, /*0,*/ wireFrame.bottom_outline, 1);
+        if (CommandSocket::isInstantiated())
+            CommandSocket::getInstance()->sendPolygons(PrintFeatureType::OuterWall, 0, wireFrame.bottom_outline, 1);
         
         if (slicerList.empty()) //Wait, there is nothing to slice.
         {
@@ -70,22 +71,23 @@ void Weaver::weave(MeshGroup* meshgroup)
         else 
             starting_point_in_layer = (Point(0,0) + meshgroup->max() + meshgroup->min()) / 2;
         
-        Progress::messageProgressStage(Progress::Stage::INSET_SKIN, nullptr);
+        Progress::messageProgressStage(Progress::Stage::INSET, nullptr);
         for (int layer_idx = starting_layer_idx + 1; layer_idx < layer_count; layer_idx++)
         {
-            Progress::messageProgress(Progress::Stage::INSET_SKIN, layer_idx+1, layer_count); // abuse the progress system of the normal mode of CuraEngine
+            Progress::messageProgress(Progress::Stage::INSET, layer_idx+1, layer_count); // abuse the progress system of the normal mode of CuraEngine
             
             Polygons parts1;
             for (cura::Slicer* slicer : slicerList)
-                parts1.add(slicer->layers[layer_idx].polygons);
+                parts1.add(slicer->layers[layer_idx].polygonList);
 
             
             Polygons chainified;
 
             chainify_polygons(parts1, starting_point_in_layer, chainified, false);
             
-            CommandSocket::sendPolygons(PrintFeatureType::OuterWall, /*layer_idx - starting_layer_idx,*/ chainified, 1);
-
+            if (CommandSocket::isInstantiated())
+                CommandSocket::getInstance()->sendPolygons(PrintFeatureType::OuterWall, layer_idx - starting_layer_idx, chainified, 1);
+            
             if (chainified.size() > 0)
             {
                 if (starting_z == -1) starting_z = slicerList[0]->layers[layer_idx-1].z;
@@ -106,10 +108,10 @@ void Weaver::weave(MeshGroup* meshgroup)
     {
         Polygons* lower_top_parts = &wireFrame.bottom_outline;
         
-        Progress::messageProgressStage(Progress::Stage::SUPPORT, nullptr);
+        Progress::messageProgressStage(Progress::Stage::SKIN, nullptr);
         for (unsigned int layer_idx = 0; layer_idx < wireFrame.layers.size(); layer_idx++)
         {
-            Progress::messageProgress(Progress::Stage::SUPPORT, layer_idx+1, wireFrame.layers.size()); // abuse the progress system of the normal mode of CuraEngine
+            Progress::messageProgress(Progress::Stage::SKIN, layer_idx+1, wireFrame.layers.size()); // abuse the progress system of the normal mode of CuraEngine
             
             WeaveLayer& layer = wireFrame.layers[layer_idx];
             
@@ -324,7 +326,7 @@ void Weaver::connections2moves(WeaveRoofPart& inset)
             WeaveConnectionSegment& segment = segments[idx];
             assert(segment.segmentType == WeaveSegmentType::UP);
             Point3 from = (idx == 0)? part.connection.from : segments[idx-1].to;
-            bool skipped = (segment.to - from).vSize2() < line_width * line_width;
+            bool skipped = (segment.to - from).vSize2() < extrusionWidth * extrusionWidth;
             if (skipped)
             {
                 unsigned int begin = idx;
@@ -333,11 +335,9 @@ void Weaver::connections2moves(WeaveRoofPart& inset)
                     WeaveConnectionSegment& segment = segments[idx];
                     assert(segments[idx].segmentType == WeaveSegmentType::UP);
                     Point3 from = (idx == 0)? part.connection.from : segments[idx-1].to;
-                    bool skipped = (segment.to - from).vSize2() < line_width * line_width;
+                    bool skipped = (segment.to - from).vSize2() < extrusionWidth * extrusionWidth;
                     if (!skipped) 
-                    {
                         break;
-                    }
                 }
                 int end = idx - ((include_half_of_last_down)? 2 : 1);
                 if (idx >= segments.size())
@@ -387,6 +387,8 @@ void Weaver::connect(Polygons& parts0, int z0, Polygons& parts1, int z1, WeaveCo
 
 void Weaver::chainify_polygons(Polygons& parts1, Point start_close_to, Polygons& result, bool include_last)
 {
+    
+        
     for (unsigned int prt = 0 ; prt < parts1.size(); prt++)
     {
         const PolygonRef upperPart = parts1[prt];
@@ -400,9 +402,9 @@ void Weaver::chainify_polygons(Polygons& parts1, Point start_close_to, Polygons&
         bool found = true;
         int idx = 0;
         
-        for (Point upper_point = upperPart[closestInPoly.point_idx]; found; upper_point = next_upper.location)
+        for (Point upper_point = upperPart[closestInPoly.pos]; found; upper_point = next_upper.location)
         {
-            found = PolygonUtils::getNextPointWithDistance(upper_point, nozzle_top_diameter, upperPart, idx, closestInPoly.point_idx, next_upper);
+            found = PolygonUtils::getNextPointWithDistance(upper_point, nozzle_top_diameter, upperPart, idx, closestInPoly.pos, next_upper);
 
             
             if (!found) 
@@ -427,7 +429,7 @@ void Weaver::connect_polygons(Polygons& supporting, int z0, Polygons& supported,
  
     if (supporting.size() < 1)
     {
-        std::cerr << "lower layer has zero parts!\n";
+        DEBUG_PRINTLN("lower layer has zero parts!");
         return;
     }
     
@@ -473,4 +475,16 @@ void Weaver::connect_polygons(Polygons& supporting, int z0, Polygons& supported,
 }
 
 
+
+
+
+
+
+
+
+
+
+
+
 }//namespace cura
+    

src/Weaver.h

@@ -3,7 +3,7 @@
 
 #include "weaveDataStorage.h"
 #include "commandSocket.h"
-#include "settings/settings.h"
+#include "settings.h"
 
 #include "MeshGroup.h"
 #include "slicer.h"
@@ -12,6 +12,8 @@
 #include "utils/polygon.h"
 #include "utils/polygonUtils.h"
 
+#include "debug.h"
+
 namespace cura
 {
 
@@ -28,7 +30,7 @@ private:
     
     int initial_layer_thickness;
     int connectionHeight; 
-    int line_width;
+    int extrusionWidth;
     
     int roof_inset; 
     
@@ -45,7 +47,7 @@ public:
         initial_layer_thickness = getSettingInMicrons("layer_height_0");
         connectionHeight = getSettingInMicrons("wireframe_height"); 
         
-        line_width = getSettingInMicrons("wall_line_width_x");
+        extrusionWidth = getSettingInMicrons("wall_line_width_x");
         
         roof_inset = getSettingInMicrons("wireframe_roof_inset"); 
         nozzle_outer_diameter = getSettingInMicrons("machine_nozzle_tip_outer_diameter");      // ___       ___   .

src/Wireframe2gcode.cpp

@@ -3,12 +3,10 @@
 #include <cmath> // sqrt
 #include <fstream> // debug IO
 
-#include "utils/math.h"
-#include "utils/logoutput.h"
 #include "weaveDataStorage.h"
-#include "progress/Progress.h"
+#include "Progress.h"
 
-#include "pathOrderOptimizer.h" //For skirt/brim.
+#include "pathOrderOptimizer.h" // for skirt
 
 namespace cura 
 {
@@ -19,8 +17,6 @@ void Wireframe2gcode::writeGCode()
 
     gcode.preSetup(wireFrame.meshgroup);
     
-    gcode.setInitialTemps(*wireFrame.meshgroup);
-    
     if (CommandSocket::getInstance())
         CommandSocket::getInstance()->beginGCode();
     
@@ -35,22 +31,23 @@ void Wireframe2gcode::writeGCode()
     {
         maxObjectHeight = wireFrame.layers.back().z1;
     }
-
-    gcode.setZ(initial_layer_thickness);
-
+    
     processSkirt();
-
+    
+            
     unsigned int total_layers = wireFrame.layers.size();
     gcode.writeLayerComment(0);
-    gcode.writeTypeComment(PrintFeatureType::SkirtBrim);
+    gcode.writeTypeComment("SKIRT");
 
+    gcode.setZ(initial_layer_thickness);
+    
     for (PolygonRef bottom_part : wireFrame.bottom_infill.roof_outlines)
     {
         if (bottom_part.size() == 0) continue;
         writeMoveWithRetract(bottom_part[bottom_part.size()-1]);
         for (Point& segment_to : bottom_part)
         {
-            gcode.writeMove(segment_to, speedBottom, extrusion_mm3_per_mm_flat);
+            gcode.writeMove(segment_to, speedBottom, extrusion_per_mm_flat);
         }
     }
     
@@ -66,7 +63,7 @@ void Wireframe2gcode::writeGCode()
                         writeMoveWithRetract(segment.to); 
                     } else 
                     {
-                        gcode.writeMove(segment.to, speedBottom, extrusion_mm3_per_mm_connection);
+                        gcode.writeMove(segment.to, speedBottom, extrusion_per_mm_connection); 
                     }
                 }   
             , 
@@ -76,7 +73,7 @@ void Wireframe2gcode::writeGCode()
                     else if (segment.segmentType == WeaveSegmentType::DOWN_AND_FLAT)
                         return; // do nothing
                     else 
-                        gcode.writeMove(segment.to, speedBottom, extrusion_mm3_per_mm_flat);
+                        gcode.writeMove(segment.to, speedBottom, extrusion_per_mm_flat); 
                 }
             );
     Progress::messageProgressStage(Progress::Stage::EXPORT, nullptr);
@@ -99,7 +96,7 @@ void Wireframe2gcode::writeGCode()
        
             if (part.connection.segments.size() == 0) continue;
             
-            gcode.writeTypeComment(PrintFeatureType::Support); // connection
+            gcode.writeTypeComment("SUPPORT"); // connection
             {
                 if (vSize2(gcode.getPositionXY() - part.connection.from) > connectionHeight)
                 {
@@ -115,7 +112,7 @@ void Wireframe2gcode::writeGCode()
             
             
             
-            gcode.writeTypeComment(PrintFeatureType::OuterWall); // top
+            gcode.writeTypeComment("WALL-OUTER"); // top
             {
                 for (unsigned int segment_idx = 0; segment_idx < part.connection.segments.size(); segment_idx++)
                 {
@@ -126,7 +123,7 @@ void Wireframe2gcode::writeGCode()
                         writeMoveWithRetract(segment.to);
                     } else 
                     {
-                        gcode.writeMove(segment.to, speedFlat, extrusion_mm3_per_mm_flat);
+                        gcode.writeMove(segment.to, speedFlat, extrusion_per_mm_flat);
                         gcode.writeDelay(flat_delay);
                     }
                 }
@@ -148,7 +145,7 @@ void Wireframe2gcode::writeGCode()
                         // do nothing
                     } else 
                     {   
-                        gcode.writeMove(segment.to, speedFlat, extrusion_mm3_per_mm_flat);
+                        gcode.writeMove(segment.to, speedFlat, extrusion_per_mm_flat);
                         gcode.writeDelay(flat_delay);
                     }
                 });
@@ -180,7 +177,7 @@ void Wireframe2gcode::go_down(WeaveLayer& layer, WeaveConnectionPart& part, unsi
         gcode.writeMove(from, speedDown, 0);
     if (straight_first_when_going_down <= 0)
     {
-        gcode.writeMove(segment.to, speedDown, extrusion_mm3_per_mm_connection);
+        gcode.writeMove(segment.to, speedDown, extrusion_per_mm_connection);
     } else 
     {
         Point3& to = segment.to;
@@ -192,14 +189,14 @@ void Wireframe2gcode::go_down(WeaveLayer& layer, WeaveConnectionPart& part, unsi
         int64_t new_length = (up - from).vSize() + (to - up).vSize() + 5;
         int64_t orr_length = vec.vSize();
         double enlargement = new_length / orr_length;
-        gcode.writeMove(up, speedDown*enlargement, extrusion_mm3_per_mm_connection / enlargement);
-        gcode.writeMove(to, speedDown*enlargement, extrusion_mm3_per_mm_connection / enlargement);
+        gcode.writeMove(up, speedDown*enlargement, extrusion_per_mm_connection / enlargement);
+        gcode.writeMove(to, speedDown*enlargement, extrusion_per_mm_connection / enlargement);
     }
     gcode.writeDelay(bottom_delay);
     if (up_dist_half_speed > 0)
     {
         
-        gcode.writeMove(Point3(0,0,up_dist_half_speed) + gcode.getPosition(), speedUp / 2, extrusion_mm3_per_mm_connection * 2);
+        gcode.writeMove(Point3(0,0,up_dist_half_speed) + gcode.getPosition(), speedUp / 2, extrusion_per_mm_connection * 2);
     }
 }
 
@@ -208,7 +205,7 @@ void Wireframe2gcode::go_down(WeaveLayer& layer, WeaveConnectionPart& part, unsi
 void Wireframe2gcode::strategy_knot(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx)
 {
     WeaveConnectionSegment& segment = part.connection.segments[segment_idx];
-    gcode.writeMove(segment.to, speedUp, extrusion_mm3_per_mm_connection);
+    gcode.writeMove(segment.to, speedUp, extrusion_per_mm_connection);
     Point3 next_vector;
     if (segment_idx + 1 < part.connection.segments.size())
     {
@@ -242,7 +239,7 @@ void Wireframe2gcode::strategy_retract(WeaveLayer& layer, WeaveConnectionPart& p
     retraction_config.primeSpeed = 15; // 30;
     retraction_config.zHop = 0; //getSettingInt("retraction_hop");
     retraction_config.retraction_count_max = getSettingAsCount("retraction_count_max");
-    retraction_config.retraction_extrusion_window = getSettingInMillimeters("retraction_extrusion_window");
+    retraction_config.retraction_extrusion_window = INT2MM(getSettingInMicrons("retraction_extrusion_window"));
     retraction_config.retraction_min_travel_distance = getSettingInMicrons("retraction_min_travel");
 
     double top_retract_pause = 2.0;
@@ -258,7 +255,7 @@ void Wireframe2gcode::strategy_retract(WeaveLayer& layer, WeaveConnectionPart& p
         Point3 vec = to - from;
         Point3 lowering = vec * retract_hop_dist / 2 / vec.vSize();
         Point3 lower = to - lowering;
-        gcode.writeMove(lower, speedUp, extrusion_mm3_per_mm_connection);
+        gcode.writeMove(lower, speedUp, extrusion_per_mm_connection);
         gcode.writeRetraction(&retraction_config);
         gcode.writeMove(to + lowering, speedUp, 0);
         gcode.writeDelay(top_retract_pause);
@@ -267,7 +264,7 @@ void Wireframe2gcode::strategy_retract(WeaveLayer& layer, WeaveConnectionPart& p
         
     } else 
     {
-        gcode.writeMove(to, speedUp, extrusion_mm3_per_mm_connection);
+        gcode.writeMove(to, speedUp, extrusion_per_mm_connection);
         gcode.writeRetraction(&retraction_config);
         gcode.writeMove(to + Point3(0, 0, retract_hop_dist), speedFlat, 0);
         gcode.writeDelay(top_retract_pause);
@@ -305,7 +302,7 @@ void Wireframe2gcode::strategy_compensate(WeaveLayer& layer, WeaveConnectionPart
     int64_t orrLength = (segment.to - from).vSize() + next_vector.vSize() + 1; // + 1 in order to avoid division by zero
     int64_t newLength = (newTop - from).vSize() + (next_point - newTop).vSize() + 1; // + 1 in order to avoid division by zero
     
-    gcode.writeMove(newTop, speedUp * newLength / orrLength, extrusion_mm3_per_mm_connection * orrLength / newLength);
+    gcode.writeMove(newTop, speedUp * newLength / orrLength, extrusion_per_mm_connection * orrLength / newLength);
 }
 void Wireframe2gcode::handle_segment(WeaveLayer& layer, WeaveConnectionPart& part, unsigned int segment_idx) 
 {
@@ -320,7 +317,7 @@ void Wireframe2gcode::handle_segment(WeaveLayer& layer, WeaveConnectionPart& par
             go_down(layer, part, segment_idx);
             break;
         case WeaveSegmentType::FLAT:
-            logWarning("Warning: flat piece in wire print connection.\n");
+            DEBUG_SHOW("flat piece in connection?!!?!");
             break;
         case WeaveSegmentType::UP:
             if (strategy == STRATEGY_KNOT)
@@ -384,12 +381,12 @@ void Wireframe2gcode::handle_roof_segment(WeaveRoofPart& inset, WeaveConnectionP
                     detoured -= next_dir;
                 }
                 
-                gcode.writeMove(detoured, speedUp, extrusion_mm3_per_mm_connection);
+                gcode.writeMove(detoured, speedUp, extrusion_per_mm_connection);
 
             }
             break;
         case WeaveSegmentType::DOWN:
-            gcode.writeMove(segment.to, speedDown, extrusion_mm3_per_mm_connection);
+            gcode.writeMove(segment.to, speedDown, extrusion_per_mm_connection);
             gcode.writeDelay(roof_outer_delay);
             break;
         case WeaveSegmentType::FLAT:
@@ -407,7 +404,7 @@ void Wireframe2gcode::writeFill(std::vector<WeaveRoofPart>& infill_insets, Polyg
 {
         
     // bottom:
-    gcode.writeTypeComment(PrintFeatureType::Infill);
+    gcode.writeTypeComment("FILL");
     for (unsigned int inset_idx = 0; inset_idx < infill_insets.size(); inset_idx++)
     {
         WeaveRoofPart& inset = infill_insets[inset_idx];
@@ -418,7 +415,7 @@ void Wireframe2gcode::writeFill(std::vector<WeaveRoofPart>& infill_insets, Polyg
             WeaveConnectionPart& inset_part = inset.connections[inset_part_nr];
             std::vector<WeaveConnectionSegment>& segments = inset_part.connection.segments;
             
-            gcode.writeTypeComment(PrintFeatureType::Support); // connection
+            gcode.writeTypeComment("SUPPORT"); // connection
             if (segments.size() == 0) continue;
             Point3 first_extrusion_from = inset_part.connection.from;
             unsigned int first_segment_idx;
@@ -434,7 +431,7 @@ void Wireframe2gcode::writeFill(std::vector<WeaveRoofPart>& infill_insets, Polyg
                 connectionHandler(*this, inset, inset_part, segment_idx);
             }
             
-            gcode.writeTypeComment(PrintFeatureType::InnerWall); // top
+            gcode.writeTypeComment("WALL-INNER"); // top
             for (unsigned int segment_idx = 0; segment_idx < segments.size(); segment_idx++)
             {
                 WeaveConnectionSegment& segment = segments[segment_idx];
@@ -448,7 +445,7 @@ void Wireframe2gcode::writeFill(std::vector<WeaveRoofPart>& infill_insets, Polyg
         
     }
     
-    gcode.writeTypeComment(PrintFeatureType::OuterWall); // outer perimeter of the flat parts
+    gcode.writeTypeComment("WALL-OUTER"); // outer perimeter of the flat parts
     for (PolygonRef poly : roof_outlines)
     {
         writeMoveWithRetract(poly[poly.size() - 1]);
@@ -488,15 +485,16 @@ Wireframe2gcode::Wireframe2gcode(Weaver& weaver, GCodeExport& gcode, SettingsBas
     roof_inset = getSettingInMicrons("wireframe_roof_inset"); 
     
     filament_diameter = getSettingInMicrons("material_diameter");
-    line_width = getSettingInMicrons("wall_line_width_x");
+    extrusionWidth = getSettingInMicrons("wall_line_width_x");
     
     flowConnection = getSettingInPercentage("wireframe_flow_connection");
     flowFlat = getSettingInPercentage("wireframe_flow_flat");
-
-    const double line_area = M_PI * square(INT2MM(line_width) / 2.0);
-    extrusion_mm3_per_mm_connection = line_area * flowConnection / 100.0;
-    extrusion_mm3_per_mm_flat = line_area * flowFlat / 100.0;
-
+    
+    double filament_area = /* M_PI * */ (INT2MM(filament_diameter) / 2.0) * (INT2MM(filament_diameter) / 2.0);
+    double lineArea = /* M_PI * */ (INT2MM(extrusionWidth) / 2.0) * (INT2MM(extrusionWidth) / 2.0);
+    extrusion_per_mm_connection = lineArea / filament_area * flowConnection / 100.0;
+    extrusion_per_mm_flat = lineArea / filament_area * flowFlat / 100.0;
+    
     nozzle_outer_diameter = getSettingInMicrons("machine_nozzle_tip_outer_diameter"); // ___       ___   .
     nozzle_head_distance = getSettingInMicrons("machine_nozzle_head_distance");      //    |     |      .
     nozzle_expansion_angle = getSettingInAngleRadians("machine_nozzle_expansion_angle");  //     \_U_/       .
@@ -536,29 +534,26 @@ Wireframe2gcode::Wireframe2gcode(Weaver& weaver, GCodeExport& gcode, SettingsBas
     roof_outer_delay = getSettingInSeconds("wireframe_roof_outer_delay");
     
     
-    standard_retraction_config.distance = getSettingInMillimeters("retraction_amount");
+    standard_retraction_config.distance = INT2MM(getSettingInMicrons("retraction_amount"));
     standard_retraction_config.prime_volume = getSettingInCubicMillimeters("retraction_extra_prime_amount");
     standard_retraction_config.speed = getSettingInMillimetersPerSecond("retraction_retract_speed");
     standard_retraction_config.primeSpeed = getSettingInMillimetersPerSecond("retraction_prime_speed");
     standard_retraction_config.zHop = getSettingInMicrons("retraction_hop");
     standard_retraction_config.retraction_count_max = getSettingAsCount("retraction_count_max");
-    standard_retraction_config.retraction_extrusion_window = getSettingInMillimeters("retraction_extrusion_window");
+    standard_retraction_config.retraction_extrusion_window = INT2MM(getSettingInMicrons("retraction_extrusion_window"));
     standard_retraction_config.retraction_min_travel_distance = getSettingInMicrons("retraction_min_travel");
 }
 
 void Wireframe2gcode::processStartingCode()
 {
-    if (!CommandSocket::isInstantiated())
+    if (gcode.getFlavor() == EGCodeFlavor::ULTIGCODE)
     {
-        std::string prefix = gcode.getFileHeader();
-        gcode.writeCode(prefix.c_str());
+        if (!CommandSocket::isInstantiated())
+        {
+            gcode.writeCode(";FLAVOR:UltiGCode\n;TIME:666\n;MATERIAL:666\n;MATERIAL2:-1\n");
+        }
     }
-
-    int start_extruder_nr = getSettingAsIndex("adhesion_extruder_nr");
-
-    gcode.writeComment("Generated with Cura_SteamEngine " VERSION);
-
-    if (gcode.getFlavor() != EGCodeFlavor::ULTIGCODE && gcode.getFlavor() != EGCodeFlavor::GRIFFIN)
+    else 
     {
         if (getSettingBoolean("material_bed_temp_prepend"))
         {
@@ -567,27 +562,23 @@ void Wireframe2gcode::processStartingCode()
                 gcode.writeBedTemperatureCommand(getSettingInDegreeCelsius("material_bed_temperature"), getSettingBoolean("material_bed_temp_wait"));
             }
         }
-
+        
         if (getSettingBoolean("material_print_temp_prepend"))
         {
-            for (int extruder_nr = 0; extruder_nr < getSettingAsCount("machine_extruder_count"); extruder_nr++)
+            if (getSettingInDegreeCelsius("material_print_temperature") > 0)
             {
-                double print_temp = getSettingInDegreeCelsius("material_print_temperature");
-                gcode.writeTemperatureCommand(extruder_nr, print_temp);
-            }
-            if (getSettingBoolean("material_print_temp_wait"))
-            {
-                for (int extruder_nr = 0; extruder_nr < getSettingAsCount("machine_extruder_count"); extruder_nr++)
+                gcode.writeTemperatureCommand(getSettingAsIndex("extruder_nr"), getSettingInDegreeCelsius("material_print_temperature"));
+                if (getSettingBoolean("machine_print_temp_wait"))
                 {
-                    double print_temp = getSettingInDegreeCelsius("material_print_temperature");
-                    gcode.writeTemperatureCommand(extruder_nr, print_temp, true);
+                    gcode.writeTemperatureCommand(getSettingAsIndex("extruder_nr"), getSettingInDegreeCelsius("material_print_temperature"), true);
                 }
             }
         }
+        
     }
-
     gcode.writeCode(getSettingString("machine_start_gcode").c_str());
-
+    
+    gcode.writeComment("Generated with Cura_SteamEngine " VERSION);
     if (gcode.getFlavor() == EGCodeFlavor::BFB)
     {
         gcode.writeComment("enable auto-retraction");
@@ -595,16 +586,6 @@ void Wireframe2gcode::processStartingCode()
         tmp << "M227 S" << (getSettingInMicrons("retraction_amount") * 2560 / 1000) << " P" << (getSettingInMicrons("retraction_amount") * 2560 / 1000);
         gcode.writeLine(tmp.str().c_str());
     }
-    else if (gcode.getFlavor() == EGCodeFlavor::GRIFFIN)
-    { // initialize extruder trains
-        gcode.writeCode("T0"); // Toolhead already assumed to be at T0, but writing it just to be safe...
-        CommandSocket::setSendCurrentPosition(gcode.getPositionXY());
-        gcode.startExtruder(start_extruder_nr);
-        constexpr bool wait = true;
-        gcode.writeTemperatureCommand(start_extruder_nr, getSettingInDegreeCelsius("material_print_temperature"), wait);
-        gcode.writePrimeTrain(getSettingInMillimetersPerSecond("speed_travel"));
-        gcode.writeRetraction(&standard_retraction_config);
-    }
 }
 
 
@@ -618,16 +599,16 @@ void Wireframe2gcode::processSkirt()
     PathOrderOptimizer order(Point(INT32_MIN, INT32_MIN));
     order.addPolygons(skirt);
     order.optimize();
-
-    for (unsigned int poly_order_idx = 0; poly_order_idx < skirt.size(); poly_order_idx++)
+    
+    for (unsigned int poly_idx = 0; poly_idx < skirt.size(); poly_idx++)
     {
-        unsigned int poly_idx = order.polyOrder[poly_order_idx];
-        PolygonRef poly = skirt[poly_idx];
-        gcode.writeMove(poly[order.polyStart[poly_idx]], getSettingInMillimetersPerSecond("speed_travel"), 0);
+        unsigned int actual_poly_idx = order.polyOrder[poly_idx];
+        PolygonRef poly = skirt[actual_poly_idx];
+        gcode.writeMove(poly[order.polyStart[actual_poly_idx]], getSettingInMillimetersPerSecond("speed_travel"), 0);
         for (unsigned int point_idx = 0; point_idx < poly.size(); point_idx++)
         {
-            Point& p = poly[(point_idx + order.polyStart[poly_idx] + 1) % poly.size()];
-            gcode.writeMove(p, getSettingInMillimetersPerSecond("skirt_brim_speed"), getSettingInMillimeters("skirt_brim_line_width") * INT2MM(initial_layer_thickness));
+            Point& p = poly[(point_idx + order.polyStart[actual_poly_idx] + 1) % poly.size()];
+            gcode.writeMove(p, getSettingInMillimetersPerSecond("skirt_speed"), getSettingInMillimetersPerSecond("skirt_line_width"));
         }
     }
 }
@@ -635,7 +616,7 @@ void Wireframe2gcode::processSkirt()
 
 void Wireframe2gcode::finalize()
 {
-    gcode.finalize(getSettingString("machine_end_gcode").c_str());
+    gcode.finalize(getSettingInMillimetersPerSecond("speed_travel"), getSettingString("machine_end_gcode").c_str());
     for(int e=0; e<getSettingAsCount("machine_extruder_count"); e++)
         gcode.writeTemperatureCommand(e, 0, false);
 }

src/Wireframe2gcode.h

@@ -8,7 +8,7 @@
 
 #include "weaveDataStorage.h"
 #include "commandSocket.h"
-#include "settings/settings.h"
+#include "settings.h"
 
 #include "MeshGroup.h"
 #include "slicer.h"
@@ -16,6 +16,8 @@
 #include "utils/polygon.h"
 #include "Weaver.h"
 
+#include "debug.h"
+
 namespace cura
 {
 
@@ -31,11 +33,11 @@ private:
     
     int initial_layer_thickness;
     int filament_diameter;
-    int line_width;
+    int extrusionWidth;
     double flowConnection;
     double flowFlat; 
-    double extrusion_mm3_per_mm_connection;
-    double extrusion_mm3_per_mm_flat;
+    double extrusion_per_mm_connection; 
+    double extrusion_per_mm_flat; 
     int nozzle_outer_diameter;
     int nozzle_head_distance;
     double nozzle_expansion_angle;

src/comb.cpp

@@ -0,0 +1,391 @@
+/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
+#include "comb.h"
+
+#include <algorithm>
+
+#include "utils/polygonUtils.h"
+#include "sliceDataStorage.h"
+#include "utils/SVG.h"
+
+namespace cura {
+
+
+// boundary_outside is only computed when it's needed!
+Polygons* Comb::getBoundaryOutside()
+{
+    if (!boundary_outside)
+    {
+        boundary_outside = new Polygons();
+        *boundary_outside =  storage.getLayerOutlines(layer_nr, false).offset(offset_from_outlines_outside); 
+    }
+    return boundary_outside;
+}
+  
+Comb::Comb(SliceDataStorage& storage, int layer_nr, Polygons& comb_boundary_inside, int64_t comb_boundary_offset, bool travel_avoid_other_parts, int64_t travel_avoid_distance)
+: storage(storage)
+, layer_nr(layer_nr)
+, offset_from_outlines(comb_boundary_offset) // between second wall and infill / other walls
+, max_moveInside_distance2(offset_from_outlines * 2 * offset_from_outlines * 2)
+, offset_from_outlines_outside(travel_avoid_distance)
+, avoid_other_parts(travel_avoid_other_parts)
+// , boundary_inside( boundary.offset(-offset_from_outlines) ) // TODO: make inside boundary configurable?
+, boundary_inside( comb_boundary_inside )
+, boundary_outside(nullptr)
+, partsView_inside( boundary_inside.splitIntoPartsView() ) // !! changes the order of boundary_inside !!
+{
+}
+
+Comb::~Comb()
+{
+    if (boundary_outside)
+        delete boundary_outside;
+}
+
+bool Comb::calc(Point startPoint, Point endPoint, CombPaths& combPaths, bool startInside, bool endInside, int64_t max_comb_distance_ignored)
+{
+    if (shorterThen(endPoint - startPoint, max_comb_distance_ignored))
+    {
+        return true;
+    }
+    
+
+    
+    //Move start and end point inside the comb boundary
+    unsigned int start_inside_poly = NO_INDEX;
+    if (startInside) 
+    {
+        start_inside_poly = PolygonUtils::moveInside(boundary_inside, startPoint, offset_extra_start_end, max_moveInside_distance2);
+        if (!boundary_inside.inside(start_inside_poly) || start_inside_poly == NO_INDEX)
+        {
+            if (start_inside_poly != NO_INDEX)
+            { // if not yet inside because of overshoot, try again
+                start_inside_poly = PolygonUtils::moveInside(boundary_inside, startPoint, offset_extra_start_end, max_moveInside_distance2);
+            }
+            if (start_inside_poly == NO_INDEX)    //If we fail to move the point inside the comb boundary we need to retract.
+            {
+                startInside = false;
+            }
+        }
+    }
+    unsigned int end_inside_poly = NO_INDEX;
+    if (endInside)
+    {
+        end_inside_poly = PolygonUtils::moveInside(boundary_inside, endPoint, offset_extra_start_end, max_moveInside_distance2);
+        if (!boundary_inside.inside(endPoint) || end_inside_poly == NO_INDEX)
+        {
+            if (end_inside_poly != NO_INDEX)
+            { // if not yet inside because of overshoot, try again
+                end_inside_poly = PolygonUtils::moveInside(boundary_inside, endPoint, offset_extra_start_end, max_moveInside_distance2);
+            }
+            if (end_inside_poly == NO_INDEX)    //If we fail to move the point inside the comb boundary we need to retract.
+            {
+                endInside = false;
+            }
+        }
+    }
+
+    
+    unsigned int start_part_boundary_poly_idx;
+    unsigned int end_part_boundary_poly_idx;
+    unsigned int start_part_idx =   (start_inside_poly == NO_INDEX)?    NO_INDEX : partsView_inside.getPartContaining(start_inside_poly, &start_part_boundary_poly_idx);
+    unsigned int end_part_idx =     (end_inside_poly == NO_INDEX)?      NO_INDEX : partsView_inside.getPartContaining(end_inside_poly, &end_part_boundary_poly_idx);
+    
+    if (startInside && endInside && start_part_idx == end_part_idx)
+    { // normal combing within part
+        PolygonsPart part = partsView_inside.assemblePart(start_part_idx);
+        combPaths.emplace_back();
+        LinePolygonsCrossings::comb(part, startPoint, endPoint, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+        return true;
+    }
+    else 
+    { // comb inside part to edge (if needed) >> move through air avoiding other parts >> comb inside end part upto the endpoint (if needed) 
+        Point middle_from;
+        Point middle_to;
+        Point inside_middle_from;
+        Point inside_middle_to;
+        
+        if (startInside && endInside)
+        {
+            ClosestPolygonPoint middle_from_cp = PolygonUtils::findClosest(endPoint, boundary_inside[start_part_boundary_poly_idx]);
+            ClosestPolygonPoint middle_to_cp = PolygonUtils::findClosest(middle_from_cp.location, boundary_inside[end_part_boundary_poly_idx]);
+//             walkToNearestSmallestConnection(middle_from_cp, middle_to_cp); // TODO: perform this optimization?
+            middle_from = middle_from_cp.location;
+            inside_middle_from = middle_from_cp.location;
+            middle_to = middle_to_cp.location;
+            inside_middle_to = middle_to_cp.location;
+            PolygonUtils::moveInside(boundary_inside,inside_middle_from,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored); //Also move the intermediary waypoint inside if it isn't yet.
+            PolygonUtils::moveInside(boundary_inside,inside_middle_to,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored);
+        }
+        else if(!startInside && !endInside)
+        {
+            middle_from = startPoint;
+            inside_middle_from = startPoint;
+            middle_to = endPoint;
+            inside_middle_to = endPoint;
+        }
+        else if(!startInside && endInside)
+        {
+            middle_from = startPoint;
+            inside_middle_from = startPoint;
+            ClosestPolygonPoint middle_to_cp = PolygonUtils::findClosest(middle_from,boundary_inside[end_part_boundary_poly_idx]);
+            middle_to = middle_to_cp.location;
+            inside_middle_to = middle_to_cp.location;
+            PolygonUtils::moveInside(boundary_inside,inside_middle_to,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored);
+        }
+        else if(startInside && !endInside)
+        {
+            middle_to = endPoint;
+            inside_middle_to = endPoint;
+            ClosestPolygonPoint middle_from_cp = PolygonUtils::findClosest(middle_to,boundary_inside[start_part_boundary_poly_idx]);
+            middle_from = middle_from_cp.location;
+            inside_middle_from = middle_from_cp.location;
+            PolygonUtils::moveInside(boundary_inside,inside_middle_from,offset_dist_to_get_from_on_the_polygon_to_outside,max_comb_distance_ignored);
+        }
+        
+        if (startInside)
+        {
+            // start to boundary
+            PolygonsPart part_begin = partsView_inside.assemblePart(start_part_idx); // comb through the starting part only
+            combPaths.emplace_back();
+            LinePolygonsCrossings::comb(part_begin, startPoint, inside_middle_from, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+        }
+        
+        // throught air from boundary to boundary
+        if (avoid_other_parts)
+        {
+            Polygons& middle = *getBoundaryOutside(); // comb through all air, since generally the outside consists of a single part
+            Point from_outside = middle_from;
+            if (startInside || middle.inside(from_outside, true))
+            { // move outside
+                PolygonUtils::moveInside(middle, from_outside, -offset_extra_start_end, max_moveInside_distance2);
+            }
+            Point to_outside = middle_to;
+            if (endInside || middle.inside(to_outside, true))
+            { // move outside
+                PolygonUtils::moveInside(middle, to_outside, -offset_extra_start_end, max_moveInside_distance2);
+            }
+            combPaths.emplace_back();
+            combPaths.back().throughAir = true;
+            if ( vSize(inside_middle_from - inside_middle_to) < vSize(inside_middle_from - from_outside) + vSize(inside_middle_to - to_outside) )
+            { // via outside is a detour
+                combPaths.back().push_back(inside_middle_from);
+                combPaths.back().push_back(inside_middle_to);
+            }
+            else
+            {
+                LinePolygonsCrossings::comb(middle, from_outside, to_outside, combPaths.back(), offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+            }
+        }
+        else 
+        { // directly through air (not avoiding other parts)
+            combPaths.emplace_back();
+            combPaths.back().throughAir = true;
+            combPaths.back().cross_boundary = true; // TODO: calculate whether we cross a boundary!
+            combPaths.back().push_back(inside_middle_from);
+            combPaths.back().push_back(inside_middle_to);
+        }
+        
+        if (endInside)
+        {
+            // boundary to end
+            PolygonsPart part_end = partsView_inside.assemblePart(end_part_idx); // comb through end part only
+            combPaths.emplace_back();
+            LinePolygonsCrossings::comb(part_end, inside_middle_to, endPoint, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored);
+        }
+        
+        return true;
+    }
+}
+
+void LinePolygonsCrossings::calcScanlineCrossings()
+{
+    
+    min_crossing_idx = NO_INDEX;
+    max_crossing_idx = NO_INDEX;
+        
+    for(unsigned int poly_idx = 0; poly_idx < boundary.size(); poly_idx++)
+    {
+        PolyCrossings minMax(poly_idx); 
+        PolygonRef poly = boundary[poly_idx];
+        Point p0 = transformation_matrix.apply(poly[poly.size() - 1]);
+        for(unsigned int point_idx = 0; point_idx < poly.size(); point_idx++)
+        {
+            Point p1 = transformation_matrix.apply(poly[point_idx]);
+            if((p0.Y >= transformed_startPoint.Y && p1.Y <= transformed_startPoint.Y) || (p1.Y >= transformed_startPoint.Y && p0.Y <= transformed_startPoint.Y))
+            {
+                if(p1.Y == p0.Y) //Line segment is parallel with the scanline. That means that both endpoints lie on the scanline, so they will have intersected with the adjacent line.
+                {
+                    p0 = p1;
+                    continue;
+                }
+                int64_t x = p0.X + (p1.X - p0.X) * (transformed_startPoint.Y - p0.Y) / (p1.Y - p0.Y);
+                
+                if (x >= transformed_startPoint.X && x <= transformed_endPoint.X)
+                {
+                    if(x < minMax.min.x) //For the leftmost intersection, move x left to stay outside of the border.
+                                         //Note: The actual distance from the intersection to the border is almost always less than dist_to_move_boundary_point_outside, since it only moves along the direction of the scanline.
+                    {
+                        minMax.min.x = x;
+                        minMax.min.point_idx = point_idx;
+                    }
+                    if(x > minMax.max.x) //For the rightmost intersection, move x right to stay outside of the border.
+                    {
+                        minMax.max.x = x;
+                        minMax.max.point_idx = point_idx;
+                    }
+                }
+            }
+            p0 = p1;
+        }
+        
+        if (minMax.min.point_idx != NO_INDEX)
+        { // then also max.point_idx != -1
+            if (min_crossing_idx == NO_INDEX || minMax.min.x < crossings[min_crossing_idx].min.x) { min_crossing_idx = crossings.size(); }
+            if (max_crossing_idx == NO_INDEX || minMax.max.x > crossings[max_crossing_idx].max.x) { max_crossing_idx = crossings.size(); }
+            crossings.push_back(minMax);
+        }
+        
+    }
+}
+
+
+bool LinePolygonsCrossings::lineSegmentCollidesWithBoundary()
+{
+    Point diff = endPoint - startPoint;
+
+    transformation_matrix = PointMatrix(diff);
+    transformed_startPoint = transformation_matrix.apply(startPoint);
+    transformed_endPoint = transformation_matrix.apply(endPoint);
+
+    for(PolygonRef poly : boundary)
+    {
+        Point p0 = transformation_matrix.apply(poly.back());
+        for(Point p1_ : poly)
+        {
+            Point p1 = transformation_matrix.apply(p1_);
+            if ((p0.Y > transformed_startPoint.Y && p1.Y < transformed_startPoint.Y) || (p1.Y > transformed_startPoint.Y && p0.Y < transformed_startPoint.Y))
+            {
+                int64_t x = p0.X + (p1.X - p0.X) * (transformed_startPoint.Y - p0.Y) / (p1.Y - p0.Y);
+                
+                if (x > transformed_startPoint.X && x < transformed_endPoint.X)
+                    return true;
+            }
+            p0 = p1;
+        }
+    }
+    
+    return false;
+}
+
+
+void LinePolygonsCrossings::getCombingPath(CombPath& combPath, int64_t max_comb_distance_ignored)
+{
+    if (shorterThen(endPoint - startPoint, max_comb_distance_ignored) || !lineSegmentCollidesWithBoundary())
+    {
+        //We're not crossing any boundaries. So skip the comb generation.
+        combPath.push_back(startPoint); 
+        combPath.push_back(endPoint);
+        return;
+    }
+    
+    calcScanlineCrossings();
+    
+    CombPath basicPath;
+    getBasicCombingPath(basicPath);
+    optimizePath(basicPath, combPath);
+}
+
+
+void LinePolygonsCrossings::getBasicCombingPath(CombPath& combPath) 
+{
+    for (PolyCrossings* crossing = getNextPolygonAlongScanline(transformed_startPoint.X)
+        ; crossing != nullptr
+        ; crossing = getNextPolygonAlongScanline(crossing->max.x))
+    {
+        getBasicCombingPath(*crossing, combPath);
+    }
+    combPath.push_back(endPoint);
+}
+
+void LinePolygonsCrossings::getBasicCombingPath(PolyCrossings& polyCrossings, CombPath& combPath) 
+{
+    PolygonRef poly = boundary[polyCrossings.poly_idx];
+    combPath.push_back(transformation_matrix.unapply(Point(polyCrossings.min.x + dist_to_move_boundary_point_outside, transformed_startPoint.Y)));
+    if ( ( polyCrossings.max.point_idx - polyCrossings.min.point_idx + poly.size() ) % poly.size() 
+        < poly.size() / 2 )
+    { // follow the path in the same direction as the winding order of the boundary polygon
+        for(unsigned int point_idx = polyCrossings.min.point_idx
+            ; point_idx != polyCrossings.max.point_idx
+            ; point_idx = (point_idx < poly.size() - 1) ? (point_idx + 1) : (0))
+        {
+            combPath.push_back(PolygonUtils::getBoundaryPointWithOffset(poly, point_idx, dist_to_move_boundary_point_outside));
+        }
+    }
+    else
+    { // follow the path in the opposite direction of the winding order of the boundary polygon
+        unsigned int min_idx = (polyCrossings.min.point_idx == 0)? poly.size() - 1: polyCrossings.min.point_idx - 1;
+        unsigned int max_idx = (polyCrossings.max.point_idx == 0)? poly.size() - 1: polyCrossings.max.point_idx - 1;
+
+        for(unsigned int point_idx = min_idx; point_idx != max_idx; point_idx = (point_idx > 0) ? (point_idx - 1) : (poly.size() - 1))
+        {
+            combPath.push_back(PolygonUtils::getBoundaryPointWithOffset(poly, point_idx, dist_to_move_boundary_point_outside));
+        }
+    }
+    combPath.push_back(transformation_matrix.unapply(Point(polyCrossings.max.x - dist_to_move_boundary_point_outside, transformed_startPoint.Y))); 
+}
+
+
+
+LinePolygonsCrossings::PolyCrossings* LinePolygonsCrossings::getNextPolygonAlongScanline(int64_t x)
+{
+    PolyCrossings* ret = nullptr;
+    for(PolyCrossings& crossing : crossings)
+    {
+        if (crossing.min.x > x && (ret == nullptr || crossing.min.x < ret->min.x) )
+        {
+            ret = &crossing;
+        }
+    }
+    return ret;
+}
+
+bool LinePolygonsCrossings::optimizePath(CombPath& comb_path, CombPath& optimized_comb_path) 
+{
+    optimized_comb_path.push_back(startPoint);
+    for(unsigned int point_idx = 1; point_idx<comb_path.size(); point_idx++)
+    {
+        if(comb_path[point_idx] == comb_path[point_idx - 1]) //Two points are the same. Skip the second.
+        {
+            continue;
+        }
+        Point& current_point = optimized_comb_path.back();
+        if (PolygonUtils::polygonCollidesWithlineSegment(boundary, current_point, comb_path[point_idx]))
+        {
+            if (PolygonUtils::polygonCollidesWithlineSegment(boundary, current_point, comb_path[point_idx - 1]))
+            {
+                comb_path.cross_boundary = true;
+            }
+            optimized_comb_path.push_back(comb_path[point_idx - 1]);
+        }
+        else 
+        {
+            // : dont add the newest point
+            
+            // TODO: add the below extra optimization? (+/- 7% extra computation time, +/- 2% faster print for Dual_extrusion_support_generation.stl)
+            while (optimized_comb_path.size() > 1)
+            {
+                if (PolygonUtils::polygonCollidesWithlineSegment(boundary, optimized_comb_path[optimized_comb_path.size() - 2], comb_path[point_idx]))
+                {
+                    break;
+                }
+                else 
+                {
+                    optimized_comb_path.pop_back();
+                }
+            }
+        }
+    }
+    return true;
+}
+
+}//namespace cura

src/comb.h

@@ -1,15 +1,20 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef PATH_PLANNING_LINE_POLYGONS_CROSSINGS_H
-#define PATH_PLANNING_LINE_POLYGONS_CROSSINGS_H
+#ifndef COMB_H
+#define COMB_H
 
-#include "../utils/polygon.h"
-#include "../utils/polygonUtils.h"
-#include "../utils/SparseLineGrid.h"
-
-#include "CombPath.h"
+#include "utils/polygon.h"
 
 namespace cura 
 {
+    
+struct CombPath : public  std::vector<Point> //!< A single path either inside or outise the parts
+{
+    bool throughAir = false; //!< Whether the path is one which moves through air.
+    bool cross_boundary = false; //!< Whether the path crosses a boundary.
+};
+struct CombPaths : public  std::vector<CombPath> //!< A list of paths alternating between inside a part and outside a part
+{
+}; 
 
 /*!
  * Class for generating a combing move action from point a to point b and avoiding collision with other parts when moving through air.
@@ -55,7 +60,6 @@ private:
         unsigned int poly_idx; //!< The index of the polygon which crosses the scanline
         Crossing min; //!< The point where the polygon first crosses the scanline.
         Crossing max; //!< The point where the polygon last crosses the scanline.
-        int n_crossings; //!< The number of times the polygon crossed the scanline.
         /*!
          * Create a PolyCrossings with minimal initialization. PolyCrossings::min and PolyCrossings::max are not yet computed.
          * \param poly_idx The index of the polygon in LinePolygonsCrossings::boundary
@@ -63,7 +67,6 @@ private:
         PolyCrossings(unsigned int poly_idx) 
         : poly_idx(poly_idx)
         , min(INT64_MAX, NO_INDEX), max(INT64_MIN, NO_INDEX) 
-        , n_crossings(0)
         { 
         }
     };
@@ -82,15 +85,14 @@ private:
     unsigned int max_crossing_idx; //!< The index into LinePolygonsCrossings::crossings to the crossing with the maximal PolyCrossings::max crossing of all PolyCrossings's.
     
     Polygons& boundary; //!< The boundary not to cross during combing.
-    LocToLineGrid& loc_to_line_grid; //!< Mapping from locations to line segments of \ref LinePolygonsCrossings::boundary
     Point startPoint; //!< The start point of the scanline.
     Point endPoint; //!< The end point of the scanline.
     
     int64_t dist_to_move_boundary_point_outside; //!< The distance used to move outside or inside so that a boundary point doesn't intersect with the boundary anymore. Neccesary due to computational rounding problems. Use negative value for insicde combing.
     
     PointMatrix transformation_matrix; //!< The transformation which rotates everything such that the scanline is aligned with the x-axis.
-    Point transformed_startPoint; //!< The LinePolygonsCrossings::startPoint as transformed by Comb::transformation_matrix such that it has (roughly) the same Y as transformed_endPoint
-    Point transformed_endPoint; //!< The LinePolygonsCrossings::endPoint as transformed by Comb::transformation_matrix such that it has (roughly) the same Y as transformed_startPoint
+    Point transformed_startPoint; //!< The LinePolygonsCrossings::startPoint as transformed by Comb::transformation_matrix
+    Point transformed_endPoint; //!< The LinePolygonsCrossings::endPoint as transformed by Comb::transformation_matrix
 
     
     /*!
@@ -103,19 +105,15 @@ private:
     
     /*!
      * Calculate Comb::crossings, Comb::min_crossing_idx and Comb::max_crossing_idx.
-     * \param fail_on_unavoidable_obstacles When moving over other parts is inavoidable, stop calculation early and return false.
-     * \return Whether combing succeeded, i.e. when fail_on_unavoidable_obstacles: we didn't cross any gaps/other parts
      */
-    bool calcScanlineCrossings(bool fail_on_unavoidable_obstacles);
+    void calcScanlineCrossings();
     
     /*! 
      * Get the basic combing path and optimize it.
      * 
      * \param combPath Output parameter: the points along the combing path.
-     * \param fail_on_unavoidable_obstacles When moving over other parts is inavoidable, stop calculation early and return false.
-     * \return Whether combing succeeded, i.e. we didn't cross any gaps/other parts
      */
-    bool getCombingPath(CombPath& combPath, int64_t max_comb_distance_ignored, bool fail_on_unavoidable_obstacles);
+    void getCombingPath(CombPath& combPath, int64_t max_comb_distance_ignored = MM2INT(1.5));
     
     /*! 
      * Get the basic combing path, without shortcuts. The path goes straight toward the endPoint and follows the boundary when it hits it, until it passes the scanline again.
@@ -166,12 +164,8 @@ private:
      * \param end the end point
      * \param dist_to_move_boundary_point_outside Distance used to move a point from a boundary so that it doesn't intersect with it anymore. (Precision issue)
      */
-    LinePolygonsCrossings(Polygons& boundary, LocToLineGrid& loc_to_line_grid, Point& start, Point& end, int64_t dist_to_move_boundary_point_outside)
-    : boundary(boundary)
-    , loc_to_line_grid(loc_to_line_grid)
-    , startPoint(start)
-    , endPoint(end)
-    , dist_to_move_boundary_point_outside(dist_to_move_boundary_point_outside)
+    LinePolygonsCrossings(Polygons& boundary, Point& start, Point& end, int64_t dist_to_move_boundary_point_outside)
+    : boundary(boundary), startPoint(start), endPoint(end), dist_to_move_boundary_point_outside(dist_to_move_boundary_point_outside)
     {
     }
     
@@ -180,20 +174,84 @@ public:
     /*!
      * The main function of this class: calculate one combing path within the boundary.
      * \param boundary The polygons to follow when calculating the basic combing path
-     * \param loc_to_line_grid A sparse grid mapping cells to all line segments of (at least) \p boundary in those cells
      * \param startPoint From where to start the combing move.
      * \param endPoint Where to end the combing move.
      * \param combPath Output parameter: the combing path generated.
-     * \param fail_on_unavoidable_obstacles When moving over other parts is inavoidable, stop calculation early and return false.
-     * \return Whether combing succeeded, i.e. we didn't cross any gaps/other parts
      */
-    static bool comb(Polygons& boundary, LocToLineGrid& loc_to_line_grid, Point startPoint, Point endPoint, CombPath& combPath, int64_t dist_to_move_boundary_point_outside, int64_t max_comb_distance_ignored, bool fail_on_unavoidable_obstacles)
+    static void comb(Polygons& boundary, Point startPoint, Point endPoint, CombPath& combPath, int64_t dist_to_move_boundary_point_outside, int64_t max_comb_distance_ignored = MM2INT(1.5))
     {
-        LinePolygonsCrossings linePolygonsCrossings(boundary, loc_to_line_grid, startPoint, endPoint, dist_to_move_boundary_point_outside);
-        return linePolygonsCrossings.getCombingPath(combPath, max_comb_distance_ignored, fail_on_unavoidable_obstacles);
+        LinePolygonsCrossings linePolygonsCrossings(boundary, startPoint, endPoint, dist_to_move_boundary_point_outside);
+        linePolygonsCrossings.getCombingPath(combPath, max_comb_distance_ignored);
     };
 };
 
+class SliceDataStorage;
+
+/*!
+ * Class for generating a full combing actions from a travel move from a start point to an end point.
+ * A single Comb object is used for each layer.
+ * 
+ * Comb::calc is the main function of this class.
+ * 
+ * Typical output: A combing path to the boundary of the polygon + a move through air avoiding other parts in the layer + a combing path from the boundary of the ending polygon to the end point.
+ * Each of these three is a CombPath; the first and last are within Comb::boundary_inside while the middle is outside of Comb::boundary_outside.
+ * Between these there is a little gap where the nozzle crosses the boundary of an object approximately perpendicular to its boundary.
+ * 
+ * As an optimization, the combing paths inside are calculated on specifically those PolygonsParts within which to comb, while the coundary_outside isn't split into outside parts, 
+ * because generally there is only one outside part; encapsulated holes occur less often.
+ */
+class Comb 
+{
+    friend class LinePolygonsCrossings;
+private:
+    SliceDataStorage& storage; //!< The storage from which to compute the outside boundary, when needed.
+    int layer_nr; //!< The layer number for the layer for which to compute the outside boundary, when needed.
+    
+    int64_t offset_from_outlines; //!< Offset from the boundary of a part to the comb path. (nozzle width / 2)
+    int64_t max_moveInside_distance2; //!< Maximal distance of a point to the Comb::boundary_inside which is still to be considered inside. (very sharp corners not allowed :S)
+    int64_t offset_from_outlines_outside; //!< Offset from the boundary of a part to a travel path which avoids it by this distance.
+    static const int64_t max_moveOutside_distance2 = INT64_MAX; //!< Any point which is not inside should be considered outside.
+    static const int64_t offset_dist_to_get_from_on_the_polygon_to_outside = 40; //!< in order to prevent on-boundary vs crossing boundary confusions (precision thing)
+    static const int64_t offset_extra_start_end = 100; //!< Distance to move start point and end point toward eachother to extra avoid collision with the boundaries.
+    
+    bool avoid_other_parts; //!< Whether to perform inverse combing a.k.a. avoid parts.
+    
+    Polygons& boundary_inside; //!< The boundary within which to comb.
+    Polygons* boundary_outside; //!< The boundary outside of which to stay to avoid collision with other layer parts. This is a pointer cause we only compute it when we move outside the boundary (so not when there is only a single part in the layer)
+    PartsView partsView_inside; //!< Structured indices onto boundary_inside which shows which polygons belong to which part. 
+
+    /*!
+     * Get the boundary_outside, which is an offset from the outlines of all meshes in the layer. Calculate it when it hasn't been calculated yet.
+     */
+    Polygons* getBoundaryOutside();
+    
+public:
+    /*!
+     * Initializes the combing areas for every mesh in the layer (not support)
+     * \param storage Where the layer polygon data is stored
+     * \param layer_nr The number of the layer for which to generate the combing areas.
+     * \param comb_boundary_inside The comb boundary within which to comb within layer parts.
+     * \param offset_from_outlines The offset from the outline polygon, to create the combing boundary in case there is no second wall.
+     * \param travel_avoid_other_parts Whether to avoid other layer parts when traveling through air.
+     * \param travel_avoid_distance The distance by which to avoid other layer parts when traveling through air.
+     */
+    Comb(SliceDataStorage& storage, int layer_nr, Polygons& comb_boundary_inside, int64_t offset_from_outlines, bool travel_avoid_other_parts, int64_t travel_avoid_distance);
+    
+    ~Comb();
+
+    /*!
+     * Calculate the comb paths (if any) - one for each polygon combed alternated with travel paths
+     * 
+     * \param startPoint Where to start moving from
+     * \param endPoint Where to move to
+     * \param combPoints Output parameter: The points along the combing path, excluding the \p startPoint (?) and \p endPoint
+     * \param startInside Whether we want to start inside the comb boundary
+     * \param endInside Whether we want to end up inside the comb boundary
+     * \return Whether combing has succeeded; otherwise a retraction is needed.
+     */    
+    bool calc(Point startPoint, Point endPoint, CombPaths& combPaths, bool startInside = false, bool endInside = false, int64_t max_comb_distance_ignored = MM2INT(1.5));
+};
+
 }//namespace cura
 
-#endif//PATH_PLANNING_LINE_POLYGONS_CROSSINGS_H
+#endif//COMB_H

src/commandSocket.cpp

@@ -1,16 +1,12 @@
 #include "utils/logoutput.h"
 #include "commandSocket.h"
 #include "FffProcessor.h"
-#include "progress/Progress.h"
+#include "Progress.h"
 
 #include <thread>
 #include <cinttypes>
 
-#ifdef ARCUS
 #include <Arcus/Socket.h>
-#include <Arcus/SocketListener.h>
-#include <Arcus/Error.h>
-#endif
 
 #include <string> // stoi
 
@@ -19,7 +15,6 @@
 #endif
 
 #define DEBUG_OUTPUT_OBJECT_STL_THROUGH_CERR(x) 
-
 // std::cerr << x;
 
 namespace cura {
@@ -30,222 +25,52 @@ namespace cura {
 
 CommandSocket* CommandSocket::instance = nullptr; // instantiate instance
 
-#ifdef ARCUS
-class Listener : public Arcus::SocketListener
-{
-public:
-    void stateChanged(Arcus::SocketState::SocketState newState) override
-    {
-    }
-
-    void messageReceived() override
-    {
-    }
-
-    void error(const Arcus::Error & error) override
-    {
-        if (error.getErrorCode() == Arcus::ErrorCode::Debug)
-        {
-            log("%s\n", error.toString().c_str());
-        }
-        else
-        {
-            logError("%s\n", error.toString().c_str());
-        }
-    }
-};
-
-/*!
- * A template structure used to store data to be sent to the front end.
- */
-template <typename T>
-class SliceDataStruct
-{
-    SliceDataStruct(const SliceDataStruct&) = delete;
-    SliceDataStruct& operator=(const SliceDataStruct&) = delete;
-public:
-
-    SliceDataStruct()
-        : sliced_objects(0)
-        , current_layer_count(0)
-        , current_layer_offset(0)
-    { }
-
-    //! The number of sliced objects for this sliced object list
-    int sliced_objects;
-
-    int current_layer_count;//!< Number of layers for which data has been buffered in slice_data so far.
-    int current_layer_offset;//!< Offset to add to layer number for the current slice object when slicing one at a time.
-
-    std::unordered_map<int, std::shared_ptr<T>> slice_data;
-};
-
 class CommandSocket::Private
 {
 public:
     Private()
         : socket(nullptr)
         , object_count(0)
+        , current_sliced_object(nullptr)
+        , sliced_objects(0)
+        , current_layer_count(0)
+        , current_layer_offset(0)
     { }
 
-    std::shared_ptr<cura::proto::Layer> getLayerById(int id);
-
-    std::shared_ptr<cura::proto::LayerOptimized> getOptimizedLayerById(int id);
+    cura::proto::Layer* getLayerById(int id);
 
     Arcus::Socket* socket;
     
     // Number of objects that need to be sliced
     int object_count;
+    
+    // Message that holds a list of sliced objects
+    std::shared_ptr<cura::proto::SlicedObjectList> sliced_object_list;
+    
+    // Message that holds the currently sliced object (to be added to sliced_object_list)
+    cura::proto::SlicedObject* current_sliced_object;
+    
+    // Number of sliced objects for this sliced object list
+    int sliced_objects;
+
+    // Number of layers sent to the front end so far
+    // Used for incrementing the current layer in one at a time mode
+    int current_layer_count;
+    int current_layer_offset;
+    
+    // Ids of the sliced objects
+    std::vector<int64_t> object_ids;
 
     std::string temp_gcode_file;
     std::ostringstream gcode_output_stream;
     
     // Print object that olds one or more meshes that need to be sliced. 
     std::vector< std::shared_ptr<MeshGroup> > objects_to_slice;
-
-    SliceDataStruct<cura::proto::Layer> sliced_layers;
-    SliceDataStruct<cura::proto::LayerOptimized> optimized_layers;
 };
 
-/*!
- * PathCompiler buffers and prepares the sliced data to be sent to the front end and saves them in
- * appropriate buffers
- */
-class CommandSocket::PathCompiler
-{
-    typedef cura::proto::PathSegment::PointType PointType;
-    static_assert(sizeof(PrintFeatureType) == 1, "To be compatible with the Cura frontend code PrintFeatureType needs to be of size 1");
-    //! Reference to the private data of the CommandSocket used to send the data to the front end.
-    CommandSocket::Private& _cs_private_data;
-    //! Keeps track of the current layer number being processed. If layer number is set to a different value, the current data is flushed to CommandSocket.
-    int _layer_nr;
-    int extruder;
-    PointType data_point_type;
-
-    std::vector<PrintFeatureType> line_types; //!< Line types for the line segments stored, the size of this vector is N.
-    std::vector<float> line_widths; //!< Line widths for the line segments stored, the size of this vector is N.
-    std::vector<float> points; //!< The points used to define the line segments, the size of this vector is D*(N+1) as each line segment is defined from one point to the next. D is the dimensionality of the point.
-
-    Point last_point;
-
-    PathCompiler(const PathCompiler&) = delete;
-    PathCompiler& operator=(const PathCompiler&) = delete;
-public:
-    PathCompiler(CommandSocket::Private& cs_private_data):
-        _cs_private_data(cs_private_data),
-        _layer_nr(0),
-        extruder(0),
-        data_point_type(cura::proto::PathSegment::Point2D),
-        line_types(),
-        line_widths(),
-        points(),
-        last_point{0,0}
-    {}
-    ~PathCompiler()
-    {
-        if (line_types.size())
-        {
-            flushPathSegments();
-        }
-    }
-
-    /*!
-     * Used to select which layer the following layer data is intended for.
-     */
-    void setLayer(int new_layer_nr)
-    {
-        if (_layer_nr != new_layer_nr)
-        {
-            flushPathSegments();
-            _layer_nr = new_layer_nr;
-        }
-    }
-    /*!
-     * Returns the current layer which data is written to.
-     */
-    int getLayer() const
-    {
-        return _layer_nr;
-    }
-    /*!
-     * Used to set which extruder will be used for printing the following layer data is intended for.
-     */
-    void setExtruder(int new_extruder)
-    {
-        if (extruder != new_extruder)
-        {
-            flushPathSegments();
-            extruder = new_extruder;
-        }
-    }
-
-    /*!
-     * Special handling of the first point in an added line sequence.
-     * If the new sequence of lines does not start at the current end point
-     * of the path this jump is marked as PrintFeatureType::NoneType
-     */
-    void handleInitialPoint(Point from)
-    {
-        if (points.size() == 0)
-        {
-            addPoint2D(from);
-        }
-        else if (from != last_point)
-        {
-            addLineSegment(PrintFeatureType::NoneType, from, 1.0);
-        }
-    }
-
-    /*!
-     * Transfers the currently buffered line segments to the
-     * CommandSocket layer message storage.
-     */
-    void flushPathSegments();
-    /*!
-     * Move the current point of this path to \position.
-     */
-    void setCurrentPosition(Point position)
-    {
-        handleInitialPoint(position);
-    }
-    /*!
-     * Adds a single line segment to the current path. The line segment added is from the current last point to point \p to
-     */
-    void sendLineTo(PrintFeatureType print_feature_type, Point to, int width);
-    /*!
-     * Adds closed polygon to the current path
-     */
-    void sendPolygon(PrintFeatureType print_feature_type, Polygon poly, int width);
-private:
-    /*!
-     * Convert and add a point to the points buffer, each point being represented as two consecutive floats. All members adding a 2D point to the data should use this function.
-     */
-    void addPoint2D(Point point)
-    {
-        points.push_back(INT2MM(point.X));
-        points.push_back(INT2MM(point.Y));
-        last_point = point;
-    }
-    /*!
-     * Implements the functionality of adding a single 2D line segment to the path data. All member functions adding a 2D line segment should use this functions.
-     */
-    void addLineSegment(PrintFeatureType print_feature_type, Point point, int line_width)
-    {
-        addPoint2D(point);
-        line_types.push_back(print_feature_type);
-        line_widths.push_back(INT2MM(line_width));
-    }
-};
-#endif
-
 CommandSocket::CommandSocket()
-#ifdef ARCUS
     : private_data(new Private)
-    , path_comp(new PathCompiler(*private_data))
-#endif
 {
-#ifdef ARCUS
-#endif
 }
 
 CommandSocket* CommandSocket::getInstance()
@@ -266,32 +91,27 @@ bool CommandSocket::isInstantiated()
 
 void CommandSocket::connect(const std::string& ip, int port)
 {
-#ifdef ARCUS
     private_data->socket = new Arcus::Socket();
-    private_data->socket->addListener(new Listener());
-
     //private_data->socket->registerMessageType(1, &Cura::ObjectList::default_instance());
     private_data->socket->registerMessageType(&cura::proto::Slice::default_instance());
-    private_data->socket->registerMessageType(&cura::proto::Layer::default_instance());
-    private_data->socket->registerMessageType(&cura::proto::LayerOptimized::default_instance());
+    private_data->socket->registerMessageType(&cura::proto::SlicedObjectList::default_instance());
     private_data->socket->registerMessageType(&cura::proto::Progress::default_instance());
     private_data->socket->registerMessageType(&cura::proto::GCodeLayer::default_instance());
-    private_data->socket->registerMessageType(&cura::proto::PrintTimeMaterialEstimates::default_instance());
+    private_data->socket->registerMessageType(&cura::proto::ObjectPrintTime::default_instance());
     private_data->socket->registerMessageType(&cura::proto::SettingList::default_instance());
     private_data->socket->registerMessageType(&cura::proto::GCodePrefix::default_instance());
     private_data->socket->registerMessageType(&cura::proto::SlicingFinished::default_instance());
-    private_data->socket->registerMessageType(&cura::proto::SettingExtruder::default_instance());
 
     private_data->socket->connect(ip, port);
 
-    log("Connecting to %s:%i\n", ip.c_str(), port);
+    log("Connecting to %s:%i", ip.c_str(), port);
 
     while(private_data->socket->getState() != Arcus::SocketState::Connected && private_data->socket->getState() != Arcus::SocketState::Error)
     {
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
 
-    log("Connected to %s:%i\n", ip.c_str(), port);
+    log("Connected to %s:%i", ip.c_str(), port);
     
     bool slice_another_time = true;
     
@@ -300,83 +120,45 @@ void CommandSocket::connect(const std::string& ip, int port)
     {
         // Actually start handling messages.
         Arcus::MessagePtr message = private_data->socket->takeNextMessage();
-
-        /*
-         * handle a message which consists purely of a SettingList
         cura::proto::SettingList* setting_list = dynamic_cast<cura::proto::SettingList*>(message.get());
-        if (setting_list)
+        if(setting_list)
         {
             handleSettingList(setting_list);
         }
-        */
 
-        /*
-         * handle a message which consists purely of an ObjectList
-        cura::proto::ObjectList* object_list = dynamic_cast<cura::proto::ObjectList*>(message.get());
-        if (object_list)
+        /*cura::proto::ObjectList* object_list = dynamic_cast<cura::proto::ObjectList*>(message.get());
+        if(object_list)
         {
             handleObjectList(object_list);
-        }
-        */
-
-        // Handle the main Slice message
-        cura::proto::Slice* slice = dynamic_cast<cura::proto::Slice*>(message.get()); // See if the message is of the message type Slice; returns nullptr otherwise
-        if (slice)
+        }*/
+        
+        cura::proto::Slice* slice = dynamic_cast<cura::proto::Slice*>(message.get());
+        if(slice)
         {
-            logDebug("Received a Slice message\n");
-            const cura::proto::SettingList& global_settings = slice->global_settings();
-            for (auto setting : global_settings.settings())
-            {
-                FffProcessor::getInstance()->setSetting(setting.name(), setting.value());
-            }
             // Reset object counts
             private_data->object_count = 0;
-            for (auto object : slice->object_lists())
+            private_data->object_ids.clear();
+            for(auto object : slice->object_lists())
             {
-                handleObjectList(&object, slice->extruders());
+                handleObjectList(&object);
             }
-            //For every object, set the extruder fallbacks from the limit_to_extruder.
-            for (const cura::proto::SettingExtruder setting_extruder : slice->limit_to_extruder())
-            {
-                const int32_t extruder_nr = setting_extruder.extruder(); //Implicit cast from Protobuf's int32 to normal int32.
-                for (std::shared_ptr<MeshGroup> meshgroup : private_data->objects_to_slice)
-                {
-                    if (extruder_nr < 0 || extruder_nr >= meshgroup->getExtruderCount()) //We obtained an invalid value from the front-end. Ignore.
-                    {
-                        continue;
-                    }
-                    const ExtruderTrain* settings_base = meshgroup->getExtruderTrain(extruder_nr); //The extruder train that the setting should fall back to.
-                    for (Mesh& mesh : meshgroup->meshes)
-                    {
-                        mesh.setSettingInheritBase(setting_extruder.name(), *settings_base);
-                    }
-                }
-            }
-            logDebug("Done reading Slice message\n");
         }
 
         //If there is an object to slice, do so.
-        if (private_data->objects_to_slice.size())
+        if(private_data->objects_to_slice.size())
         {
-            int object_count = private_data->objects_to_slice.size();
-            logDebug("Slicing %i objects\n", object_count);
-            FffProcessor::getInstance()->resetMeshGroupNumber();
-            int i = 1;
-            for (auto object : private_data->objects_to_slice)
+            FffProcessor::getInstance()->resetFileNumber();
+            for(auto object : private_data->objects_to_slice)
             {
-                logDebug("Slicing object %i of %i\n", i, object_count);
-                if (!FffProcessor::getInstance()->processMeshGroup(object.get()))
+                if(!FffProcessor::getInstance()->processMeshGroup(object.get()))
                 {
                     logError("Slicing mesh group failed!");
                 }
-                i++;
             }
-            logDebug("Done slicing objects\n");
-
             private_data->objects_to_slice.clear();
             FffProcessor::getInstance()->finalize();
             flushGcode();
-            sendPrintTimeMaterialEstimates();
+            sendPrintTime();
             sendFinishedSlicing();
             slice_another_time = false; // TODO: remove this when multiple slicing with CuraEngine is safe
             //TODO: Support all-at-once/one-at-a-time printing
@@ -384,20 +166,24 @@ void CommandSocket::connect(const std::string& ip, int port)
             //private_data->object_to_slice.reset();
             //private_data->processor->resetFileNumber();
 
-            //sendPrintTimeMaterialEstimates();
+            //sendPrintTime();
+        }
+
+        if(private_data->socket->getLastError().isValid())
+        {
+            logError("%s\n", private_data->socket->getLastError().toString().c_str());
+            private_data->socket->clearError();
         }
 
         std::this_thread::sleep_for(std::chrono::milliseconds(250));
     }
-    log("Closing connection\n");
+    
     private_data->socket->close();
-#endif
 }
 
-#ifdef ARCUS
-void CommandSocket::handleObjectList(cura::proto::ObjectList* list, const google::protobuf::RepeatedPtrField<cura::proto::Extruder> settings_per_extruder_train)
+void CommandSocket::handleObjectList(cura::proto::ObjectList* list)
 {
-    if (list->objects_size() <= 0)
+    if(list->objects_size() <= 0)
     {
         return;
     }
@@ -407,45 +193,30 @@ void CommandSocket::handleObjectList(cura::proto::ObjectList* list, const google
     //private_data->object_ids.clear();
     private_data->objects_to_slice.push_back(std::make_shared<MeshGroup>(FffProcessor::getInstance()));
     MeshGroup* meshgroup = private_data->objects_to_slice.back().get();
-
-    // load meshgroup settings
-    for (auto setting : list->settings())
+    
+    for(auto setting : list->settings())
     {
         meshgroup->setSetting(setting.name(), setting.value());
     }
-
-    { // load extruder settings
-        for (int extruder_nr = 0; extruder_nr < FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count"); extruder_nr++)
-        { // initialize remaining extruder trains and load the defaults
-            meshgroup->createExtruderTrain(extruder_nr); // create new extruder train objects or use already existing ones
-        }
-
-        for (auto extruder : settings_per_extruder_train)
-        {
-            int extruder_nr = extruder.id();
-            ExtruderTrain* train = meshgroup->getExtruderTrain(extruder_nr);
-            for (auto setting : extruder.settings().settings())
-            {
-                train->setSetting(setting.name(), setting.value());
-            }
-        }
+    
+    for (int extruder_nr = 0; extruder_nr < FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count"); extruder_nr++)
+    { // initialize remaining extruder trains and load the defaults
+        meshgroup->createExtruderTrain(extruder_nr)->setExtruderTrainDefaults(extruder_nr); // create new extruder train objects or use already existing ones
     }
-
-    for (auto object : list->objects())
+    
+    for(auto object : list->objects())
     {
         int bytes_per_face = BYTES_PER_FLOAT * FLOATS_PER_VECTOR * VECTORS_PER_FACE;
         int face_count = object.vertices().size() / bytes_per_face;
 
-        if (face_count <= 0)
+        if(face_count <= 0)
         {
             logWarning("Got an empty mesh, ignoring it!");
             continue;
         }
         DEBUG_OUTPUT_OBJECT_STL_THROUGH_CERR("solid Cura_out\n");
-
-        // Check to which extruder train this object belongs
-        int extruder_train_nr = 0; // assume extruder 0 if setting wasn't supplied
-        for (auto setting : object.settings())
+        int extruder_train_nr = 0; // TODO: make primary extruder configurable!
+        for(auto setting : object.settings())
         {
             if (setting.name() == "extruder_nr")
             {
@@ -458,7 +229,7 @@ void CommandSocket::handleObjectList(cura::proto::ObjectList* list, const google
         meshgroup->meshes.push_back(extruder_train); //Construct a new mesh (with the corresponding extruder train as settings parent object) and put it into MeshGroup's mesh list.
         Mesh& mesh = meshgroup->meshes.back();
 
-        for (int i = 0; i < face_count; ++i)
+        for(int i = 0; i < face_count; ++i)
         {
             //TODO: Apply matrix
             std::string data = object.vertices().substr(i * bytes_per_face, bytes_per_face);
@@ -479,116 +250,67 @@ void CommandSocket::handleObjectList(cura::proto::ObjectList* list, const google
             DEBUG_OUTPUT_OBJECT_STL_THROUGH_CERR("  endfacet\n");
         }
         DEBUG_OUTPUT_OBJECT_STL_THROUGH_CERR("endsolid Cura_out\n");
-
-        for (auto setting : object.settings())
+        for(auto setting : object.settings())
         {
             mesh.setSetting(setting.name(), setting.value());
         }
 
+        private_data->object_ids.push_back(object.id());
         mesh.finish();
     }
 
     private_data->object_count++;
     meshgroup->finalize();
 }
-#endif
 
-void CommandSocket::sendOptimizedLayerInfo(int layer_nr, int32_t z, int32_t height)
+void CommandSocket::handleSettingList(cura::proto::SettingList* list)
 {
-#ifdef ARCUS
-    std::shared_ptr<cura::proto::LayerOptimized> layer = private_data->getOptimizedLayerById(layer_nr);
-    layer->set_height(z);
-    layer->set_thickness(height);
-#endif
+    for(auto setting : list->settings())
+    {
+        FffProcessor::getInstance()->setSetting(setting.name(), setting.value());
+    }
 }
 
-void CommandSocket::sendPolygons(PrintFeatureType type, const Polygons& polygons, int line_width)
+void CommandSocket::sendLayerInfo(int layer_nr, int32_t z, int32_t height)
 {
-#ifdef ARCUS
-    if (polygons.size() == 0)
+    if(!private_data->current_sliced_object)
     {
         return;
     }
-
-    if (CommandSocket::isInstantiated())
-    {
-        auto& path_comp = CommandSocket::getInstance()->path_comp;
-
-        for (unsigned int i = 0; i < polygons.size(); ++i)
-        {
-            path_comp->sendPolygon(type, polygons[i], line_width);
-        }
-    }
-#endif
+    
+    cura::proto::Layer* layer = private_data->getLayerById(layer_nr);
+    layer->set_height(z);
+    layer->set_thickness(height);
 }
 
-void CommandSocket::sendPolygon(PrintFeatureType type, Polygon& polygon, int line_width)
+void CommandSocket::sendPolygons(PrintFeatureType type, int layer_nr, Polygons& polygons, int line_width)
 {
-#ifdef ARCUS
-    if (CommandSocket::isInstantiated())
+    if(!private_data->current_sliced_object)
+        return;
+    
+    if (polygons.size() == 0)
+        return;
+
+    cura::proto::Layer* proto_layer = private_data->getLayerById(layer_nr);
+
+    for(unsigned int i = 0; i < polygons.size(); ++i)
     {
-        auto& path_comp = CommandSocket::getInstance()->path_comp;
-
-        path_comp->sendPolygon(type, polygon, line_width);
+        cura::proto::Polygon* p = proto_layer->add_polygons();
+        p->set_type(static_cast<cura::proto::Polygon_Type>(type));
+        std::string polydata;
+        polydata.append(reinterpret_cast<const char*>(polygons[i].data()), polygons[i].size() * sizeof(Point));
+        p->set_points(polydata);
+        p->set_line_width(line_width);
     }
-#endif
 }
 
-void CommandSocket::sendLineTo(cura::PrintFeatureType type, Point to, int line_width)
-{
-#ifdef ARCUS
-    if (CommandSocket::isInstantiated())
-    {
-        auto& path_comp = CommandSocket::getInstance()->path_comp;
-
-        path_comp->sendLineTo(type, to, line_width);
-    }
-#endif
-}
-
-void CommandSocket::setSendCurrentPosition(Point position)
-{
-#ifdef ARCUS
-    if (CommandSocket::isInstantiated())
-    {
-        auto& path_comp = CommandSocket::getInstance()->path_comp;
-        path_comp->setCurrentPosition(position);
-    }
-#endif
-}
-
-void CommandSocket::setLayerForSend(int layer_nr)
-{
-#ifdef ARCUS
-    if (CommandSocket::isInstantiated())
-    {
-        auto& path_comp = CommandSocket::getInstance()->path_comp;
-        path_comp->setLayer(layer_nr);
-    }
-#endif
-}
-
-void CommandSocket::setExtruderForSend(int extruder)
-{
-#ifdef ARCUS
-    if (CommandSocket::isInstantiated())
-    {
-        auto& path_comp = CommandSocket::getInstance()->path_comp;
-        path_comp->setExtruder(extruder);
-    }
-#endif
-}
-
-
 void CommandSocket::sendProgress(float amount)
 {
-#ifdef ARCUS
     auto message = std::make_shared<cura::proto::Progress>();
     amount /= private_data->object_count;
-    amount += private_data->optimized_layers.sliced_objects * (1. / private_data->object_count);
+    amount += private_data->sliced_objects * (1. / private_data->object_count);
     message->set_amount(amount);
     private_data->socket->sendMessage(message);
-#endif
 }
 
 void CommandSocket::sendProgressStage(Progress::Stage stage)
@@ -596,25 +318,12 @@ void CommandSocket::sendProgressStage(Progress::Stage stage)
     // TODO
 }
 
-void CommandSocket::sendPrintTimeMaterialEstimates()
+void CommandSocket::sendPrintTime()
 {
-#ifdef ARCUS
-    logDebug("Sending print time and material estimates.\n");
-    auto message = std::make_shared<cura::proto::PrintTimeMaterialEstimates>();
-
+    auto message = std::make_shared<cura::proto::ObjectPrintTime>();
     message->set_time(FffProcessor::getInstance()->getTotalPrintTime());
-    int num_extruders = FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count");
-    for (int extruder_nr (0); extruder_nr < num_extruders; ++extruder_nr)
-    {
-        cura::proto::MaterialEstimates* material_message = message->add_materialestimates();
-
-        material_message->set_id(extruder_nr);
-        material_message->set_material_amount(FffProcessor::getInstance()->getTotalFilamentUsed(extruder_nr));
-    }
-
+    message->set_material_amount(FffProcessor::getInstance()->getTotalFilamentUsed(0));
     private_data->socket->sendMessage(message);
-    logDebug("Done sending print time and material estimates.\n");
-#endif
 }
 
 void CommandSocket::sendPrintMaterialForObject(int index, int extruder_nr, float print_time)
@@ -626,202 +335,83 @@ void CommandSocket::sendPrintMaterialForObject(int index, int extruder_nr, float
 //     socket.sendFloat32(print_time);
 }
 
-void CommandSocket::sendLayerData()
+void CommandSocket::beginSendSlicedObject()
 {
-#ifdef ARCUS
-#endif
-#ifdef ARCUS
-    auto& data = private_data->sliced_layers;
-
-    data.sliced_objects++;
-    data.current_layer_offset = data.current_layer_count;
-//    log("End sliced object called. Sending %d layers.", data.current_layer_count);
-
-    // Only send the data to the front end when all mesh groups have been processed.
-    if (data.sliced_objects >= private_data->object_count)
+    if(!private_data->sliced_object_list)
     {
-        for (std::pair<const int, std::shared_ptr<cura::proto::Layer>> entry : data.slice_data) //Note: This is in no particular order!
-        {
-            private_data->socket->sendMessage(entry.second); //Send the actual layers.
-        }
-        data.sliced_objects = 0;
-        data.current_layer_count = 0;
-        data.current_layer_offset = 0;
-        data.slice_data.clear();
+        private_data->sliced_object_list = std::make_shared<cura::proto::SlicedObjectList>();
     }
-#endif
+
+    private_data->current_sliced_object = private_data->sliced_object_list->add_objects();
+    private_data->current_sliced_object->set_id(private_data->object_ids[private_data->sliced_objects]);
 }
 
-void CommandSocket::sendOptimizedLayerData()
+void CommandSocket::endSendSlicedObject()
 {
-#ifdef ARCUS
-    path_comp->flushPathSegments(); // make sure the last path segment has been flushed from the compiler
+    private_data->sliced_objects++;
+    private_data->current_layer_offset = private_data->current_layer_count;
+    std::cout << "End sliced object called. Sliced objects " << private_data->sliced_objects << " object count: " << private_data->object_count << std::endl;
 
-    auto& data = private_data->optimized_layers;
-
-    data.sliced_objects++;
-    data.current_layer_offset = data.current_layer_count;
-    log("End sliced object called. Sending %d layers.", data.current_layer_count);
-
-    if (data.sliced_objects >= private_data->object_count)
+    if(private_data->sliced_objects >= private_data->object_count)
     {
-        for (std::pair<const int, std::shared_ptr<cura::proto::LayerOptimized>> entry : data.slice_data) //Note: This is in no particular order!
-        {
-            private_data->socket->sendMessage(entry.second); //Send the actual layers.
-        }
-        data.sliced_objects = 0;
-        data.current_layer_count = 0;
-        data.current_layer_offset = 0;
-        data.slice_data.clear();
+        private_data->socket->sendMessage(private_data->sliced_object_list);
+        private_data->sliced_objects = 0;
+        private_data->current_layer_count = 0;
+        private_data->current_layer_offset = 0;
+        private_data->sliced_object_list.reset();
+        private_data->current_sliced_object = nullptr;
+        auto done_message = std::make_shared<cura::proto::SlicingFinished>();
+        private_data->socket->sendMessage(done_message);
     }
-#endif
 }
 
 void CommandSocket::sendFinishedSlicing()
 {
-#ifdef ARCUS
-    logDebug("Sending Slicing Finished message.\n");
     std::shared_ptr<cura::proto::SlicingFinished> done_message = std::make_shared<cura::proto::SlicingFinished>();
     private_data->socket->sendMessage(done_message);
-    logDebug("Done sending Slicing Finished message.\n");
-#endif
 }
 
 void CommandSocket::beginGCode()
 {
-#ifdef ARCUS
     FffProcessor::getInstance()->setTargetStream(&private_data->gcode_output_stream);
-#endif
 }
 
 void CommandSocket::flushGcode()
 {
-#ifdef ARCUS
     auto message = std::make_shared<cura::proto::GCodeLayer>();
+    message->set_id(private_data->object_ids[0]);
     message->set_data(private_data->gcode_output_stream.str());
     private_data->socket->sendMessage(message);
     
     private_data->gcode_output_stream.str("");
-#endif
 }
 
 void CommandSocket::sendGCodePrefix(std::string prefix)
 {
-#ifdef ARCUS
     auto message = std::make_shared<cura::proto::GCodePrefix>();
     message->set_data(prefix);
     private_data->socket->sendMessage(message);
-#endif
 }
 
-#ifdef ARCUS
-std::shared_ptr<cura::proto::Layer> CommandSocket::Private::getLayerById(int id)
+cura::proto::Layer* CommandSocket::Private::getLayerById(int id)
 {
-    id += sliced_layers.current_layer_offset;
+    id += current_layer_offset;
 
-    auto itr = sliced_layers.slice_data.find(id);
+    auto itr = std::find_if(current_sliced_object->mutable_layers()->begin(), current_sliced_object->mutable_layers()->end(), [id](cura::proto::Layer& l) { return l.id() == id; });
 
-    std::shared_ptr<cura::proto::Layer> layer;
-    if (itr != sliced_layers.slice_data.end())
+    cura::proto::Layer* layer = nullptr;
+    if(itr != current_sliced_object->mutable_layers()->end())
     {
-        layer = itr->second;
+        layer = &(*itr);
     }
     else
     {
-        layer = std::make_shared<cura::proto::Layer>();
+        layer = current_sliced_object->add_layers();
         layer->set_id(id);
-        sliced_layers.current_layer_count++;
-        sliced_layers.slice_data[id] = layer;
+        current_layer_count++;
     }
 
     return layer;
 }
-#endif
-
-#ifdef ARCUS
-std::shared_ptr<cura::proto::LayerOptimized> CommandSocket::Private::getOptimizedLayerById(int id)
-{
-    id += optimized_layers.current_layer_offset;
-
-    auto itr = optimized_layers.slice_data.find(id);
-
-    std::shared_ptr<cura::proto::LayerOptimized> layer;
-    if (itr != optimized_layers.slice_data.end())
-    {
-        layer = itr->second;
-    }
-    else
-    {
-        layer = std::make_shared<cura::proto::LayerOptimized>();
-        layer->set_id(id);
-        optimized_layers.current_layer_count++;
-        optimized_layers.slice_data[id] = layer;
-    }
-
-    return layer;
-}
-#endif
-
-#ifdef ARCUS
-void CommandSocket::PathCompiler::flushPathSegments()
-{
-    if (line_types.size() > 0 && CommandSocket::isInstantiated())
-    {
-        std::shared_ptr<cura::proto::LayerOptimized> proto_layer = _cs_private_data.getOptimizedLayerById(_layer_nr);
-
-        cura::proto::PathSegment* p = proto_layer->add_path_segment();
-        p->set_extruder(extruder);
-        p->set_point_type(data_point_type);
-        std::string line_type_data;
-        line_type_data.append(reinterpret_cast<const char*>(line_types.data()), line_types.size()*sizeof(PrintFeatureType));
-        p->set_line_type(line_type_data);
-        std::string polydata;
-        polydata.append(reinterpret_cast<const char*>(points.data()), points.size() * sizeof(float));
-        p->set_points(polydata);
-        std::string line_width_data;
-        line_width_data.append(reinterpret_cast<const char*>(line_widths.data()), line_widths.size()*sizeof(float));
-        p->set_line_width(line_width_data);
-    }
-    points.clear();
-    line_widths.clear();
-    line_types.clear();
-}
-
-void CommandSocket::PathCompiler::sendLineTo(PrintFeatureType print_feature_type, Point to, int width)
-{
-    assert(points.size() > 0 && "A point must already be in the buffer for sendLineTo(.) to function properly");
-
-    if (to != last_point)
-    {
-        addLineSegment(print_feature_type, to, width);
-    }
-}
-
-void CommandSocket::PathCompiler::sendPolygon(PrintFeatureType print_feature_type, Polygon polygon, int width)
-{
-    if (polygon.size() < 2)
-    {
-        return;
-    }
-
-    auto it = polygon.begin();
-    handleInitialPoint(*it);
-
-    const auto it_end = polygon.end();
-    while (++it != it_end)
-    {
-        // Ignore zero-length segments.
-        if (*it != last_point)
-        {
-            addLineSegment(print_feature_type, *it, width);
-        }
-    }
-    // Make sure the polygon is closed
-    if (*polygon.begin() != polygon.back())
-    {
-        addLineSegment(print_feature_type, *polygon.begin(), width);
-    }
-}
-#endif
 
 }//namespace cura

src/commandSocket.h

@@ -3,18 +3,16 @@
 
 #include "utils/socket.h"
 #include "utils/polygon.h"
-#include "settings/settings.h"
-#include "progress/Progress.h"
+#include "settings.h"
+#include "Progress.h"
 #include "PrintFeature.h"
 
 #include <memory>
 
-#ifdef ARCUS
 #include "Cura.pb.h"
-#endif
 
-namespace cura
-{
+namespace cura {
+
 
 class CommandSocket
 {
@@ -37,59 +35,33 @@ public:
      * \param port int of the port to connect with.
      */
     void connect(const std::string& ip, int port);
-
-#ifdef ARCUS
+    
     /*! 
      * Handler for ObjectList message. 
      * Loads all objects from the message and starts the slicing process
-     * 
-     * Also handles meshgroup settings and extruder settings.
-     * 
-     * \param[in] list The list of objects to slice
-     * \param[in] settings_per_extruder_train The extruder train settings to load into the meshgroup
      */
-    void handleObjectList(cura::proto::ObjectList* list, const google::protobuf::RepeatedPtrField<cura::proto::Extruder> settings_per_extruder_train);
-#endif
-
+    void handleObjectList(cura::proto::ObjectList* list);
+    
+    /*! 
+     * Handler for SettingList message. 
+     * This simply sets all the settings by using key value pair
+     */
+    void handleSettingList(cura::proto::SettingList* list);
+    
     /*!
-     * Send info on an optimized layer to be displayed by the forntend: set the z and the thickness of the layer.
+     * Send info on a layer to be displayed by the forntend: set the z and the thickness of the layer.
      */
-    void sendOptimizedLayerInfo(int layer_nr, int32_t z, int32_t height);
+    void sendLayerInfo(int layer_nr, int32_t z, int32_t height);
+    
+    /*! 
+     * Send a polygon to the engine. This is used for the layerview in the GUI
+     */
+    void sendPolygons(cura::PrintFeatureType type, int layer_nr, cura::Polygons& polygons, int line_width);
 
     /*! 
-     * Send a polygon to the front-end. This is used for the layerview in the GUI
+     * Send a polygon to the engine if the command socket is instantiated. This is used for the layerview in the GUI
      */
-    static void sendPolygons(cura::PrintFeatureType type, const cura::Polygons& polygons, int line_width);
-
-    /*! 
-     * Send a polygon to the front-end. This is used for the layerview in the GUI
-     */
-    static void sendPolygon(cura::PrintFeatureType type, Polygon& polygon, int line_width);
-
-    /*!
-     * Send a line to the front-end. This is used for the layerview in the GUI
-     */
-    static void sendLineTo(cura::PrintFeatureType type, Point to, int line_width);
-
-    /*!
-     * Set the current position of the path compiler to \p position. This is used for the layerview in the GUI
-     */
-    static void setSendCurrentPosition(Point position);
-
-    /*!
-    * Set which layer is being used for the following calls to SendPolygons, SendPolygon and SendLineTo.
-    */
-    static void setLayerForSend(int layer_nr);
-
-     /*!
-     * Set which extruder is being used for the following calls to SendPolygons, SendPolygon and SendLineTo.
-     */
-    static void setExtruderForSend(int extruder);
-
-    /*!
-     * Send a polygon to the front-end if the command socket is instantiated. This is used for the layerview in the GUI
-     */
-    static void sendPolygonsToCommandSocket(cura::PrintFeatureType type, int layer_nr, const cura::Polygons& polygons, int line_width);
+    static void sendPolygonsToCommandSocket(cura::PrintFeatureType type, int layer_nr, cura::Polygons& polygons, int line_width);
 
     /*! 
      * Send progress to GUI
@@ -104,29 +76,22 @@ public:
     /*!
      * Send time estimate of how long print would take.
      */
-    void sendPrintTimeMaterialEstimates();
+    void sendPrintTime();
     
     /*!
      * Does nothing at the moment
      */
     void sendPrintMaterialForObject(int index, int extruder_nr, float material_amount);
-    
-    /*!
-     * Send the slices of the model as polygons to the GUI.
-     *
-     * The GUI may use this to visualize the early result of the slicing
-     * process.
-     */
-    void sendLayerData();
 
     /*!
-     * Send the sliced layer data to the GUI after the optimization is done and
-     * the actual order in which to print has been set.
-     *
-     * The GUI may use this to visualize the g-code, so that the user can
-     * inspect the result of slicing.
+     * Start the slicing of a new meshgroup
      */
-    void sendOptimizedLayerData();
+    void beginSendSlicedObject();
+    
+    /*!
+     * Conclude the slicing of the current meshgroup, so that we can start the next
+     */
+    void endSendSlicedObject();
 
     /*!
      * \brief Sends a message to indicate that all the slicing is done.
@@ -144,13 +109,9 @@ public:
     void flushGcode();
     void sendGCodePrefix(std::string prefix);
 
-#ifdef ARCUS
 private:
     class Private;
     const std::unique_ptr<Private> private_data;
-    class PathCompiler;
-    const std::unique_ptr<PathCompiler> path_comp;
-#endif
 };
 
 }//namespace cura

src/debug.h

@@ -0,0 +1,61 @@
+#ifndef DEBUG_H
+#define DEBUG_H
+
+#include <string.h>
+
+#define __FILE_NAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+
+
+#define DEBUG_HERE std::cerr << __FILE_NAME__ << " : " << __LINE__ << std::endl
+
+
+
+
+
+#define DEBUG 1
+
+#define DEBUG_SHOW_LINE 1
+
+#if DEBUG_SHOW_LINE == 1
+#define DEBUG_FILE_LINE __FILE_NAME__ << "." << __LINE__ << ": "
+#else
+#define DEBUG_FILE_LINE  ""
+#endif
+
+#if DEBUG == 1
+#   define DEBUG_DO(x) do { x } while (0)
+#   define DEBUG_SHOW(x) do {       std::cerr << DEBUG_FILE_LINE << #x << " = " << x << std::endl; } while (0)
+#   define DEBUG_PRINTLN(x) do {    std::cerr << DEBUG_FILE_LINE << x << std::endl; } while (0)
+#else
+#   define DEBUG_DO(x)
+#   define DEBUG_SHOW(x)
+#   define DEBUG_PRINTLN(x)
+#endif
+
+
+
+#include <sstream>
+
+#if 0==1
+#define ENUM(name, ...) enum class name { __VA_ARGS__, __COUNT};
+#endif
+#define ENUM(name, ...) enum class name { __VA_ARGS__}; \
+inline std::ostream& operator<<(std::ostream& os, name value) { \
+std::string enumName = #name; \
+std::string str = #__VA_ARGS__; \
+int len = str.length(); \
+std::vector<std::string> strings; \
+std::ostringstream temp; \
+for(int i = 0; i < len; i ++) { \
+if(isspace(str[i])) continue; \
+        else if(str[i] == ',') { \
+        strings.push_back(temp.str()); \
+        temp.str(std::string());\
+        } \
+        else temp<< str[i]; \
+} \
+strings.push_back(temp.str()); \
+os << enumName << "::" << strings[static_cast<int>(value)]; \
+return os;}
+
+#endif // DEBUG_H

src/gcodeExport.cpp

@@ -6,8 +6,6 @@
 #include "gcodeExport.h"
 #include "utils/logoutput.h"
 #include "PrintFeature.h"
-#include "utils/Date.h"
-#include "utils/string.h" // MMtoStream, PrecisionedDouble
 
 namespace cura {
 
@@ -16,191 +14,21 @@ GCodeExport::GCodeExport()
 , currentPosition(0,0,MM2INT(20))
 , layer_nr(0)
 {
-    *output_stream << std::fixed;
-
     current_e_value = 0;
     current_extruder = 0;
     currentFanSpeed = -1;
-
+    
     totalPrintTime = 0.0;
-
+    
     currentSpeed = 1;
-    current_acceleration = -1;
-    current_jerk = -1;
-    current_max_z_feedrate = -1;
-
     isZHopped = 0;
     setFlavor(EGCodeFlavor::REPRAP);
-    initial_bed_temp = 0;
-
-    extruder_count = 0;
-
-    total_bounding_box = AABB3D();
 }
 
 GCodeExport::~GCodeExport()
 {
 }
 
-void GCodeExport::preSetup(const MeshGroup* meshgroup)
-{
-    setFlavor(meshgroup->getSettingAsGCodeFlavor("machine_gcode_flavor"));
-    use_extruder_offset_to_offset_coords = meshgroup->getSettingBoolean("machine_use_extruder_offset_to_offset_coords");
-
-    extruder_count = meshgroup->getSettingAsCount("machine_extruder_count");
-
-    for (const Mesh& mesh : meshgroup->meshes)
-    {
-        if (!mesh.getSettingBoolean("anti_overhang_mesh")
-            && !mesh.getSettingBoolean("support_mesh")
-        )
-        {
-            extruder_attr[mesh.getSettingAsIndex("extruder_nr")].is_used = true;
-        }
-    }
-
-    for (unsigned int extruder_nr = 0; extruder_nr < extruder_count; extruder_nr++)
-    {
-        const ExtruderTrain* train = meshgroup->getExtruderTrain(extruder_nr);
-
-        if (meshgroup->getSettingAsIndex("adhesion_extruder_nr") == int(extruder_nr) && meshgroup->getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::NONE)
-        {
-            extruder_attr[extruder_nr].is_used = true;
-        }
-        for (const Mesh& mesh : meshgroup->meshes)
-        {
-            if ((mesh.getSettingBoolean("support_enable") && mesh.getSettingBoolean("support_interface_enable") && meshgroup->getSettingAsIndex("support_interface_extruder_nr") == int(extruder_nr))
-                || (mesh.getSettingBoolean("support_enable") && meshgroup->getSettingAsIndex("support_infill_extruder_nr") == int(extruder_nr))
-                || (mesh.getSettingBoolean("support_enable") && meshgroup->getSettingAsIndex("support_extruder_nr_layer_0") == int(extruder_nr))
-                )
-            {
-                extruder_attr[extruder_nr].is_used = true;
-            }
-        }
-        setFilamentDiameter(extruder_nr, train->getSettingInMicrons("material_diameter")); 
-
-        extruder_attr[extruder_nr].prime_pos = Point3(train->getSettingInMicrons("extruder_prime_pos_x"), train->getSettingInMicrons("extruder_prime_pos_y"), train->getSettingInMicrons("extruder_prime_pos_z"));
-        extruder_attr[extruder_nr].prime_pos_is_abs = train->getSettingBoolean("extruder_prime_pos_abs");
-
-        extruder_attr[extruder_nr].nozzle_size = train->getSettingInMicrons("machine_nozzle_size");
-        extruder_attr[extruder_nr].nozzle_offset = Point(train->getSettingInMicrons("machine_nozzle_offset_x"), train->getSettingInMicrons("machine_nozzle_offset_y"));
-        extruder_attr[extruder_nr].material_guid = train->getSettingString("material_guid");
-
-        extruder_attr[extruder_nr].start_code = train->getSettingString("machine_extruder_start_code");
-        extruder_attr[extruder_nr].end_code = train->getSettingString("machine_extruder_end_code");
-
-        extruder_attr[extruder_nr].last_retraction_prime_speed = train->getSettingInMillimetersPerSecond("retraction_prime_speed"); // the alternative would be switch_extruder_prime_speed, but dual extrusion might not even be configured...
-    }
-    machine_dimensions.x = meshgroup->getSettingInMicrons("machine_width");
-    machine_dimensions.y = meshgroup->getSettingInMicrons("machine_depth");
-    machine_dimensions.z = meshgroup->getSettingInMicrons("machine_height");
-
-    machine_name = meshgroup->getSettingString("machine_name");
-
-    if (flavor == EGCodeFlavor::BFB)
-    {
-        new_line = "\r\n";
-    }
-    else 
-    {
-        new_line = "\n";
-    }
-
-    estimateCalculator.setFirmwareDefaults(meshgroup);
-}
-
-void GCodeExport::setInitialTemps(const MeshGroup& settings)
-{
-    int start_extruder_nr = 0;
-    if (settings.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::NONE)
-    {
-        start_extruder_nr = settings.getSettingAsIndex("adhesion_extruder_nr");
-    }
-    for (unsigned int extr_nr = 0; extr_nr < extruder_count; extr_nr++)
-    {
-        const ExtruderTrain& train = *settings.getExtruderTrain(extr_nr);
-        
-        double print_temp_0 = train.getSettingInDegreeCelsius("material_print_temperature_layer_0");
-        double print_temp_here = (print_temp_0 != 0)? print_temp_0 : train.getSettingInDegreeCelsius("material_print_temperature");
-        double temp = ((int)extr_nr == start_extruder_nr)? print_temp_here : train.getSettingInDegreeCelsius("material_standby_temperature");
-        setInitialTemp(extr_nr, temp);
-    }
-
-    initial_bed_temp = settings.getSettingInDegreeCelsius("material_bed_temperature_layer_0");
-}
-
-void GCodeExport::setInitialTemp(int extruder_nr, double temp)
-{
-    extruder_attr[extruder_nr].initial_temp = temp;
-    if (flavor == EGCodeFlavor::GRIFFIN || flavor == EGCodeFlavor::ULTIGCODE)
-    {
-        extruder_attr[extruder_nr].currentTemperature = temp;
-    }
-}
-
-
-std::string GCodeExport::getFileHeader(const double* print_time, const std::vector<double>& filament_used, const std::vector<std::string>& mat_ids)
-{
-    std::ostringstream prefix;
-    switch (flavor)
-    {
-    case EGCodeFlavor::GRIFFIN:
-        prefix << ";START_OF_HEADER" << new_line;
-        prefix << ";HEADER_VERSION:0.1" << new_line;
-        prefix << ";FLAVOR:" << toString(flavor) << new_line;
-        prefix << ";GENERATOR.NAME:Cura_SteamEngine" << new_line;
-        prefix << ";GENERATOR.VERSION:" << VERSION << new_line;
-        prefix << ";GENERATOR.BUILD_DATE:" << Date::getDate().toStringDashed() << new_line;
-        prefix << ";TARGET_MACHINE.NAME:" << machine_name << new_line;
-
-        for (unsigned int extr_nr = 0; extr_nr < extruder_count; extr_nr++)
-        {
-            if (!extruder_attr[extr_nr].is_used)
-            {
-                continue;
-            }
-            prefix << ";EXTRUDER_TRAIN." << extr_nr << ".INITIAL_TEMPERATURE:" << extruder_attr[extr_nr].initial_temp << new_line;
-            if (filament_used.size() == extruder_count)
-            {
-                prefix << ";EXTRUDER_TRAIN." << extr_nr << ".MATERIAL.VOLUME_USED:" << static_cast<int>(filament_used[extr_nr]) << new_line;
-            }
-            if (mat_ids.size() == extruder_count && mat_ids[extr_nr] != "")
-            {
-                prefix << ";EXTRUDER_TRAIN." << extr_nr << ".MATERIAL.GUID:" << mat_ids[extr_nr] << new_line;
-            }
-            prefix << ";EXTRUDER_TRAIN." << extr_nr << ".NOZZLE.DIAMETER:" << float(INT2MM(getNozzleSize(extr_nr))) << new_line;
-        }
-        prefix << ";BUILD_PLATE.INITIAL_TEMPERATURE:" << initial_bed_temp << new_line;
-
-        if (print_time)
-        {
-            prefix << ";PRINT.TIME:" << static_cast<int>(*print_time) << new_line;
-        }
-
-        prefix << ";PRINT.SIZE.MIN.X:" << INT2MM(total_bounding_box.min.x) << new_line;
-        prefix << ";PRINT.SIZE.MIN.Y:" << INT2MM(total_bounding_box.min.y) << new_line;
-        prefix << ";PRINT.SIZE.MIN.Z:" << INT2MM(total_bounding_box.min.z) << new_line;
-        prefix << ";PRINT.SIZE.MAX.X:" << INT2MM(total_bounding_box.max.x) << new_line;
-        prefix << ";PRINT.SIZE.MAX.Y:" << INT2MM(total_bounding_box.max.y) << new_line;
-        prefix << ";PRINT.SIZE.MAX.Z:" << INT2MM(total_bounding_box.max.z) << new_line;
-        prefix << ";END_OF_HEADER" << new_line;
-        return prefix.str();
-    default:
-        prefix << ";FLAVOR:" << toString(flavor) << new_line;
-        prefix << ";TIME:" << ((print_time)? static_cast<int>(*print_time) : 6666) << new_line;
-        if (flavor == EGCodeFlavor::ULTIGCODE)
-        {
-            prefix << ";MATERIAL:" << ((filament_used.size() >= 1)? static_cast<int>(filament_used[0]) : 6666) << new_line;
-            prefix << ";MATERIAL2:" << ((filament_used.size() >= 2)? static_cast<int>(filament_used[1]) : 0) << new_line;
-
-            prefix << ";NOZZLE_DIAMETER:" << float(INT2MM(getNozzleSize(0))) << new_line;
-            // TODO: the second nozzle size isn't always initiated! ";NOZZLE_DIAMETER2:"
-        }
-        return prefix.str();
-    }
-}
-
-
 void GCodeExport::setLayerNr(unsigned int layer_nr_) {
     layer_nr = layer_nr_;
 }
@@ -211,27 +39,12 @@ void GCodeExport::setOutputStream(std::ostream* stream)
     *output_stream << std::fixed;
 }
 
-bool GCodeExport::getExtruderIsUsed(const int extruder_nr) const
-{
-    return extruder_attr[extruder_nr].is_used;
-}
-
-int GCodeExport::getNozzleSize(const int extruder_nr) const
-{
-    return extruder_attr[extruder_nr].nozzle_size;
-}
-
-Point GCodeExport::getExtruderOffset(const int id) const
+Point GCodeExport::getExtruderOffset(int id)
 {
     return extruder_attr[id].nozzle_offset;
 }
 
-std::string GCodeExport::getMaterialGUID(const int extruder_nr) const
-{
-    return extruder_attr[extruder_nr].material_guid;
-}
-
-Point GCodeExport::getGcodePos(const int64_t x, const int64_t y, const int extruder_train) const
+Point GCodeExport::getGcodePos(int64_t x, int64_t y, int extruder_train)
 {
     if (use_extruder_offset_to_offset_coords) { return Point(x,y) - getExtruderOffset(extruder_train); }
     else { return Point(x,y); }
@@ -273,7 +86,7 @@ EGCodeFlavor GCodeExport::getFlavor()
 
 void GCodeExport::setZ(int z)
 {
-    this->current_layer_z = z;
+    this->zPos = z;
 }
 
 Point3 GCodeExport::getPosition()
@@ -320,48 +133,12 @@ double GCodeExport::getCurrentExtrudedVolume()
     }
 }
 
-double GCodeExport::eToMm(double e)
-{
-    if (is_volumatric)
-    {
-        return e / extruder_attr[current_extruder].filament_area;
-    }
-    else
-    {
-        return e;
-    }
-}
 
-double GCodeExport::mm3ToE(double mm3)
+double GCodeExport::getTotalFilamentUsed(int e)
 {
-    if (is_volumatric)
-    {
-        return mm3;
-    }
-    else
-    {
-        return mm3 / extruder_attr[current_extruder].filament_area;
-    }
-}
-
-double GCodeExport::mmToE(double mm)
-{
-    if (is_volumatric)
-    {
-        return mm * extruder_attr[current_extruder].filament_area;
-    }
-    else
-    {
-        return mm;
-    }
-}
-
-
-double GCodeExport::getTotalFilamentUsed(int extruder_nr)
-{
-    if (extruder_nr == current_extruder)
-        return extruder_attr[extruder_nr].totalFilament + getCurrentExtrudedVolume();
-    return extruder_attr[extruder_nr].totalFilament;
+    if (e == current_extruder)
+        return extruder_attr[e].totalFilament + getCurrentExtrudedVolume();
+    return extruder_attr[e].totalFilament;
 }
 
 double GCodeExport::getTotalPrintTime()
@@ -385,7 +162,6 @@ void GCodeExport::updateTotalPrintTime()
 {
     totalPrintTime += estimateCalculator.calculate();
     estimateCalculator.reset();
-    writeTimeComment(totalPrintTime);
 }
 
 void GCodeExport::writeComment(std::string comment)
@@ -400,12 +176,12 @@ void GCodeExport::writeComment(std::string comment)
             *output_stream << comment[i];
         }
     }
-    *output_stream << new_line;
+    *output_stream << "\n";
 }
 
-void GCodeExport::writeTimeComment(const double time)
+void GCodeExport::writeTypeComment(const char* type)
 {
-    *output_stream << ";TIME_ELAPSED:" << time << new_line;
+    *output_stream << ";TYPE:" << type << "\n";
 }
 
 void GCodeExport::writeTypeComment(PrintFeatureType type)
@@ -413,25 +189,25 @@ void GCodeExport::writeTypeComment(PrintFeatureType type)
     switch (type)
     {
         case PrintFeatureType::OuterWall:
-            *output_stream << ";TYPE:WALL-OUTER" << new_line;
+            *output_stream << ";TYPE:WALL-OUTER\n";
             break;
         case PrintFeatureType::InnerWall:
-            *output_stream << ";TYPE:WALL-INNER" << new_line;
+            *output_stream << ";TYPE:WALL-INNER\n";
             break;
         case PrintFeatureType::Skin:
-            *output_stream << ";TYPE:SKIN" << new_line;
+            *output_stream << ";TYPE:SKIN\n";
             break;
         case PrintFeatureType::Support:
-            *output_stream << ";TYPE:SUPPORT" << new_line;
+            *output_stream << ";TYPE:SUPPORT\n";
             break;
-        case PrintFeatureType::SkirtBrim:
-            *output_stream << ";TYPE:SKIRT" << new_line;
+        case PrintFeatureType::Skirt:
+            *output_stream << ";TYPE:SKIRT\n";
             break;
         case PrintFeatureType::Infill:
-            *output_stream << ";TYPE:FILL" << new_line;
+            *output_stream << ";TYPE:FILL\n";
             break;
         case PrintFeatureType::SupportInfill:
-            *output_stream << ";TYPE:SUPPORT" << new_line;
+            *output_stream << ";TYPE:SUPPORT\n";
             break;
         case PrintFeatureType::MoveCombing:
         case PrintFeatureType::MoveRetraction:
@@ -444,24 +220,24 @@ void GCodeExport::writeTypeComment(PrintFeatureType type)
 
 void GCodeExport::writeLayerComment(int layer_nr)
 {
-    *output_stream << ";LAYER:" << layer_nr << new_line;
+    *output_stream << ";LAYER:" << layer_nr << "\n";
 }
 
 void GCodeExport::writeLayerCountComment(int layer_count)
 {
-    *output_stream << ";LAYER_COUNT:" << layer_count << new_line;
+    *output_stream << ";LAYER_COUNT:" << layer_count << "\n";
 }
 
 void GCodeExport::writeLine(const char* line)
 {
-    *output_stream << line << new_line;
+    *output_stream << line << "\n";
 }
 
 void GCodeExport::resetExtrusionValue()
 {
-    if (flavor != EGCodeFlavor::MAKERBOT && flavor != EGCodeFlavor::BFB)
+    if (current_e_value != 0.0 && flavor != EGCodeFlavor::MAKERBOT && flavor != EGCodeFlavor::BFB)
     {
-        *output_stream << "G92 " << extruder_attr[current_extruder].extruderCharacter << "0" << new_line;
+        *output_stream << "G92 " << extruder_attr[current_extruder].extruderCharacter << "0\n";
         double current_extruded_volume = getCurrentExtrudedVolume();
         extruder_attr[current_extruder].totalFilament += current_extruded_volume;
         for (double& extruded_volume_at_retraction : extruder_attr[current_extruder].extruded_volume_at_previous_n_retractions)
@@ -475,13 +251,13 @@ void GCodeExport::resetExtrusionValue()
 
 void GCodeExport::writeDelay(double timeAmount)
 {
-    *output_stream << "G4 P" << int(timeAmount * 1000) << new_line;
+    *output_stream << "G4 P" << int(timeAmount * 1000) << "\n";
     estimateCalculator.addTime(timeAmount);
 }
 
 void GCodeExport::writeMove(Point p, double speed, double extrusion_mm3_per_mm)
 {
-    writeMove(p.X, p.Y, current_layer_z, speed, extrusion_mm3_per_mm);
+    writeMove(p.X, p.Y, zPos, speed, extrusion_mm3_per_mm);
 }
 
 void GCodeExport::writeMove(Point3 p, double speed, double extrusion_mm3_per_mm)
@@ -491,7 +267,11 @@ void GCodeExport::writeMove(Point3 p, double speed, double extrusion_mm3_per_mm)
 
 void GCodeExport::writeMoveBFB(int x, int y, int z, double speed, double extrusion_mm3_per_mm)
 {
-    double extrusion_per_mm = mm3ToE(extrusion_mm3_per_mm);
+    double extrusion_per_mm = extrusion_mm3_per_mm;
+    if (!is_volumatric)
+    {
+        extrusion_per_mm = extrusion_mm3_per_mm / extruder_attr[current_extruder].filament_area;
+    }
     
     Point gcode_pos = getGcodePos(x,y, current_extruder);
     
@@ -508,11 +288,11 @@ void GCodeExport::writeMoveBFB(int x, int y, int z, double speed, double extrusi
             {
                 //fprintf(f, "; %f e-per-mm %d mm-width %d mm/s\n", extrusion_per_mm, lineWidth, speed);
                 //fprintf(f, "M108 S%0.1f\r\n", rpm);
-                *output_stream << "M108 S" << PrecisionedDouble{1, rpm} << new_line;
+                *output_stream << "M108 S" << std::setprecision(1) << rpm << "\r\n";
                 currentSpeed = double(rpm);
             }
             //Add M101 or M201 to enable the proper extruder.
-            *output_stream << "M" << int((current_extruder + 1) * 100 + 1) << new_line;
+            *output_stream << "M" << int((current_extruder + 1) * 100 + 1) << "\r\n";
             extruder_attr[current_extruder].retraction_e_amount_current = 0.0;
         }
         //Fix the speed by the actual RPM we are asking, because of rounding errors we cannot get all RPM values, but we have a lot more resolution in the feedrate value.
@@ -529,15 +309,17 @@ void GCodeExport::writeMoveBFB(int x, int y, int z, double speed, double extrusi
         //If we are not extruding, check if we still need to disable the extruder. This causes a retraction due to auto-retraction.
         if (!extruder_attr[current_extruder].retraction_e_amount_current)
         {
-            *output_stream << "M103" << new_line;
+            *output_stream << "M103\r\n";
             extruder_attr[current_extruder].retraction_e_amount_current = 1.0; // 1.0 used as stub; BFB doesn't use the actual retraction amount; it performs retraction on the firmware automatically
         }
     }
-    *output_stream << "G1 X" << MMtoStream{gcode_pos.X} << " Y" << MMtoStream{gcode_pos.Y} << " Z" << MMtoStream{z};
-    *output_stream << " F" << PrecisionedDouble{1, fspeed} << new_line;
+    *output_stream << std::setprecision(3) << 
+        "G1 X" << INT2MM(gcode_pos.X) << 
+        " Y" << INT2MM(gcode_pos.Y) << 
+        " Z" << INT2MM(z) << std::setprecision(1) << " F" << fspeed << "\r\n";
     
     currentPosition = Point3(x, y, z);
-    estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), eToMm(current_e_value)), speed);
+    estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), current_e_value), speed);
 }
 
 void GCodeExport::writeMove(int x, int y, int z, double speed, double extrusion_mm3_per_mm)
@@ -546,14 +328,11 @@ void GCodeExport::writeMove(int x, int y, int z, double speed, double extrusion_
         return;
 
 #ifdef ASSERT_INSANE_OUTPUT
-    assert(speed < 400 && speed > 1); // normal F values occurring in UM2 gcode (this code should not be compiled for release)
+    assert(speed < 200 && speed > 1); // normal F values occurring in UM2 gcode (this code should not be compiled for release)
     assert(currentPosition != no_point3);
-    assert(Point3(x, y, z) != no_point3);
     assert((Point3(x,y,z) - currentPosition).vSize() < MM2INT(300)); // no crazy positions (this code should not be compiled for release)
 #endif //ASSERT_INSANE_OUTPUT
 
-    total_bounding_box.include(Point3(x, y, z));
-
     if (extrusion_mm3_per_mm < 0)
         logWarning("Warning! Negative extrusion move!");
 
@@ -563,7 +342,11 @@ void GCodeExport::writeMove(int x, int y, int z, double speed, double extrusion_
         return;
     }
 
-    double extrusion_per_mm = mm3ToE(extrusion_mm3_per_mm);
+    double extrusion_per_mm = extrusion_mm3_per_mm;
+    if (!is_volumatric)
+    {
+        extrusion_per_mm = extrusion_mm3_per_mm / extruder_attr[current_extruder].filament_area;
+    }
 
     Point gcode_pos = getGcodePos(x,y, current_extruder);
 
@@ -572,30 +355,30 @@ void GCodeExport::writeMove(int x, int y, int z, double speed, double extrusion_
         Point3 diff = Point3(x,y,z) - getPosition();
         if (isZHopped > 0)
         {
-            *output_stream << "G1 Z" << MMtoStream{currentPosition.z} << new_line;
+            *output_stream << std::setprecision(3) << "G1 Z" << INT2MM(currentPosition.z) << "\n";
             isZHopped = 0;
         }
         double prime_volume = extruder_attr[current_extruder].prime_volume;
-        current_e_value += mm3ToE(prime_volume);
+        current_e_value += (is_volumatric) ? prime_volume : prime_volume / extruder_attr[current_extruder].filament_area;   
         if (extruder_attr[current_extruder].retraction_e_amount_current)
         {
             if (firmware_retract)
             { // note that BFB is handled differently
-                *output_stream << "G11" << new_line;
+                *output_stream << "G11\n";
                 //Assume default UM2 retraction settings.
                 if (prime_volume > 0)
                 {
-                    *output_stream << "G1 F" << PrecisionedDouble{1, extruder_attr[current_extruder].last_retraction_prime_speed * 60} << " " << extruder_attr[current_extruder].extruderCharacter << PrecisionedDouble{5, current_e_value} << new_line;
+                    *output_stream << "G1 F" << (extruder_attr[current_extruder].last_retraction_prime_speed * 60) << " " << extruder_attr[current_extruder].extruderCharacter << std::setprecision(5) << current_e_value << "\n";
                     currentSpeed = extruder_attr[current_extruder].last_retraction_prime_speed;
                 }
-                estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), eToMm(current_e_value)), 25.0);
+                estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), current_e_value), 25.0);
             }
             else
             {
                 current_e_value += extruder_attr[current_extruder].retraction_e_amount_current;
-                *output_stream << "G1 F" << PrecisionedDouble{1, extruder_attr[current_extruder].last_retraction_prime_speed * 60} << " " << extruder_attr[current_extruder].extruderCharacter << PrecisionedDouble{5, current_e_value} << new_line;
+                *output_stream << "G1 F" << (extruder_attr[current_extruder].last_retraction_prime_speed * 60) << " " << extruder_attr[current_extruder].extruderCharacter << std::setprecision(5) << current_e_value << "\n";
                 currentSpeed = extruder_attr[current_extruder].last_retraction_prime_speed;
-                estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), eToMm(current_e_value)), currentSpeed);
+                estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), current_e_value), currentSpeed);
             }
             if (getCurrentExtrudedVolume() > 10000.0) //According to https://github.com/Ultimaker/CuraEngine/issues/14 having more then 21m of extrusion causes inaccuracies. So reset it every 10m, just to be sure.
             {
@@ -605,9 +388,10 @@ void GCodeExport::writeMove(int x, int y, int z, double speed, double extrusion_
         }
         else if (prime_volume > 0.0)
         {
-            *output_stream << "G1 F" << PrecisionedDouble{1, extruder_attr[current_extruder].last_retraction_prime_speed * 60} << " " << extruder_attr[current_extruder].extruderCharacter << PrecisionedDouble{5, current_e_value} << new_line;
+            current_e_value += prime_volume;
+            *output_stream << "G1 F" << (extruder_attr[current_extruder].last_retraction_prime_speed * 60) << " " << extruder_attr[current_extruder].extruderCharacter << std::setprecision(5) << current_e_value << "\n";
             currentSpeed = extruder_attr[current_extruder].last_retraction_prime_speed;
-            estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), eToMm(current_e_value)), currentSpeed);
+            estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), current_e_value), currentSpeed);
         }
         extruder_attr[current_extruder].prime_volume = 0.0;
         current_e_value += extrusion_per_mm * diff.vSizeMM();
@@ -617,56 +401,55 @@ void GCodeExport::writeMove(int x, int y, int z, double speed, double extrusion_
     {
         *output_stream << "G0";
 
-        CommandSocket::sendLineTo(extruder_attr[current_extruder].retraction_e_amount_current ? PrintFeatureType::MoveRetraction : PrintFeatureType::MoveCombing, Point(x, y), extruder_attr[current_extruder].retraction_e_amount_current ? MM2INT(0.2) : MM2INT(0.1));
+        if (CommandSocket::isInstantiated()) 
+        {
+            // we should send this travel as a non-retraction move
+            cura::Polygons travelPoly;
+            PolygonRef travel = travelPoly.newPoly();
+            travel.add(Point(currentPosition.x, currentPosition.y));
+            travel.add(Point(x, y));
+            CommandSocket::getInstance()->sendPolygons(extruder_attr[current_extruder].retraction_e_amount_current ? PrintFeatureType::MoveRetraction : PrintFeatureType::MoveCombing, layer_nr, travelPoly, extruder_attr[current_extruder].retraction_e_amount_current ? MM2INT(0.2) : MM2INT(0.1));
+        }
     }
 
     if (currentSpeed != speed)
     {
-        *output_stream << " F" << PrecisionedDouble{1, speed * 60};
+        *output_stream << " F" << (speed * 60);
         currentSpeed = speed;
     }
 
-    *output_stream << " X" << MMtoStream{gcode_pos.X} << " Y" << MMtoStream{gcode_pos.Y};
+    *output_stream << std::setprecision(3) << 
+        " X" << INT2MM(gcode_pos.X) << 
+        " Y" << INT2MM(gcode_pos.Y);
     if (z != currentPosition.z + isZHopped)
-    {
-        *output_stream << " Z" << MMtoStream{z + isZHopped};
-    }
+        *output_stream << " Z" << INT2MM(z + isZHopped);
     if (extrusion_mm3_per_mm > 0.000001)
-        *output_stream << " " << extruder_attr[current_extruder].extruderCharacter << PrecisionedDouble{5, current_e_value};
-    *output_stream << new_line;
+        *output_stream << " " << extruder_attr[current_extruder].extruderCharacter << std::setprecision(5) << current_e_value;
+    *output_stream << "\n";
     
     currentPosition = Point3(x, y, z);
-    estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), eToMm(current_e_value)), speed);
+    estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), current_e_value), speed);
 }
 
-void GCodeExport::writeRetraction(RetractionConfig* config, bool force, bool extruder_switch)
+void GCodeExport::writeRetraction(RetractionConfig* config, bool force)
 {
-    ExtruderTrainAttributes& extr_attr = extruder_attr[current_extruder];
-
     if (flavor == EGCodeFlavor::BFB)//BitsFromBytes does automatic retraction.
     {
-        if (extruder_switch)
-        {
-            if (!extr_attr.retraction_e_amount_current)
-                *output_stream << "M103" << new_line;
-
-            extr_attr.retraction_e_amount_current = 1.0; // 1.0 is a stub; BFB doesn't use the actual retracted amount; retraction is performed by firmware
-        }
         return;
     }
-
-    double old_retraction_e_amount = extr_attr.retraction_e_amount_current;
-    double new_retraction_e_amount = mmToE(config->distance);
-    double retraction_diff_e_amount = old_retraction_e_amount - new_retraction_e_amount;
-    if (std::abs(retraction_diff_e_amount) < 0.000001)
+    if (extruder_attr[current_extruder].retraction_e_amount_current == config->distance * ((is_volumatric)? extruder_attr[current_extruder].filament_area : 1.0))
+    {
+        return;
+    }
+    if (config->distance <= 0)
     {
         return;
     }
 
     { // handle retraction limitation
         double current_extruded_volume = getCurrentExtrudedVolume();
-        std::deque<double>& extruded_volume_at_previous_n_retractions = extr_attr.extruded_volume_at_previous_n_retractions;
-        while (int(extruded_volume_at_previous_n_retractions.size()) > config->retraction_count_max && !extruded_volume_at_previous_n_retractions.empty()) 
+        std::deque<double>& extruded_volume_at_previous_n_retractions = extruder_attr[current_extruder].extruded_volume_at_previous_n_retractions;
+        while (int(extruded_volume_at_previous_n_retractions.size()) >= config->retraction_count_max && !extruded_volume_at_previous_n_retractions.empty()) 
         {
             // extruder switch could have introduced data which falls outside the retraction window
             // also the retraction_count_max could have changed between the last retraction and this
@@ -676,144 +459,127 @@ void GCodeExport::writeRetraction(RetractionConfig* config, bool force, bool ext
         {
             return;
         }
-        if (!force && int(extruded_volume_at_previous_n_retractions.size()) == config->retraction_count_max
-            && current_extruded_volume < extruded_volume_at_previous_n_retractions.back() + config->retraction_extrusion_window * extr_attr.filament_area) 
+        if (!force && int(extruded_volume_at_previous_n_retractions.size()) == config->retraction_count_max - 1 
+            && current_extruded_volume < extruded_volume_at_previous_n_retractions.back() + config->retraction_extrusion_window * extruder_attr[current_extruder].filament_area) 
         {
             return;
         }
         extruded_volume_at_previous_n_retractions.push_front(current_extruded_volume);
-        if (int(extruded_volume_at_previous_n_retractions.size()) == config->retraction_count_max + 1) 
+        if (int(extruded_volume_at_previous_n_retractions.size()) == config->retraction_count_max) 
         {
             extruded_volume_at_previous_n_retractions.pop_back();
         }
     }
-
+    
+    extruder_attr[current_extruder].last_retraction_prime_speed = config->primeSpeed;
+    
+    double retraction_e_amount = config->distance * ((is_volumatric)? extruder_attr[current_extruder].filament_area : 1.0);
     if (firmware_retract)
     {
-        if (extruder_switch && extr_attr.retraction_e_amount_current) 
-        {
-            return; 
-        }
-        *output_stream << "G10";
-        if (extruder_switch)
-        {
-            *output_stream << " S1";
-        }
-        *output_stream << new_line;
+        *output_stream << "G10\n";
         //Assume default UM2 retraction settings.
-        estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), eToMm(current_e_value + retraction_diff_e_amount)), 25); // TODO: hardcoded values!
+        estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), current_e_value - retraction_e_amount), 25); // TODO: hardcoded values!
     }
     else
     {
-        double speed = ((retraction_diff_e_amount < 0.0)? config->speed : extr_attr.last_retraction_prime_speed) * 60;
-        current_e_value += retraction_diff_e_amount;
-        *output_stream << "G1 F" << PrecisionedDouble{1, speed} << " "
-            << extr_attr.extruderCharacter << PrecisionedDouble{5, current_e_value} << new_line;
-        currentSpeed = speed;
-        estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), eToMm(current_e_value)), currentSpeed);
-        extr_attr.last_retraction_prime_speed = config->primeSpeed;
+        current_e_value -= retraction_e_amount;
+        *output_stream << "G1 F" << (config->speed * 60) << " " << extruder_attr[current_extruder].extruderCharacter << std::setprecision(5) << current_e_value << "\n";
+        currentSpeed = config->speed;
+        estimateCalculator.plan(TimeEstimateCalculator::Position(INT2MM(currentPosition.x), INT2MM(currentPosition.y), INT2MM(currentPosition.z), current_e_value), currentSpeed);
     }
 
-    extr_attr.retraction_e_amount_current = new_retraction_e_amount; // suppose that for UM2 the retraction amount in the firmware is equal to the provided amount
-    extr_attr.prime_volume += config->prime_volume;
-
-}
-
-void GCodeExport::writeZhopStart(int hop_height)
-{
-    if (hop_height > 0)
+    extruder_attr[current_extruder].retraction_e_amount_current = retraction_e_amount ;
+    extruder_attr[current_extruder].prime_volume += config->prime_volume;
+    
+    if (config->zHop > 0)
     {
-        isZHopped = hop_height;
-        *output_stream << "G1 Z" << MMtoStream{currentPosition.z + isZHopped} << new_line;
-        total_bounding_box.include(currentPosition + Point3(0, 0, isZHopped));
+        isZHopped = config->zHop;
+        *output_stream << std::setprecision(3) << "G1 Z" << INT2MM(currentPosition.z + isZHopped) << "\n";
     }
 }
 
-void GCodeExport::writeZhopEnd()
+void GCodeExport::writeRetraction_extruderSwitch()
 {
-    if (isZHopped)
+    if (flavor == EGCodeFlavor::BFB)
     {
-        isZHopped = 0;
-        *output_stream << "G1 Z" << MMtoStream{currentPosition.z} << new_line;
-    }
-}
+        if (!extruder_attr[current_extruder].retraction_e_amount_current)
+            *output_stream << "M103\r\n";
 
-void GCodeExport::startExtruder(int new_extruder)
-{
-    if (new_extruder != current_extruder) // wouldn't be the case on the very first extruder start if it's extruder 0
+        extruder_attr[current_extruder].retraction_e_amount_current = 1.0; // 1.0 is a stub; BFB doesn't use the actual retracted amount; retraction is performed by firmware
+        return;
+    }
+
+    double retraction_e_amount = extruder_attr[current_extruder].extruder_switch_retraction_distance * ((is_volumatric)? extruder_attr[current_extruder].filament_area : 1.0);
+    if (extruder_attr[current_extruder].retraction_e_amount_current == retraction_e_amount)
     {
-        if (flavor == EGCodeFlavor::MAKERBOT)
+        return; 
+    }
+
+    double current_extruded_volume = getCurrentExtrudedVolume();
+    std::deque<double>& extruded_volume_at_previous_n_retractions = extruder_attr[current_extruder].extruded_volume_at_previous_n_retractions;
+    extruded_volume_at_previous_n_retractions.push_front(current_extruded_volume);
+
+    if (firmware_retract)
+    {
+        if (extruder_attr[current_extruder].retraction_e_amount_current) 
         {
-            *output_stream << "M135 T" << new_extruder << new_line;
-        }
-        else
-        {
-            *output_stream << "T" << new_extruder << new_line;
+            return; 
         }
+        *output_stream << "G10 S1\n";
     }
-
-    current_extruder = new_extruder;
-
-    assert(getCurrentExtrudedVolume() == 0.0 && "Just after an extruder switch we haven't extruded anything yet!");
-    resetExtrusionValue(); // zero the E value on the new extruder, just to be sure
-
-    writeCode(extruder_attr[new_extruder].start_code.c_str());
-    CommandSocket::setExtruderForSend(new_extruder);
-    CommandSocket::setSendCurrentPosition( getPositionXY() );
-
-    //Change the Z position so it gets re-writting again. We do not know if the switch code modified the Z position.
-    currentPosition.z += 1;
+    else
+    {
+        current_e_value -= retraction_e_amount;
+        *output_stream << "G1 F" << (extruder_attr[current_extruder].extruderSwitchRetractionSpeed * 60) << " " 
+            << extruder_attr[current_extruder].extruderCharacter << std::setprecision(5) << current_e_value << "\n";
+            // the E value of the extruder switch retraction 'overwrites' the E value of the normal retraction
+        currentSpeed = extruder_attr[current_extruder].extruderSwitchRetractionSpeed;
+        extruder_attr[current_extruder].last_retraction_prime_speed = extruder_attr[current_extruder].extruderSwitchPrimeSpeed;
+    }
+    extruder_attr[current_extruder].retraction_e_amount_current = retraction_e_amount; // suppose that for UM2 the retraction amount in the firmware is equal to the provided amount
 }
 
-void GCodeExport::switchExtruder(int new_extruder, const RetractionConfig& retraction_config_old_extruder)
+void GCodeExport::switchExtruder(int new_extruder)
 {
     if (current_extruder == new_extruder)
         return;
 
-    bool force = true;
-    bool extruder_switch = true;
-    writeRetraction(&const_cast<RetractionConfig&>(retraction_config_old_extruder), force, extruder_switch);
+    writeRetraction_extruderSwitch();
 
-    resetExtrusionValue(); // zero the E value on the old extruder, so that the current_e_value is registered on the old extruder
+    resetExtrusionValue(); // should be called on the old extruder
 
     int old_extruder = current_extruder;
+    current_extruder = new_extruder;
 
+    if (flavor == EGCodeFlavor::MACH3)
+    {
+        resetExtrusionValue(); // also zero the E value on the new extruder
+    }
+    
     writeCode(extruder_attr[old_extruder].end_code.c_str());
-
-    startExtruder(new_extruder);
+    if (flavor == EGCodeFlavor::MAKERBOT)
+    {
+        *output_stream << "M135 T" << current_extruder << "\n";
+    }
+    else
+    {
+        *output_stream << "T" << current_extruder << "\n";
+    }
+    writeCode(extruder_attr[new_extruder].start_code.c_str());
+    
+    //Change the Z position so it gets re-writting again. We do not know if the switch code modified the Z position.
+    currentPosition.z += 1;
 }
 
 void GCodeExport::writeCode(const char* str)
 {
-    *output_stream << str << new_line;
-}
-
-void GCodeExport::writePrimeTrain(double travel_speed)
-{
-    if (extruder_attr[current_extruder].is_primed)
-    { // extruder is already primed once!
-        return;
-    }
-    Point3 prime_pos = extruder_attr[current_extruder].prime_pos;
-    if (!extruder_attr[current_extruder].prime_pos_is_abs)
-    {
-        prime_pos += currentPosition;
-    }
-    writeMove(prime_pos, travel_speed, 0.0);
-
-    if (flavor == EGCodeFlavor::GRIFFIN)
-    {
-        *output_stream << "G280" << new_line;
-    }
+    *output_stream << str;
+    if (flavor == EGCodeFlavor::BFB)
+        *output_stream << "\r\n";
     else
-    {
-        // there is no prime gcode for other firmware versions...
-    }
-
-    extruder_attr[current_extruder].is_primed = true;
+        *output_stream << "\n";
 }
 
-
 void GCodeExport::writeFanCommand(double speed)
 {
     if (currentFanSpeed == speed)
@@ -821,16 +587,16 @@ void GCodeExport::writeFanCommand(double speed)
     if (speed > 0)
     {
         if (flavor == EGCodeFlavor::MAKERBOT)
-            *output_stream << "M126 T0" << new_line; //value = speed * 255 / 100 // Makerbot cannot set fan speed...;
+            *output_stream << "M126 T0\n"; //value = speed * 255 / 100 // Makerbot cannot set fan speed...;
         else
-            *output_stream << "M106 S" << PrecisionedDouble{1, speed * 255 / 100} << new_line;
+            *output_stream << "M106 S" << (speed * 255 / 100) << "\n";
     }
     else
     {
         if (flavor == EGCodeFlavor::MAKERBOT)
-            *output_stream << "M127 T0" << new_line;
+            *output_stream << "M127 T0\n";
         else
-            *output_stream << "M107" << new_line;
+            *output_stream << "M107\n";
     }
     currentFanSpeed = speed;
 }
@@ -839,91 +605,32 @@ void GCodeExport::writeTemperatureCommand(int extruder, double temperature, bool
 {
     if (!wait && extruder_attr[extruder].currentTemperature == temperature)
         return;
-
-    if (flavor == EGCodeFlavor::ULTIGCODE)
-    { // The UM2 family doesn't support temperature commands (they are fixed in the firmware)
-        return;
-    }
-
+    
     if (wait)
         *output_stream << "M109";
     else
         *output_stream << "M104";
     if (extruder != current_extruder)
         *output_stream << " T" << extruder;
-#ifdef ASSERT_INSANE_OUTPUT
-    assert(temperature >= 0);
-#endif // ASSERT_INSANE_OUTPUT
-    *output_stream << " S" << PrecisionedDouble{1, temperature} << new_line;
+    *output_stream << " S" << temperature << "\n";
     extruder_attr[extruder].currentTemperature = temperature;
 }
 
 void GCodeExport::writeBedTemperatureCommand(double temperature, bool wait)
 {
-    if (flavor == EGCodeFlavor::ULTIGCODE)
-    { // The UM2 family doesn't support temperature commands (they are fixed in the firmware)
-        return;
-    }
-
     if (wait)
         *output_stream << "M190 S";
     else
         *output_stream << "M140 S";
-    *output_stream << PrecisionedDouble{1, temperature} << new_line;
+    *output_stream << temperature << "\n";
 }
 
-void GCodeExport::writeAcceleration(double acceleration)
-{
-    if (current_acceleration != acceleration)
-    {
-        *output_stream << "M204 S" << PrecisionedDouble{0, acceleration} << new_line; // Print and Travel acceleration
-        current_acceleration = acceleration;
-        estimateCalculator.setAcceleration(acceleration);
-    }
-}
-
-void GCodeExport::writeJerk(double jerk)
-{
-    if (current_jerk != jerk)
-    {
-        if (getFlavor() == EGCodeFlavor::REPETIER)
-        {
-            *output_stream << "M207 X";
-        }
-        else
-        {
-            *output_stream << "M205 X";
-        }
-        *output_stream << PrecisionedDouble{2, jerk} << new_line;
-        current_jerk = jerk;
-        estimateCalculator.setMaxXyJerk(jerk);
-    }
-}
-
-void GCodeExport::writeMaxZFeedrate(double max_z_feedrate)
-{
-    if (current_max_z_feedrate != max_z_feedrate)
-    {
-        *output_stream << "M203 Z" << int(max_z_feedrate * 60) << new_line;
-        current_max_z_feedrate = max_z_feedrate;
-        estimateCalculator.setMaxZFeedrate(max_z_feedrate);
-    }
-}
-
-double GCodeExport::getCurrentMaxZFeedrate()
-{
-    return current_max_z_feedrate;
-}
-
-void GCodeExport::finalize(const char* endCode)
+void GCodeExport::finalize(double moveSpeed, const char* endCode)
 {
     writeFanCommand(0);
     writeCode(endCode);
-    long print_time = getTotalPrintTime();
-    int mat_0 = getTotalFilamentUsed(0);
-    log("Print time: %d\n", print_time);
-    log("Print time (readable): %dh %dm %ds\n", print_time / 60 / 60, (print_time / 60) % 60, print_time % 60);
-    log("Filament: %d\n", mat_0);
+    log("Print time: %d\n", int(getTotalPrintTime()));
+    log("Filament: %d\n", int(getTotalFilamentUsed(0)));
     for(int n=1; n<MAX_EXTRUDERS; n++)
         if (getTotalFilamentUsed(n) > 0)
             log("Filament%d: %d\n", n + 1, int(getTotalFilamentUsed(n)));

src/gcodeExport.h

@@ -6,30 +6,127 @@
 #include <deque> // for extrusionAmountAtPreviousRetractions
 #include <sstream> // for stream.str()
 
-#include "settings/settings.h"
+#include "settings.h"
 #include "utils/intpoint.h"
 #include "utils/NoCopy.h"
 #include "timeEstimate.h"
 #include "MeshGroup.h"
 #include "commandSocket.h"
-#include "RetractionConfig.h"
 
 namespace cura {
 
-/*!
- * Coasting configuration used during printing.
- * Can differ per extruder.
- * 
- * Might be used in the future to have different coasting per feature, e.g. outer wall only.
- */
 struct CoastingConfig
 {
-    bool coasting_enable; //!< Whether coasting is enabled on the extruder to which this config is attached 
-    double coasting_volume; //!< The volume leeked when printing without feeding
-    double coasting_speed; //!< A modifier (0-1) on the last used travel speed to move slower during coasting
-    double coasting_min_volume;  //!< The minimal volume printed to build up enough pressure to leek the coasting_volume
+    bool coasting_enable; 
+    double coasting_volume; 
+    double coasting_speed; 
+    double coasting_min_volume; 
+};
+    
+class RetractionConfig
+{
+public:
+    double distance; //!< The distance retracted (in mm)
+    double speed; //!< The speed with which to retract (in mm/s)
+    double primeSpeed; //!< the speed with which to unretract (in mm/s)
+    double prime_volume; //!< the amount of material primed after unretracting (in mm^3)
+    int zHop; //!< the amount with which to lift the head during a retraction-travel
+    int retraction_min_travel_distance; //!< 
+    double retraction_extrusion_window; //!< in mm
+    int retraction_count_max;
 };
 
+//The GCodePathConfig is the configuration for moves/extrusion actions. This defines at which width the line is printed and at which speed.
+class GCodePathConfig
+{
+private:
+    double speed_iconic; //!< movement speed (mm/s) specific to this print feature
+    double speed; //!< current movement speed (mm/s) (modified by layer_nr etc.)
+    int line_width; //!< width of the line extruded
+    double flow; //!< extrusion flow in %
+    int layer_thickness; //!< layer height
+    double extrusion_mm3_per_mm;//!< mm^3 filament moved per mm line extruded
+public:
+    PrintFeatureType type; //!< name of the feature type
+    bool spiralize;
+    RetractionConfig *const retraction_config;
+    
+    // GCodePathConfig() : speed(0), line_width(0), extrusion_mm3_per_mm(0.0), name(nullptr), spiralize(false), retraction_config(nullptr) {}
+    GCodePathConfig(RetractionConfig* retraction_config, PrintFeatureType type) : speed_iconic(0), speed(0), line_width(0), extrusion_mm3_per_mm(0.0), type(type), spiralize(false), retraction_config(retraction_config) {}
+    
+    /*!
+     * Initialize some of the member variables.
+     * 
+     * Warning! setLayerHeight still has to be called before this object can be used.
+     */
+    void init(double speed, int line_width, double flow)
+    {
+        speed_iconic = speed;
+        this->speed = speed;
+        this->line_width = line_width;
+        this->flow = flow;
+    }
+
+    /*!
+     * Set the layer height and (re)compute the extrusion_per_mm
+     */
+    void setLayerHeight(int layer_height)
+    {
+        this->layer_thickness = layer_height;
+        calculateExtrusion();
+    }
+    
+    /*!
+     * Set the speed to somewhere between the @p min_speed and the speed_iconic.
+     * 
+     * This functions should not be called with @p layer_nr > @p max_speed_layer !
+     * 
+     * \param min_speed The speed at layer zero
+     * \param layer_nr The layer number 
+     * \param max_speed_layer The layer number for which the speed_iconic should be used.
+     */
+    void smoothSpeed(double min_speed, int layer_nr, double max_speed_layer) 
+    {
+        speed = (speed_iconic*layer_nr)/max_speed_layer + (min_speed*(max_speed_layer-layer_nr)/max_speed_layer);
+    }
+
+    /*!
+     * Can only be called after the layer height has been set (which is done while writing the gcode!)
+     */
+    double getExtrusionMM3perMM()
+    {
+        return extrusion_mm3_per_mm;
+    }
+    
+    /*!
+     * Get the movement speed in mm/s
+     */
+    double getSpeed()
+    {
+        return speed;
+    }
+    
+    int getLineWidth()
+    {
+        return line_width;
+    }
+    
+    bool isTravelPath()
+    {
+        return line_width == 0;
+    }
+    
+    double getFlowPercentage()
+    {
+        return flow;
+    }
+    
+private:
+    void calculateExtrusion()
+    {
+        extrusion_mm3_per_mm = INT2MM(line_width) * INT2MM(layer_thickness) * double(flow) / 100.0;
+    }
+};
 
 //The GCodeExport class writes the actual GCode. This is the only class that knows how GCode looks and feels.
 //  Any customizations on GCodes flavors are done in this class.
@@ -38,23 +135,18 @@ class GCodeExport : public NoCopy
 private:
     struct ExtruderTrainAttributes
     {
-        Point3 prime_pos; //!< The location this nozzle is primed before printing
-        bool prime_pos_is_abs; //!< Whether the prime position is absolute, rather than relative to the last given position
-        bool is_primed; //!< Whether this extruder has currently already been primed in this print
-
-        bool is_used; //!< Whether this extruder train is actually used during the printing of all meshgroups
-        int nozzle_size; //!< The nozzle size label of the nozzle (e.g. 0.4mm; irrespective of tolerances)
         Point nozzle_offset;
         char extruderCharacter;
-        std::string material_guid; //!< The GUID for the material used by this extruder
-
         std::string start_code;
         std::string end_code;
         double filament_area; //!< in mm^2 for non-volumetric, cylindrical filament
 
+        double extruder_switch_retraction_distance; //<! extruder switch retraction distance in mm
+        int extruderSwitchRetractionSpeed; //!< extruder switch retraction speed in mm/s
+        int extruderSwitchPrimeSpeed; //!< prime speed of extruder switch in mm/s
+
         double totalFilament; //!< total filament used per extruder in mm^3
         int currentTemperature;
-        int initial_temp; //!< Temperature this nozzle needs to be at the start of the print.
 
         double retraction_e_amount_current; //!< The current retracted amount (in mm or mm^3), or zero(i.e. false) if it is not currently retracted (positive values mean retracted amount, so negative impact on E values)
         double retraction_e_amount_at_e_start; //!< The ExtruderTrainAttributes::retraction_amount_current value at E0, i.e. the offset (in mm or mm^3) from E0 to the situation where the filament is at the tip of the nozzle.
@@ -65,127 +157,56 @@ private:
         std::deque<double> extruded_volume_at_previous_n_retractions; // in mm^3
 
         ExtruderTrainAttributes()
-        : prime_pos(0, 0, 0)
-        , prime_pos_is_abs(false)
-        , is_primed(false)
-        , is_used(false)
-        , nozzle_offset(0,0)
+        : nozzle_offset(0,0)
         , extruderCharacter(0)
         , start_code("")
         , end_code("")
         , filament_area(0)
+        , extruder_switch_retraction_distance(0.0)
+        , extruderSwitchRetractionSpeed(0)
+        , extruderSwitchPrimeSpeed(0)
         , totalFilament(0)
         , currentTemperature(0)
-        , initial_temp(0)
         , retraction_e_amount_current(0.0)
         , retraction_e_amount_at_e_start(0.0)
         , prime_volume(0.0)
-        , last_retraction_prime_speed(0.0)
+        , last_retraction_prime_speed(1.0)
         { }
     };
     ExtruderTrainAttributes extruder_attr[MAX_EXTRUDERS];
-    unsigned int extruder_count;
     bool use_extruder_offset_to_offset_coords;
-    Point3 machine_dimensions;
-    std::string machine_name;
-
+    
     std::ostream* output_stream;
-    std::string new_line;
-
     double current_e_value; //!< The last E value written to gcode (in mm or mm^3)
     Point3 currentPosition;
     double currentSpeed; //!< The current speed (F values / 60) in mm/s
-    double current_acceleration; //!< The current acceleration in the XY direction (in mm/s^2)
-    double current_jerk; //!< The current jerk in the XY direction (in mm/s^3)
-    double current_max_z_feedrate; //!< The current max z speed
-
-    AABB3D total_bounding_box; //!< The bounding box of all g-code.
-
-    /*!
-     * The z position to be used on the next xy move, if the head wasn't in the correct z position yet.
-     * 
-     * \see GCodeExport::writeMove(Point, double, double)
-     * 
-     * \note After GCodeExport::writeMove(Point, double, double) has been called currentPosition.z coincides with this value
-     */
-    int current_layer_z;
+    int zPos; // TODO: why is this different from currentPosition.z ? zPos is set every layer, while currentPosition.z is set every move. However, the z position is generally not changed within a layer!
     int isZHopped; //!< The amount by which the print head is currently z hopped, or zero if it is not z hopped. (A z hop is used during travel moves to avoid collision with other layer parts)
 
     int current_extruder;
     int currentFanSpeed;
     EGCodeFlavor flavor;
 
-    double totalPrintTime; //!< The total estimated print time in seconds
+    double totalPrintTime;
     TimeEstimateCalculator estimateCalculator;
     
     bool is_volumatric;
     bool firmware_retract; //!< whether retractions are done in the firmware, or hardcoded in E values.
 
     unsigned int layer_nr; //!< for sending travel data
-
-    int initial_bed_temp; //!< bed temperature at the beginning of the print.
-protected:
-    /*!
-     * Convert an E value to a value in mm (if it wasn't already in mm) for the current extruder.
-     * 
-     * E values are either in mm or in mm^3
-     * The current extruder is used to determine the filament area to make the conversion.
-     * 
-     * \param e the value to convert
-     * \return the value converted to mm
-     */
-    double eToMm(double e);
-
-    /*!
-     * Convert a volume value to an E value (which might be volumetric as well) for the current extruder.
-     * 
-     * E values are either in mm or in mm^3
-     * The current extruder is used to determine the filament area to make the conversion.
-     * 
-     * \param mm3 the value to convert
-     * \return the value converted to mm or mm3 depending on whether the E axis is volumetric
-     */
-    double mm3ToE(double mm3);
-
-    /*!
-     * Convert a distance value to an E value (which might be linear/distance based as well) for the current extruder.
-     * 
-     * E values are either in mm or in mm^3
-     * The current extruder is used to determine the filament area to make the conversion.
-     * 
-     * \param mm the value to convert
-     * \return the value converted to mm or mm3 depending on whether the E axis is volumetric
-     */
-    double mmToE(double mm);
-
+    
 public:
     
     GCodeExport();
     ~GCodeExport();
-
-    /*!
-     * Get the gcode file header (e.g. ";FLAVOR:UltiGCode\n")
-     * 
-     * \param print_time The total print time in seconds of the whole gcode (if known)
-     * \param filament_used The total mm^3 filament used for each extruder or a vector of the wrong size of unknown
-     * \param mat_ids The material GUIDs for each material.
-     * \return The string representing the file header
-     */
-    std::string getFileHeader(const double* print_time = nullptr, const std::vector<double>& filament_used = std::vector<double>(), const std::vector<std::string>& mat_ids = std::vector<std::string>());
-
+    
     void setLayerNr(unsigned int layer_nr);
     
     void setOutputStream(std::ostream* stream);
-
-    bool getExtruderIsUsed(const int extruder_nr) const; //!< Returns whether the extruder with the given index is used up until the current meshgroup
-
-    int getNozzleSize(const int extruder_nr) const;
-
-    Point getExtruderOffset(const int id) const;
-
-    std::string getMaterialGUID(const int extruder_nr) const; //!< returns the GUID of the material used for the nozzle with id \p extruder_nr
-
-    Point getGcodePos(const int64_t x, const int64_t y, const int extruder_train) const;
+    
+    Point getExtruderOffset(int id);
+    
+    Point getGcodePos(int64_t x, int64_t y, int extruder_train);
     
     void setFlavor(EGCodeFlavor flavor);
     EGCodeFlavor getFlavor();
@@ -208,35 +229,16 @@ public:
     void setFilamentDiameter(unsigned int n, int diameter);
     
     double getCurrentExtrudedVolume();
+    
+    double getTotalFilamentUsed(int e);
 
-    /*!
-     * Get the total extruded volume for a specific extruder in mm^3
-     * 
-     * Retractions and unretractions don't contribute to this.
-     * 
-     * \param extruder_nr The extruder number for which to get the total netto extruded volume
-     * \return total filament printed in mm^3
-     */
-    double getTotalFilamentUsed(int extruder_nr);
-
-    /*!
-     * Get the total estimated print time in seconds
-     * 
-     * \return total print time in seconds
-     */
     double getTotalPrintTime();
     void updateTotalPrintTime();
     void resetTotalPrintTimeAndFilament();
     
     void writeComment(std::string comment);
+    void writeTypeComment(const char* type);
     void writeTypeComment(PrintFeatureType type);
-
-    /*!
-     * Write a comment saying what (estimated) time has passed up to this point
-     * 
-     * \param time The time passed up till this point
-     */
-    void writeTimeComment(const double time);
     void writeLayerComment(int layer_nr);
     void writeLayerCountComment(int layer_count);
     
@@ -251,126 +253,53 @@ public:
     
     void writeDelay(double timeAmount);
     
-    void writeMove(Point p, double speed, double extrusion_mm3_per_mm);
+    void writeMove(Point p, double speed, double extrusion_per_mm);
     
-    void writeMove(Point3 p, double speed, double extrusion_mm3_per_mm);
+    void writeMove(Point3 p, double speed, double extrusion_per_mm);
 private:
-    void writeMove(int x, int y, int z, double speed, double extrusion_mm3_per_mm);
+    void writeMove(int x, int y, int z, double speed, double extrusion_per_mm);
     /*!
      * The writeMove when flavor == BFB
      */
-    void writeMoveBFB(int x, int y, int z, double speed, double extrusion_mm3_per_mm);
+    void writeMoveBFB(int x, int y, int z, double speed, double extrusion_per_mm);
 public:
-    void writeRetraction(RetractionConfig* config, bool force = false, bool extruder_switch = false);
-
-    /*!
-     * Start a z hop with the given \p hop_height
-     * 
-     * \param hop_height The height to move above the current layer
-     */
-    void writeZhopStart(int hop_height);
-
-    /*!
-     * End a z hop: go back to the layer height
-     * 
-     */
-    void writeZhopEnd();
-
-    /*!
-     * Start the new_extruder: 
-     * - set new extruder
-     * - zero E value
-     * - write extruder start gcode
-     * 
-     * \param new_extruder The extruder to start with
-     */
-    void startExtruder(int new_extruder);
-
-    /*!
-     * Switch to the new_extruder: 
-     * - perform neccesary retractions
-     * - fiddle with E-values
-     * - write extruder end gcode
-     * - set new extruder
-     * - write extruder start gcode
-     * 
-     * \param new_extruder The extruder to switch to
-     * \param retraction_config_old_extruder The extruder switch retraction config of the old extruder, to perform the extruder switch retraction with.
-     */
-    void switchExtruder(int new_extruder, const RetractionConfig& retraction_config_old_extruder);
-
-    void writeCode(const char* str);
+    void writeRetraction(RetractionConfig* config, bool force=false);
     
-    /*!
-     * Write the gcode for priming the current extruder train so that it can be used.
-     * 
-     * \param travel_speed The travel speed when priming involves a movement
-     */
-    void writePrimeTrain(double travel_speed);
+    void writeRetraction_extruderSwitch();
+    
+    void switchExtruder(int newExtruder);
+    
+    void writeCode(const char* str);
     
     void writeFanCommand(double speed);
     
     void writeTemperatureCommand(int extruder, double temperature, bool wait = false);
     void writeBedTemperatureCommand(double temperature, bool wait = false);
+    
+    void preSetup(MeshGroup* settings)
+    {
+        for(int n=0; n<settings->getSettingAsCount("machine_extruder_count"); n++)
+        {
+            ExtruderTrain* train = settings->getExtruderTrain(n);
+            setFilamentDiameter(n, train->getSettingInMicrons("material_diameter")); 
+            
+            extruder_attr[n].nozzle_offset = Point(train->getSettingInMicrons("machine_nozzle_offset_x"), train->getSettingInMicrons("machine_nozzle_offset_y"));
+            
+            extruder_attr[n].start_code = train->getSettingString("machine_extruder_start_code");
+            extruder_attr[n].end_code = train->getSettingString("machine_extruder_end_code");
+            
+            extruder_attr[n].extruder_switch_retraction_distance = INT2MM(train->getSettingInMicrons("switch_extruder_retraction_amount")); 
+            extruder_attr[n].extruderSwitchRetractionSpeed = train->getSettingInMillimetersPerSecond("switch_extruder_retraction_speed");
+            extruder_attr[n].extruderSwitchPrimeSpeed = train->getSettingInMillimetersPerSecond("switch_extruder_prime_speed");
+        }
 
-    /*!
-     * Write the command for setting the acceleration to a specific value
-     */
-    void writeAcceleration(double acceleration);
-
-    /*!
-     * Write the command for setting the jerk to a specific value
-     */
-    void writeJerk(double jerk);
-
-    /*!
-     * Write the command for setting the maximum z feedrate to a specific value
-     */
-    void writeMaxZFeedrate(double max_z_feedrate);
-
-    /*!
-     * Get the last set max z feedrate value sent in the gcode.
-     * 
-     * Returns a value <= 0 when no value is set.
-     */
-    double getCurrentMaxZFeedrate();
-
-    /*!
-     * Set member variables using the settings in \p settings
-     * 
-     * \param settings The meshgroup to get the global bed temp from and to get the extruder trains from which to get the nozzle temperatures
-     */
-    void preSetup(const MeshGroup* settings);
-
-    /*!
-     * Handle the initial (bed/nozzle) temperatures before any gcode is processed.
-     * These temperatures are set in the pre-print setup in the firmware.
-     * 
-     * See FffGcodeWriter::processStartingCode
-     * 
-     * \param settings The meshgroup to get the global bed temp from and to get the extruder trains from which to get the nozzle temperatures
-     */
-    void setInitialTemps(const MeshGroup& settings);
-
-    /*!
-     * Override or set an initial nozzle temperature as written by GCodeExport::setInitialTemps
-     * This is used primarily during better specification of temperatures in LayerPlanBuffer::insertPreheatCommand
-     * 
-     * \param extruder_nr The extruder number for which to better specify the temp
-     * \param temp The temp at which the nozzle should be at startup
-     */
-    void setInitialTemp(int extruder_nr, double temp);
-
-    /*!
-     * Finish the gcode: turn fans off, write end gcode and flush all gcode left in the buffer.
-     * 
-     * \param endCode The end gcode to be appended at the very end.
-     */
-    void finalize(const char* endCode);
-
+        setFlavor(settings->getSettingAsGCodeFlavor("machine_gcode_flavor"));
+        use_extruder_offset_to_offset_coords = settings->getSettingBoolean("machine_use_extruder_offset_to_offset_coords");
+    }
+    void finalize(double moveSpeed, const char* endCode);
+    
 };
 
 }
 
 #endif//GCODEEXPORT_H
-

src/gcodePlanner.h

@@ -1,26 +1,22 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
 #ifndef GCODE_PLANNER_H
 #define GCODE_PLANNER_H
 
 #include <vector>
 
 #include "gcodeExport.h"
-#include "pathPlanning/Comb.h"
+#include "comb.h"
 #include "utils/polygon.h"
 #include "utils/logoutput.h"
 #include "wallOverlap.h"
 #include "commandSocket.h"
 #include "FanSpeedLayerTime.h"
 #include "SpaceFillType.h"
-#include "GCodePathConfig.h"
 
-#include "utils/optional.h"
 
 namespace cura 
 {
 
 class SliceDataStorage;
-class SliceLayerPart;
 
 /*!
  * A gcode command to insert before a specific path.
@@ -40,9 +36,7 @@ struct NozzleTempInsert
     , extruder(extruder)
     , temperature(temperature)
     , wait(wait)
-    {
-        assert(temperature != 0 && temperature != -1 && "Temperature command must be set!");
-    }
+    {}
     
     /*!
      * Write the temperature command at the current position in the gcode.
@@ -54,29 +48,21 @@ struct NozzleTempInsert
     }
 };
 
-class ExtruderPlan; // forward declaration so that TimeMaterialEstimates can be a friend
-
+class GCodePlanner; // forward declaration so that TimeMaterialEstimates can be a friend
 
 /*!
  * Time and material estimates for a portion of paths, e.g. layer, extruder plan, path.
  */
 class TimeMaterialEstimates
 {
-    friend class ExtruderPlan; // cause there the naive estimates are calculated
+    friend class GCodePlanner;
 private:
-    double extrude_time; //!< Time in seconds occupied by extrusion
-    double unretracted_travel_time; //!< Time in seconds occupied by non-retracted travel (non-extrusion)
-    double retracted_travel_time; //!< Time in seconds occupied by retracted travel (non-extrusion)
-    double material; //!< Material used (in mm^3)
+    double extrude_time; //!< in seconds
+    double unretracted_travel_time; //!< in seconds 
+    double retracted_travel_time; //!< in seconds
+    double material; //!< in mm^3
 public:
-    /*!
-     * Basic contructor
-     * 
-     * \param extrude_time Time in seconds occupied by extrusion
-     * \param unretracted_travel_time Time in seconds occupied by non-retracted travel (non-extrusion)
-     * \param retracted_travel_time Time in seconds occupied by retracted travel (non-extrusion)
-     * \param material Material used (in mm^3)
-     */
+    
     TimeMaterialEstimates(double extrude_time, double unretracted_travel_time, double retracted_travel_time, double material)
     : extrude_time(extrude_time)
     , unretracted_travel_time(unretracted_travel_time)
@@ -84,10 +70,6 @@ public:
     , material(material)
     {
     }
-
-    /*!
-     * Basic constructor initializing all estimates to zero.
-     */
     TimeMaterialEstimates()
     : extrude_time(0.0)
     , unretracted_travel_time(0.0)
@@ -95,7 +77,7 @@ public:
     , material(0.0)
     {
     }
-
+    
     /*!
      * Set all estimates to zero.
      */
@@ -106,24 +88,12 @@ public:
         retracted_travel_time = 0.0;
         material = 0.0;
     }
-
-    /*!
-     * Pointwise addition of estimate stats
-     * 
-     * \param other The estimates to add to these estimates.
-     * \return The resulting estimates
-     */
+    
     TimeMaterialEstimates operator+(const TimeMaterialEstimates& other)
     {
         return TimeMaterialEstimates(extrude_time+other.extrude_time, unretracted_travel_time+other.unretracted_travel_time, retracted_travel_time+other.retracted_travel_time, material+other.material);
     }
-
-    /*!
-     * In place pointwise addition of estimate stats
-     * 
-     * \param other The estimates to add to these estimates.
-     * \return These estimates
-     */
+    
     TimeMaterialEstimates& operator+=(const TimeMaterialEstimates& other)
     {
         extrude_time += other.extrude_time;
@@ -132,7 +102,7 @@ public:
         material += other.material;
         return *this;
     }
-
+    
     /*!
      * \brief Subtracts the specified estimates from these estimates and returns
      * the result.
@@ -143,7 +113,7 @@ public:
      * \return These estimates with the specified estimates subtracted.
      */
     TimeMaterialEstimates operator-(const TimeMaterialEstimates& other);
-
+    
     /*!
      * \brief Subtracts the specified elements from these estimates.
      * 
@@ -154,72 +124,29 @@ public:
      * \return A reference to this instance.
      */
     TimeMaterialEstimates& operator-=(const TimeMaterialEstimates& other);
-
-    /*!
-     * Get total time estimate. The different time estimate member values added together.
-     * 
-     * \return the total of all different time estimate values 
-     */
+    
     double getTotalTime() const
     {
         return extrude_time + unretracted_travel_time + retracted_travel_time;
     }
-
-    /*!
-     * Get the total time during which the head is not retracted.
-     * 
-     * This includes extrusion time and non-retracted travel time
-     * 
-     * \return the total time during which the head is not retracted.
-     */
     double getTotalUnretractedTime() const
     {
         return extrude_time + unretracted_travel_time;
     }
-
-    /*!
-     * Get the total travel time.
-     * 
-     * This includes the retracted travel time as well as the unretracted travel time.
-     * 
-     * \return the total travel time.
-     */
     double getTravelTime() const
     {
         return retracted_travel_time + unretracted_travel_time;
     }
-
-    /*!
-     * Get the extrusion time.
-     * 
-     * \return extrusion time.
-     */
     double getExtrudeTime() const
     {
         return extrude_time;
     }
-
-    /*!
-     * Get the amount of material used in mm^3.
-     * 
-     * \return amount of material
-     */
     double getMaterial() const
     {
         return material;
     }
 };
 
-/*!
- * A class for representing a planned path.
- * 
- * A path consists of several segments of the same type of movement: retracted travel, infill extrusion, etc.
- * 
- * This is a compact premature representation in which are line segments have the same config, i.e. the config of this path.
- * 
- * In the final representation (gcode) each line segment may have different properties, 
- * which are added when the generated GCodePaths are processed.
- */
 class GCodePath
 {
 public:
@@ -227,30 +154,18 @@ public:
     SpaceFillType space_fill_type; //!< The type of space filling of which this path is a part
     float flow; //!< A type-independent flow configuration (used for wall overlap compensation)
     bool retract; //!< Whether the path is a move path preceded by a retraction move; whether the path is a retracted move path. 
-    bool perform_z_hop; //!< Whether to perform a z_hop in this path, which is assumed to be a travel path.
     std::vector<Point> points; //!< The points constituting this path.
     bool done;//!< Path is finished, no more moves should be added, and a new path should be started instead of any appending done to this one.
-
-    bool spiralize; //!< Whether to gradually increment the z position during the printing of this path. A sequence of spiralized paths should start at the given layer height and end in one layer higher.
-
+    
     TimeMaterialEstimates estimates; //!< Naive time and material estimates
-
-    /*!
-     * Whether this config is the config of a travel path.
-     * 
-     * \return Whether this config is the config of a travel path.
-     */
+    
     bool isTravelPath()
     {
         return config->isTravelPath();
     }
-
+    
     /*!
-     * Get the material flow in mm^3 per mm traversed.
-     * 
-     * \warning Can only be called after the layer height has been set (which is done while writing the gcode!)
-     * 
-     * \return The flow
+     * Can only be called after the layer height has been set (which is done while writing the gcode!)
      */
     double getExtrusionMM3perMM()
     {
@@ -267,77 +182,46 @@ public:
     }
 };
 
-class GCodePlanner; // forward declaration so that ExtruderPlan can be a friend
-class LayerPlanBuffer; // forward declaration so that ExtruderPlan can be a friend
-
-/*!
- * An extruder plan contains all planned paths (GCodePath) pertaining to a single extruder train.
- * 
- * It allows for temperature command inserts which can be inserted in between paths.
- */
 class ExtruderPlan
 {
-    friend class GCodePlanner; // TODO: GCodePlanner still does a lot which should actually be handled in this class.
-    friend class LayerPlanBuffer; // TODO: LayerPlanBuffer handles paths directly
-protected:
-    std::vector<GCodePath> paths; //!< The paths planned for this extruder
-    std::list<NozzleTempInsert> inserts; //!< The nozzle temperature command inserts, to be inserted in between paths
-
-    int extruder; //!< The extruder used for this paths in the current plan.
-    double heated_pre_travel_time; //!< The time at the start of this ExtruderPlan during which the head travels and has a temperature of initial_print_temperature
-    double initial_printing_temperature; //!< The required temperature at the start of this extruder plan.
-    double printing_temperature; //!< The normal temperature for printing this extruder plan. That start and end of this extruder plan may deviate because of the initial and final print temp
-    std::optional<std::list<NozzleTempInsert>::iterator> printing_temperature_command; //!< The command to heat from the printing temperature of this extruder plan to the printing temperature of the next extruder plan (if it has the same extruder).
-    std::optional<double> prev_extruder_standby_temp; //!< The temperature to which to set the previous extruder. Not used if the previous extruder plan was the same extruder.
-
-    TimeMaterialEstimates estimates; //!< Accumulated time and material estimates for all planned paths within this extruder plan.
 public:
-    /*!
-     * Simple contructor.
-     * 
-     * \warning Doesn't set the required temperature yet.
-     * 
-     * \param extruder The extruder number for which this object is a plan.
-     * \param start_position The position the head is when this extruder plan starts
-     */
-    ExtruderPlan(int extruder, Point start_position, int layer_nr, bool is_initial_layer, int layer_thickness, FanSpeedLayerTimeSettings& fan_speed_layer_time_settings, const RetractionConfig& retraction_config);
-
+    std::vector<GCodePath> paths;
+    std::list<NozzleTempInsert> inserts;
+    
+    int extruder; //!< The extruder used for this paths in the current plan.
+    double required_temp;
+    
+    TimeMaterialEstimates estimates;
+    
+    ExtruderPlan(int extruder)
+    : extruder(extruder)
+    , required_temp(-1)
+    {
+    }
+        
     /*!
      * Add a new Insert, constructed with the given arguments
-     * 
-     * \see NozzleTempInsert
-     * 
-     * \param contructor_args The arguments for the constructor of an insert 
      */
     template<typename... Args>
     void insertCommand(Args&&... contructor_args)
     {
         inserts.emplace_back(contructor_args...);
     }
-
+    
     /*!
-     * Insert the inserts into gcode which should be inserted before \p path_idx
-     * 
-     * \param path_idx The index into ExtruderPlan::paths which is currently being consider for temperature command insertion
-     * \param gcode The gcode exporter to which to write the temperature command.
+     * Insert the inserts into gcode which should be inserted before @p path_idx
      */
     void handleInserts(unsigned int& path_idx, GCodeExport& gcode)
-    {
+    {            
         while ( ! inserts.empty() && path_idx >= inserts.front().path_idx)
         { // handle the Insert to be inserted before this path_idx (and all inserts not handled yet)
             inserts.front().write(gcode);
             inserts.pop_front();
         }
     }
-
+    
     /*!
      * Insert all remaining temp inserts into gcode, to be called at the end of an extruder plan
-     * 
-     * Inserts temperature commands which should be inserted _after_ the last path.
-     * Also inserts all temperatures which should have been inserted earlier,
-     * but for which ExtruderPlan::handleInserts hasn't been called correctly.
-     * 
-     * \param gcode The gcode exporter to which to write the temperature command.
      */
     void handleAllRemainingInserts(GCodeExport& gcode)
     { 
@@ -349,120 +233,21 @@ public:
             inserts.pop_front();
         }
     }
-
-    /*!
-     * Applying speed corrections for minimal layer times and determine the fanSpeed. 
-     * 
-     * \param force_minimal_layer_time Whether we should apply speed changes and perhaps a head lift in order to meet the minimal layer time
-     */
-    void processFanSpeedAndMinimalLayerTime(bool force_minimal_layer_time);
-
-    /*!
-     * Set the extrude speed factor. This is used for printing slower than normal.
-     * 
-     * Leaves the extrusion speed as is for values of 1.0
-     * 
-     * \param speedFactor The factor by which to alter the extrusion move speed
-     */
-    void setExtrudeSpeedFactor(double speedFactor);
-
-    /*!
-     * Get the extrude speed factor. This is used for printing slower than normal.
-     * 
-     * \return The factor by which to alter the extrusion move speed
-     */
-    double getExtrudeSpeedFactor();
-
-    /*!
-     * Set the travel speed factor. This is used for performing non-extrusion travel moves slower than normal.
-     * 
-     * Leaves the extrusion speed as is for values of 1.0
-     * 
-     * \param speedFactor The factor by which to alter the non-extrusion move speed
-     */
-    void setTravelSpeedFactor(double speedFactor);
-
-    /*!
-     * Get the travel speed factor. This is used for travelling slower than normal.
-     * 
-     * Limited to at most 1.0
-     * 
-     * \return The factor by which to alter the non-extrusion move speed
-     */
-    double getTravelSpeedFactor();
-
-    /*!
-     * Get the fan speed computed for this extruder plan
-     * 
-     * \warning assumes ExtruderPlan::processFanSpeedAndMinimalLayerTime has already been called
-     * 
-     * \return The fan speed computed in processFanSpeedAndMinimalLayerTime
-     */
-    double getFanSpeed();
-protected:
-
-    Point start_position; //!< The position the print head was at at the start of this extruder plan
-
-    int layer_nr; //!< The layer number at which we are currently printing.
-    bool is_initial_layer; //!< Whether this extruder plan is printed on the very first layer (which might be raft)
-
-    int layer_thickness; //!< The thickness of this layer in Z-direction
-
-    FanSpeedLayerTimeSettings& fan_speed_layer_time_settings; //!< The fan speed and layer time settings used to limit this extruder plan
-
-    const RetractionConfig& retraction_config; //!< The retraction settings for the extruder of this plan
-
-    double extrudeSpeedFactor; //!< The factor by which to alter the extrusion move speed
-    double travelSpeedFactor; //!< The factor by which to alter the non-extrusion move speed
-
-    double extraTime; //!< Extra waiting time at the and of this extruder plan, so that the filament can cool
-    double totalPrintTime; //!< The total naive time estimate for this extruder plan
-
-    double fan_speed; //!< The fan speed to be used during this extruder plan
-
-    /*!
-     * Set the fan speed to be used while printing this extruder plan
-     * 
-     * \param fan_speed The speed for the fan
-     */
-    void setFanSpeed(double fan_speed);
-
-    /*!
-     * Force the minimal layer time to hold by slowing down and lifting the head if required.
-     * 
-     */
-    void forceMinimalLayerTime(double minTime, double minimalSpeed, double travelTime, double extrusionTime);
-
-    /*!
-     * Compute naive time estimates (without accounting for slow down at corners etc.) and naive material estimates (without accounting for MergeInfillLines)
-     * and store them in each ExtruderPlan and each GCodePath.
-     * 
-     * \return the total estimates of this layer
-     */
-    TimeMaterialEstimates computeNaiveTimeEstimates();
 };
 
 class LayerPlanBuffer; // forward declaration to prevent circular dependency
-
 /*! 
  * The GCodePlanner class stores multiple moves that are planned.
- * 
- * 
  * It facilitates the combing to keep the head inside the print.
  * It also keeps track of the print time estimate for this planning so speed adjustments can be made for the minimal-layer-time.
- * 
- * A GCodePlanner is also knows as a 'layer plan'.
- * 
  */
 class GCodePlanner : public NoCopy
 {
     friend class LayerPlanBuffer;
-    friend class GCodePlannerTest;
 private:
-    SliceDataStorage& storage; //!< The polygon data obtained from FffPolygonProcessor
+    SliceDataStorage& storage;
 
-    int layer_nr; //!< The layer number of this layer plan
-    int is_initial_layer; //!< Whether this is the first layer (which might be raft)
+    int layer_nr;
     
     int z; 
     
@@ -472,16 +257,23 @@ private:
     Point lastPosition;
     
     std::vector<ExtruderPlan> extruder_plans; //!< should always contain at least one ExtruderPlan
-
-    int last_extruder_previous_layer; //!< The last id of the extruder with which was printed in the previous layer
-    SettingsBaseVirtual* last_planned_extruder_setting_base; //!< The setting base of the last planned extruder.
-    SliceLayerPart* was_inside; //!< The layer part the last planned (extrusion) move was inside (if any)
-    SliceLayerPart* is_inside; //!< The layer part the destination of the next planned travel move is inside (if any)
+    
+    bool was_inside; //!< Whether the last planned (extrusion) move was inside a layer part
+    bool is_inside; //!< Whether the destination of the next planned travel move is inside a layer part
     Polygons comb_boundary_inside; //!< The boundary within which to comb, or to move into when performing a retraction.
     Comb* comb;
 
+    RetractionConfig* last_retraction_config;
+    
+    FanSpeedLayerTimeSettings& fan_speed_layer_time_settings;
 
-    std::vector<FanSpeedLayerTimeSettings>& fan_speed_layer_time_settings_per_extruder;
+    double extrudeSpeedFactor;
+    double travelSpeedFactor;
+    
+    double fan_speed;
+    
+    double extraTime;
+    double totalPrintTime;
     
 private:
     /*!
@@ -491,12 +283,10 @@ private:
      * \param config The config used for the path returned
      * \param space_fill_type The type of space filling which this path employs
      * \param flow (optional) A ratio for the extrusion speed
-     * \param spiralize Whether to gradually increase the z while printing. (Note that this path may be part of a sequence of spiralized paths, forming one polygon)
      * \return A path with the given config which is now the last path in GCodePlanner::paths
      */
-    GCodePath* getLatestPathWithConfig(GCodePathConfig* config, SpaceFillType space_fill_type, float flow = 1.0, bool spiralize = false);
-
-public:
+    GCodePath* getLatestPathWithConfig(GCodePathConfig* config, SpaceFillType space_fill_type, float flow = 1.0);
+    
     /*!
      * Force GCodePlanner::getLatestPathWithConfig to return a new path.
      * 
@@ -508,31 +298,22 @@ public:
      * - when changing extruder, the same travel config is used, but its extruder field is changed.
      */
     void forceNewPathStart();
-
+public:
     /*!
      * 
-     * \param fan_speed_layer_time_settings_per_extruder The fan speed and layer time settings for each extruder.
      * \param travel_avoid_other_parts Whether to avoid other layer parts when travaeling through air.
      * \param travel_avoid_distance The distance by which to avoid other layer parts when traveling through air.
      * \param last_position The position of the head at the start of this gcode layer
-     * \param combing_mode Whether combing is enabled and full or within infill only.
      */
-    GCodePlanner(SliceDataStorage& storage, int layer_nr, int z, int layer_height, Point last_position, int current_extruder, std::vector<FanSpeedLayerTimeSettings>& fan_speed_layer_time_settings_per_extruder, CombingMode combing_mode, int64_t comb_boundary_offset, bool travel_avoid_other_parts, int64_t travel_avoid_distance);
+    GCodePlanner(SliceDataStorage& storage, unsigned int layer_nr, int z, int layer_height, Point last_position, int current_extruder, FanSpeedLayerTimeSettings& fan_speed_layer_time_settings, bool retraction_combing, int64_t comb_boundary_offset, bool travel_avoid_other_parts, int64_t travel_avoid_distance);
     ~GCodePlanner();
 
-    void overrideFanSpeeds(double speed);
-    /*!
-     * Get the settings base of the last extruder planned.
-     * \return the settings base of the last extruder planned.
-     */
-    SettingsBaseVirtual* getLastPlannedExtruderTrainSettings();
 private:
     /*!
      * Compute the boundary within which to comb, or to move into when performing a retraction.
-     * \param combing_mode Whether combing is enabled and full or within infill only.
      * \return the comb_boundary_inside
      */
-    Polygons computeCombBoundaryInside(CombingMode combing_mode);
+    Polygons computeCombBoundaryInside();
 
 public:
     int getLayerNr()
@@ -546,18 +327,19 @@ public:
     }
 
     /*!
-     * return whether the last position planned was inside the mesh (used in combing)
+     * send a polygon through the command socket from the previous point to the given point
      */
-    bool getIsInsideMesh()
+    void sendPolygon(PrintFeatureType print_feature_type, Point from, Point to, int line_width)
     {
-        return was_inside;
-    }
-    /*!
-     * send a line segment through the command socket from the previous point to the given point \p to
-     */
-    void sendLineTo(PrintFeatureType print_feature_type, Point to, int line_width)
-    {
-        CommandSocket::sendLineTo(print_feature_type, to, line_width);
+        if (CommandSocket::isInstantiated()) 
+        {
+            // we should send this travel as a non-retraction move
+            cura::Polygons pathPoly;
+            PolygonRef path = pathPoly.newPoly();
+            path.add(from);
+            path.add(to);
+            CommandSocket::getInstance()->sendPolygons(print_feature_type, layer_nr, pathPoly, line_width);
+        }
     }
 
     /*!
@@ -565,9 +347,8 @@ public:
     * 
     * Features like infill, walls, skin etc. are considered inside.
     * Features like prime tower and support are considered outside.
-    * \param inside_part The part in which the newly planned position is inside, or nullptr if not inside anything
     */
-    void setIsInside(SliceLayerPart* inside_part);
+    void setIsInside(bool going_to_comb);
     
     bool setExtruder(int extruder);
 
@@ -579,7 +360,28 @@ public:
         return extruder_plans.back().extruder;
     }
 
-
+    void setExtrudeSpeedFactor(double speedFactor)
+    {
+        this->extrudeSpeedFactor = speedFactor;
+    }
+    double getExtrudeSpeedFactor()
+    {
+        return this->extrudeSpeedFactor;
+    }
+    void setTravelSpeedFactor(double speedFactor)
+    {
+        if (speedFactor < 1) speedFactor = 1.0;
+        this->travelSpeedFactor = speedFactor;
+    }
+    double getTravelSpeedFactor()
+    {
+        return this->travelSpeedFactor;
+    }
+    
+    void setFanSpeed(double _fan_speed)
+    {
+        fan_speed = _fan_speed;
+    }
     
     /*!
      * Add a travel path to a certain point, retract if needed and when avoiding boundary crossings:
@@ -587,7 +389,7 @@ public:
      * 
      * \param p The point to travel to
      */
-    GCodePath& addTravel(Point p);
+    void addTravel(Point p);
     
     /*!
      * Add a travel path to a certain point and retract if needed.
@@ -597,7 +399,7 @@ public:
      * \param p The point to travel to
      * \param path (optional) The travel path to which to add the point \p p
      */
-    GCodePath& addTravel_simple(Point p, GCodePath* path = nullptr);
+    void addTravel_simple(Point p, GCodePath* path = nullptr);
 
     /*!
      * Add an extrusion move to a certain point, optionally with a different flow than the one in the \p config.
@@ -606,38 +408,12 @@ public:
      * \param config The config with which to extrude
      * \param space_fill_type Of what space filling type this extrusion move is a part
      * \param flow A modifier of the extrusion width which would follow from the \p config
-     * \param spiralize Whether to gradually increase the z while printing. (Note that this path may be part of a sequence of spiralized paths, forming one polygon)
      */
-    void addExtrusionMove(Point p, GCodePathConfig* config, SpaceFillType space_fill_type, float flow = 1.0, bool spiralize = false);
+    void addExtrusionMove(Point p, GCodePathConfig* config, SpaceFillType space_fill_type, float flow = 1.0);
 
-    /*!
-     * Add polygon to the gcode starting at vertex \p startIdx
-     * \param polygon The polygon
-     * \param startIdx The index of the starting vertex of the \p polygon
-     * \param config The config with which to print the polygon lines
-     * \param wall_overlap_computation The wall overlap compensation calculator for each given segment (optionally nullptr)
-     * \param wall_0_wipe_dist The distance to travel along the polygon after it has been laid down, in order to wipe the start and end of the wall together
-     * \param spiralize Whether to gradually increase the z height from the normal layer height to the height of the next layer over this polygon
-     */
-    void addPolygon(PolygonRef polygon, int startIdx, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation = nullptr, coord_t wall_0_wipe_dist = 0, bool spiralize = false);
+    void addPolygon(PolygonRef polygon, int startIdx, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation = nullptr);
 
-    /*!
-     * Add polygons to the gcode with optimized order.
-     * 
-     * When \p spiralize is true, each polygon will gradually increase from a z corresponding to this layer to the z corresponding to the next layer.
-     * Doing this for each polygon means there is a chance for the print head to crash into already printed parts,
-     * but doing it for the last polygon only would mean you are printing half of the layer in non-spiralize mode,
-     * while each layer starts with a different part.
-     * Two towers would result in alternating spiralize and non-spiralize layers.
-     * 
-     * \param polygons The polygons
-     * \param config The config with which to print the polygon lines
-     * \param wall_overlap_computation The wall overlap compensation calculator for each given segment (optionally nullptr)
-     * \param z_seam_type The seam type / poly start optimizer
-     * \param wall_0_wipe_dist The distance to travel along each polygon after it has been laid down, in order to wipe the start and end of the wall together
-     * \param spiralize Whether to gradually increase the z height from the normal layer height to the height of the next layer over each polygon printed
-     */
-    void addPolygonsByOptimizer(Polygons& polygons, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation = nullptr, EZSeamType z_seam_type = EZSeamType::SHORTEST, coord_t wall_0_wipe_dist = 0, bool spiralize = false);
+    void addPolygonsByOptimizer(Polygons& polygons, GCodePathConfig* config, WallOverlapComputation* wall_overlap_computation = nullptr, EZSeamType z_seam_type = EZSeamType::SHORTEST);
 
     /*!
      * Add lines to the gcode with optimized order.
@@ -649,26 +425,25 @@ public:
     void addLinesByOptimizer(Polygons& polygons, GCodePathConfig* config, SpaceFillType space_fill_type, int wipe_dist = 0);
 
     /*!
-     * Compute naive time estimates (without accounting for slow down at corners etc.) and naive material estimates (without accounting for MergeInfillLines)
+     * Compute naive time estimates (without accountign for slow down at corners etc.) and naive material estimates (without accounting for MergeInfillLines)
      * and store them in each ExtruderPlan and each GCodePath.
      * 
-     * \warning This function recomputes values which are already computed if you've called processFanSpeedAndMinimalLayerTime
-     * 
      * \return the total estimates of this layer
      */
     TimeMaterialEstimates computeNaiveTimeEstimates();
     
+    void forceMinimalLayerTime(double minTime, double minimalSpeed, double travelTime, double extrusionTime);
+    
     /*!
      * Write the planned paths to gcode
      * 
      * \param gcode The gcode to write the planned paths to
      */
-    void writeGCode(GCodeExport& gcode);
+    void writeGCode(GCodeExport& gcode, bool liftHeadIfNeeded, int layerThickness);
     
     /*!
-     * Complete all GcodePathConfigs by
-     * - altering speeds to conform to speed_print_layer_0 and
-     *   speed_travel_layer_0
+     * Complete all GcodePathConfig s by 
+     * - altering speed to conform to speed_layer_0
      * - setting the layer_height (and thereby computing the extrusionMM3perMM)
      */
     void completeConfigs();
@@ -705,6 +480,22 @@ public:
      */
     bool writePathWithCoasting(GCodeExport& gcode, unsigned int extruder_plan_idx, unsigned int path_idx, int64_t layerThickness, double coasting_volume, double coasting_speed, double coasting_min_volume);
 
+    /*!
+     * Write a retraction: either an extruder switch retraction or a normal retraction based on the last extrusion paths retraction config.
+     * \param gcode The gcode to write the planned paths to
+     * \param extruder_plan_idx The index of the current extruder plan
+     * \param path_idx_travel_after Index in GCodePlanner::paths to the travel move before which to do the retraction
+     */
+    void writeRetraction(GCodeExport& gcode, unsigned int extruder_plan_idx, unsigned int path_idx_travel_after);
+    
+    /*!
+     * Write a retraction: either an extruder switch retraction or a normal retraction based on the given retraction config.
+     * \param gcode The gcode to write the planned paths to
+     * \param extruder_switch_retract Whether to write an extruder switch retract
+     * \param retraction_config The config used.
+     */
+    void writeRetraction(GCodeExport& gcode, bool extruder_switch_retract, RetractionConfig* retraction_config);
+    
     /*!
      * Applying speed corrections for minimal layer times and determine the fanSpeed. 
      */
@@ -715,9 +506,8 @@ public:
      * This is supposed to be called when the nozzle is around the boundary of a layer part, not when the nozzle is in the middle of support, or in the middle of the air.
      * 
      * \param distance The distance to the comb boundary after we moved inside it.
-     * \param part_outline The part in which we last resided
      */
-    void moveInsideCombBoundary(int distance, const SliceLayerPart& part);
+    void moveInsideCombBoundary(int distance);
 };
 
 }//namespace cura

src/infill.cpp

@@ -6,21 +6,11 @@
 
 namespace cura {
 
-int Infill::computeScanSegmentIdx(int x, int line_width)
-{
-    if (x < 0)
-    {
-        return (x + 1) / line_width - 1;
-        // - 1 because -1 belongs to scansegment -1
-        // + 1 because -line_width belongs to scansegment -1
-    }
-    return x / line_width;
-}
-
-void Infill::generate(Polygons& result_polygons, Polygons& result_lines)
+void Infill::generate(Polygons& result_polygons, Polygons& result_lines, Polygons* in_between)
 {
     if (in_outline.size() == 0) return;
     if (line_distance == 0) return;
+    const Polygons* outline = &in_outline;
     Polygons outline_offsetted;
     switch(pattern)
     {
@@ -28,22 +18,22 @@ void Infill::generate(Polygons& result_polygons, Polygons& result_lines)
         generateGridInfill(result_lines);
         break;
     case EFillMethod::LINES:
-        generateLineInfill(result_lines, line_distance, fill_angle, 0);
-        break;
-    case EFillMethod::CUBIC:
-        generateCubicInfill(result_lines);
-        break;
-    case EFillMethod::TETRAHEDRAL:
-        generateTetrahedralInfill(result_lines);
+        generateLineInfill(result_lines, line_distance, fill_angle);
         break;
     case EFillMethod::TRIANGLES:
         generateTriangleInfill(result_lines);
         break;
     case EFillMethod::CONCENTRIC:
-        generateConcentricInfill(result_polygons, line_distance);
-        break;
-    case EFillMethod::CONCENTRIC_3D:
-        generateConcentric3DInfill(result_polygons);
+        PolygonUtils::offsetSafe(in_outline, outline_offset - infill_line_width / 2, infill_line_width, outline_offsetted, false); // - infill_line_width / 2 cause generateConcentricInfill expects [outline] to be the outer most polygon instead of the outer outline 
+        outline = &outline_offsetted;
+        if (abs(infill_line_width - line_distance) < 10)
+        {
+            generateConcentricInfillDense(*outline, result_polygons, in_between, remove_overlapping_perimeters);
+        }
+        else
+        {
+            generateConcentricInfill(*outline, result_polygons, line_distance);
+        }
         break;
     case EFillMethod::ZIG_ZAG:
         generateZigZagInfill(result_lines, line_distance, fill_angle, connected_zigzags, use_endpieces);
@@ -54,89 +44,52 @@ void Infill::generate(Polygons& result_polygons, Polygons& result_lines)
     }
 }
 
-void Infill::generateConcentricInfill(Polygons& result, int inset_value)
-{
-    Polygons first_concentric_wall = in_outline.offset(outline_offset - line_distance + infill_line_width / 2); // - infill_line_width / 2 cause generateConcentricInfill expects [outline] to be the outer most polygon instead of the outer outline
 
-    result.add(first_concentric_wall);
-    if (perimeter_gaps)
-    {
-        const Polygons inner = first_concentric_wall.offset(infill_line_width / 2 + perimeter_gaps_extra_offset);
-        const Polygons gaps_here = in_outline.difference(inner);
-        perimeter_gaps->add(gaps_here);
-    }
-    generateConcentricInfill(first_concentric_wall, result, inset_value);
-}
 
-void Infill::generateConcentricInfill(Polygons& first_concentric_wall, Polygons& result, int inset_value)
+void Infill::generateConcentricInfillDense(Polygons outline, Polygons& result, Polygons* in_between, bool avoidOverlappingPerimeters)
 {
-    Polygons* prev_inset = &first_concentric_wall;
-    Polygons next_inset;
-    while (prev_inset->size() > 0)
+    while(outline.size() > 0)
     {
-        next_inset = prev_inset->offset(-inset_value);
-        result.add(next_inset);
-        if (perimeter_gaps)
+        for (unsigned int polyNr = 0; polyNr < outline.size(); polyNr++)
         {
-            const Polygons outer = prev_inset->offset(-infill_line_width / 2 - perimeter_gaps_extra_offset);
-            const Polygons inner = next_inset.offset(infill_line_width / 2 + perimeter_gaps_extra_offset);
-            const Polygons gaps_here = outer.difference(inner);
-            perimeter_gaps->add(gaps_here);
+            PolygonRef r = outline[polyNr];
+            result.add(r);
         }
-        prev_inset = &next_inset;
+        Polygons next_outline;
+        PolygonUtils::offsetExtrusionWidth(outline, true, infill_line_width, next_outline, in_between, avoidOverlappingPerimeters);
+        outline = next_outline;
     }
+
 }
 
-void Infill::generateConcentric3DInfill(Polygons& result)
+void Infill::generateConcentricInfill(Polygons outline, Polygons& result, int inset_value)
 {
-    int period = line_distance * 2;
-    int shift = int64_t(one_over_sqrt_2 * z) % period;
-    shift = std::min(shift, period - shift); // symmetry due to the fact that we are applying the shift in both directions
-    shift = std::min(shift, period / 2 - infill_line_width / 2); // don't put lines too close to each other
-    shift = std::max(shift, infill_line_width / 2); // don't put lines too close to each other
-    Polygons first_wall;
-    // in contrast to concentric infill we dont do "- infill_line_width / 2" cause this is already handled by the max two lines above
-    first_wall = in_outline.offset(outline_offset - shift);
-    generateConcentricInfill(first_wall, result, period);
-    first_wall = in_outline.offset(outline_offset - period + shift);
-    generateConcentricInfill(first_wall, result, period);
+    while(outline.size() > 0)
+    {
+        for (unsigned int polyNr = 0; polyNr < outline.size(); polyNr++)
+        {
+            PolygonRef r = outline[polyNr];
+            result.add(r);
+        }
+        outline = outline.offset(-inset_value);
+    } 
 }
 
+
 void Infill::generateGridInfill(Polygons& result)
 {
-    generateLineInfill(result, line_distance, fill_angle, 0);
-    generateLineInfill(result, line_distance, fill_angle + 90, 0);
-}
-
-void Infill::generateCubicInfill(Polygons& result)
-{
-    int64_t shift = one_over_sqrt_2 * z;
-    generateLineInfill(result, line_distance, fill_angle, shift);
-    generateLineInfill(result, line_distance, fill_angle + 120, shift);
-    generateLineInfill(result, line_distance, fill_angle + 240, shift);
-}
-
-void Infill::generateTetrahedralInfill(Polygons& result)
-{
-    int period = line_distance * 2;
-    int shift = int64_t(one_over_sqrt_2 * z) % period;
-    shift = std::min(shift, period - shift); // symmetry due to the fact that we are applying the shift in both directions
-    shift = std::min(shift, period / 2 - infill_line_width / 2); // don't put lines too close to each other
-    shift = std::max(shift, infill_line_width / 2); // don't put lines too close to each other
-    generateLineInfill(result, period, fill_angle, shift);
-    generateLineInfill(result, period, fill_angle, -shift);
-    generateLineInfill(result, period, fill_angle + 90, shift);
-    generateLineInfill(result, period, fill_angle + 90, -shift);
+    generateLineInfill(result, line_distance * 2, fill_angle);
+    generateLineInfill(result, line_distance * 2, fill_angle + 90);
 }
 
 void Infill::generateTriangleInfill(Polygons& result)
 {
-    generateLineInfill(result, line_distance, fill_angle, 0);
-    generateLineInfill(result, line_distance, fill_angle + 60, 0);
-    generateLineInfill(result, line_distance, fill_angle + 120, 0);
+    generateLineInfill(result, line_distance * 3, fill_angle);
+    generateLineInfill(result, line_distance * 3, fill_angle + 60);
+    generateLineInfill(result, line_distance * 3, fill_angle + 120);
 }
 
-void Infill::addLineInfill(Polygons& result, const PointMatrix& rotation_matrix, const int scanline_min_idx, const int line_distance, const AABB boundary, std::vector<std::vector<int64_t>>& cut_list, int64_t shift)
+void Infill::addLineInfill(Polygons& result, const PointMatrix& rotation_matrix, const int scanline_min_idx, const int line_distance, const AABB boundary, std::vector<std::vector<int64_t>>& cut_list)
 {
     auto addLine = [&](Point from, Point to)
     {
@@ -160,7 +113,7 @@ void Infill::addLineInfill(Polygons& result, const PointMatrix& rotation_matrix,
     };
 
     int scanline_idx = 0;
-    for(int64_t x = scanline_min_idx * line_distance + shift; x < boundary.max.X; x += line_distance)
+    for(int64_t x = scanline_min_idx * line_distance; x < boundary.max.X; x += line_distance)
     {
         std::vector<int64_t>& crossings = cut_list[scanline_idx];
         qsort(crossings.data(), crossings.size(), sizeof(int64_t), compare_int64_t);
@@ -176,17 +129,19 @@ void Infill::addLineInfill(Polygons& result, const PointMatrix& rotation_matrix,
     }
 }
 
-void Infill::generateLineInfill(Polygons& result, int line_distance, const double& fill_angle, int64_t shift)
+void Infill::generateLineInfill(Polygons& result, int line_distance, const double& fill_angle)
 {
     PointMatrix rotation_matrix(fill_angle);
     NoZigZagConnectorProcessor lines_processor(rotation_matrix, result);
     bool connected_zigzags = false;
-    generateLinearBasedInfill(outline_offset, result, line_distance, rotation_matrix, lines_processor, connected_zigzags, shift);
+    bool safe_outline_offset = false;
+    generateLinearBasedInfill(outline_offset, safe_outline_offset, result, line_distance, rotation_matrix, lines_processor, connected_zigzags);
 }
 
 
 void Infill::generateZigZagInfill(Polygons& result, const int line_distance, const double& fill_angle, const bool connected_zigzags, const bool use_endpieces)
 {
+    bool safe_outline_offset = true;
 
     PointMatrix rotation_matrix(fill_angle);
     if (use_endpieces)
@@ -194,18 +149,18 @@ void Infill::generateZigZagInfill(Polygons& result, const int line_distance, con
         if (connected_zigzags)
         {
             ZigzagConnectorProcessorConnectedEndPieces zigzag_processor(rotation_matrix, result);
-            generateLinearBasedInfill(outline_offset - infill_line_width / 2, result, line_distance, rotation_matrix, zigzag_processor, connected_zigzags, 0);
+            generateLinearBasedInfill(outline_offset - infill_line_width / 2, safe_outline_offset, result, line_distance, rotation_matrix, zigzag_processor, connected_zigzags);
         }
         else
         {
             ZigzagConnectorProcessorDisconnectedEndPieces zigzag_processor(rotation_matrix, result);
-            generateLinearBasedInfill(outline_offset - infill_line_width / 2, result, line_distance, rotation_matrix, zigzag_processor, connected_zigzags, 0);
+            generateLinearBasedInfill(outline_offset - infill_line_width / 2, safe_outline_offset, result, line_distance, rotation_matrix, zigzag_processor, connected_zigzags);
         }
     }
     else 
     {
         ZigzagConnectorProcessorNoEndPieces zigzag_processor(rotation_matrix, result);
-        generateLinearBasedInfill(outline_offset - infill_line_width / 2, result, line_distance, rotation_matrix, zigzag_processor, connected_zigzags, 0);
+        generateLinearBasedInfill(outline_offset - infill_line_width / 2, safe_outline_offset, result, line_distance, rotation_matrix, zigzag_processor, connected_zigzags);
     }
 }
 
@@ -232,7 +187,7 @@ void Infill::generateZigZagInfill(Polygons& result, const int line_distance, con
  * Edit: the term scansegment is wrong, since I call a boundary segment leaving from an even scanline to the left as belonging to an even scansegment, 
  *  while I also call a boundary segment leaving from an even scanline toward the right as belonging to an even scansegment.
  */
-void Infill::generateLinearBasedInfill(const int outline_offset, Polygons& result, const int line_distance, const PointMatrix& rotation_matrix, ZigzagConnectorProcessor& zigzag_connector_processor, const bool connected_zigzags, int64_t extra_shift)
+void Infill::generateLinearBasedInfill(const int outline_offset, bool safe_outline_offset, Polygons& result, const int line_distance, const PointMatrix& rotation_matrix, ZigzagConnectorProcessor& zigzag_connector_processor, const bool connected_zigzags)
 {
     if (line_distance == 0)
     {
@@ -242,25 +197,22 @@ void Infill::generateLinearBasedInfill(const int outline_offset, Polygons& resul
     {
         return;
     }
-
-    int shift = extra_shift + this->shift;
-
+    
     Polygons outline;
     if (outline_offset != 0)
     {
-        outline = in_outline.offset(outline_offset);
-        if (perimeter_gaps)
-        {
-            perimeter_gaps->add(in_outline.difference(outline.offset(infill_line_width / 2 + perimeter_gaps_extra_offset)));
-        }
+        PolygonUtils::offsetSafe(in_outline, outline_offset, infill_line_width, outline, remove_overlapping_perimeters && safe_outline_offset);
     }
     else
     {
         outline = in_outline;
     }
-
-    outline = outline.offset(infill_overlap);
-
+    
+    if (line_distance > infill_line_width * 3 / 2) 
+    { // infill is not too dense to have overlap with surrounding polygon
+        outline = outline.offset(infill_overlap * infill_line_width / 100); // division by 100 cause it's a percentage.
+    }
+    
     if (outline.size() == 0)
     {
         return;
@@ -268,19 +220,10 @@ void Infill::generateLinearBasedInfill(const int outline_offset, Polygons& resul
 
     outline.applyMatrix(rotation_matrix);
 
-    if (shift < 0)
-    {
-        shift = line_distance - (-shift) % line_distance;
-    }
-    else
-    {
-        shift = shift % line_distance;
-    }
-
     AABB boundary(outline);
 
-    int scanline_min_idx = computeScanSegmentIdx(boundary.min.X - shift, line_distance);
-    int line_count = computeScanSegmentIdx(boundary.max.X - shift, line_distance) + 1 - scanline_min_idx;
+    int scanline_min_idx = boundary.min.X / line_distance;
+    int line_count = (boundary.max.X + (line_distance - 1)) / line_distance - scanline_min_idx;
 
     std::vector<std::vector<int64_t> > cut_list; // mapping from scanline to all intersections with polygon segments
 
@@ -306,29 +249,26 @@ void Infill::generateLinearBasedInfill(const int outline_offset, Polygons& resul
                 continue; 
             }
 
-            int scanline_idx0;
-            int scanline_idx1;
+            int scanline_idx0 = (p0.X + ((p0.X > 0)? -1 : -line_distance)) / line_distance; // -1 cause a linesegment on scanline x counts as belonging to scansegment x-1   ...
+            int scanline_idx1 = (p1.X + ((p1.X > 0)? -1 : -line_distance)) / line_distance; // -linespacing because a line between scanline -n and -n-1 belongs to scansegment -n-1 (for n=positive natural number)
             // this way of handling the indices takes care of the case where a boundary line segment ends exactly on a scanline:
             // in case the next segment moves back from that scanline either 2 or 0 scanline-boundary intersections are created
             // otherwise only 1 will be created, counting as an actual intersection
             int direction = 1;
-            if (p0.X < p1.X) 
+            if (p0.X > p1.X) 
             { 
-                scanline_idx0 = computeScanSegmentIdx(p0.X - shift, line_distance) + 1; // + 1 cause we don't cross the scanline of the first scan segment
-                scanline_idx1 = computeScanSegmentIdx(p1.X - shift, line_distance); // -1 cause the vertex point is handled in the next segment (or not in the case which looks like >)
+                direction = -1; 
+                scanline_idx1 += 1; // only consider the scanlines in between the scansegments
             }
             else
             {
-                direction = -1; 
-                scanline_idx0 = computeScanSegmentIdx(p0.X - shift, line_distance); // -1 cause the vertex point is handled in the previous segment (or not in the case which looks like >)
-                scanline_idx1 = computeScanSegmentIdx(p1.X - shift, line_distance) + 1; // + 1 cause we don't cross the scanline of the first scan segment
+                scanline_idx0 += 1; // only consider the scanlines in between the scansegments
             }
 
             for(int scanline_idx = scanline_idx0; scanline_idx != scanline_idx1 + direction; scanline_idx += direction)
             {
-                int x = scanline_idx * line_distance + shift;
+                int x = scanline_idx * line_distance;
                 int y = p1.Y + (p0.Y - p1.Y) * (x - p1.X) / (p0.X - p1.X);
-                assert(scanline_idx - scanline_min_idx >= 0 && scanline_idx - scanline_min_idx < int(cut_list.size()) && "reading infill cutlist index out of bounds!");
                 cut_list[scanline_idx - scanline_min_idx].push_back(y);
                 Point scanline_linesegment_intersection(x, y);
                 zigzag_connector_processor.registerScanlineSegmentIntersection(scanline_linesegment_intersection, scanline_idx % 2 == 0);
@@ -348,7 +288,7 @@ void Infill::generateLinearBasedInfill(const int outline_offset, Polygons& resul
         return;  // don't add connection if boundary already contains whole outline!
     }
 
-    addLineInfill(result, rotation_matrix, scanline_min_idx, line_distance, boundary, cut_list, shift);
+    addLineInfill(result, rotation_matrix, scanline_min_idx, line_distance, boundary, cut_list);
 }
 
 }//namespace cura

src/infill.h

@@ -3,7 +3,7 @@
 #define INFILL_H
 
 #include "utils/polygon.h"
-#include "settings/settings.h"
+#include "settings.h"
 // #include "ZigzagConnectorProcessor.h"
 #include "infill/ZigzagConnectorProcessor.h"
 #include "infill/NoZigZagConnectorProcessor.h"
@@ -20,54 +20,27 @@ namespace cura
 
 class Infill 
 {
-    static constexpr int perimeter_gaps_extra_offset = 15; // extra offset so that the perimeter gaps aren't created everywhere due to rounding errors
-
     EFillMethod pattern; //!< the space filling pattern of the infill to generate
     const Polygons& in_outline; //!< a reference polygon for getting the actual area within which to generate infill (see outline_offset)
     int outline_offset; //!< Offset from Infill::in_outline to get the actual area within which to generate infill
+    bool remove_overlapping_perimeters; //!< Whether to remove overlapping perimeter parts
     int infill_line_width; //!< The line width of the infill lines to generate
     int line_distance; //!< The distance between two infill lines / polygons
-    int infill_overlap; //!< the distance by which to overlap with the actual area within which to generate infill
+    double infill_overlap; //!< the percentage (of infill_line_width) to overlap with the actual area within which to generate infill
     double fill_angle; //!< for linear infill types: the angle of the infill lines (or the angle of the grid)
-    int64_t z; //!< height of the layer for which we generate infill
-    int64_t shift; //!< shift of the scanlines in the direction perpendicular to the fill_angle
-    Polygons* perimeter_gaps; //!< (optional output) The areas in between consecutive insets when Concentric infill is used.
     bool connected_zigzags; //!< (ZigZag) Whether endpieces of zigzag infill should be connected to the nearest infill line on both sides of the zigzag connector
     bool use_endpieces; //!< (ZigZag) Whether to include endpieces: zigzag connector segments from one infill line to itself
 
-    static constexpr double one_over_sqrt_2 = 0.7071067811865475244008443621048490392848359376884740; //!< 1.0 / sqrt(2.0)
 public:
-    /*!
-     * \warning If \p perimeter_gaps is given, then the difference between the \p in_outline
-     * and the polygons which result from offsetting it by the \p outline_offset
-     * and then expanding it again by half the \p infill_line_width
-     * is added to the \p perimeter_gaps
-     * 
-     * \param[out] perimeter_gaps (optional output) The areas in between consecutive insets when Concentric infill is used.
-     */
-    Infill(EFillMethod pattern
-        , const Polygons& in_outline
-        , int outline_offset
-        , int infill_line_width
-        , int line_distance
-        , int infill_overlap
-        , double fill_angle
-        , int64_t z
-        , int64_t shift
-        , Polygons* perimeter_gaps = nullptr
-        , bool connected_zigzags = false
-        , bool use_endpieces = false
-    )
+    Infill(EFillMethod pattern, const Polygons& in_outline, int outline_offset, bool remove_overlapping_perimeters, int infill_line_width, int line_distance, double infill_overlap, double fill_angle, bool connected_zigzags = false, bool use_endpieces = false)
     : pattern(pattern)
     , in_outline(in_outline)
     , outline_offset(outline_offset)
+    , remove_overlapping_perimeters(remove_overlapping_perimeters)
     , infill_line_width(infill_line_width)
     , line_distance(line_distance)
     , infill_overlap(infill_overlap)
     , fill_angle(fill_angle)
-    , z(z)
-    , shift(shift)
-    , perimeter_gaps(perimeter_gaps)
     , connected_zigzags(connected_zigzags)
     , use_endpieces(use_endpieces)
     {
@@ -77,45 +50,29 @@ public:
      * 
      * \param result_polygons (output) The resulting polygons (from concentric infill)
      * \param result_lines (output) The resulting line segments (from linear infill types)
+     * \param in_between (optional output) The areas in between two concecutive concentric infill polygons
      */
-    void generate(Polygons& result_polygons, Polygons& result_lines);
+    void generate(Polygons& result_polygons, Polygons& result_lines, Polygons* in_between);
 
 private:
-    /*!
-     * Function which returns the scanline_idx for a given x coordinate
-     * 
-     * For negative \p x this is different from simple division.
-     * 
-     * \warning \p line_distance is assumed to be positive
-     * 
-     * \param x the point to get the scansegment index for
-     * \param line_distance the width of the scan segments
-     */
-    static inline int computeScanSegmentIdx(int x, int line_distance);
-
-    /*!
-     * Generate sparse concentric infill
-     * 
-     * Also adds \ref Inifll::perimeter_gaps between \ref Infill::in_outline and the first wall
-     * 
-     * \param result (output) The resulting polygons
-     * \param inset_value The offset between each consecutive two polygons
-     */
-    void generateConcentricInfill(Polygons& result, int inset_value);
-
-    /*!
-     * Generate sparse concentric infill starting from a specific outer wall
-     * \param first_wall The outer wall from which to start
-     * \param result (output) The resulting polygons
-     * \param inset_value The offset between each consecutive two polygons
-     */
-    void generateConcentricInfill(Polygons& first_wall, Polygons& result, int inset_value);
 
     /*!
      * Generate sparse concentric infill 
+     * \param outline The actual outline of the area within which to generate infill
      * \param result (output) The resulting polygons
+     * \param inset_value The offset between each consecutive two polygons
      */
-    void generateConcentric3DInfill(Polygons& result);
+    void generateConcentricInfill(Polygons outline, Polygons& result, int inset_value);
+
+    /*!
+     * Generate dense concentric infill (100%)
+     * 
+     * \param outline The actual outline of the area within which to generate infill
+     * \param result (output) The resulting polygons
+     * \param in_between (output) The areas in between each two consecutive polygons
+     * \param remove_overlapping_perimeters Whether to remove overlapping perimeter parts
+     */
+    void generateConcentricInfillDense(Polygons outline, Polygons& result, Polygons* in_between, bool remove_overlapping_perimeters);
 
     /*!
      * Generate a rectangular grid of infill lines
@@ -123,18 +80,6 @@ private:
      */
     void generateGridInfill(Polygons& result);
 
-    /*!
-     * Generate a shifting triangular grid of infill lines, which combine with consecutive layers into a cubic pattern
-     * \param result (output) The resulting lines
-     */
-    void generateCubicInfill(Polygons& result);
-
-    /*!
-     * Generate a double shifting square grid of infill lines, which combine with consecutive layers into a tetrahedral pattern
-     * \param result (output) The resulting lines
-     */
-    void generateTetrahedralInfill(Polygons& result);
-
     /*!
      * Generate a triangular grid of infill lines
      * \param result (output) The resulting lines
@@ -149,9 +94,8 @@ private:
      * \param line_distance The distance between two lines which are in the same direction
      * \param boundary The axis aligned boundary box within which the polygon is
      * \param cut_list A mapping of each scanline to all y-coordinates (in the space transformed by rotation_matrix) where the polygons are crossing the scanline
-     * \param total_shift total shift of the scanlines in the direction perpendicular to the fill_angle.
      */
-    void addLineInfill(Polygons& result, const PointMatrix& rotation_matrix, const int scanline_min_idx, const int line_distance, const AABB boundary, std::vector<std::vector<int64_t>>& cut_list, int64_t total_shift);
+    void addLineInfill(Polygons& result, const PointMatrix& rotation_matrix, const int scanline_min_idx, const int line_distance, const AABB boundary, std::vector<std::vector<int64_t>>& cut_list);
 
     /*!
      * generate lines within the area of \p in_outline, at regular intervals of \p line_distance
@@ -162,9 +106,8 @@ private:
      * \param result (output) The resulting lines
      * \param line_distance The distance between two lines which are in the same direction
      * \param fill_angle The angle of the generated lines
-     * \param extra_shift extra shift of the scanlines in the direction perpendicular to the fill_angle
      */
-    void generateLineInfill(Polygons& result, int line_distance, const double& fill_angle, int64_t extra_shift);
+    void generateLineInfill(Polygons& result, int line_distance, const double& fill_angle);
     
     /*!
      * Function for creating linear based infill types (Lines, ZigZag).
@@ -175,14 +118,14 @@ private:
      * It is called only from Infill::generateLineinfill and Infill::generateZigZagInfill.
      * 
      * \param outline_offset An offset from the reference polygon (Infill::in_outline) to get the actual outline within which to generate infill
+     * \param safe_outline_offset Whether to consider removing overlapping wall parts (not so for normal line infill)
      * \param result (output) The resulting lines
      * \param line_distance The distance between two lines which are in the same direction
      * \param rotation_matrix The rotation matrix (un)applied to enforce the angle of the infill 
      * \param zigzag_connector_processor The processor used to generate zigzag connectors
      * \param connected_zigzags Whether to connect the endpiece zigzag segments on both sides to the same infill line
-     * \param extra_shift extra shift of the scanlines in the direction perpendicular to the fill_angle
      */
-    void generateLinearBasedInfill(const int outline_offset, Polygons& result, const int line_distance, const PointMatrix& rotation_matrix, ZigzagConnectorProcessor& zigzag_connector_processor, const bool connected_zigzags, int64_t extra_shift);
+    void generateLinearBasedInfill(const int outline_offset, bool safe_outline_offset, Polygons& result, const int line_distance, const PointMatrix& rotation_matrix, ZigzagConnectorProcessor& zigzag_connector_processor, const bool connected_zigzags);
 
     /*!
      * 

src/inset.cpp

@@ -0,0 +1,74 @@
+/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
+#include "inset.h"
+#include "utils/polygonUtils.h"
+namespace cura {
+
+void generateInsets(SliceLayerPart* part, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
+{
+    if (insetCount == 0)
+    {
+        part->insets.push_back(part->outline);
+        return;
+    }
+    
+    for(int i=0; i<insetCount; i++)
+    {
+        part->insets.push_back(Polygons());
+        if (i == 0)
+        {
+            if (line_width_0 < nozzle_width)
+            {
+                PolygonUtils::offsetSafe(part->outline, - nozzle_width/2, line_width_0, part->insets[0], avoidOverlappingPerimeters_0);
+            }
+            else 
+            {
+                PolygonUtils::offsetSafe(part->outline, - line_width_0/2, line_width_0, part->insets[0], avoidOverlappingPerimeters_0);
+            }
+        } else if (i == 1)
+        {
+            if (line_width_0 < nozzle_width)
+            {
+                int offset_from_first_boundary_for_edge_of_outer_wall = -nozzle_width/2; 
+                // ideally this /\ should be: nozzle_width/2 - line_width_0; however, factually, the nozzle will fill up part of the perimeter gaps
+                PolygonUtils::offsetSafe(part->insets[0], nozzle_width/2 - line_width_0 - line_width_x/2, offset_from_first_boundary_for_edge_of_outer_wall, line_width_x, part->insets[1], &part->perimeterGaps, avoidOverlappingPerimeters);
+            }
+            else 
+            {
+                PolygonUtils::offsetSafe(part->insets[0], -line_width_0/2 - line_width_x/2, -line_width_0/2, line_width_x, part->insets[1], &part->perimeterGaps, avoidOverlappingPerimeters);
+            }
+        } else
+        {
+            PolygonUtils::offsetExtrusionWidth(part->insets[i-1], true, line_width_x, part->insets[i], &part->perimeterGaps, avoidOverlappingPerimeters);
+        }
+        
+        
+        //Finally optimize all the polygons. Every point removed saves time in the long run.
+        part->insets[i].simplify();
+        if (part->insets[i].size() < 1)
+        {
+            part->insets.pop_back();
+            break;
+        }
+    }
+}
+
+void generateInsets(SliceLayer* layer, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
+{
+    for(unsigned int partNr = 0; partNr < layer->parts.size(); partNr++)
+    {
+        generateInsets(&layer->parts[partNr], nozzle_width, line_width_0, line_width_x, insetCount, avoidOverlappingPerimeters_0, avoidOverlappingPerimeters);
+    }
+    
+    //Remove the parts which did not generate an inset. As these parts are too small to print,
+    // and later code can now assume that there is always minimal 1 inset line.
+    for(unsigned int partNr = 0; partNr < layer->parts.size(); partNr++)
+    {
+        if (layer->parts[partNr].insets.size() < 1)
+        {
+            layer->parts.erase(layer->parts.begin() + partNr);
+            partNr -= 1;
+        }
+    }
+}
+
+}//namespace cura

src/inset.h

@@ -0,0 +1,41 @@
+/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
+#ifndef INSET_H
+#define INSET_H
+
+#include "sliceDataStorage.h"
+
+namespace cura 
+{
+
+/*!
+ * Generates the insets / perimeters for a single layer part.
+ * 
+ * \param part The part for which to generate the insets.
+ * \param nozzle_width The diameter of the hole in the nozzle
+ * \param line_width_0 line width of the outer wall
+ * \param line_width_x line width of other walls
+ * \param insetCount The number of insets to to generate
+ * \param avoidOverlappingPerimeters_0 Whether to remove the parts of the first perimeters where it have overlap with itself (and store the gaps thus created in the \p storage)
+ * \param avoidOverlappingPerimeters Whether to remove the parts of two consecutive perimeters where they have overlap (and store the gaps thus created in the \p part)
+ */
+void generateInsets(SliceLayerPart* part, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters);
+
+/*!
+ * Generates the insets / perimeters for all parts in a layer.
+ * 
+ * Note that the second inset gets offsetted by \p line_width_0 instead of the first, 
+ * which leads to better results for a smaller \p line_width_0 than \p line_width_x and when printing the outer wall last.
+ * 
+ * \param layer The layer for which to generate the insets.
+ * \param nozzle_width The diameter of the hole in the nozzle
+ * \param line_width_0 line width of the outer wall
+ * \param line_width_x line width of other walls
+ * \param insetCount The number of insets to to generate
+ * \param avoidOverlappingPerimeters_0 Whether to remove the parts of the first perimeters where it have overlap with itself (and store the gaps thus created in the \p storage)
+ * \param avoidOverlappingPerimeters Whether to remove the parts of two consecutive perimeters where they have overlap (and store the gaps thus created in the \p part)
+ */ 
+void generateInsets(SliceLayer* layer, int nozzle_width, int line_width_0, int line_width_x, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters);
+
+}//namespace cura
+
+#endif//INSET_H

src/layerPart.cpp

@@ -1,8 +1,8 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
 
 #include "layerPart.h"
-#include "settings/settings.h"
-#include "progress/Progress.h"
+#include "settings.h"
+#include "Progress.h"
 
 #include "utils/SVG.h" // debug output
 
@@ -26,15 +26,15 @@ void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, bool uni
 
     if (union_all_remove_holes)
     {
-        for(unsigned int i=0; i<layer->polygons.size(); i++)
+        for(unsigned int i=0; i<layer->polygonList.size(); i++)
         {
-            if (layer->polygons[i].orientation())
-                layer->polygons[i].reverse();
+            if (layer->polygonList[i].orientation())
+                layer->polygonList[i].reverse();
         }
     }
     
     std::vector<PolygonsPart> result;
-    result = layer->polygons.splitIntoParts(union_layers || union_all_remove_holes);
+    result = layer->polygonList.splitIntoParts(union_layers || union_all_remove_holes);
     for(unsigned int i=0; i<result.size(); i++)
     {
         storageLayer.parts.emplace_back();
@@ -42,13 +42,14 @@ void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, bool uni
         storageLayer.parts[i].boundaryBox.calculate(storageLayer.parts[i].outline);
     }
 }
-void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer, bool union_layers, bool union_all_remove_holes)
+void createLayerParts(SliceMeshStorage& storage, Slicer* slicer, bool union_layers, bool union_all_remove_holes)
 {
     for(unsigned int layer_nr = 0; layer_nr < slicer->layers.size(); layer_nr++)
     {
-        mesh.layers[layer_nr].sliceZ = slicer->layers[layer_nr].z;
-        mesh.layers[layer_nr].printZ = slicer->layers[layer_nr].z;
-        createLayerWithParts(mesh.layers[layer_nr], &slicer->layers[layer_nr], union_layers, union_all_remove_holes);
+        storage.layers.push_back(SliceLayer());
+        storage.layers[layer_nr].sliceZ = slicer->layers[layer_nr].z;
+        storage.layers[layer_nr].printZ = slicer->layers[layer_nr].z;
+        createLayerWithParts(storage.layers[layer_nr], &slicer->layers[layer_nr], union_layers, union_all_remove_holes);
     }
 }
 

src/layerPart.h

@@ -22,9 +22,9 @@ namespace cura {
 
 void createLayerWithParts(SliceLayer& storageLayer, SlicerLayer* layer, bool union_layers, bool union_all_remove_holes);
 
-void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer, bool union_layers, bool union_all_remove_holes);
+void createLayerParts(SliceMeshStorage& storage, Slicer* slicer, bool union_layers, bool union_all_remove_holes);
 
-void layerparts2HTML(SliceDataStorage& mesh, const char* filename, bool all_layers = true, int layer_nr = -1);
+void layerparts2HTML(SliceDataStorage& storage, const char* filename, bool all_layers = true, int layer_nr = -1);
 
 }//namespace cura
 

src/main.cpp

@@ -16,41 +16,36 @@
 #include "utils/string.h"
 
 #include "FffProcessor.h"
-#include "settings/SettingRegistry.h"
-
-#include "settings/SettingsToGV.h"
+#include "settingRegistry.h"
 
 namespace cura
 {
     
 void print_usage()
 {
-    logAlways("\n");
-    logAlways("usage:\n");
-    logAlways("CuraEngine help\n");
-    logAlways("\tShow this help message\n");
-    logAlways("\n");
-    logAlways("CuraEngine connect <host>[:<port>] [-j <settings.def.json>]\n");
-    logAlways("  --connect <host>[:<port>]\n\tConnect to <host> via a command socket, \n\tinstead of passing information via the command line\n");
-    logAlways("  -j<settings.def.json>\n\tLoad settings.json file to register all settings and their defaults\n");
-    logAlways("  -v\n\tIncrease the verbose level (show log messages).\n");
-    logAlways("\n");
-    logAlways("CuraEngine slice [-v] [-p] [-j <settings.json>] [-s <settingkey>=<value>] [-g] [-e<extruder_nr>] [-o <output.gcode>] [-l <model.stl>] [--next]\n");
-    logAlways("  -v\n\tIncrease the verbose level (show log messages).\n");
-    logAlways("  -p\n\tLog progress information.\n");
-    logAlways("  -j\n\tLoad settings.def.json file to register all settings and their defaults.\n");
-    logAlways("  -s <setting>=<value>\n\tSet a setting to a value for the last supplied object, \n\textruder train, or general settings.\n");
-    logAlways("  -l <model_file>\n\tLoad an STL model. \n");
-    logAlways("  -g\n\tSwitch setting focus to the current mesh group only.\n\tUsed for one-at-a-time printing.\n");
-    logAlways("  -e<extruder_nr>\n\tSwitch setting focus to the extruder train with the given number.\n");
-    logAlways("  --next\n\tGenerate gcode for the previously supplied mesh group and append that to \n\tthe gcode of further models for one-at-a-time printing.\n");
-    logAlways("  -o <output_file>\n\tSpecify a file to which to write the generated gcode.\n");
-    logAlways("\n");
-    logAlways("The settings are appended to the last supplied object:\n");
-    logAlways("CuraEngine slice [general settings] \n\t-g [current group settings] \n\t-e0 [extruder train 0 settings] \n\t-l obj_inheriting_from_last_extruder_train.stl [object settings] \n\t--next [next group settings]\n\t... etc.\n");
-    logAlways("\n");
-    logAlways("In order to load machine definitions from custom locations, you need to create the environment variable CURA_ENGINE_SEARCH_PATH, which should contain all search paths delimited by a (semi-)colon.\n");
-    logAlways("\n");
+    cura::logError("\n");
+    cura::logError("usage:\n");
+    cura::logError("CuraEngine help\n");
+    cura::logError("\tShow this help message\n");
+    cura::logError("\n");
+    cura::logError("CuraEngine connect <host>[:<port>] [-j <settings.json>]\n");
+    cura::logError("  --connect <host>[:<port>]\n\tConnect to <host> via a command socket, \n\tinstead of passing information via the command line\n");
+    cura::logError("  -j\n\tLoad settings.json file to register all settings and their defaults\n");
+    cura::logError("\n");
+    cura::logError("CuraEngine slice [-v] [-p] [-j <settings.json>] [-s <settingkey>=<value>] [-g] [-e] [-o <output.gcode>] [-l <model.stl>] [--next]\n");
+    cura::logError("  -v\n\tIncrease the verbose level (show log messages).\n");
+    cura::logError("  -p\n\tLog progress information.\n");
+    cura::logError("  -j\n\tLoad settings.json file to register all settings and their defaults.\n");
+    cura::logError("  -s <setting>=<value>\n\tSet a setting to a value for the last supplied object, \n\textruder train, or general settings.\n");
+    cura::logError("  -l <model_file>\n\tLoad an STL model. \n");
+    cura::logError("  -g\n\tSwitch setting focus to the current mesh group only.\n\tUsed for one-at-a-time printing.\n");
+    cura::logError("  -e\n\tAdd a new extruder train.\n");
+    cura::logError("  --next\n\tGenerate gcode for the previously supplied mesh group and append that to \n\tthe gcode of further models for one-at-a-time printing.\n");
+    cura::logError("  -o <output_file>\n\tSpecify a file to which to write the generated gcode.\n");
+    cura::logError("\n");
+    cura::logError("The settings are appended to the last supplied object:\n");
+    cura::logError("CuraEngine slice [general settings] \n\t-g [current group settings] \n\t-e [extruder train settings] \n\t-l obj_inheriting_from_last_extruder_train.stl [object settings] \n\t--next [next group settings]\n\t... etc.\n");
+    cura::logError("\n");
 }
 
 //Signal handler for a "floating point exception", which can also be integer division by zero errors.
@@ -71,10 +66,10 @@ void print_call(int argc, char **argv)
 
 void connect(int argc, char **argv)
 {
+    CommandSocket::instantiate();
     std::string ip;
     int port = 49674;
-
-    // parse ip port
+    
     std::string ip_port(argv[2]);
     if (ip_port.find(':') != std::string::npos)
     {
@@ -82,6 +77,7 @@ void connect(int argc, char **argv)
         port = std::stoi(ip_port.substr(ip_port.find(':') + 1).data());
     }
 
+    
     for(int argn = 3; argn < argc; argn++)
     {
         char* str = argv[argn];
@@ -96,10 +92,9 @@ void connect(int argc, char **argv)
                     break;
                 case 'j':
                     argn++;
-                    if (SettingRegistry::getInstance()->loadJSONsettings(argv[argn], FffProcessor::getInstance()))
+                    if (SettingRegistry::getInstance()->loadJSONsettings(argv[argn]))
                     {
-                        cura::logError("Failed to load json file: %s\n", argv[argn]);
-                        std::exit(1);
+                        cura::logError("ERROR: Failed to load json file: %s\n", argv[argn]);
                     }
                     break;
                 default:
@@ -111,8 +106,7 @@ void connect(int argc, char **argv)
             }
         }
     }
-
-    CommandSocket::instantiate();
+    
     CommandSocket::getInstance()->connect(ip, port);
 }
 
@@ -126,8 +120,7 @@ void slice(int argc, char **argv)
     
     int extruder_train_nr = 0;
 
-    SettingsBase* last_extruder_train = nullptr;
-    // extruder defaults cannot be loaded yet cause no json has been parsed
+    SettingsBase* last_extruder_train = meshgroup->createExtruderTrain(0); 
     SettingsBase* last_settings_object = FffProcessor::getInstance();
     for(int argn = 2; argn < argc; argn++)
     {
@@ -141,15 +134,13 @@ void slice(int argc, char **argv)
                     try {
                         //Catch all exceptions, this prevents the "something went wrong" dialog on windows to pop up on a thrown exception.
                         // Only ClipperLib currently throws exceptions. And only in case that it makes an internal error.
+                        meshgroup->finalize();
                         log("Loaded from disk in %5.3fs\n", FffProcessor::getInstance()->time_keeper.restart());
                         
                         for (int extruder_nr = 0; extruder_nr < FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count"); extruder_nr++)
                         { // initialize remaining extruder trains and load the defaults
-                            meshgroup->createExtruderTrain(extruder_nr); // create new extruder train objects or use already existing ones
+                            meshgroup->getExtruderTrain(extruder_nr)->setExtruderTrainDefaults(extruder_nr); // create new extruder train objects or use already existing ones
                         }
-
-                        meshgroup->finalize();
-
                         //start slicing
                         FffProcessor::getInstance()->processMeshGroup(meshgroup);
                         
@@ -180,10 +171,9 @@ void slice(int argc, char **argv)
                         break;
                     case 'j':
                         argn++;
-                        if (SettingRegistry::getInstance()->loadJSONsettings(argv[argn], last_settings_object))
+                        if (SettingRegistry::getInstance()->loadJSONsettings(argv[argn]))
                         {
-                            cura::logError("Failed to load json file: %s\n", argv[argn]);
-                            std::exit(1);
+                            cura::logError("ERROR: Failed to load json file: %s\n", argv[argn]);
                         }
                         break;
                     case 'e':
@@ -196,17 +186,11 @@ void slice(int argc, char **argv)
                         argn++;
                         
                         log("Loading %s from disk...\n", argv[argn]);
-
-                        transformation = last_settings_object->getSettingAsPointMatrix("mesh_rotation_matrix"); // the transformation applied to a model when loaded
-
-                        if (!last_extruder_train)
-                        {
-                            last_extruder_train = meshgroup->createExtruderTrain(0); // assume a json has already been provided on the command line
-                        }
+                        // transformation = // TODO: get a transformation from somewhere
+                        
                         if (!loadMeshIntoMeshGroup(meshgroup, argv[argn], transformation, last_extruder_train))
                         {
                             logError("Failed to load model: %s\n", argv[argn]);
-                            std::exit(1);
                         }
                         else 
                         {
@@ -256,10 +240,9 @@ void slice(int argc, char **argv)
         }
     }
 
-    int extruder_count = FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count");
-    for (extruder_train_nr = 0; extruder_train_nr < extruder_count; extruder_train_nr++)
+    for (extruder_train_nr = 0; extruder_train_nr < FffProcessor::getInstance()->getSettingAsCount("machine_extruder_count"); extruder_train_nr++)
     { // initialize remaining extruder trains and load the defaults
-        meshgroup->createExtruderTrain(extruder_train_nr); // create new extruder train objects or use already existing ones
+        meshgroup->createExtruderTrain(extruder_train_nr)->setExtruderTrainDefaults(extruder_train_nr); // create new extruder train objects or use already existing ones
     }
     
     
@@ -304,23 +287,23 @@ int main(int argc, char **argv)
 
     Progress::init();
     
-    std::cerr << std::boolalpha;
-    logAlways("\n");
-    logAlways("Cura_SteamEngine version %s\n", VERSION);
-    logAlways("Copyright (C) 2014 David Braam\n");
-    logAlways("\n");
-    logAlways("This program is free software: you can redistribute it and/or modify\n");
-    logAlways("it under the terms of the GNU Affero General Public License as published by\n");
-    logAlways("the Free Software Foundation, either version 3 of the License, or\n");
-    logAlways("(at your option) any later version.\n");
-    logAlways("\n");
-    logAlways("This program is distributed in the hope that it will be useful,\n");
-    logAlways("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
-    logAlways("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
-    logAlways("GNU Affero General Public License for more details.\n");
-    logAlways("\n");
-    logAlways("You should have received a copy of the GNU Affero General Public License\n");
-    logAlways("along with this program.  If not, see <http://www.gnu.org/licenses/>.\n");
+    
+    logCopyright("\n");
+    logCopyright("Cura_SteamEngine version %s\n", VERSION);
+    logCopyright("Copyright (C) 2014 David Braam\n");
+    logCopyright("\n");
+    logCopyright("This program is free software: you can redistribute it and/or modify\n");
+    logCopyright("it under the terms of the GNU Affero General Public License as published by\n");
+    logCopyright("the Free Software Foundation, either version 3 of the License, or\n");
+    logCopyright("(at your option) any later version.\n");
+    logCopyright("\n");
+    logCopyright("This program is distributed in the hope that it will be useful,\n");
+    logCopyright("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+    logCopyright("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
+    logCopyright("GNU Affero General Public License for more details.\n");
+    logCopyright("\n");
+    logCopyright("You should have received a copy of the GNU Affero General Public License\n");
+    logCopyright("along with this program.  If not, see <http://www.gnu.org/licenses/>.\n");
 
 
     if (argc < 2)
@@ -342,78 +325,6 @@ int main(int argc, char **argv)
         print_usage();
         exit(0);
     }
-    else if (stringcasecompare(argv[1], "analyse") == 0)
-    { // CuraEngine analyse [json] [output.gv] [engine_settings] -[p|i|e|w]
-        // p = show parent-child relations
-        // i = show inheritance function
-        // e = show error functions
-        // w = show warning functions
-        // dot refl_ff.gv -Tpng > rafl_ff_dotted.png
-        // see meta/HOWTO.txt
-        
-        bool parent_child_viz = false;
-        bool inherit_viz = false;
-        bool warning_viz = false;
-        bool error_viz = false;
-        bool global_only_viz = false;
-        if (argc >= 6)
-        {
-            char* str = argv[5];
-            if (str[0] == '-')
-            {
-                for(str++; *str; str++)
-                {
-                    switch(*str)
-                    {
-                    case 'p':
-                        parent_child_viz = true;
-                        break;
-                    case 'i':
-                        inherit_viz = true;
-                        break;
-                    case 'e':
-                        error_viz = true;
-                        break;
-                    case 'w':
-                        warning_viz = true;
-                        break;
-                    case 'g':
-                        global_only_viz = true;
-                        break;
-                    default:
-                        cura::logError("Unknown option: %c\n", *str);
-                        print_call(argc, argv);
-                        print_usage();
-                        break;
-                    }
-                }
-            }
-        }
-        else
-        {
-            cura::log("\n");
-            cura::log("usage:\n");
-            cura::log("CuraEngine analyse <fdmPrinter.def.json> <output.gv> <engine_settings_list> -[p|i|e|w]\n");
-            cura::log("\tGenerate a grpah to visualize the setting inheritance structure.\n");
-            cura::log("\t<fdmPrinter.def.json>\n\tThe base seting definitions file.\n");
-            cura::log("\t<output.gv>\n\tThe output file.\n");
-            cura::log("\t<engine_settings_list>\n\tA text file with all setting keys used in the engine, separated by newlines.\n");
-            cura::log("\t-[p|i|e|w]\n\tOptions for what to include in the visualization\n");
-            cura::log("\t\tp\tVisualize the parent-child relationship.\n");
-            cura::log("\t\ti\tVisualize inheritance function relationships.\n");
-            cura::log("\t\te\tVisualize (max/min) error function relationships.\n");
-            cura::log("\t\tw\tVisualize (max/min) warning function relationships.\n");
-            cura::log("\n");
-    
-        }
-        
-        SettingsToGv gv_out(argv[3], argv[4], parent_child_viz, inherit_viz, error_viz, warning_viz, global_only_viz);
-        if (gv_out.generate(std::string(argv[2])))
-        {
-            cura::logError("Failed to analyse json file: %s\n", argv[2]);
-        }
-        exit(0);
-    }
     else
     {
         cura::logError("Unknown command: %s\n", argv[1]);

src/mesh.cpp

@@ -5,11 +5,7 @@ namespace cura
 {
 
 const int vertex_meld_distance = MM2INT(0.03);
-/*!
- * returns a hash for the location, but first divides by the vertex_meld_distance,
- * so that any point within a box of vertex_meld_distance by vertex_meld_distance would get mapped to the same hash.
- */
-static inline uint32_t pointHash(const Point3& p)
+static inline uint32_t pointHash(Point3& p)
 {
     return ((p.x + vertex_meld_distance/2) / vertex_meld_distance) ^ (((p.y + vertex_meld_distance/2) / vertex_meld_distance) << 10) ^ (((p.z + vertex_meld_distance/2) / vertex_meld_distance) << 20);
 }
@@ -53,35 +49,22 @@ void Mesh::finish()
     for(unsigned int i=0; i<faces.size(); i++)
     {
         MeshFace& face = faces[i];
-        // faces are connected via the outside
-        face.connected_face_index[0] = getFaceIdxWithPoints(face.vertex_index[0], face.vertex_index[1], i, face.vertex_index[2]);
-        face.connected_face_index[1] = getFaceIdxWithPoints(face.vertex_index[1], face.vertex_index[2], i, face.vertex_index[0]);
-        face.connected_face_index[2] = getFaceIdxWithPoints(face.vertex_index[2], face.vertex_index[0], i, face.vertex_index[1]);
+        face.connected_face_index[0] = getFaceIdxWithPoints(face.vertex_index[0], face.vertex_index[1], i); // faces are connected via the outside
+        face.connected_face_index[1] = getFaceIdxWithPoints(face.vertex_index[1], face.vertex_index[2], i);
+        face.connected_face_index[2] = getFaceIdxWithPoints(face.vertex_index[2], face.vertex_index[0], i);
     }
 }
 
-Point3 Mesh::min() const
+Point3 Mesh::min()
 {
     return aabb.min;
 }
-Point3 Mesh::max() const
+Point3 Mesh::max()
 {
     return aabb.max;
 }
-AABB3D Mesh::getAABB() const
-{
-    return aabb;
-}
-void Mesh::expandXY(int64_t offset)
-{
-    if (offset)
-    {
-        aabb.expandXY(offset);
-    }
-}
 
-
-int Mesh::findIndexOfVertex(const Point3& v)
+int Mesh::findIndexOfVertex(Point3& v)
 {
     uint32_t hash = pointHash(v);
 
@@ -124,13 +107,17 @@ See <a href="http://stackoverflow.com/questions/14066933/direct-way-of-computing
 
 
 */
-int Mesh::getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx, int notFaceVertexIdx) const
+int Mesh::getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx)
 {
     std::vector<int> candidateFaces; // in case more than two faces meet at an edge, multiple candidates are generated
+    int notFaceVertexIdx = -1; // index of the third vertex of the face corresponding to notFaceIdx
     for(int f : vertices[idx0].connected_faces) // search through all faces connected to the first vertex and find those that are also connected to the second
     {
         if (f == notFaceIdx)
         {
+            for (int i = 0; i<3; i++) // find the vertex which is not idx0 or idx1
+                if (faces[f].vertex_index[i] != idx0 && faces[f].vertex_index[i] != idx1)
+                    notFaceVertexIdx = faces[f].vertex_index[i];
             continue;
         }
         if ( faces[f].vertex_index[0] == idx1 // && faces[f].vertex_index[1] == idx0 // next face should have the right direction!
@@ -140,10 +127,12 @@ int Mesh::getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx, int notFaceVe
 
     }
 
-    if (candidateFaces.size() == 0) { cura::logWarning("Couldn't find face connected to face %i.\n", notFaceIdx); return -1; }
+    if (candidateFaces.size() == 0) { cura::logError("Couldn't find face connected to face %i.\n", notFaceIdx); return -1; }
     if (candidateFaces.size() == 1) { return candidateFaces[0]; }
 
 
+    if (notFaceVertexIdx < 0) { cura::logError("Couldn't find third point on face %i.\n", notFaceIdx); return -1; }
+
     if (candidateFaces.size() % 2 == 0) cura::log("Warning! Edge with uneven number of faces connecting it!(%i)\n", candidateFaces.size()+1);
 
     FPoint3 vn = vertices[idx1].p - vertices[idx0].p;
@@ -178,6 +167,7 @@ int Mesh::getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx, int notFaceVe
         if (angle == 0)
         {
             cura::log("Warning! Overlapping faces: face %i and face %i.\n", notFaceIdx, candidateFace);
+            std::cerr<< n.vSize() <<"; "<<n1.vSize()<<";"<<n0.vSize() <<std::endl;
         }
         if (angle < smallestAngle)
         {
@@ -185,8 +175,8 @@ int Mesh::getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx, int notFaceVe
             bestIdx = candidateFace;
         }
     }
-    if (bestIdx < 0) cura::logWarning("Couldn't find face connected to face %i.\n", notFaceIdx);
+    if (bestIdx < 0) cura::logError("Couldn't find face connected to face %i.\n", notFaceIdx);
     return bestIdx;
 }
 
-}//namespace cura
+}//namespace cura

src/mesh.h

@@ -1,8 +1,8 @@
 #ifndef MESH_H
 #define MESH_H
 
-#include "settings/settings.h"
-#include "utils/AABB3D.h"
+#include "settings.h"
+#include "utils/AABB.h"
 
 namespace cura
 {
@@ -69,10 +69,8 @@ public:
     void clear(); //!< clears all data
     void finish(); //!< complete the model : set the connected_face_index fields of the faces.
 
-    Point3 min() const; //!< min (in x,y and z) vertex of the bounding box
-    Point3 max() const; //!< max (in x,y and z) vertex of the bounding box
-    AABB3D getAABB() const; //!< Get the axis aligned bounding box
-    void expandXY(int64_t offset); //!< Register applied horizontal expansion in the AABB
+    Point3 min(); //!< min (in x,y and z) vertex of the bounding box
+    Point3 max(); //!< max (in x,y and z) vertex of the bounding box
     
     /*!
      * Offset the whole mesh (all vertices and the bounding box).
@@ -87,20 +85,12 @@ public:
     }
 
 private:
-    int findIndexOfVertex(const Point3& v); //!< find index of vertex close to the given point, or create a new vertex and return its index.
-
+    int findIndexOfVertex(Point3& v); //!< find index of vertex close to the given point, or create a new vertex and return its index.
     /*!
-     * Get the index of the face connected to the face with index \p notFaceIdx, via vertices \p idx0 and \p idx1.
-     * 
-     * In case multiple faces connect with the same edge, return the next counter-clockwise face when viewing from \p idx1 to \p idx0.
-     * 
-     * \param idx0 the first vertex index
-     * \param idx1 the second vertex index
-     * \param notFaceIdx the index of a face which shouldn't be returned
-     * \param notFaceVertexIdx should be the third vertex of face \p notFaceIdx.
-     * \return the face index of a face sharing the edge from \p idx0 to \p idx1
+    Get the index of the face connected to the face with index \p notFaceIdx, via vertices \p idx0 and \p idx1.
+    In case multiple faces connect with the same edge, return the next counter-clockwise face when viewing from \p idx1 to \p idx0.
     */
-    int getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx, int notFaceVertexIdx) const;
+    int getFaceIdxWithPoints(int idx0, int idx1, int notFaceIdx);
 };
 
 }//namespace cura

src/multiVolumes.cpp

@@ -3,45 +3,18 @@
 namespace cura 
 {
  
-void carveMultipleVolumes(std::vector<Slicer*> &volumes, bool alternate_carve_order)
+void carveMultipleVolumes(std::vector<Slicer*> &volumes)
 {
     //Go trough all the volumes, and remove the previous volume outlines from our own outline, so we never have overlapped areas.
-    for (unsigned int volume_1_idx = 1; volume_1_idx < volumes.size(); volume_1_idx++)
+    for(unsigned int idx=0; idx < volumes.size(); idx++)
     {
-        Slicer& volume_1 = *volumes[volume_1_idx];
-        if (volume_1.mesh->getSettingBoolean("infill_mesh") 
-            || volume_1.mesh->getSettingBoolean("anti_overhang_mesh")
-            || volume_1.mesh->getSettingBoolean("support_mesh")
-            )
+        for(unsigned int idx2=0; idx2<idx; idx2++)
         {
-            continue;
-        }
-        for (unsigned int volume_2_idx = 0; volume_2_idx < volume_1_idx; volume_2_idx++)
-        {
-            Slicer& volume_2 = *volumes[volume_2_idx];
-            if (volume_2.mesh->getSettingBoolean("infill_mesh")
-                || volume_2.mesh->getSettingBoolean("anti_overhang_mesh")
-                || volume_2.mesh->getSettingBoolean("support_mesh")
-                )
+            for(unsigned int layerNr=0; layerNr < volumes[idx]->layers.size(); layerNr++)
             {
-                continue;
-            }
-            if (!volume_1.mesh->getAABB().hit(volume_2.mesh->getAABB()))
-            {
-                continue;
-            }
-            for (unsigned int layerNr = 0; layerNr < volume_1.layers.size(); layerNr++)
-            {
-                SlicerLayer& layer1 = volume_1.layers[layerNr];
-                SlicerLayer& layer2 = volume_2.layers[layerNr];
-                if (alternate_carve_order && layerNr % 2 == 0)
-                {
-                    layer2.polygons = layer2.polygons.difference(layer1.polygons);
-                }
-                else
-                {
-                    layer1.polygons = layer1.polygons.difference(layer2.polygons);
-                }
+                SlicerLayer& layer1 = volumes[idx]->layers[layerNr];
+                SlicerLayer& layer2 = volumes[idx2]->layers[layerNr];
+                layer1.polygonList = layer1.polygonList.difference(layer2.polygonList);
             }
         }
     }
@@ -49,46 +22,24 @@ void carveMultipleVolumes(std::vector<Slicer*> &volumes, bool alternate_carve_or
  
 //Expand each layer a bit and then keep the extra overlapping parts that overlap with other volumes.
 //This generates some overlap in dual extrusion, for better bonding in touching parts.
-void generateMultipleVolumesOverlap(std::vector<Slicer*> &volumes)
+void generateMultipleVolumesOverlap(std::vector<Slicer*> &volumes, int overlap)
 {
-    if (volumes.size() < 2)
+    if (volumes.size() < 2 || overlap <= 0) return;
+    
+    for(unsigned int layerNr=0; layerNr < volumes[0]->layers.size(); layerNr++)
     {
-        return;
-    }
-
-    int offset_to_merge_other_merged_volumes = 20;
-    for (Slicer* volume : volumes)
-    {
-        int overlap = volume->mesh->getSettingInMicrons("multiple_mesh_overlap");
-        if (volume->mesh->getSettingBoolean("infill_mesh")
-            || volume->mesh->getSettingBoolean("anti_overhang_mesh")
-            || volume->mesh->getSettingBoolean("support_mesh")
-            || overlap == 0)
+        Polygons fullLayer;
+        for(unsigned int volIdx = 0; volIdx < volumes.size(); volIdx++)
         {
-            continue;
+            SlicerLayer& layer1 = volumes[volIdx]->layers[layerNr];
+            fullLayer = fullLayer.unionPolygons(layer1.polygonList.offset(20)); // TODO: put hard coded value in a variable with an explanatory name (and make var a parameter, and perhaps even a setting?)
         }
-        AABB3D aabb(volume->mesh->getAABB());
-        aabb.expandXY(overlap); // expand to account for the case where two models and their bounding boxes are adjacent along the X or Y-direction
-        for (unsigned int layer_nr = 0; layer_nr < volume->layers.size(); layer_nr++)
+        fullLayer = fullLayer.offset(-20); // TODO: put hard coded value in a variable with an explanatory name (and make var a parameter, and perhaps even a setting?)
+        
+        for(unsigned int volIdx = 0; volIdx < volumes.size(); volIdx++)
         {
-            Polygons all_other_volumes;
-            for (Slicer* other_volume : volumes)
-            {
-                if (other_volume->mesh->getSettingBoolean("infill_mesh")
-                    || other_volume->mesh->getSettingBoolean("anti_overhang_mesh")
-                    || other_volume->mesh->getSettingBoolean("support_mesh")
-                    || !other_volume->mesh->getAABB().hit(aabb)
-                    || other_volume == volume
-                )
-                {
-                    continue;
-                }
-                SlicerLayer& other_volume_layer = other_volume->layers[layer_nr];
-                all_other_volumes = all_other_volumes.unionPolygons(other_volume_layer.polygons.offset(offset_to_merge_other_merged_volumes));
-            }
-
-            SlicerLayer& volume_layer = volume->layers[layer_nr];
-            volume_layer.polygons = volume_layer.polygons.unionPolygons(all_other_volumes.intersection(volume_layer.polygons.offset(overlap / 2)));
+            SlicerLayer& layer1 = volumes[volIdx]->layers[layerNr];
+            layer1.polygonList = fullLayer.intersection(layer1.polygonList.offset(overlap / 2));
         }
     }
 }

src/multiVolumes.h

@@ -7,17 +7,13 @@
 /* This file contains code to help fixing up and changing layers that are build from multiple volumes. */
 namespace cura {
 
-/*!
- * 
- * \param alternate_carve_order Whether to switch which model carves out of which with every layer
- */
-void carveMultipleVolumes(std::vector<Slicer*> &meshes, bool alternate_carve_order);
+void carveMultipleVolumes(std::vector<Slicer*> &meshes);
 
 /*!
  * Expand each layer a bit and then keep the extra overlapping parts that overlap with other volumes.
  * This generates some overlap in dual extrusion, for better bonding in touching parts.
  */
-void generateMultipleVolumesOverlap(std::vector<Slicer*> &meshes);
+void generateMultipleVolumesOverlap(std::vector<Slicer*> &meshes, int overlap);
 
 }//namespace cura
 

src/pathOrderOptimizer.cpp

@@ -1,31 +1,33 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
 #include "pathOrderOptimizer.h"
 #include "utils/logoutput.h"
-#include "utils/SparsePointGridInclusive.h"
-#include "utils/linearAlg2D.h"
+#include "utils/BucketGrid2D.h"
+#include "utils/TravellingSalesman.h"
 
 #define INLINE static inline
 
-namespace cura {
+namespace cura
+{
 
 /**
-*
-*/
+ *
+ */
 void PathOrderOptimizer::optimize()
 {
     bool picked[polygons.size()];
-    memset(picked, false, sizeof(bool) * polygons.size());/// initialized as falses
-    
-    for (PolygonRef poly : polygons) /// find closest point to initial starting point within each polygon +initialize picked
+    memset(picked, false, sizeof (bool) * polygons.size()); /// initialized as falses
+
+    for (unsigned int i_polygon = 0; i_polygon < polygons.size(); i_polygon++) /// find closest point to initial starting point within each polygon +initialize picked
     {
         int best = -1;
         float bestDist = std::numeric_limits<float>::infinity();
-        for (unsigned int point_idx = 0; point_idx < poly.size(); point_idx++) /// get closest point in polygon
+        PolygonRef poly = polygons[i_polygon];
+        for (unsigned int i_point = 0; i_point < poly.size(); i_point++) /// get closest point in polygon
         {
-            float dist = vSize2f(poly[point_idx] - startPoint);
+            float dist = vSize2f(poly[i_point] - startPoint);
             if (dist < bestDist)
             {
-                best = point_idx;
+                best = i_point;
                 bestDist = dist;
             }
         }
@@ -37,50 +39,46 @@ void PathOrderOptimizer::optimize()
 
 
     Point prev_point = startPoint;
-    for (unsigned int poly_order_idx = 0; poly_order_idx < polygons.size(); poly_order_idx++) /// actual path order optimizer
+    for (unsigned int polygon_idx = 0; polygon_idx < polygons.size(); polygon_idx++) /// actual path order optimizer
     {
-        int best_poly_idx = -1;
+        int best = -1;
         float bestDist = std::numeric_limits<float>::infinity();
 
 
-        for (unsigned int poly_idx = 0; poly_idx < polygons.size(); poly_idx++)
+        for (unsigned int polygon2_idx = 0; polygon2_idx < polygons.size(); polygon2_idx++)
         {
-            if (picked[poly_idx] || polygons[poly_idx].size() < 1) /// skip single-point-polygons
-            {
+            if (picked[polygon2_idx] || polygons[polygon2_idx].size() < 1) /// skip single-point-polygons
                 continue;
-            }
 
-            assert (polygons[poly_idx].size() != 2);
+            assert(polygons[polygon2_idx].size() != 2);
 
-            float dist = vSize2f(polygons[poly_idx][polyStart[poly_idx]] - prev_point);
+            float dist = vSize2f(polygons[polygon2_idx][polyStart[polygon2_idx]] - prev_point);
             if (dist < bestDist)
             {
-                best_poly_idx = poly_idx;
+                best = polygon2_idx;
                 bestDist = dist;
             }
 
         }
 
 
-        if (best_poly_idx > -1) /// should always be true; we should have been able to identify the best next polygon
+        if (best > -1) /// should always be true; we should have been able to identify the best next polygon
         {
-            assert(polygons[best_poly_idx].size() != 2);
+            assert(polygons[best].size() != 2);
 
-            prev_point = polygons[best_poly_idx][polyStart[best_poly_idx]];
+            prev_point = polygons[best][polyStart[best]];
 
-            picked[best_poly_idx] = true;
-            polyOrder.push_back(best_poly_idx);
+            picked[best] = true;
+            polyOrder.push_back(best);
         }
         else
-        {
             logError("Failed to find next closest polygon.\n");
-        }
     }
 
     prev_point = startPoint;
-    for (unsigned int order_idx = 0; order_idx < polyOrder.size(); order_idx++) /// decide final starting points in each polygon
+    for (unsigned int n = 0; n < polyOrder.size(); n++) /// decide final starting points in each polygon
     {
-        int poly_idx = polyOrder[order_idx];
+        int poly_idx = polyOrder[n];
         int point_idx = getPolyStart(prev_point, poly_idx);
         polyStart[poly_idx] = point_idx;
         prev_point = polygons[poly_idx][point_idx];
@@ -92,34 +90,32 @@ int PathOrderOptimizer::getPolyStart(Point prev_point, int poly_idx)
 {
     switch (type)
     {
-        case EZSeamType::BACK:      return getFarthestPointInPolygon(poly_idx); 
-        case EZSeamType::RANDOM:    return getRandomPointInPolygon(poly_idx); 
+        case EZSeamType::BACK:      return getFarthestPointInPolygon(poly_idx);
+        case EZSeamType::RANDOM:    return getRandomPointInPolygon(poly_idx);
         case EZSeamType::SHORTEST:  return getClosestPointInPolygon(prev_point, poly_idx);
         default:                    return getClosestPointInPolygon(prev_point, poly_idx);
     }
 }
 
-
 int PathOrderOptimizer::getClosestPointInPolygon(Point prev_point, int poly_idx)
 {
     PolygonRef poly = polygons[poly_idx];
-
     int best_point_idx = -1;
-    float best_point_score = std::numeric_limits<float>::infinity();
-    Point p0 = poly.back();
-    for (unsigned int point_idx = 0; point_idx < poly.size(); point_idx++)
+    float bestDist = std::numeric_limits<float>::infinity();
+    bool orientation = poly.orientation();
+    for (unsigned int i_point = 0; i_point < poly.size(); i_point++)
     {
-        Point& p1 = poly[point_idx];
-        Point& p2 = poly[(point_idx + 1) % poly.size()];
-        int64_t dist = vSize2(p1 - prev_point);
-        float is_on_inside_corner_score = -LinearAlg2D::getAngleLeft(p0, p1, p2) / M_PI * 5000 * 5000; // prefer inside corners
-        // this score is in the order of 5 mm
-        if (dist + is_on_inside_corner_score < best_point_score)
+        float dist = vSize2f(poly[i_point] - prev_point);
+        Point n0 = normal(poly[(i_point - 1 + poly.size()) % poly.size()] - poly[i_point], 2000);
+        Point n1 = normal(poly[i_point] - poly[(i_point + 1) % poly.size()], 2000);
+        float dot_score = dot(n0, n1) - dot(crossZ(n0), n1); /// prefer binnenbocht
+        if (orientation)
+            dot_score = -dot_score;
+        if (dist + dot_score < bestDist)
         {
-            best_point_idx = point_idx;
-            best_point_score = dist + is_on_inside_corner_score;
+            best_point_idx = i_point;
+            bestDist = dist;
         }
-        p0 = p1;
     }
     return best_point_idx;
 }
@@ -129,13 +125,12 @@ int PathOrderOptimizer::getRandomPointInPolygon(int poly_idx)
     return rand() % polygons[poly_idx].size();
 }
 
-
 int PathOrderOptimizer::getFarthestPointInPolygon(int poly_idx)
 {
     PolygonRef poly = polygons[poly_idx];
     int best_point_idx = -1;
     float best_y = std::numeric_limits<float>::min();
-    for(unsigned int point_idx=0 ; point_idx<poly.size() ; point_idx++)
+    for (unsigned int point_idx = 0; point_idx < poly.size(); point_idx++)
     {
         if (poly[point_idx].Y > best_y)
         {
@@ -146,126 +141,177 @@ int PathOrderOptimizer::getFarthestPointInPolygon(int poly_idx)
     return best_point_idx;
 }
 
+LineOrderOptimizer::LineOrderOptimizer(const Point& start_point, unsigned long long cluster_grid_size)
+: cluster_grid_size(cluster_grid_size == 0 ? 2000 : cluster_grid_size) //Initialise cluster_grid_size to 2000 if the input grid size is invalid (e.g. no infill).
+{
+    this->startPoint = start_point;
+}
 
 /**
-*
-*/
+ *
+ */
 void LineOrderOptimizer::optimize()
 {
-    int gridSize = 5000; // the size of the cells in the hash grid. TODO
-    SparsePointGridInclusive<unsigned int> line_bucket_grid(gridSize);
-    bool picked[polygons.size()];
-    memset(picked, false, sizeof(bool) * polygons.size());/// initialized as falses
-    
-    for (unsigned int poly_idx = 0; poly_idx < polygons.size(); poly_idx++) /// find closest point to initial starting point within each polygon +initialize picked
+    if (lines.empty()) //Nothing to do. Terminate early.
     {
-        int best_point_idx = -1;
-        float best_point_dist = std::numeric_limits<float>::infinity();
-        PolygonRef poly = polygons[poly_idx];
-        for (unsigned int point_idx = 0; point_idx < poly.size(); point_idx++) /// get closest point from polygon
-        {
-            float dist = vSize2f(poly[point_idx] - startPoint);
-            if (dist < best_point_dist)
-            {
-                best_point_idx = point_idx;
-                best_point_dist = dist;
-            }
-        }
-        polyStart.push_back(best_point_idx);
-
-        assert(poly.size() == 2);
-
-        line_bucket_grid.insert(poly[0], poly_idx);
-        line_bucket_grid.insert(poly[1], poly_idx);
-
+        return;
     }
 
+    //Since polyOrder must be filled with indices, an index in the polygons vector represents each line.
+    std::vector<Cluster> line_clusters = cluster();
 
-    Point incoming_perpundicular_normal(0, 0);
-    Point prev_point = startPoint;
-    for (unsigned int order_idx = 0; order_idx < polygons.size(); order_idx++) /// actual path order optimizer
+    //Define how the TSP solver should use its elements.
+    std::function<std::vector<std::pair<Point, Point>> (size_t)> get_orientations = [&](size_t cluster_index)->std::vector<std::pair<Point, Point>> //How to get the possible orientations of a cluster.
     {
-        int best_line_idx = -1;
-        float best_score = std::numeric_limits<float>::infinity(); // distance score for the best next line
-
-        /// check if single-line-polygon is close to last point
-        for(unsigned int close_line_idx :
-                line_bucket_grid.getNearbyVals(prev_point, gridSize))
+        std::vector<std::pair<Point, Point>> result;
+        const size_t first_line_index = line_clusters[cluster_index][0]; //The first line in the current cluster.
+        const size_t last_line_index = line_clusters[cluster_index].back(); //The last line in the current cluster.
+        const PolygonRef first_line = lines[first_line_index];
+        const PolygonRef last_line = lines[last_line_index];
+        const Point start_normal = first_line[polyStart[first_line_index]]; //Start of the path, not mirrored.
+        const Point end_normal = last_line[(polyStart[last_line_index] + last_line.size() - 1) % last_line.size()]; //End of the path, not mirrored.
+        result.push_back(std::pair<Point, Point>(start_normal, end_normal));
+        result.push_back(std::pair<Point, Point>(end_normal, start_normal)); //Can also insert in reverse!
+        if (line_clusters[cluster_index].size() > 1u) //If the cluster has one line, mirroring the line is equal to reversing the path. Otherwise, we must also include mirrored options.
         {
-            if (picked[close_line_idx] || polygons[close_line_idx].size() < 1)
-            {
-                continue;
-            }
-
-            updateBestLine(close_line_idx, best_line_idx, best_score, prev_point, incoming_perpundicular_normal);
+            const Point start_mirrored = first_line[(polyStart[first_line_index] + first_line.size() - 1) % first_line.size()]; //Start of the path, mirrored.
+            const Point end_mirrored = first_line[(polyStart[first_line_index] + first_line.size() - 1) % first_line.size()]; //End of the path, mirrored.
+            result.push_back(std::pair<Point, Point>(start_mirrored, end_mirrored));
+            result.push_back(std::pair<Point, Point>(end_mirrored, start_mirrored));
         }
+        return result;
+    };
+    TravellingSalesman<size_t> tspsolver(get_orientations); //Solves the macro TSP problem of ordering the clusters.
+    std::vector<size_t> cluster_orientations;
+    std::vector<size_t> unoptimised(line_clusters.size());
+    std::iota(unoptimised.begin(), unoptimised.end(), 0);
+    std::vector<size_t> optimised = tspsolver.findPath(unoptimised, cluster_orientations, &startPoint); //Approximate the shortest path with the TSP solver.
 
-        if (best_line_idx == -1) /// if single-line-polygon hasn't been found yet
+    //Actually put the paths in their correct order for the output.
+    polyOrder.reserve(lines.size());
+    for (size_t cluster_index = 0; cluster_index < optimised.size(); cluster_index++)
+    {
+        Cluster cluster = line_clusters[optimised[cluster_index]];
+        //Determine in what orientation we should place the cluster depending on cluster_orientations[cluster_index].
+        size_t orientation = cluster_orientations[cluster_index];
+        if (cluster.size() == 1) //Singleton clusters have only 2 possible orientations.
         {
-            for (unsigned int poly_idx = 0; poly_idx < polygons.size(); poly_idx++)
+            polyOrder.push_back(static_cast<int>(cluster[0]));
+            if (orientation >= 1)
             {
-                if (picked[poly_idx] || polygons[poly_idx].size() < 1) /// skip single-point-polygons
+                polyStart[cluster[0]] = 1 - polyStart[cluster[0]];
+            }
+        }
+        else //Larger clusters have 4 possible orientations.
+        {
+            if ((orientation & 1) == 0) //Not reversed.
+            {
+                for (size_t polygon_index = 0; polygon_index < cluster.size(); polygon_index++)
+                {
+                    polyOrder.push_back(static_cast<int>(cluster[polygon_index]));
+                }
+            }
+            else //Reversed.
+            {
+                for (size_t polygon_index = cluster.size(); polygon_index-- > 0; ) //Insert the lines in backward direction.
+                {
+                    polyOrder.push_back(static_cast<int>(cluster[polygon_index]));
+                }
+            }
+            if (orientation >= 2u) //Mirrored.
+            {
+                for (size_t polygon_index : cluster) //Mirror each line in the cluster.
+                {
+                    polyStart[polygon_index] = 1 - polyStart[polygon_index];
+                }
+            }
+        }
+    }
+}
+
+std::vector<std::vector<size_t>> LineOrderOptimizer::cluster()
+{
+    polyStart.resize(lines.size()); //Polystart should always contain an entry for all polygons.
+    BucketGrid2D<size_t> grid(cluster_grid_size);
+    for (size_t polygon_index = 0; polygon_index < lines.size(); polygon_index++) //First put every endpoint of all lines in the grid.
+    {
+        grid.insert(lines[polygon_index][0], polygon_index);
+        grid.insert(lines[polygon_index].back(), polygon_index);
+    }
+
+    std::vector<Cluster> clusters;
+    bool picked[lines.size()]; //For each polygon, whether it is already in a cluster.
+    memset(picked, 0, lines.size()); //Initialise to false.
+    for (size_t polygon_index = 0; polygon_index < lines.size(); polygon_index++) //Find clusters with nearest neighbour-ish search.
+    {
+        if (picked[polygon_index]) //Already in a cluster.
+        {
+            continue;
+        }
+        clusters.push_back(Cluster()); //Make a new cluster for this line.
+        clusters.back().push_back(polygon_index);
+        polyStart[polygon_index] = 0; //Choose one possible mirroring of the lines. This determines the start point of each line. The mirror of a cluster is also checked by the TSP solver (but the combination of directions of each individual line is determined here below).
+        picked[polygon_index] = true;
+        size_t current_polygon = polygon_index; //We'll do a walk to the nearest valid neighbour. A neighbour is valid if it is not picked yet and if both its endpoints are near.
+        size_t best_polygon = current_polygon;
+        while (best_polygon != static_cast<size_t>(-1)) //Keep going until there is no valid neighbour.
+        {
+            const PolygonRef current_line = lines[current_polygon];
+            Point current_start = current_line[polyStart[current_polygon]]; //Start and end point of the current polygon. These are used to find the distance to the next polygon.
+            Point current_end = current_line[(polyStart[current_polygon] + current_line.size() - 1) % current_line.size()];
+            best_polygon = static_cast<size_t>(-1);
+            unsigned long long best_distance = cluster_grid_size * cluster_grid_size + 1; //grid_size squared since vSize2 gives squared distance.
+            size_t best_start;
+            for (size_t neighbour : grid.findNearbyObjects(current_line[0]))
+            {
+                if (picked[neighbour]) //Don't use neighbours that are already in another cluster.
                 {
                     continue;
                 }
-                assert(polygons[poly_idx].size() == 2);
-
-                updateBestLine(poly_idx, best_line_idx, best_score, prev_point, incoming_perpundicular_normal);
-
+                tryCluster(neighbour, current_start, current_end, &best_polygon, &best_distance, &best_start);
+            }
+            if (best_polygon != static_cast<size_t>(-1)) //We found one.
+            {
+                current_polygon = best_polygon;
+                clusters.back().push_back(best_polygon);
+                polyStart[best_polygon] = best_start;
+                picked[best_polygon] = true;
             }
         }
-
-        if (best_line_idx > -1) /// should always be true; we should have been able to identify the best next polygon
-        {
-            PolygonRef best_line = polygons[best_line_idx];
-            assert(best_line.size() == 2);
-
-            int line_start_point_idx = polyStart[best_line_idx];
-            int line_end_point_idx = line_start_point_idx * -1 + 1; /// 1 -> 0 , 0 -> 1
-            Point& line_start = best_line[line_start_point_idx];
-            Point& line_end = best_line[line_end_point_idx];
-            prev_point = line_end;
-            incoming_perpundicular_normal = turn90CCW(normal(line_end - line_start, 1000));
-
-            picked[best_line_idx] = true;
-            polyOrder.push_back(best_line_idx);
-        }
-        else
-        {
-            logError("Failed to find next closest line.\n");
-        }
     }
+    return clusters;
 }
 
-inline void LineOrderOptimizer::updateBestLine(unsigned int poly_idx, int& best, float& best_score, Point prev_point, Point incoming_perpundicular_normal)
+void LineOrderOptimizer::tryCluster(size_t line, const Point current_start, const Point current_end, size_t* best_polygon, unsigned long long* best_distance, size_t* best_start)
 {
-    Point& p0 = polygons[poly_idx][0];
-    Point& p1 = polygons[poly_idx][1];
-    float dot_score = getAngleScore(incoming_perpundicular_normal, p0, p1);
-    { /// check distance to first point on line (0)
-        float score = vSize2f(p0 - prev_point) + dot_score; // prefer 90 degree corners
-        if (score < best_score)
+    //Input checking.
+    if (!best_polygon || !best_distance || !best_start) //Output parameter missing.
+    {
+        return;
+    }
+    
+    const unsigned long long distance_start_start = vSize2(current_start - lines[line][0]);
+    const unsigned long long distance_start_end = vSize2(current_start - lines[line].back());
+    const unsigned long long distance_end_start = vSize2(current_end - lines[line][0]);
+    const unsigned long long distance_end_end = vSize2(current_end - lines[line].back());
+    if (distance_start_start < cluster_grid_size * cluster_grid_size && distance_end_end < cluster_grid_size * cluster_grid_size) //Two lines are alongside each other.
+    {
+        if (distance_end_end < *best_distance) //Best neighbour and orientation so far.
         {
-            best = poly_idx;
-            best_score = score;
-            polyStart[poly_idx] = 0;
+            *best_polygon = line;
+            *best_distance = distance_end_end;
+            *best_start = lines[line].size() - 1;
         }
     }
-    { /// check distance to second point on line (1)
-        float score = vSize2f(p1 - prev_point) + dot_score; // prefer 90 degree corners
-        if (score < best_score)
+    if (distance_start_end < cluster_grid_size * cluster_grid_size && distance_end_start < cluster_grid_size * cluster_grid_size) //Two lines are alongside each other, but in reverse direction.
+    {
+        if (distance_end_start < *best_distance)
         {
-            best = poly_idx;
-            best_score = score;
-            polyStart[poly_idx] = 1;
+            *best_polygon = line;
+            *best_distance = distance_end_start;
+            *best_start = 0;
         }
     }
 }
 
-float LineOrderOptimizer::getAngleScore(Point incoming_perpundicular_normal, Point p0, Point p1)
-{
-    return dot(incoming_perpundicular_normal, normal(p1 - p0, 1000)) * 0.0001f;
-}
-
-
 }//namespace cura

src/pathOrderOptimizer.h

@@ -4,7 +4,7 @@
 
 #include <stdint.h>
 #include "utils/polygon.h"
-#include "settings/settings.h"
+#include "settings.h"
 
 namespace cura {
  
@@ -18,7 +18,7 @@ class PathOrderOptimizer
 {
 public:
     EZSeamType type;
-    Point startPoint; //!< A location near the prefered start location
+    Point startPoint; //!< The location of the nozzle before starting to print the current layer
     std::vector<PolygonRef> polygons; //!< the parts of the layer (in arbitrary order)
     std::vector<int> polyStart; //!< polygons[i][polyStart[i]] = point of polygon i which is to be the starting point in printing the polygon
     std::vector<int> polyOrder; //!< the optimized order as indices in #polygons
@@ -56,60 +56,89 @@ private:
 */
 class LineOrderOptimizer
 {
+    typedef typename std::vector<size_t> Cluster; //To make it more clear what a cluster is.
+
 public:
+    /*!
+     * \brief The size of the grid cells used to cluster lines.
+     * 
+     * Increase this value to make the optimisation algorithm fall back to
+     * nearest neighbour more often. Reduce this value to make the optimisation
+     * algorithm use random insertion on smaller pieces of the input.
+     */
+    const unsigned long long cluster_grid_size;
+    
     Point startPoint; //!< The location of the nozzle before starting to print the current layer
-    std::vector<PolygonRef> polygons; //!< the parts of the layer (in arbitrary order)
+    std::vector<PolygonRef> lines; //!< the parts of the layer (in arbitrary order)
     std::vector<int> polyStart; //!< polygons[i][polyStart[i]] = point of polygon i which is to be the starting point in printing the polygon
     std::vector<int> polyOrder; //!< the optimized order as indices in #polygons
 
-    LineOrderOptimizer(Point startPoint)
-    {
-        this->startPoint = startPoint;
-    }
+    /*!
+     * \brief Constructs the line order optimiser with the specified settings.
+     * 
+     * \param start_point The starting point from where the paths generated by
+     * this optimiser must start.
+     * \param cluster_grid_size The size of the grid cells used to cluster
+     * lines. Make this bigger and the optimiser will fall back to nearest
+     * neighbour search more often. Make this smaller and the optimiser will
+     * use random insertion more often.
+     */
+    LineOrderOptimizer(const Point& start_point, unsigned long long cluster_grid_size);
 
     void addPolygon(PolygonRef polygon)
     {
-        this->polygons.push_back(polygon);
+        this->lines.push_back(polygon);
     }
 
     void addPolygons(Polygons& polygons)
     {
-        for(unsigned int i=0;i<polygons.size(); i++)
-            this->polygons.push_back(polygons[i]);
+        for(unsigned int i = 0; i < polygons.size(); i++)
+        {
+            this->lines.push_back(polygons[i]);
+        }
     }
 
     void optimize(); //!< sets #polyStart and #polyOrder
 
 private:
     /*!
-     * Update LineOrderOptimizer::polyStart if the current line is better than the current best.
+     * \brief Clusters the polygons in groups such that the start and end of the
+     * polygons in each group are close together.
      * 
-     * Besides looking at the distance from the previous line segment, we also look at the angle we make.
+     * This performs a simple nearest-neighbour traversal through all lines. An
+     * arbitrary line is chosen as starting point for a cluster, and iteratively
+     * the nearest neighbouring line will get added to that cluster. A line is
+     * only neighbouring if both of its endpoints are nearby the endpoints of
+     * the previous line. This way you get logical groups of lines that should
+     * always be in sequence, with fairly low computational cost.
      * 
-     * We prefer 90 degree angles; 180 degree turn arounds are slow on machines where the jerk is limited.
-     * 0 degree (straight ahead) 'corners' occur only when a single infill line is interrupted, 
-     * in which case the travel move might involve combing, which makes it rather longer.
-     * 
-     * \param poly_idx[in] The index in LineOrderOptimizer::polygons for the current line to test
-     * \param best[in, out] The index of current best line
-     * \param best_score[in, out] The distance score for the current best line
-     * \param prev_point[in] The previous point from which to find the next best line
-     * \param incoming_perpundicular_normal[in] The direction of movement when the print head arrived at \p prev_point, turned 90 degrees CCW
+     * \return Clusters of polygons, where each cluster is represented with a
+     * vector of indices pointing to positions in \link polygons.
      */
-    void updateBestLine(unsigned int poly_idx, int& best, float& best_score, Point prev_point, Point incoming_perpundicular_normal);
+    std::vector<Cluster> cluster();
 
     /*!
-     * Get a score to modify the distance score for measuring how good two lines follow each other.
-     * 
-     * The angle score is symmetric in \p from and \p to; they can be exchanged without altering the result. (Code relies on this property)
-     * 
-     * \param incoming_perpundicular_normal The direction in which the head was moving while printing the previous line, turned 90 degrees CCW
-     * \param from The one end of the next line
-     * \param to The other end of the next line
-     * \return A score measuring how good the angle is of the line between \p from and \p to when the previous line had a direction given by \p incoming_perpundicular_normal 
-     * 
+     * \brief Tries to insert the specified line in the currently processed
+     * cluster.
+     *
+     * The distance of the line to the current line (represented by
+     * \p current_start and \p current_end) is measured, and compared to the
+     * distance of the best candidate to insert so far. If it is shorter, then
+     * the new line is stored via \p best_polygon as the best line to add to the
+     * cluster.
+     *
+     * \param line The index of the new line to try to add to the cluster.
+     * \param current_start The start point of the previous line that was added.
+     * \param current_end The end point of the previous line that was added.
+     * \param best_polygon The line that is the best candidate to insert so far.
+     * This parameter may be changed by this function if the new line is better.
+     * \param best_distance The distance of the best candidate to insert so far.
+     * This parameter may be changed by this function if the new line is better.
+     * \param best_start The starting vertex index of the best candidate to
+     * insert so far. This parameter may be changed by this function if the new
+     * line is better.
      */
-    static float getAngleScore(Point incoming_perpundicular_normal, Point from, Point to);
+    void tryCluster(size_t line, const Point current_start, const Point current_end, size_t* best_polygon, unsigned long long* best_distance, size_t* best_start);
 };
 
 }//namespace cura

src/pathPlanning/Comb.cpp

@@ -1,419 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include "Comb.h"
-
-#include <algorithm>
-#include <functional> // function
-#include <unordered_set>
-
-#include "../utils/polygonUtils.h"
-#include "../utils/PolygonsPointIndex.h"
-#include "../sliceDataStorage.h"
-#include "../utils/SVG.h"
-
-namespace cura {
-
-Polygons Comb::getCombOutlines()
-{
-    if (layer_nr >= 0)
-    {
-        bool include_helper_parts = false;
-        return storage.getLayerOutlines(layer_nr, include_helper_parts);
-    }
-    else
-    {
-        return storage.raftOutline;
-    }
-}
-
-LocToLineGrid& Comb::getOutsideLocToLine()
-{
-    return *outside_loc_to_line;
-}
-
-Polygons& Comb::getBoundaryOutside()
-{
-    return *boundary_outside;
-}
-  
-Comb::Comb(SliceDataStorage& storage, int layer_nr, Polygons& comb_boundary_inside, int64_t comb_boundary_offset, bool travel_avoid_other_parts, int64_t travel_avoid_distance)
-: storage(storage)
-, layer_nr(layer_nr)
-, offset_from_outlines(comb_boundary_offset) // between second wall and infill / other walls
-, max_move_inside_distance2(offset_from_outlines * 2 * offset_from_outlines * 2)
-, offset_from_outlines_outside(travel_avoid_distance)
-, offset_from_inside_to_outside(offset_from_outlines + offset_from_outlines_outside)
-, max_crossing_dist2(offset_from_inside_to_outside * offset_from_inside_to_outside * 2) // so max_crossing_dist = offset_from_inside_to_outside * sqrt(2) =approx 1.5 to allow for slightly diagonal crossings and slightly inaccurate crossing computation
-, avoid_other_parts(travel_avoid_other_parts)
-, boundary_inside( comb_boundary_inside )
-, partsView_inside( boundary_inside.splitIntoPartsView() ) // WARNING !! changes the order of boundary_inside !!
-, outlines(getCombOutlines())
-, inside_loc_to_line(PolygonUtils::createLocToLineGrid(boundary_inside, comb_boundary_offset))
-, boundary_outside(
-        [&storage, layer_nr, travel_avoid_distance]()
-        {
-            return storage.getLayerOutlines(layer_nr, false).offset(travel_avoid_distance);
-        }
-    )
-, outside_loc_to_line(
-        [](Comb* comber, const int64_t offset_from_inside_to_outside)
-        {
-            return PolygonUtils::createLocToLineGrid(comber->getBoundaryOutside(), offset_from_inside_to_outside * 3 / 2);
-        }
-        , this
-        , offset_from_inside_to_outside
-    )
-{
-}
-
-Comb::~Comb()
-{
-    if (inside_loc_to_line)
-    {
-        delete inside_loc_to_line;
-    }
-}
-
-bool Comb::calc(Point startPoint, Point endPoint, CombPaths& combPaths, bool _startInside, bool _endInside, int64_t max_comb_distance_ignored, bool via_outside_makes_combing_fail, bool fail_on_unavoidable_obstacles)
-{
-    if (shorterThen(endPoint - startPoint, max_comb_distance_ignored))
-    {
-        return true;
-    }
-
-    //Move start and end point inside the comb boundary
-    unsigned int start_inside_poly = NO_INDEX;
-    const bool startInside = moveInside(_startInside, startPoint, start_inside_poly);
-
-    unsigned int end_inside_poly = NO_INDEX;
-    const bool endInside = moveInside(_endInside, endPoint, end_inside_poly);
-
-    unsigned int start_part_boundary_poly_idx;
-    unsigned int end_part_boundary_poly_idx;
-    unsigned int start_part_idx =   (start_inside_poly == NO_INDEX)?    NO_INDEX : partsView_inside.getPartContaining(start_inside_poly, &start_part_boundary_poly_idx);
-    unsigned int end_part_idx =     (end_inside_poly == NO_INDEX)?      NO_INDEX : partsView_inside.getPartContaining(end_inside_poly, &end_part_boundary_poly_idx);
-    
-    if (startInside && endInside && start_part_idx == end_part_idx)
-    { // normal combing within part
-        PolygonsPart part = partsView_inside.assemblePart(start_part_idx);
-        combPaths.emplace_back();
-        return LinePolygonsCrossings::comb(part, *inside_loc_to_line, startPoint, endPoint, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored, fail_on_unavoidable_obstacles);
-    }
-    else 
-    { // comb inside part to edge (if needed) >> move through air avoiding other parts >> comb inside end part upto the endpoint (if needed) 
-        //  INSIDE  |          in_between            |            OUTSIDE     |              in_between         |     INSIDE
-        //        ^crossing_1_in     ^crossing_1_mid  ^crossing_1_out        ^crossing_2_out    ^crossing_2_mid   ^crossing_2_in
-        //
-        // when startPoint is inside crossing_1_in is of interest
-        // when it is in between inside and outside it is equal to crossing_1_mid
-
-        if (via_outside_makes_combing_fail)
-        {
-            return false;
-        }
-
-        Crossing start_crossing(startPoint, startInside, start_part_idx, start_part_boundary_poly_idx, boundary_inside, inside_loc_to_line);
-        Crossing end_crossing(endPoint, endInside, end_part_idx, end_part_boundary_poly_idx, boundary_inside, inside_loc_to_line);
-
-        { // find crossing over the in-between area between inside and outside
-            start_crossing.findCrossingInOrMid(partsView_inside, endPoint);
-            end_crossing.findCrossingInOrMid(partsView_inside, start_crossing.in_or_mid);
-        }
-
-        bool skip_avoid_other_parts_path = false;
-        if (skip_avoid_other_parts_path && vSize2(start_crossing.in_or_mid - end_crossing.in_or_mid) < offset_from_inside_to_outside * offset_from_inside_to_outside * 4)
-        { // parts are next to eachother, i.e. the direct crossing will always be smaller than two crossings via outside
-            skip_avoid_other_parts_path = true;
-        }
-
-        if (avoid_other_parts && !skip_avoid_other_parts_path)
-        { // compute the crossing points when moving through air
-            // comb through all air, since generally the outside consists of a single part
-
-            bool success = start_crossing.findOutside(*boundary_outside, end_crossing.in_or_mid, fail_on_unavoidable_obstacles, *this);
-            if (!success)
-            {
-                return false;
-            }
-
-            success = end_crossing.findOutside(*boundary_outside, start_crossing.out, fail_on_unavoidable_obstacles, *this);
-            if (!success)
-            {
-                return false;
-            }
-        }
-
-        // generate the actual comb paths
-        if (startInside)
-        {
-            // start to boundary
-            assert(start_crossing.dest_part.size() > 0 && "The part we start inside when combing should have been computed already!");
-            combPaths.emplace_back();
-            bool combing_succeeded = LinePolygonsCrossings::comb(start_crossing.dest_part, *inside_loc_to_line, startPoint, start_crossing.in_or_mid, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored, fail_on_unavoidable_obstacles);
-            if (!combing_succeeded)
-            { // Couldn't comb between start point and computed crossing from the start part! Happens for very thin parts when the offset_to_get_off_boundary moves points to outside the polygon
-                return false;
-            }
-        }
-        
-        // throught air from boundary to boundary
-        if (avoid_other_parts && !skip_avoid_other_parts_path)
-        {
-            combPaths.emplace_back();
-            combPaths.throughAir = true;
-            if ( vSize(start_crossing.in_or_mid - end_crossing.in_or_mid) < vSize(start_crossing.in_or_mid - start_crossing.out) + vSize(end_crossing.in_or_mid - end_crossing.out) )
-            { // via outside is moving more over the in-between zone
-                combPaths.back().push_back(start_crossing.in_or_mid);
-                combPaths.back().push_back(end_crossing.in_or_mid);
-            }
-            else
-            {
-                bool combing_succeeded = LinePolygonsCrossings::comb(*boundary_outside, *outside_loc_to_line, start_crossing.out, end_crossing.out, combPaths.back(), offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored, fail_on_unavoidable_obstacles);
-                if (!combing_succeeded)
-                {
-                    return false;
-                }
-            }
-        }
-        else 
-        { // directly through air (not avoiding other parts)
-            combPaths.emplace_back();
-            combPaths.throughAir = true;
-            combPaths.back().cross_boundary = true; // note: we don't actually know whether this is cross boundary, but it might very well be
-            combPaths.back().push_back(start_crossing.in_or_mid);
-            combPaths.back().push_back(end_crossing.in_or_mid);
-        }
-        if (skip_avoid_other_parts_path)
-        {
-            if (startInside == endInside && start_part_idx == end_part_idx)
-            {
-                if (startInside)
-                { // both start and end are inside
-                    combPaths.back().cross_boundary = PolygonUtils::polygonCollidesWithLineSegment(startPoint, endPoint, *inside_loc_to_line);
-                }
-                else
-                { // both start and end are outside
-                    combPaths.back().cross_boundary = PolygonUtils::polygonCollidesWithLineSegment(startPoint, endPoint, *outside_loc_to_line);
-                }
-            }
-            else
-            {
-                combPaths.back().cross_boundary = true;
-            }
-        }
-        
-        if (endInside)
-        {
-            // boundary to end
-            assert(end_crossing.dest_part.size() > 0 && "The part we end up inside when combing should have been computed already!");
-            combPaths.emplace_back();
-            
-            bool combing_succeeded = LinePolygonsCrossings::comb(end_crossing.dest_part, *inside_loc_to_line, end_crossing.in_or_mid, endPoint, combPaths.back(), -offset_dist_to_get_from_on_the_polygon_to_outside, max_comb_distance_ignored, fail_on_unavoidable_obstacles);
-            if (!combing_succeeded)
-            { // Couldn't comb between end point and computed crossing to the end part! Happens for very thin parts when the offset_to_get_off_boundary moves points to outside the polygon
-                return false;
-            }
-        }
-        
-        return true;
-    }
-}
-
-Comb::Crossing::Crossing(const Point& dest_point, const bool dest_is_inside, const unsigned int dest_part_idx, const unsigned int dest_part_boundary_crossing_poly_idx, const Polygons& boundary_inside, const LocToLineGrid* inside_loc_to_line)
-: dest_is_inside(dest_is_inside)
-, boundary_inside(boundary_inside)
-, inside_loc_to_line(inside_loc_to_line)
-, dest_point(dest_point)
-, dest_part_idx(dest_part_idx)
-{
-    if (dest_is_inside)
-    {
-        dest_crossing_poly = boundary_inside[dest_part_boundary_crossing_poly_idx]; // initialize with most obvious poly, cause mostly a combing move will move outside the part, rather than inside a hole in the part
-    }
-}
-
-bool Comb::moveInside(bool is_inside, Point& dest_point, unsigned int& inside_poly)
-{
-    if (is_inside)
-    {
-        coord_t max_move_inside_distance2_here = std::numeric_limits<coord_t>::max(); // the distance which would make the moveInside fail
-        if (storage.getSettingAsCombingMode("retraction_combing") == cura::CombingMode::NO_SKIN)
-        { // if we perform no_skin combing, then a far move inside is likely a consequence of there meing skin in between the destination point and the inside comb boundary
-            // if we perform normal combing, then a far move inside is likely to be a consequence of sharp pointy segments in the layer part
-            max_move_inside_distance2_here = max_move_inside_distance2;
-        }
-        Point original_dest_point = dest_point;
-        ClosestPolygonPoint cpp = PolygonUtils::ensureInsideOrOutside(boundary_inside, dest_point, offset_extra_start_end, max_move_inside_distance2_here, &boundary_inside, inside_loc_to_line);
-        if (!cpp.isValid())
-        {
-            return false;
-        }
-        else
-        {
-            if (vSize2(dest_point - original_dest_point) > max_move_inside_distance2 // only check for collision with outlines for long moves
-                && PolygonUtils::polygonCollidesWithLineSegment(outlines, dest_point, original_dest_point))
-            {
-                return false;
-            }
-            else
-            {
-                inside_poly = cpp.poly_idx;
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-void Comb::Crossing::findCrossingInOrMid(const PartsView& partsView_inside, const Point close_to)
-{
-    if (dest_is_inside)
-    { // in-case
-        // find the point on the start inside-polygon closest to the endpoint, but also kind of close to the start point
-        Point _dest_point(dest_point); // copy to local variable for lambda capture
-        std::function<int(Point)> close_towards_start_penalty_function([_dest_point](Point candidate){ return vSize2((candidate - _dest_point) / 10); });
-        dest_part = partsView_inside.assemblePart(dest_part_idx);
-
-        ClosestPolygonPoint boundary_crossing_point;
-        { // set [result] to a point on the destination part closest to close_to (but also a bit close to fest_point)
-            std::unordered_set<unsigned int> dest_part_poly_indices;
-            for (unsigned int poly_idx : partsView_inside[dest_part_idx])
-            {
-                dest_part_poly_indices.emplace(poly_idx);
-            }
-            coord_t dist2_score = std::numeric_limits<coord_t>::max();
-            std::function<bool (const PolygonsPointIndex&)> line_processor
-                = [close_to, _dest_point, &boundary_crossing_point, &dist2_score, &dest_part_poly_indices](const PolygonsPointIndex& boundary_segment)
-                {
-                    if (dest_part_poly_indices.find(boundary_segment.poly_idx) == dest_part_poly_indices.end())
-                    { // we're not looking at a polygon from the dest_part
-                        return true; // a.k.a. continue;
-                    }
-                    Point closest_here = LinearAlg2D::getClosestOnLineSegment(close_to, boundary_segment.p(), boundary_segment.next().p());
-                    coord_t dist2_score_here = vSize2(close_to - closest_here) + vSize2(_dest_point - closest_here) / 10;
-                    if (dist2_score_here < dist2_score)
-                    {
-                        dist2_score = dist2_score_here;
-                        boundary_crossing_point = ClosestPolygonPoint(closest_here, boundary_segment.point_idx, boundary_segment.getPolygon(), boundary_segment.poly_idx);
-                    }
-                    return true;
-                };
-            inside_loc_to_line->processLine(std::make_pair(dest_point, close_to), line_processor);
-        }
-
-        Point result(boundary_crossing_point.p()); // the inside point of the crossing
-        if (!boundary_crossing_point.isValid())
-        { // no point has been found in the sparse grid
-            result = dest_point;
-        }
-
-        int64_t max_dist2 = std::numeric_limits<int64_t>::max();
-        ClosestPolygonPoint crossing_1_in_cp = PolygonUtils::ensureInsideOrOutside(dest_part, result, boundary_crossing_point, offset_dist_to_get_from_on_the_polygon_to_outside, max_dist2, &boundary_inside, inside_loc_to_line, close_towards_start_penalty_function);
-        if (crossing_1_in_cp.isValid())
-        {
-            dest_crossing_poly = crossing_1_in_cp.poly;
-            in_or_mid = result;
-        }
-        else
-        { // part is too small to be ensuring a point inside with the given distance
-            in_or_mid = dest_point; // just use the startPoint or endPoint itself
-        }
-    }
-    else
-    {
-        in_or_mid = dest_point; // mid-case
-    }
-};
-
-bool Comb::Crossing::findOutside(const Polygons& outside, const Point close_to, const bool fail_on_unavoidable_obstacles, Comb& comber)
-{
-    out = in_or_mid;
-    if (dest_is_inside || outside.inside(in_or_mid, true)) // start in_between
-    { // move outside
-        Point preferred_crossing_1_out = in_or_mid + normal(close_to - in_or_mid, comber.offset_from_inside_to_outside);
-        std::function<int(Point)> close_to_penalty_function([preferred_crossing_1_out](Point candidate){ return vSize2((candidate - preferred_crossing_1_out) / 2); });
-        std::optional<ClosestPolygonPoint> crossing_1_out_cpp = PolygonUtils::findClose(in_or_mid, outside, comber.getOutsideLocToLine(), close_to_penalty_function);
-        if (crossing_1_out_cpp)
-        {
-            out = PolygonUtils::moveOutside(*crossing_1_out_cpp, comber.offset_dist_to_get_from_on_the_polygon_to_outside);
-        }
-        else 
-        {
-            PolygonUtils::moveOutside(outside, out, comber.offset_dist_to_get_from_on_the_polygon_to_outside);
-        }
-    }
-    int64_t in_out_dist2_1 = vSize2(out - in_or_mid); 
-    if (dest_is_inside && in_out_dist2_1 > comber.max_crossing_dist2) // moveInside moved too far
-    { // if move is too far over in_between
-        // find crossing closer by
-        assert(dest_crossing_poly && "destination crossing poly should have been instantiated!");
-        std::shared_ptr<std::pair<ClosestPolygonPoint, ClosestPolygonPoint>> best = findBestCrossing(outside, *dest_crossing_poly, dest_point, close_to, comber);
-        if (best)
-        {
-            in_or_mid = PolygonUtils::moveInside(best->first, comber.offset_dist_to_get_from_on_the_polygon_to_outside);
-            out = PolygonUtils::moveOutside(best->second, comber.offset_dist_to_get_from_on_the_polygon_to_outside);
-        }
-        if (fail_on_unavoidable_obstacles && vSize2(out - in_or_mid) > comber.max_crossing_dist2) // moveInside moved still too far
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-
-std::shared_ptr<std::pair<ClosestPolygonPoint, ClosestPolygonPoint>> Comb::Crossing::findBestCrossing(const Polygons& outside, const PolygonRef from, const Point estimated_start, const Point estimated_end, Comb& comber)
-{
-    ClosestPolygonPoint* best_in = nullptr;
-    ClosestPolygonPoint* best_out = nullptr;
-    int64_t best_detour_score = std::numeric_limits<int64_t>::max();
-    int64_t best_crossing_dist2;
-    std::vector<std::pair<ClosestPolygonPoint, ClosestPolygonPoint>> crossing_out_candidates = PolygonUtils::findClose(from, outside, comber.getOutsideLocToLine());
-    bool seen_close_enough_connection = false;
-    for (std::pair<ClosestPolygonPoint, ClosestPolygonPoint>& crossing_candidate : crossing_out_candidates)
-    {
-        int64_t crossing_dist2 = vSize2(crossing_candidate.first.location - crossing_candidate.second.location);
-        if (crossing_dist2 > comber.max_crossing_dist2 * 2)
-        { // preliminary filtering
-            continue;
-        }
-        
-        int64_t dist_to_start = vSize(crossing_candidate.second.location - estimated_start); // use outside location, so that the crossing direction is taken into account
-        int64_t dist_to_end = vSize(crossing_candidate.second.location - estimated_end);
-        int64_t detour_dist = dist_to_start + dist_to_end;
-        int64_t detour_score = crossing_dist2 + detour_dist * detour_dist / 1000; // prefer a closest connection over a detour
-        // The detour distance is generally large compared to the crossing distance.
-        // While the crossing is generally about 1mm across,
-        // the distance between an arbitrary point and the boundary may well be a couple of centimetres.
-        // So the crossing_dist2 is about 1.000.000 while the detour_dist_2 is in the order of 400.000.000
-        // In the end we just want to choose between two points which have the _same_ crossing distance, modulo rounding error.
-        if ((!seen_close_enough_connection && detour_score < best_detour_score) // keep the best as long as we havent seen one close enough (so that we may walk along the polygon to find a closer connection from it in the code below)
-            || (!seen_close_enough_connection && crossing_dist2 <= comber.max_crossing_dist2) // make the one which is close enough the best as soon as we see one close enough
-            || (seen_close_enough_connection && crossing_dist2 <= comber.max_crossing_dist2 && detour_score < best_detour_score)) // update to keep the best crossing which is close enough already
-        {
-            if (!seen_close_enough_connection && crossing_dist2 <= comber.max_crossing_dist2)
-            {
-                seen_close_enough_connection = true;
-            }
-            best_in = &crossing_candidate.first;
-            best_out = &crossing_candidate.second;
-            best_detour_score = detour_score;
-            best_crossing_dist2 = crossing_dist2;
-        }
-    }
-    if (best_detour_score == std::numeric_limits<int64_t>::max())
-    { // i.e. if best_in == nullptr or if best_out == nullptr
-        return std::shared_ptr<std::pair<ClosestPolygonPoint, ClosestPolygonPoint>>();
-    }
-    if (best_crossing_dist2 > comber.max_crossing_dist2)
-    { // find closer point on line segments, rather than moving between vertices of the polygons only
-        PolygonUtils::walkToNearestSmallestConnection(*best_in, *best_out);
-        best_crossing_dist2 = vSize2(best_in->location - best_out->location);
-        if (best_crossing_dist2 > comber.max_crossing_dist2)
-        {
-            return std::shared_ptr<std::pair<ClosestPolygonPoint, ClosestPolygonPoint>>();
-        }
-    }
-    return std::make_shared<std::pair<ClosestPolygonPoint, ClosestPolygonPoint>>(*best_in, *best_out);
-}
-
-}//namespace cura

src/pathPlanning/Comb.h

@@ -1,185 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef PATH_PLANNING_COMB_H
-#define PATH_PLANNING_COMB_H
-
-#include <memory> // shared_ptr
-
-#include "../utils/optional.h"
-#include "../utils/polygon.h"
-#include "../utils/SparsePointGridInclusive.h"
-#include "../utils/polygonUtils.h"
-#include "../utils/LazyInitialization.h"
-
-#include "LinePolygonsCrossings.h"
-#include "CombPath.h"
-#include "CombPaths.h"
-
-namespace cura 
-{
-
-class SliceDataStorage;
-
-/*!
- * Class for generating a full combing actions from a travel move from a start point to an end point.
- * A single Comb object is used for each layer.
- * 
- * Comb::calc is the main function of this class.
- * 
- * Typical output: A combing path to the boundary of the polygon + a move through air avoiding other parts in the layer + a combing path from the boundary of the ending polygon to the end point.
- * Each of these three is a CombPath; the first and last are within Comb::boundary_inside while the middle is outside of Comb::boundary_outside.
- * Between these there is a little gap where the nozzle crosses the boundary of an object approximately perpendicular to its boundary.
- * 
- * As an optimization, the combing paths inside are calculated on specifically those PolygonsParts within which to comb, while the coundary_outside isn't split into outside parts, 
- * because generally there is only one outside part; encapsulated holes occur less often.
- */
-class Comb
-{
-    friend class LinePolygonsCrossings;
-private:
-    /*!
-     * A crossing from the inside boundary to the outside boundary.
-     * 
-     * 'dest' is either the startPoint or the endpoint of a whole combing move.
-     */
-    class Crossing
-    {
-    public:
-        bool dest_is_inside; //!< Whether the startPoint or endPoint is inside the inside boundary
-        Point in_or_mid; //!< The point on the inside boundary, or in between the inside and outside boundary if the start/end point isn't inside the inside boudary
-        Point out; //!< The point on the outside boundary
-        PolygonsPart dest_part; //!< The assembled inside-boundary PolygonsPart in which the dest_point lies. (will only be initialized when Crossing::dest_is_inside holds)
-        std::optional<PolygonRef> dest_crossing_poly; //!< The polygon of the part in which dest_point lies, which will be crossed (often will be the outside polygon)
-        const Polygons& boundary_inside; //!< The inside boundary as in \ref Comb::boundary_inside
-        const LocToLineGrid* inside_loc_to_line; //!< The loc to line grid \ref Comb::inside_loc_to_line
-
-        /*!
-         * Simple constructor
-         * 
-         * \param dest_point Either the eventual startPoint or the eventual endPoint of this combing move.
-         * \param dest_is_inside Whether the startPoint or endPoint is inside the inside boundary.
-         * \param dest_part_idx The index into Comb:partsView_inside of the part in which the \p dest_point is.
-         * \param dest_part_boundary_crossing_poly_idx The index in \p boundary_inside of the polygon of the part in which dest_point lies, which will be crossed (often will be the outside polygon).
-         * \param boundary_inside The boundary within which to comb.
-         */
-        Crossing(const Point& dest_point, const bool dest_is_inside, const unsigned int dest_part_idx, const unsigned int dest_part_boundary_crossing_poly_idx, const Polygons& boundary_inside, const LocToLineGrid* inside_loc_to_line);
-
-        /*!
-         * Find the not-outside location (Combing::in_or_mid) of the crossing between to the outside boundary
-         * 
-         * \param partsView_inside Structured indices onto Comb::boundary_inside which shows which polygons belong to which part. 
-         * \param close_to[in] Try to get a crossing close to this point
-         */
-        void findCrossingInOrMid(const PartsView& partsView_inside, const Point close_to);
-
-        /*!
-         * Find the outside location (Combing::out)
-         * 
-         * \param outside The outside boundary polygons
-         * \param close_to A point to get closer to when there are multiple candidates on the outside boundary which are almost equally close to the Crossing::in_or_mid
-         * \param fail_on_unavoidable_obstacles When moving over other parts is inavoidable, stop calculation early and return false.
-         * \param comber[in] The combing calculator which has references to the offsets and boundaries to use in combing.
-         */
-        bool findOutside(const Polygons& outside, const Point close_to, const bool fail_on_unavoidable_obstacles, Comb& comber);
-
-    private:
-        const Point dest_point; //!< Either the eventual startPoint or the eventual endPoint of this combing move
-        unsigned int dest_part_idx; //!< The index into Comb:partsView_inside of the part in which the \p dest_point is.
-
-        /*!
-         * Find the best crossing from some inside polygon to the outside boundary.
-         * 
-         * The detour from \p estimated_start to \p estimated_end is minimized.
-         * 
-         * \param outside The outside boundary polygons
-         * \param from From which inside boundary the crossing to the outside starts or ends
-         * \param estimated_start The one point to which to stay close when evaluating crossings which cross about the same distance
-         * \param estimated_end The other point to which to stay close when evaluating crossings which cross about the same distance
-         * \param comber[in] The combing calculator which has references to the offsets and boundaries to use in combing.
-         * \return A pair of which the first is the crossing point on the inside boundary and the second the crossing point on the outside boundary
-         */
-        std::shared_ptr<std::pair<ClosestPolygonPoint, ClosestPolygonPoint>> findBestCrossing(const Polygons& outside, const PolygonRef from, Point estimated_start, Point estimated_end, Comb& comber);
-    };
-
-
-    SliceDataStorage& storage; //!< The storage from which to compute the outside boundary, when needed.
-    const int layer_nr; //!< The layer number for the layer for which to compute the outside boundary, when needed.
-    
-    const int64_t offset_from_outlines; //!< Offset from the boundary of a part to the comb path. (nozzle width / 2)
-    const int64_t max_move_inside_distance2; //!< Maximal distance of a point to the Comb::boundary_inside which is still to be considered inside. (very sharp corners not allowed :S)
-    const int64_t offset_from_outlines_outside; //!< Offset from the boundary of a part to a travel path which avoids it by this distance.
-    const int64_t offset_from_inside_to_outside; //!< The sum of the offsets for the inside and outside boundary Comb::offset_from_outlines and Comb::offset_from_outlines_outside
-    const int64_t max_crossing_dist2; //!< The maximal distance by which to cross the in_between area between inside and outside
-    static const int64_t max_moveOutside_distance2 = INT64_MAX; //!< Any point which is not inside should be considered outside.
-    static const int64_t offset_dist_to_get_from_on_the_polygon_to_outside = 40; //!< in order to prevent on-boundary vs crossing boundary confusions (precision thing)
-    static const int64_t offset_extra_start_end = 100; //!< Distance to move start point and end point toward eachother to extra avoid collision with the boundaries.
-
-    const bool avoid_other_parts; //!< Whether to perform inverse combing a.k.a. avoid parts.
-
-    Polygons& boundary_inside; //!< The boundary within which to comb.
-    PartsView partsView_inside; //!< Structured indices onto boundary_inside which shows which polygons belong to which part. 
-    Polygons outlines; //!< The actual boundary between the model and air
-    LocToLineGrid* inside_loc_to_line; //!< The SparsePointGridInclusive mapping locations to line segments of the inner boundary.
-    LazyInitialization<Polygons> boundary_outside; //!< The boundary outside of which to stay to avoid collision with other layer parts. This is a pointer cause we only compute it when we move outside the boundary (so not when there is only a single part in the layer)
-    LazyInitialization<LocToLineGrid, Comb*, const int64_t> outside_loc_to_line; //!< The SparsePointGridInclusive mapping locations to line segments of the outside boundary.
-
-    /*!
-     * Get the outlines of the meshes or raft for this layer
-     */
-    Polygons getCombOutlines();
-
-    /*!
-     * Get the SparsePointGridInclusive mapping locations to line segments of the outside boundary. Calculate it when it hasn't been calculated yet.
-     */
-    LocToLineGrid& getOutsideLocToLine();
-
-     /*!
-      * Get the boundary_outside, which is an offset from the outlines of all meshes in the layer. Calculate it when it hasn't been calculated yet.
-      */
-    Polygons& getBoundaryOutside();
-
-    /*!
-     * Move the startPoint or endPoint inside when it should be inside
-     * \param is_inside[in] Whether the \p dest_point should be inside
-     * \param dest_point[in,out] The point to move
-     * \param start_inside_poly[out] The polygon in which the point has been moved
-     * \return Whether we have moved the point inside
-     */
-    bool moveInside(bool is_inside, Point& dest_point, unsigned int& start_inside_poly);
-
-public:
-    /*!
-     * Initializes the combing areas for every mesh in the layer (not support)
-     * 
-     * \warning \ref Comb::calc changes the order of polygons in \p Comb::comb_boundary_inside
-     * 
-     * \param storage Where the layer polygon data is stored
-     * \param layer_nr The number of the layer for which to generate the combing areas.
-     * \param comb_boundary_inside The comb boundary within which to comb within layer parts.
-     * \param offset_from_outlines The offset from the outline polygon, to create the combing boundary in case there is no second wall.
-     * \param travel_avoid_other_parts Whether to avoid other layer parts when traveling through air.
-     * \param travel_avoid_distance The distance by which to avoid other layer parts when traveling through air.
-     */
-    Comb(SliceDataStorage& storage, int layer_nr, Polygons& comb_boundary_inside, int64_t offset_from_outlines, bool travel_avoid_other_parts, int64_t travel_avoid_distance);
-
-    ~Comb();
-
-    /*!
-     * Calculate the comb paths (if any) - one for each polygon combed alternated with travel paths
-     * 
-     * \warning Changes the order of polygons in \ref Comb::comb_boundary_inside
-     * 
-     * \param startPoint Where to start moving from
-     * \param endPoint Where to move to
-     * \param combPoints Output parameter: The points along the combing path, excluding the \p startPoint (?) and \p endPoint
-     * \param startInside Whether we want to start inside the comb boundary
-     * \param endInside Whether we want to end up inside the comb boundary
-     * \param via_outside_makes_combing_fail When going through air is inavoidable, stop calculation early and return false.
-     * \param fail_on_unavoidable_obstacles When moving over other parts is inavoidable, stop calculation early and return false.
-     * \return Whether combing has succeeded; otherwise a retraction is needed.
-     */
-    bool calc(Point startPoint, Point endPoint, CombPaths& combPaths, bool startInside, bool endInside, int64_t max_comb_distance_ignored, bool via_outside_makes_combing_fail, bool fail_on_unavoidable_obstacles);
-};
-
-}//namespace cura
-
-#endif//PATH_PLANNING_COMB_H

src/pathPlanning/CombPath.h

@@ -1,17 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef PATH_PLANNING_COMB_PATH_H
-#define PATH_PLANNING_COMB_PATH_H
-
-#include "../utils/intpoint.h"
-
-namespace cura 
-{
-
-struct CombPath : public  std::vector<Point> //!< A single path either inside or outise the parts
-{
-    bool cross_boundary = false; //!< Whether the path crosses a boundary.
-};
-
-}//namespace cura
-
-#endif//PATH_PLANNING_COMB_PATH_H

src/pathPlanning/CombPaths.h

@@ -1,17 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#ifndef PATH_PLANNING_COMB_PATHS_H
-#define PATH_PLANNING_COMB_PATHS_H
-
-#include "CombPath.h"
-
-namespace cura 
-{
-
-struct CombPaths : public  std::vector<CombPath> //!< A list of paths alternating between inside a part and outside a part
-{
-    bool throughAir = false; //!< Whether the path is one which moves through air.
-}; 
-
-}//namespace cura
-
-#endif//PATH_PLANNING_COMB_PATHS_H

src/pathPlanning/LinePolygonsCrossings.cpp

@@ -1,227 +0,0 @@
-/** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include "LinePolygonsCrossings.h"
-
-#include <algorithm>
-
-#include "../utils/polygonUtils.h"
-#include "../sliceDataStorage.h"
-#include "../utils/SVG.h"
-
-namespace cura {
-
-
-bool LinePolygonsCrossings::calcScanlineCrossings(bool fail_on_unavoidable_obstacles)
-{
-    
-    min_crossing_idx = NO_INDEX;
-    max_crossing_idx = NO_INDEX;
-
-    for(unsigned int poly_idx = 0; poly_idx < boundary.size(); poly_idx++)
-    {
-        PolyCrossings minMax(poly_idx); 
-        PolygonRef poly = boundary[poly_idx];
-        Point p0 = transformation_matrix.apply(poly[poly.size() - 1]);
-        for(unsigned int point_idx = 0; point_idx < poly.size(); point_idx++)
-        {
-            Point p1 = transformation_matrix.apply(poly[point_idx]);
-            if ((p0.Y >= transformed_startPoint.Y && p1.Y <= transformed_startPoint.Y) || (p1.Y >= transformed_startPoint.Y && p0.Y <= transformed_startPoint.Y))
-            { // if line segment crosses the line through the transformed start and end point (aka scanline)
-                if (p1.Y == p0.Y) //Line segment is parallel with the scanline. That means that both endpoints lie on the scanline, so they will have intersected with the adjacent line.
-                {
-                    p0 = p1;
-                    continue;
-                }
-                int64_t x = p0.X + (p1.X - p0.X) * (transformed_startPoint.Y - p0.Y) / (p1.Y - p0.Y); // intersection point between line segment and the scanline
-                
-                if (x >= transformed_startPoint.X && x <= transformed_endPoint.X)
-                {
-                    if (!((p1.Y == transformed_startPoint.Y && p1.Y < p0.Y) || (p0.Y == transformed_startPoint.Y && p0.Y < p1.Y)))
-                    { // perform edge case only for line segments on and below the scanline, not for line segments on and above.
-                        // \/ will be no crossings and /\ two, but most importantly | will be one crossing.
-                        minMax.n_crossings++;
-                    }
-                    if(x < minMax.min.x) //For the leftmost intersection, move x left to stay outside of the border.
-                                         //Note: The actual distance from the intersection to the border is almost always less than dist_to_move_boundary_point_outside, since it only moves along the direction of the scanline.
-                    {
-                        minMax.min.x = x;
-                        minMax.min.point_idx = point_idx;
-                    }
-                    if(x > minMax.max.x) //For the rightmost intersection, move x right to stay outside of the border.
-                    {
-                        minMax.max.x = x;
-                        minMax.max.point_idx = point_idx;
-                    }
-                }
-            }
-            p0 = p1;
-        }
-
-        if (fail_on_unavoidable_obstacles && minMax.n_crossings % 2 == 1)
-        { // if start area and end area are not the same
-            return false;
-        }
-        else if (minMax.min.point_idx != NO_INDEX) // then always also max.point_idx != NO_INDEX
-        { // if this polygon crossed the scanline
-            if (min_crossing_idx == NO_INDEX || minMax.min.x < crossings[min_crossing_idx].min.x) { min_crossing_idx = crossings.size(); }
-            if (max_crossing_idx == NO_INDEX || minMax.max.x > crossings[max_crossing_idx].max.x) { max_crossing_idx = crossings.size(); }
-            crossings.push_back(minMax);
-        }
-    }
-    return true;
-}
-
-
-bool LinePolygonsCrossings::lineSegmentCollidesWithBoundary()
-{
-    Point diff = endPoint - startPoint;
-
-    transformation_matrix = PointMatrix(diff);
-    transformed_startPoint = transformation_matrix.apply(startPoint);
-    transformed_endPoint = transformation_matrix.apply(endPoint);
-
-    for(PolygonRef poly : boundary)
-    {
-        Point p0 = transformation_matrix.apply(poly.back());
-        for(Point p1_ : poly)
-        {
-            Point p1 = transformation_matrix.apply(p1_);
-            // when the boundary just touches the line don't disambiguate between the boundary moving on to actually cross the line
-            // and the boundary bouncing back, resulting in not a real collision - to keep the algorithm simple.
-            //
-            // disregard overlapping line segments; probably the next or previous line segment is not overlapping, but will give a collision
-            // when the boundary line segment fully overlaps with the line segment this edge case is not viewed as a collision
-            if (p1.Y != p0.Y && ((p0.Y >= transformed_startPoint.Y && p1.Y <= transformed_startPoint.Y) || (p1.Y >= transformed_startPoint.Y && p0.Y <= transformed_startPoint.Y)))
-            {
-                int64_t x = p0.X + (p1.X - p0.X) * (transformed_startPoint.Y - p0.Y) / (p1.Y - p0.Y);
-
-                if (x > transformed_startPoint.X && x < transformed_endPoint.X)
-                {
-                    return true;
-                }
-            }
-            p0 = p1;
-        }
-    }
-    
-    return false;
-}
-
-
-bool LinePolygonsCrossings::getCombingPath(CombPath& combPath, int64_t max_comb_distance_ignored, bool fail_on_unavoidable_obstacles)
-{
-    if (shorterThen(endPoint - startPoint, max_comb_distance_ignored) || !lineSegmentCollidesWithBoundary())
-    {
-        //We're not crossing any boundaries. So skip the comb generation.
-        combPath.push_back(startPoint); 
-        combPath.push_back(endPoint);
-        return true;
-    }
-    
-    bool success = calcScanlineCrossings(fail_on_unavoidable_obstacles);
-    if (!success)
-    {
-        return false;
-    }
-
-    CombPath basicPath;
-    getBasicCombingPath(basicPath);
-    optimizePath(basicPath, combPath);
-//     combPath = basicPath; // uncomment to disable comb path optimization
-    return true;
-}
-
-
-void LinePolygonsCrossings::getBasicCombingPath(CombPath& combPath) 
-{
-    for (PolyCrossings* crossing = getNextPolygonAlongScanline(transformed_startPoint.X)
-        ; crossing != nullptr
-        ; crossing = getNextPolygonAlongScanline(crossing->max.x))
-    {
-        getBasicCombingPath(*crossing, combPath);
-    }
-    combPath.push_back(endPoint);
-}
-
-void LinePolygonsCrossings::getBasicCombingPath(PolyCrossings& polyCrossings, CombPath& combPath) 
-{
-    PolygonRef poly = boundary[polyCrossings.poly_idx];
-    combPath.push_back(transformation_matrix.unapply(Point(polyCrossings.min.x - std::abs(dist_to_move_boundary_point_outside), transformed_startPoint.Y)));
-    if ( ( polyCrossings.max.point_idx - polyCrossings.min.point_idx + poly.size() ) % poly.size() 
-        < poly.size() / 2 )
-    { // follow the path in the same direction as the winding order of the boundary polygon
-        for(unsigned int point_idx = polyCrossings.min.point_idx
-            ; point_idx != polyCrossings.max.point_idx
-            ; point_idx = (point_idx < poly.size() - 1) ? (point_idx + 1) : (0))
-        {
-            combPath.push_back(PolygonUtils::getBoundaryPointWithOffset(poly, point_idx, dist_to_move_boundary_point_outside));
-        }
-    }
-    else
-    { // follow the path in the opposite direction of the winding order of the boundary polygon
-        unsigned int min_idx = (polyCrossings.min.point_idx == 0)? poly.size() - 1: polyCrossings.min.point_idx - 1;
-        unsigned int max_idx = (polyCrossings.max.point_idx == 0)? poly.size() - 1: polyCrossings.max.point_idx - 1;
-
-        for(unsigned int point_idx = min_idx; point_idx != max_idx; point_idx = (point_idx > 0) ? (point_idx - 1) : (poly.size() - 1))
-        {
-            combPath.push_back(PolygonUtils::getBoundaryPointWithOffset(poly, point_idx, dist_to_move_boundary_point_outside));
-        }
-    }
-    combPath.push_back(transformation_matrix.unapply(Point(polyCrossings.max.x + std::abs(dist_to_move_boundary_point_outside), transformed_startPoint.Y)));
-}
-
-
-
-LinePolygonsCrossings::PolyCrossings* LinePolygonsCrossings::getNextPolygonAlongScanline(int64_t x)
-{
-    PolyCrossings* ret = nullptr;
-    for(PolyCrossings& crossing : crossings)
-    {
-        if (crossing.min.x > x && (ret == nullptr || crossing.min.x < ret->min.x) )
-        {
-            ret = &crossing;
-        }
-    }
-    return ret;
-}
-
-bool LinePolygonsCrossings::optimizePath(CombPath& comb_path, CombPath& optimized_comb_path) 
-{
-    optimized_comb_path.push_back(startPoint);
-    for(unsigned int point_idx = 1; point_idx<comb_path.size(); point_idx++)
-    {
-        if(comb_path[point_idx] == comb_path[point_idx - 1]) //Two points are the same. Skip the second.
-        {
-            continue;
-        }
-        Point& current_point = optimized_comb_path.back();
-        if (PolygonUtils::polygonCollidesWithLineSegment(current_point, comb_path[point_idx], loc_to_line_grid))
-        {
-            if (PolygonUtils::polygonCollidesWithLineSegment(current_point, comb_path[point_idx - 1], loc_to_line_grid))
-            {
-                comb_path.cross_boundary = true;
-            }
-            optimized_comb_path.push_back(comb_path[point_idx - 1]);
-        }
-        else 
-        {
-            // : dont add the newest point
-            
-            // TODO: add the below extra optimization? (+/- 7% extra computation time, +/- 2% faster print for Dual_extrusion_support_generation.stl)
-            while (optimized_comb_path.size() > 1)
-            {
-                if (PolygonUtils::polygonCollidesWithLineSegment(optimized_comb_path[optimized_comb_path.size() - 2], comb_path[point_idx], loc_to_line_grid))
-                {
-                    break;
-                }
-                else 
-                {
-                    optimized_comb_path.pop_back();
-                }
-            }
-        }
-    }
-    optimized_comb_path.push_back(comb_path.back());
-    return true;
-}
-
-}//namespace cura

src/progress/ProgressEstimator.h

@@ -1,29 +0,0 @@
-/** Copyright (C) 2016 Tim Kuipers - Released under terms of the AGPLv3 License */
-#ifndef PROGRESS_PROGRESS_ESTIMATOR_H
-#define PROGRESS_PROGRESS_ESTIMATOR_H
-
-#include <vector>
-
-namespace cura
-{
-/*
- * ProgressEstimator is a finger-tree with ProgressEstimatorLinear as leaves.
- * 
- * Each (non-leaf) node consists of a ProgressStageEstimator which consists of several stages.
- * 
- * The structure of this tree is an oversimplification of the call graph of CuraEngine.
- * 
- */
-    
-class ProgressEstimator
-{
-public:
-    virtual double progress(int current_step) = 0;
-    virtual ~ProgressEstimator()
-    {
-    }
-};
-
-} // namespace cura
-
-#endif // PROGRESS_PROGRESS_ESTIMATOR_H

src/progress/ProgressEstimatorLinear.h

@@ -1,29 +0,0 @@
-/** Copyright (C) 2016 Tim Kuipers - Released under terms of the AGPLv3 License */
-#ifndef PROGRESS_PROGRESS_ESTIMATOR_LINEAR_H
-#define PROGRESS_PROGRESS_ESTIMATOR_LINEAR_H
-
-#include <vector>
-
-#include "ProgressEstimator.h"
-
-namespace cura
-{
-
-
-class ProgressEstimatorLinear : public ProgressEstimator
-{
-    unsigned int total_steps;
-public:
-    ProgressEstimatorLinear(unsigned int total_steps)
-    : total_steps(total_steps)
-    {
-    }
-    double progress(int current_step)
-    {
-        return double(current_step) / double(total_steps);
-    }
-};
-
-} // namespace cura
-
-#endif // PROGRESS_PROGRESS_ESTIMATOR_LINEAR_H

src/progress/ProgressStageEstimator.cpp

@@ -1,52 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#include "ProgressStageEstimator.h"
-
-
-namespace cura 
-{
-
-
-ProgressStageEstimator::ProgressStageEstimator(std::vector< double >& relative_time_estimates)
-: total_estimated_time(0)
-, accumulated_estimate(0)
-, current_stage_idx(-1)
-{
-    stages.reserve(relative_time_estimates.size());
-    for (double relative_estimated_time : relative_time_estimates)
-    {
-        stages.emplace_back(relative_estimated_time);
-        total_estimated_time += relative_estimated_time;
-    }
-}
-
-ProgressStageEstimator::~ProgressStageEstimator()
-{
-    for (ProgressStage& stage : stages)
-    {
-        delete stage.stage;
-    }
-}
-
-double ProgressStageEstimator::progress(int current_step)
-{
-    ProgressStage& current_stage = stages[current_stage_idx];
-    return (accumulated_estimate + current_stage.stage->progress(current_step) * current_stage.relative_estimated_time) / total_estimated_time;
-}
-
-void ProgressStageEstimator::nextStage(ProgressEstimator* stage)
-{
-    if (current_stage_idx >= int(stages.size()) - 1)
-    {
-        return;
-    }
-    if (current_stage_idx >= 0)
-    {
-        ProgressStage& current_stage = stages[current_stage_idx];
-        accumulated_estimate += current_stage.relative_estimated_time;
-    }
-    current_stage_idx++;
-    stages[current_stage_idx].stage = stage;
-}
-
-
-} // namespace cura 

src/progress/ProgressStageEstimator.h

@@ -1,54 +0,0 @@
-/** Copyright (C) 2016 Tim Kuipers - Released under terms of the AGPLv3 License */
-#ifndef PROGRESS_PROGRESS_STAGE_ESTIMATOR_H
-#define PROGRESS_PROGRESS_STAGE_ESTIMATOR_H
-
-#include <vector>
-
-#include "ProgressEstimator.h"
-
-namespace cura
-{
-
-/*!
- * A staged progress estimator which estimates each stage to have different times.
- */
-class ProgressStageEstimator : public ProgressEstimator
-{
-    struct ProgressStage
-    {
-        double relative_estimated_time;
-        ProgressEstimator* stage;
-        ProgressStage(double relative_estimated_time)
-        : relative_estimated_time(relative_estimated_time)
-        , stage(nullptr)
-        {
-        }
-        
-    };
-    
-protected:
-    std::vector<ProgressStage> stages;
-    double total_estimated_time;
-    
-private:
-    double accumulated_estimate;
-    int current_stage_idx;
-    
-public:
-    ProgressStageEstimator(std::vector<double>& relative_time_estimates);
-    
-    double progress(int current_step);
-    
-    /*!
-     * 
-     * \warning This class is responsible for deleting the \p stage
-     * 
-     */
-    void nextStage(ProgressEstimator* stage);
-    
-    ~ProgressStageEstimator();
-};
-
-} // namespace cura
-
-#endif // PROGRESS_PROGRESS_STAGE_ESTIMATOR_H

src/raft.cpp

@@ -1,86 +1,23 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include <clipper/clipper.hpp>
-
-#include "utils/math.h"
 #include "raft.h"
 #include "support.h"
 
 namespace cura {
 
-void Raft::generate(SliceDataStorage& storage, int distance)
+void generateRaft(SliceDataStorage& storage, int distance)
 {
-    assert(storage.raftOutline.size() == 0 && "Raft polygon isn't generated yet, so should be empty!");
-    storage.raftOutline = storage.getLayerOutlines(0, true).offset(distance, ClipperLib::jtRound);
-    const int shield_line_width = storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"))->getSettingInMicrons("skirt_brim_line_width");
     if (storage.draft_protection_shield.size() > 0)
     {
-        Polygons draft_shield_raft = storage.draft_protection_shield.offset(shield_line_width) // start half a line width outside shield
-                                        .difference(storage.draft_protection_shield.offset(-distance - shield_line_width / 2, ClipperLib::jtRound)); // end distance inside shield
-        storage.raftOutline = storage.raftOutline.unionPolygons(draft_shield_raft);
+        storage.raftOutline = storage.raftOutline.unionPolygons(storage.draft_protection_shield.offset(distance));
     }
-    if (storage.oozeShield.size() > 0 && storage.oozeShield[0].size() > 0)
+    else if (storage.oozeShield.size() > 0 && storage.oozeShield[0].size() > 0)
     {
-        const Polygons& ooze_shield = storage.oozeShield[0];
-        Polygons ooze_shield_raft = ooze_shield.offset(shield_line_width) // start half a line width outside shield
-                                        .difference(ooze_shield.offset(-distance - shield_line_width / 2, ClipperLib::jtRound)); // end distance inside shield
-        storage.raftOutline = storage.raftOutline.unionPolygons(ooze_shield_raft);
+        storage.raftOutline = storage.raftOutline.unionPolygons(storage.oozeShield[0].offset(distance));
     }
-    storage.raftOutline = storage.raftOutline.offset(1000).offset(-1000); // remove small holes
-}
-
-int Raft::getTotalThickness(const SliceDataStorage& storage)
-{
-    const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));
-    return train.getSettingInMicrons("raft_base_thickness")
-        + train.getSettingInMicrons("raft_interface_thickness")
-        + train.getSettingAsCount("raft_surface_layers") * train.getSettingInMicrons("raft_surface_thickness");
-}
-
-int Raft::getZdiffBetweenRaftAndLayer1(const SliceDataStorage& storage)
-{
-    const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));
-    if (storage.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)
+    else 
     {
-        return 0;
+        storage.raftOutline = storage.getLayerOutlines(0, true).offset(distance);
     }
-    const int64_t airgap = std::max(0, train.getSettingInMicrons("raft_airgap"));
-    const int64_t layer_0_overlap = storage.getSettingInMicrons("layer_0_z_overlap");
-
-    const int64_t layer_height_0 = storage.getSettingInMicrons("layer_height_0");
-
-    const int64_t z_diff_raft_to_bottom_of_layer_1 = std::max(int64_t(0), airgap + layer_height_0 - layer_0_overlap);
-    return z_diff_raft_to_bottom_of_layer_1;
 }
 
-
-int Raft::getFillerLayerCount(const SliceDataStorage& storage)
-{
-    const int64_t normal_layer_height = storage.getSettingInMicrons("layer_height");
-    const unsigned int filler_layer_count = round_divide(getZdiffBetweenRaftAndLayer1(storage), normal_layer_height);
-    return filler_layer_count;
-}
-
-int Raft::getFillerLayerHeight(const SliceDataStorage& storage)
-{
-    if (storage.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)
-    {
-        const int64_t normal_layer_height = storage.getSettingInMicrons("layer_height");
-        return normal_layer_height;
-    }
-    const unsigned int filler_layer_height = round_divide(getZdiffBetweenRaftAndLayer1(storage), getFillerLayerCount(storage));
-    return filler_layer_height;
-}
-
-
-int Raft::getTotalExtraLayers(const SliceDataStorage& storage)
-{
-    const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));
-    if (train.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)
-    {
-        return 0;
-    }
-    return 2 + train.getSettingAsCount("raft_surface_layers") + getFillerLayerCount(storage);
-}
-
-
 }//namespace cura

src/raft.h

@@ -6,43 +6,7 @@
 
 namespace cura {
 
-class Raft
-{
-public:
-    static void generate(SliceDataStorage& storage, int distance);
-
-    /*!
-     * Get the height difference between the raft and the bottom of layer 1.
-     * 
-     * This is used for the filler layers because they don't use the layer_0_z_overlap
-     */
-    static int getZdiffBetweenRaftAndLayer1(const SliceDataStorage& storage);
-
-    /*!
-     * Get the amount of layers to fill the airgap and initial layer with helper parts (support, prime tower, etc.)
-     * 
-     * The initial layer gets a separate filler layer because we don't want to apply the layer_0_z_overlap to it.
-     */
-    static int getFillerLayerCount(const SliceDataStorage& storage);
-
-    /*!
-     * Get the layer height of the filler layers in between the raft and layer 1
-     */
-    static int getFillerLayerHeight(const SliceDataStorage& storage);
-
-    /*!
-     * Get the total thickness of the raft (without airgap)
-     */
-    static int getTotalThickness(const SliceDataStorage& storage);
-
-    /*!
-     * Get the total amount of extra layers below zero because there is a raft.
-     * 
-     * This includes the filler layers which are introduced in the air gap.
-     */
-    static int getTotalExtraLayers(const SliceDataStorage& storage);
-
-};
+void generateRaft(SliceDataStorage& storage, int distance);
 
 }//namespace cura
 

src/settingRegistry.cpp

@@ -0,0 +1,349 @@
+#include "settingRegistry.h"
+
+#include <sstream>
+#include <iostream> // debug IO
+#include <libgen.h> // dirname
+#include <string>
+#include <algorithm> // find_if
+
+#include "utils/logoutput.h"
+
+#include "rapidjson/rapidjson.h"
+#include "rapidjson/document.h"
+#include "rapidjson/error/en.h"
+#include "rapidjson/filereadstream.h"
+#include "utils/logoutput.h"
+
+namespace cura
+{
+    
+SettingRegistry SettingRegistry::instance; // define settingRegistry
+
+std::string SettingRegistry::toString(rapidjson::Type type)
+{
+    switch (type)
+    {
+        case rapidjson::Type::kNullType: return "null";
+        case rapidjson::Type::kFalseType: return "false";
+        case rapidjson::Type::kTrueType: return "true";
+        case rapidjson::Type::kObjectType: return "object";
+        case rapidjson::Type::kArrayType: return "array";
+        case rapidjson::Type::kStringType: return "string";
+        case rapidjson::Type::kNumberType: return "number";
+        default: return "Unknown";
+    }
+}
+
+
+SettingContainer::SettingContainer(std::string key, std::string label)
+: key(key)
+, label(label)
+{
+}
+
+SettingConfig* SettingContainer::addChild(std::string key, std::string label)
+{
+    children.emplace_back(key, label, nullptr);
+    return &children.back();
+}
+
+SettingConfig::SettingConfig(std::string key, std::string label, SettingContainer* parent)
+: SettingContainer(key, label)
+, parent(parent)
+{
+//     std::cerr << key << std::endl; // debug output to show all frontend registered settings...
+}
+
+void SettingContainer::debugOutputAllSettings()
+{
+    std::cerr << "CATEGORY: " << key << std::endl;
+    for (SettingConfig& child : children)
+    {
+        child.debugOutputAllSettings();
+    }
+}
+
+
+bool SettingRegistry::settingExists(std::string key) const
+{
+    return settings.find(key) != settings.end();
+}
+
+SettingConfig* SettingRegistry::getSettingConfig(std::string key)
+{
+    auto it = settings.find(key);
+    if (it == settings.end())
+        return nullptr;
+    return it->second;
+}
+
+SettingContainer* SettingRegistry::getCategory(std::string key)
+{
+    for (SettingContainer& cat : categories)
+        if (cat.getKey().compare(key) == 0)
+            return &cat;
+    return nullptr;
+}
+
+
+SettingRegistry::SettingRegistry()
+{
+}
+
+bool SettingRegistry::settingsLoaded()
+{
+    return settings.size() > 0;
+}
+
+int SettingRegistry::loadJSON(std::string filename, rapidjson::Document& json_document)
+{
+    FILE* f = fopen(filename.c_str(), "rb");
+    if (!f)
+    {
+        cura::logError("Couldn't open JSON file.\n");
+        return 1;
+    }
+    char read_buffer[4096];
+    rapidjson::FileReadStream reader_stream(f, read_buffer, sizeof(read_buffer));
+    json_document.ParseStream(reader_stream);
+    fclose(f);
+    if (json_document.HasParseError())
+    {
+        cura::logError("Error parsing JSON(offset %u): %s\n", (unsigned)json_document.GetErrorOffset(), GetParseError_En(json_document.GetParseError()));
+        return 2;
+    }
+    
+    return 0;
+}
+
+int SettingRegistry::loadJSONsettings(std::string filename)
+{
+    rapidjson::Document json_document;
+    
+    int err = loadJSON(filename, json_document);
+    if (err) { return err; }
+    
+    if (json_document.HasMember("inherits"))
+    {
+        std::string filename_copy = std::string(filename.c_str()); // copy the string because dirname(.) changes the input string!!!
+        char* filename_cstr = (char*)filename_copy.c_str();
+        int err = loadJSONsettings(std::string(dirname(filename_cstr)) + std::string("/") + json_document["inherits"].GetString());
+        if (err) { return err; }
+        return loadJSONsettingsFromDoc(json_document, false);
+    }
+    else 
+    {
+        return loadJSONsettingsFromDoc(json_document, true);
+    }
+    
+}
+
+int SettingRegistry::loadJSONsettingsFromDoc(rapidjson::Document& json_document, bool warn_duplicates)
+{
+    
+    if (!json_document.IsObject())
+    {
+        cura::logError("JSON file is not an object.\n");
+        return 3;
+    }
+
+    if (json_document.HasMember("machine_extruder_trains"))
+    {
+        categories.emplace_back("machine_extruder_trains", "Extruder Trains Settings Objects");
+        SettingContainer* category_trains = &categories.back();
+        const rapidjson::Value& trains = json_document["machine_extruder_trains"];
+        if (trains.IsArray()) 
+        {
+            if (trains.Size() > 0 && trains[0].IsObject())
+            {
+                unsigned int idx = 0;
+                for (auto it = trains.Begin(); it != trains.End(); ++it)
+                {
+                    SettingConfig* child = category_trains->addChild(std::to_string(idx), std::to_string(idx));
+                    
+                    for (rapidjson::Value::ConstMemberIterator setting_iterator = it->MemberBegin(); setting_iterator != it->MemberEnd(); ++setting_iterator)
+                    {
+                        _addSettingToContainer(child, setting_iterator, warn_duplicates, false);
+                    }
+                    
+                    idx++;
+                }
+            }
+        }
+        else 
+        {
+            logError("Error: JSON machine_extruder_trains is not an array!\n");
+        }
+    }
+    if (json_document.HasMember("machine_settings"))
+    {
+        categories.emplace_back("machine_settings", "Machine Settings");
+        SettingContainer* category_machine_settings = &categories.back();
+        
+        const rapidjson::Value& json_object_container = json_document["machine_settings"];
+        for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+        {
+            _addSettingToContainer(category_machine_settings, setting_iterator, warn_duplicates);
+        }
+    }
+    
+    if (json_document.HasMember("categories"))
+    {
+        for (rapidjson::Value::ConstMemberIterator category_iterator = json_document["categories"].MemberBegin(); category_iterator != json_document["categories"].MemberEnd(); ++category_iterator)
+        {
+            if (!category_iterator->value.IsObject())
+            {
+                continue;
+            }
+            if (!category_iterator->value.HasMember("settings") || !category_iterator->value["settings"].IsObject())
+            {
+                continue;
+            }
+            std::string cat_name = category_iterator->name.GetString();
+            std::list<SettingContainer>::iterator category_found = std::find_if(categories.begin(), categories.end(), [&cat_name](SettingContainer& cat) { return cat.getKey().compare(cat_name) == 0; });
+            if (category_found != categories.end())
+            { // category is already present; add settings to category
+                SettingContainer* category = &*category_found;
+
+                const rapidjson::Value& json_object_container = category_iterator->value["settings"];
+                for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+                {
+                    _addSettingToContainer(category, setting_iterator, warn_duplicates);
+                }
+            }
+            else 
+            {
+                if (!category_iterator->value.HasMember("label") || !category_iterator->value["label"].IsString())
+                {
+                    continue;
+                }
+                categories.emplace_back(cat_name, category_iterator->value["label"].GetString());
+                SettingContainer* category = &categories.back();
+                
+                const rapidjson::Value& json_object_container = category_iterator->value["settings"];
+                for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+                {
+                    _addSettingToContainer(category, setting_iterator, warn_duplicates);
+                }
+            }
+        }
+    }
+    
+    if (json_document.HasMember("overrides"))
+    {
+        const rapidjson::Value& json_object_container = json_document["overrides"];
+        for (rapidjson::Value::ConstMemberIterator override_iterator = json_object_container.MemberBegin(); override_iterator != json_object_container.MemberEnd(); ++override_iterator)
+        {
+            std::string setting = override_iterator->name.GetString();
+            SettingConfig* conf = getSettingConfig(setting);
+            if (!conf) //Setting could not be found.
+            {
+                logWarning("Trying to override unknown setting %s.", setting.c_str());
+                continue;
+            }
+            _loadSettingValues(conf, override_iterator, false);
+        }
+    }
+    
+    return 0;
+}
+
+
+void SettingRegistry::_addSettingToContainer(SettingContainer* parent, rapidjson::Value::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings)
+{
+    const rapidjson::Value& data = json_object_it->value;
+
+    if (data.HasMember("type") && data["type"].IsString() && 
+        (data["type"].GetString() == std::string("polygon") || data["type"].GetString() == std::string("polygons")))
+    {
+        logWarning("Loading polygon setting %s not implemented...\n", json_object_it->name.GetString());
+        /// When this setting has children, add those children to the parent setting.
+        if (data.HasMember("children") && data["children"].IsObject())
+        {
+            const rapidjson::Value& json_object_container = data["children"];
+            for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+            {
+                _addSettingToContainer(parent, setting_iterator, warn_duplicates, add_to_settings);
+            }
+        }
+        return;
+    }
+
+    std::string label;
+    if (!json_object_it->value.HasMember("label") || !data["label"].IsString())
+    {
+        label = "N/A";
+    }
+    else
+    {
+        label = data["label"].GetString();
+    }
+
+    /// Create the new setting config object.
+    SettingConfig* config = parent->addChild(json_object_it->name.GetString(), label);
+
+    _loadSettingValues(config, json_object_it, warn_duplicates, add_to_settings);
+}
+
+void SettingRegistry::_loadSettingValues(SettingConfig* config, rapidjson::GenericValue< rapidjson::UTF8< char > >::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings)
+{
+    const rapidjson::Value& data = json_object_it->value;
+    /// Fill the setting config object with data we have in the json file.
+    if (data.HasMember("type") && data["type"].IsString())
+    {
+        config->setType(data["type"].GetString());
+    }
+    if (data.HasMember("default"))
+    {
+        const rapidjson::Value& dflt = data["default"];
+        if (dflt.IsString())
+        {
+            config->setDefault(dflt.GetString());
+        }
+        else if (dflt.IsTrue())
+        {
+            config->setDefault("true");
+        }
+        else if (dflt.IsFalse())
+        {
+            config->setDefault("false");
+        }
+        else if (dflt.IsNumber())
+        {
+            std::ostringstream ss;
+            ss << dflt.GetDouble();
+            config->setDefault(ss.str());
+        } // arrays are ignored because machine_extruder_trains needs to be handled separately
+        else 
+        {
+            logError("Unrecognized data type in JSON: %s has type %s\n", json_object_it->name.GetString(), toString(dflt.GetType()).c_str());
+        }
+    }
+    if (data.HasMember("unit") && data["unit"].IsString())
+    {
+        config->setUnit(data["unit"].GetString());
+    }
+
+    /// Register the setting in the settings map lookup.
+    if (warn_duplicates && settingExists(config->getKey()))
+    {
+        cura::logError("Duplicate definition of setting: %s a.k.a. \"%s\" was already claimed by \"%s\"\n", config->getKey().c_str(), config->getLabel().c_str(), getSettingConfig(config->getKey())->getLabel().c_str());
+    }
+
+    if (add_to_settings)
+    {
+        settings[config->getKey()] = config;
+    }
+
+    /// When this setting has children, add those children to this setting.
+    if (data.HasMember("children") && data["children"].IsObject())
+    {
+        const rapidjson::Value& json_object_container = data["children"];
+        for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
+        {
+            _addSettingToContainer(config, setting_iterator, warn_duplicates, add_to_settings);
+        }
+    }
+}
+
+}//namespace cura

src/settingRegistry.h

@@ -0,0 +1,225 @@
+#ifndef SETTING_REGISTRY_H
+#define SETTING_REGISTRY_H
+
+#include <vector>
+#include <list>
+#include <unordered_map>
+#include <string>
+#include <iostream> // debug out
+
+#include "utils/NoCopy.h"
+#include "rapidjson/document.h"
+
+namespace cura
+{
+    
+// Forward declaration
+class SettingConfig;
+
+/*!
+ * Setting category.
+ * Filled from the fdmprinter.json file. Contains one or more children settings.
+ */
+class SettingContainer
+{
+    friend class SettingConfig;
+private:
+    std::string key;
+    std::string label;
+    std::list<SettingConfig> children;
+public:
+    std::string getKey() const { return key; }
+    std::string getLabel() const { return label; }
+    SettingContainer(std::string key, std::string label);
+    
+    SettingConfig* addChild(std::string key, std::string label);
+    
+    /*!
+     * Get the \p idx th child.
+     * 
+     * This is used to get a specific extruder train in Settingsbase::setExtruderTrainDefaults
+     * 
+     * \param idx The index in the list of children
+     * \return The \p idx th child
+     */
+    const SettingConfig* getChild(unsigned int idx) const
+    {
+        if (idx < children.size())
+        {
+            auto it = children.begin();
+            while (idx > 0) { ++it; idx--; }
+            return &*it;
+        }
+        else 
+            return nullptr;
+    }
+    
+    void debugOutputAllSettings();
+};
+
+/*!
+ * Single setting data.
+ * Filled from the fdmprinter.json file. Can contain child settings, and is registered in the
+ * setting registry with it's key.
+ */
+class SettingConfig : public SettingContainer
+{
+private:
+    std::string type;
+    std::string default_value;
+    std::string unit;
+    SettingContainer* parent;
+public:
+    SettingConfig(std::string key, std::string label, SettingContainer* parent);
+    
+    /*!
+     * Get the SettingConfig::children.
+     * 
+     * This is used to get the extruder trains; see Settingsbase::setExtruderTrainDefaults
+     * 
+     * \return SettingConfig::children
+     */
+    const std::list<SettingConfig>& getChildren() const { return children; }
+    
+    std::string getKey() const
+    {
+        return key;
+    }
+    
+    void setType(std::string type)
+    {
+        this->type = type;
+    }
+    
+    std::string getType() const
+    {
+        return type;
+    }
+
+    void setDefault(std::string default_value)
+    {
+        this->default_value = default_value;
+    }
+    
+    std::string getDefaultValue() const
+    {
+        return default_value;
+    }
+
+    void setUnit(std::string unit)
+    {
+        this->unit = unit;
+    }
+    
+    std::string getUnit() const
+    {
+        return unit;
+    }
+    
+    void debugOutputAllSettings()
+    {
+        std::cerr << key << std::endl;
+        for (SettingConfig& child : children)
+        {
+            child.debugOutputAllSettings();
+        }
+    }
+};
+
+/*!
+ * Setting registry.
+ * There is a single global setting registry.
+ * This registry contains all known setting keys.
+ * The registry also contains the settings categories to build up the setting hiarcy from the json file.
+ */
+class SettingRegistry : NoCopy
+{
+private:
+    static SettingRegistry instance;
+
+    SettingRegistry();
+    
+    std::unordered_map<std::string, SettingConfig*> settings;
+    std::list<SettingContainer> categories;
+public:
+    /*!
+     * Get the SettingRegistry.
+     * 
+     * This is a singleton class.
+     * 
+     * \return The SettingRegistry
+     */
+    static SettingRegistry* getInstance() { return &instance; }
+    
+    bool settingExists(std::string key) const;
+    SettingConfig* getSettingConfig(std::string key);
+    
+    /*!
+     * Return the first category with the given key as name, or a null pointer.
+     * 
+     * \param key the key as it is in the JSON file
+     * \return The first category in the list having the \p key
+     */
+    SettingContainer* getCategory(std::string key);
+    
+    bool settingsLoaded();
+    /*!
+     * Load settings from a json file and all the parents it inherits from.
+     * 
+     * Uses recursion to load the parent json file.
+     * 
+     * \param filename The filename of the json file to parse
+     * \return an error code or zero of succeeded
+     */
+    int loadJSONsettings(std::string filename);
+    void debugOutputAllSettings()
+    {
+        for (SettingContainer& cat : categories)
+        {
+            cat.debugOutputAllSettings();
+        }
+    }
+    
+private:
+    
+    /*!
+     * \param type type to convert to string
+     * \return human readable version of json type
+     */
+    static std::string toString(rapidjson::Type type);
+    /*!
+     * Load a json document.
+     * 
+     * \param filename The filename of the json file to parse
+     * \param json_document (output) the document to be loaded
+     * \return an error code or zero of succeeded
+     */
+    int loadJSON(std::string filename, rapidjson::Document& json_document);
+    
+    /*!
+     * Load settings from a single json file.
+     * 
+     * \param filename The filename of the json file to parse
+     * \param warn_duplicates whether to warn for duplicate definitions
+     * \return an error code or zero of succeeded
+     */
+    int loadJSONsettingsFromDoc(rapidjson::Document& json_document, bool warn_duplicates);
+    
+    /*!
+     * Get the string from a json value (generally the default value field of a setting)
+     * \param dflt The value to convert to string
+     * \param setting_name The name of the setting (in case we need to display an error message)
+     * \return The string
+     */
+    static std::string toString(const rapidjson::Value& dflt, std::string setting_name = "?");
+    
+    /*!
+     * \param warn_duplicates whether to warn for duplicate definitions
+     */
+    void _addSettingToContainer(SettingContainer* parent, rapidjson::Value::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings = true);
+    
+    void _loadSettingValues(SettingConfig* config, rapidjson::Value::ConstMemberIterator& json_object_it, bool warn_duplicates, bool add_to_settings = true);
+};
+
+}//namespace cura
+#endif//SETTING_REGISTRY_H

src/settings.cpp

@@ -0,0 +1,357 @@
+#include <cctype>
+#include <fstream>
+#include <stdio.h>
+#include <sstream> // ostringstream
+#include "utils/logoutput.h"
+
+#include "settings.h"
+#include "settingRegistry.h"
+
+namespace cura
+{
+//c++11 no longer defines M_PI, so add our own constant.
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+std::string toString(EGCodeFlavor flavor)
+{
+    switch (flavor)
+    {
+        case EGCodeFlavor::BFB:
+            return "BFB";
+        case EGCodeFlavor::MACH3:
+            return "Mach3";
+        case EGCodeFlavor::MAKERBOT:
+            return "Makerbot";
+        case EGCodeFlavor::ULTIGCODE:
+            return "UltiGCode";
+        case EGCodeFlavor::REPRAP_VOLUMATRIC:
+            return "RepRap(Volumetric)";
+        case EGCodeFlavor::REPRAP:
+        default:
+            return "RepRap";
+    }
+}
+
+SettingsBaseVirtual::SettingsBaseVirtual()
+: parent(NULL)
+{
+}
+
+SettingsBaseVirtual::SettingsBaseVirtual(SettingsBaseVirtual* parent)
+: parent(parent)
+{
+}
+
+SettingsBase::SettingsBase()
+: SettingsBaseVirtual(NULL)
+{
+}
+
+SettingsBase::SettingsBase(SettingsBaseVirtual* parent)
+: SettingsBaseVirtual(parent)
+{
+}
+
+SettingsMessenger::SettingsMessenger(SettingsBaseVirtual* parent)
+: SettingsBaseVirtual(parent)
+{
+}
+
+void SettingsBase::setSetting(std::string key, std::string value)
+{
+    if (SettingRegistry::getInstance()->settingExists(key))
+    {
+        setting_values[key] = value;
+    }
+    else
+    {
+        cura::logError("Warning: setting an unregistered setting %s\n", key.c_str() );
+        setting_values[key] = value; // Handy when programmers are in the process of introducing a new setting
+    }
+}
+
+std::string SettingsBase::getSettingString(std::string key)
+{
+    if (setting_values.find(key) != setting_values.end())
+    {
+        return setting_values[key];
+    }
+    if (parent)
+    {
+        return parent->getSettingString(key);
+    }
+    
+    if (SettingRegistry::getInstance()->settingExists(key))
+    {
+        setting_values[key] = SettingRegistry::getInstance()->getSettingConfig(key)->getDefaultValue();
+    }
+    else
+    {
+        setting_values[key] = "";
+        cura::logError("Unregistered setting %s\n", key.c_str());
+    }
+    return setting_values[key];
+}
+
+void SettingsMessenger::setSetting(std::string key, std::string value)
+{
+    parent->setSetting(key, value);
+}
+
+std::string SettingsMessenger::getSettingString(std::string key)
+{
+    return parent->getSettingString(key);
+}
+
+
+void SettingsBase::setExtruderTrainDefaults(unsigned int extruder_nr)
+{
+    const SettingContainer* machine_extruder_trains = SettingRegistry::getInstance()->getCategory(std::string("machine_extruder_trains"));
+    
+    if (!machine_extruder_trains) 
+    {
+        // no machine_extruder_trains setting present; just use defaults for each train..
+        return;
+    }
+    
+    const SettingConfig* train = machine_extruder_trains->getChild(extruder_nr);
+    
+    if (!train)
+    {
+        // not enough machine_extruder_trains settings present; just use defaults for this train..
+        return;
+    }
+    
+    for (const SettingConfig& setting : train->getChildren())
+    {
+        if (setting_values.find(setting.getKey()) == setting_values.end())
+        {
+            setSetting(setting.getKey(), setting.getDefaultValue());
+        }
+    }
+}
+
+int SettingsBaseVirtual::getSettingAsIndex(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atoi(value.c_str());
+}
+
+int SettingsBaseVirtual::getSettingAsCount(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atoi(value.c_str());
+}
+
+int SettingsBaseVirtual::getSettingInMicrons(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atof(value.c_str()) * 1000.0;
+}
+
+double SettingsBaseVirtual::getSettingInAngleRadians(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atof(value.c_str()) / 180.0 * M_PI;
+}
+
+bool SettingsBaseVirtual::getSettingBoolean(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "on")
+        return true;
+    if (value == "yes")
+        return true;
+    if (value == "true" or value == "True") //Python uses "True"
+        return true;
+    int num = atoi(value.c_str());
+    return num != 0;
+}
+
+double SettingsBaseVirtual::getSettingInDegreeCelsius(std::string key)
+{
+    std::string value = getSettingString(key);
+    return atof(value.c_str());
+}
+
+double SettingsBaseVirtual::getSettingInMillimetersPerSecond(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(1.0, atof(value.c_str()));
+}
+
+double SettingsBaseVirtual::getSettingInCubicMillimeters(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(0.0, atof(value.c_str()));
+}
+
+double SettingsBaseVirtual::getSettingInPercentage(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(0.0, atof(value.c_str()));
+}
+
+double SettingsBaseVirtual::getSettingInSeconds(std::string key)
+{
+    std::string value = getSettingString(key);
+    return std::max(0.0, atof(value.c_str()));
+}
+
+FlowTempGraph SettingsBaseVirtual::getSettingAsFlowTempGraph(std::string key)
+{
+    FlowTempGraph ret;
+    const char* c_str = getSettingString(key).c_str();
+    char const* char_p = c_str;
+    while (*char_p != '[')
+    {
+        if (*char_p == '\0') //We've reached the end of string without encountering the first opening bracket.
+        {
+            return ret; //Empty at this point.
+        }
+        char_p++;
+    }
+    char_p++; // skip the '['
+    for (; *char_p != '\0'; char_p++)
+    {
+        while (*char_p != '[')
+        {
+            if (*char_p == '\0') //We've reached the end of string without finding the next opening bracket.
+            {
+                return ret; //Don't continue parsing this item then. Just stop and return.
+            }
+            char_p++;
+        }
+        char_p++; // skip the '['
+        char* end;
+        double first = strtod(char_p, &end); //If not a valid number, this becomes zero.
+        char_p = end;
+        while (*char_p != ',')
+        {
+            if (*char_p == '\0') //We've reached the end of string without finding the comma.
+            {
+                return ret; //This entry is incomplete.
+            }
+            char_p++;
+        }
+        char_p++; // skip the ','
+        double second = strtod(char_p, &end); //If not a valid number, this becomes zero.
+        ret.data.emplace_back(first, second);
+        char_p = end;
+        while (*char_p != ']')
+        {
+            if (*char_p == '\0') //We've reached the end of string without finding the closing bracket.
+            {
+                return ret; //This entry is probably complete and has been added, but stop searching.
+            }
+            char_p++;
+        }
+        char_p++; // skip the ']'
+        if (*char_p == ']' || *char_p == '\0')
+        {
+            break;
+        }
+    }
+    return ret;
+}
+
+
+EGCodeFlavor SettingsBaseVirtual::getSettingAsGCodeFlavor(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "RepRap")
+        return EGCodeFlavor::REPRAP;
+    else if (value == "UltiGCode")
+        return EGCodeFlavor::ULTIGCODE;
+    else if (value == "Makerbot")
+        return EGCodeFlavor::MAKERBOT;
+    else if (value == "BFB")
+        return EGCodeFlavor::BFB;
+    else if (value == "MACH3")
+        return EGCodeFlavor::MACH3;
+    else if (value == "RepRap (Volumatric)")
+        return EGCodeFlavor::REPRAP_VOLUMATRIC;
+    return EGCodeFlavor::REPRAP;
+}
+
+EFillMethod SettingsBaseVirtual::getSettingAsFillMethod(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "lines")
+        return EFillMethod::LINES;
+    if (value == "grid")
+        return EFillMethod::GRID;
+    if (value == "triangles")
+        return EFillMethod::TRIANGLES;
+    if (value == "concentric")
+        return EFillMethod::CONCENTRIC;
+    if (value == "zigzag")
+        return EFillMethod::ZIG_ZAG;
+    return EFillMethod::NONE;
+}
+
+EPlatformAdhesion SettingsBaseVirtual::getSettingAsPlatformAdhesion(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "brim")
+        return EPlatformAdhesion::BRIM;
+    if (value == "raft")
+        return EPlatformAdhesion::RAFT;
+    return EPlatformAdhesion::SKIRT;
+}
+
+ESupportType SettingsBaseVirtual::getSettingAsSupportType(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "everywhere")
+        return ESupportType::EVERYWHERE;
+    if (value == "buildplate")
+        return ESupportType::PLATFORM_ONLY;
+    return ESupportType::NONE;
+}
+
+EZSeamType SettingsBaseVirtual::getSettingAsZSeamType(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "random")
+        return EZSeamType::RANDOM;
+    if (value == "shortest")
+        return EZSeamType::SHORTEST;
+    if (value == "back")
+        return EZSeamType::BACK;
+    return EZSeamType::SHORTEST;
+}
+
+ESurfaceMode SettingsBaseVirtual::getSettingAsSurfaceMode(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "normal")
+        return ESurfaceMode::NORMAL;
+    if (value == "surface")
+        return ESurfaceMode::SURFACE;
+    if (value == "both")
+        return ESurfaceMode::BOTH;
+    return ESurfaceMode::NORMAL;
+}
+
+FillPerimeterGapMode SettingsBaseVirtual::getSettingAsFillPerimeterGapMode(std::string key)
+{
+    std::string value = getSettingString(key);
+    if (value == "nowhere")
+    {
+        return FillPerimeterGapMode::NOWHERE;
+    }
+    if (value == "everywhere")
+    {
+        return FillPerimeterGapMode::EVERYWHERE;
+    }
+    if (value == "skin")
+    {
+        return FillPerimeterGapMode::SKIN;
+    }
+    return FillPerimeterGapMode::NOWHERE;
+}
+
+}//namespace cura

src/settings.h

@@ -1,15 +1,14 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#ifndef SETTINGS_SETTINGS_H
-#define SETTINGS_SETTINGS_H
+#ifndef SETTINGS_H
+#define SETTINGS_H
 
 #include <vector>
 #include <map>
 #include <unordered_map>
 #include <sstream>
 
-#include "../utils/floatpoint.h"
+#include "utils/floatpoint.h"
 
-#include "../FlowTempGraph.h"
+#include "FlowTempGraph.h"
 
 namespace cura
 {
@@ -76,18 +75,6 @@ enum class EGCodeFlavor
  *  M106 Sxxx and M107 are used to turn the fan on/off.
  **/
     REPRAP_VOLUMATRIC = 5,
-/**
- * Griffin flavored is Marlin based GCode.
- *  This is a type of RepRap used for machines with multiple extruder trains.
- *  G0 for moves, G1 for extrusion.
- *  E values give mm of filament extrusion.
- *  E values are stored separately per extruder train.
- *  Retraction is done on E values with G1. Start/end code is added.
- *  M227 is used to initialize a single extrusion train.
- **/
-    GRIFFIN = 6,
-
-    REPETIER = 7,
 };
 
 /*!
@@ -104,24 +91,20 @@ enum class EFillMethod
 {
     LINES,
     GRID,
-    CUBIC,
-    TETRAHEDRAL,
     TRIANGLES,
     CONCENTRIC,
-    CONCENTRIC_3D,
     ZIG_ZAG,
     NONE
 };
 
 /*!
- * Type of platform adhesion.
+ * Type of platform adheasion
  */
 enum class EPlatformAdhesion
 {
     SKIRT,
     BRIM,
-    RAFT,
-    NONE
+    RAFT
 };
 
 /*!
@@ -151,29 +134,8 @@ enum class ESurfaceMode
 enum class FillPerimeterGapMode
 {
     NOWHERE,
-    EVERYWHERE
-};
-
-enum class CombingMode
-{
-    OFF,
-    ALL,
-    NO_SKIN
-};
-
-/*!
- * How the draft shield height is limited.
- */
-enum class DraftShieldHeightLimitation
-{
-    FULL, //Draft shield takes full height of the print.
-    LIMITED //Draft shield is limited by draft_shield_height setting.
-};
-
-enum class SupportDistPriority
-{
-    XY_OVERRIDES_Z,
-    Z_OVERRIDES_XY
+    EVERYWHERE,
+    SKIN
 };
 
 #define MAX_EXTRUDERS 16
@@ -193,19 +155,10 @@ class SettingsBaseVirtual
 protected:
     SettingsBaseVirtual* parent;
 public:
-    virtual std::string getSettingString(std::string key) const = 0;
+    virtual std::string getSettingString(std::string key) = 0;
     
     virtual void setSetting(std::string key, std::string value) = 0;
-
-    /*!
-     * Set the parent settings base for inheriting a setting to a specific setting base.
-     * This overrides the use of \ref SettingsBaseVirtual::parent.
-     * 
-     * \param key The setting for which to override the inheritance
-     * \param parent The setting base from which to obtain the setting instead.
-     */
-    virtual void setSettingInheritBase(std::string key, const SettingsBaseVirtual& parent) = 0;
-
+    
     virtual ~SettingsBaseVirtual() {}
     
     SettingsBaseVirtual(); //!< SettingsBaseVirtual without a parent settings object
@@ -214,46 +167,31 @@ public:
     void setParent(SettingsBaseVirtual* parent) { this->parent = parent; }
     SettingsBaseVirtual* getParent() { return parent; }
     
-    int getSettingAsIndex(std::string key) const;
-    int getSettingAsCount(std::string key) const;
-
-    /*!
-     * \brief Interprets a setting as a layer number.
-     *
-     * The input of the layer number is one-based. This translates it to
-     * zero-based numbering.
-     *
-     * \return Zero-based numbering of a layer number setting.
-     */
-    unsigned int getSettingAsLayerNumber(std::string key) const;
-
-    double getSettingInAngleDegrees(std::string key) const;
-    double getSettingInAngleRadians(std::string key) const;
-    double getSettingInMillimeters(std::string key) const;
-    int getSettingInMicrons(std::string key) const;
-    bool getSettingBoolean(std::string key) const;
-    double getSettingInDegreeCelsius(std::string key) const;
-    double getSettingInMillimetersPerSecond(std::string key) const;
-    double getSettingInCubicMillimeters(std::string key) const;
-    double getSettingInPercentage(std::string key) const;
-    double getSettingInSeconds(std::string key) const;
-
-    FlowTempGraph getSettingAsFlowTempGraph(std::string key) const;
-    FMatrix3x3 getSettingAsPointMatrix(std::string key) const;
-
-    DraftShieldHeightLimitation getSettingAsDraftShieldHeightLimitation(const std::string key) const;
-    EGCodeFlavor getSettingAsGCodeFlavor(std::string key) const;
-    EFillMethod getSettingAsFillMethod(std::string key) const;
-    EPlatformAdhesion getSettingAsPlatformAdhesion(std::string key) const;
-    ESupportType getSettingAsSupportType(std::string key) const;
-    EZSeamType getSettingAsZSeamType(std::string key) const;
-    ESurfaceMode getSettingAsSurfaceMode(std::string key) const;
-    FillPerimeterGapMode getSettingAsFillPerimeterGapMode(std::string key) const;
-    CombingMode getSettingAsCombingMode(std::string key);
-    SupportDistPriority getSettingAsSupportDistPriority(std::string key);
+    int getSettingAsIndex(std::string key);
+    int getSettingAsCount(std::string key);
+    
+    double getSettingInAngleRadians(std::string key);
+    int getSettingInMicrons(std::string key);
+    bool getSettingBoolean(std::string key);
+    double getSettingInDegreeCelsius(std::string key);
+    double getSettingInMillimetersPerSecond(std::string key);
+    double getSettingInCubicMillimeters(std::string key);
+    double getSettingInPercentage(std::string key);
+    double getSettingInSeconds(std::string key);
+    
+    FlowTempGraph getSettingAsFlowTempGraph(std::string key);
+    
+    std::vector<std::pair<double, double>> getSettingAsPointVector(std::string key);
+    
+    EGCodeFlavor getSettingAsGCodeFlavor(std::string key);
+    EFillMethod getSettingAsFillMethod(std::string key);
+    EPlatformAdhesion getSettingAsPlatformAdhesion(std::string key);
+    ESupportType getSettingAsSupportType(std::string key);
+    EZSeamType getSettingAsZSeamType(std::string key);
+    ESurfaceMode getSettingAsSurfaceMode(std::string key);
+    FillPerimeterGapMode getSettingAsFillPerimeterGapMode(std::string key);
 };
 
-class SettingRegistry;
 /*!
  * Base class for every object that can hold settings.
  * The SettingBase object can hold multiple key-value pairs that define settings.
@@ -263,28 +201,26 @@ class SettingRegistry;
  */
 class SettingsBase : public SettingsBaseVirtual
 {
-    friend class SettingRegistry;
 private:
     std::unordered_map<std::string, std::string> setting_values;
-
-    /*!
-     * Mapping for each setting which must inherit from a different setting base than \ref SettingsBaseVirtual::parent
-     */
-    std::unordered_map<std::string, const SettingsBaseVirtual*> setting_inherit_base;
 public:
     SettingsBase(); //!< SettingsBase without a parent settings object
     SettingsBase(SettingsBaseVirtual* parent); //!< construct a SettingsBase with a parent settings object
-
-    /*!
-     * Set a setting to a value.
-     * \param key the setting
-     * \param value the value
-     */
-    void setSetting(std::string key, std::string value);
-    void setSettingInheritBase(std::string key, const SettingsBaseVirtual& parent); //!< See \ref SettingsBaseVirtual::setSettingInheritBase
-    std::string getSettingString(std::string key) const; //!< Get a setting from this SettingsBase (or any ancestral SettingsBase)
     
-    std::string getAllLocalSettingsString() const
+    /*!
+     * Retrieve the defaults for each extruder train from the machine_extruder_trains settings 
+     * and set the general settings to those defaults if they haven't been set yet.
+     * 
+     * Only sets those settings which haven't already been set on that level - not looking at its parent (FffProcessor, meshgroup) or children (meshes).
+     * 
+     * \param extruder_nr The index of which extruder train in machine_extruder_trains to get the settings from
+     */
+    void setExtruderTrainDefaults(unsigned int extruder_nr);
+    
+    void setSetting(std::string key, std::string value);
+    std::string getSettingString(std::string key); //!< Get a setting from this SettingsBase (or any ancestral SettingsBase)
+    
+    std::string getAllLocalSettingsString()
     {
         std::stringstream sstream;
         for (auto pair : setting_values)
@@ -297,18 +233,11 @@ public:
         return sstream.str();
     }
     
-    void debugOutputAllLocalSettings()  const
+    void debugOutputAllLocalSettings() 
     {
         for (auto pair : setting_values)
             std::cerr << pair.first << " : " << pair.second << std::endl;
     }
-protected:
-    /*!
-     * Set a setting without checking if it's registered.
-     * 
-     * Used in SettingsRegistry
-     */
-    void _setSetting(std::string key, std::string value);
 };
 
 /*!
@@ -322,11 +251,9 @@ public:
     SettingsMessenger(SettingsBaseVirtual* parent); //!< construct a SettingsMessenger with a parent settings object
     
     void setSetting(std::string key, std::string value); //!< Set a setting of the parent SettingsBase to a given value
-    void setSettingInheritBase(std::string key, const SettingsBaseVirtual& parent); //!< See \ref SettingsBaseVirtual::setSettingInheritBase
-    std::string getSettingString(std::string key) const; //!< Get a setting from the parent SettingsBase (or any further ancestral SettingsBase)
+    std::string getSettingString(std::string key); //!< Get a setting from the parent SettingsBase (or any further ancestral SettingsBase)
 };
 
 
 }//namespace cura
-#endif//SETTINGS_SETTINGS_H
-
+#endif//SETTINGS_H

src/settings/SettingConfig.cpp

@@ -1,14 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#include "SettingConfig.h"
-
-
-namespace cura
-{
-
-SettingConfig::SettingConfig(std::string key, std::string label)
-: SettingContainer(key, label)
-{
-//     std::cerr << key << std::endl; // debug output to show all frontend registered settings...
-}
-
-}//namespace cura

src/settings/SettingConfig.h

@@ -1,76 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#ifndef SETTINGS_SETTING_CONFIG_H
-#define SETTINGS_SETTING_CONFIG_H
-
-#include <string>
-#include <iostream> // debug out
-
-#include "SettingContainer.h"
-
-#include "../utils/NoCopy.h"
-#include "rapidjson/document.h"
-
-namespace cura
-{
-
-/*!
- * Single setting data.
- * Filled from the fdmprinter.json file. Can contain child settings, and is registered in the
- * setting registry with it's key.
- */
-class SettingConfig : public SettingContainer
-{
-private:
-    std::string type; //!< The type of the default_value, e.g. str, int, bool
-    std::string default_value; //!< The default value for this setting
-    std::string unit; //!< The unit of the physical quantity in which this setting is measured, e.g. "mm", "mm/s", ""
-public:
-    SettingConfig(std::string key, std::string label);
-
-    std::string getKey() const
-    {
-        return key;
-    }
-    
-    void setType(std::string type)
-    {
-        this->type = type;
-    }
-    
-    std::string getType() const
-    {
-        return type;
-    }
-
-    void setDefault(std::string default_value)
-    {
-        this->default_value = default_value;
-    }
-    
-    std::string getDefaultValue() const
-    {
-        return default_value;
-    }
-
-    void setUnit(std::string unit)
-    {
-        this->unit = unit;
-    }
-    
-    std::string getUnit() const
-    {
-        return unit;
-    }
-    
-    void debugOutputAllSettings() const
-    {
-        std::cerr << key <<  "(" << default_value << ")" << std::endl;
-        for (const SettingConfig& child : children)
-        {
-            child.debugOutputAllSettings();
-        }
-    }
-};
-
-}//namespace cura
-#endif//SETTINGS_SETTING_CONFIG_H

src/settings/SettingContainer.cpp

@@ -1,47 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#include "SettingContainer.h"
-#include "SettingConfig.h"
-
-#include <string>
-#include <algorithm> // find_if
-
-namespace cura
-{
-
-SettingContainer::SettingContainer(std::string key, std::string label)
-: key(key)
-, label(label)
-{
-}
-
-SettingConfig* SettingContainer::addChild(std::string key, std::string label)
-{
-    children.emplace_back(key, label);
-    return &children.back();
-}
-
-SettingConfig& SettingContainer::getOrCreateChild(std::string key, std::string label)
-{
-    auto child_it = std::find_if(children.begin(), children.end(), [&key](SettingConfig& child) { return child.key == key; } );
-    if (child_it == children.end())
-    {
-        children.emplace_back(key, label);
-        return children.back();
-    }
-    else
-    {
-        return *child_it;
-    }
-}
-
-
-void SettingContainer::debugOutputAllSettings() const
-{
-    std::cerr << "\nSETTINGS BASE: " << key << std::endl;
-    for (const SettingConfig& child : children)
-    {
-        child.debugOutputAllSettings();
-    }
-}
-
-}//namespace cura

src/settings/SettingContainer.h

@@ -1,83 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#ifndef SETTINGS_SETTING_CONTAINER_H
-#define SETTINGS_SETTING_CONTAINER_H
-
-#include <vector>
-#include <list>
-#include <unordered_map>
-#include <string>
-#include <iostream> // debug out
-
-#include "../utils/NoCopy.h"
-#include "rapidjson/document.h"
-
-namespace cura
-{
-    
-// Forward declaration
-class SettingConfig;
-class SettingRegistry;
-
-/*!
- * Setting container for a settings base of definitions and default values.
- * Filled from the .def.json files. Contains one or more children settings.
- */
-class SettingContainer
-{
-    friend class SettingConfig;
-    friend class SettingRegistry;
-private:
-    std::string key;
-    std::string label;
-    std::list<SettingConfig> children; // must be a list cause the pointers to individual children are mapped to in SettingRegistry::settings.
-    std::list<std::string> path; //!< The path of parents (internal names) to this container
-public:
-    std::string getKey() const { return key; }
-    std::string getLabel() const { return label; }
-    SettingContainer(std::string key, std::string label);
-    
-    /*!
-     * Get the SettingConfig::children.
-     * 
-     * This is used to get the extruder trains; see Settingsbase::setExtruderTrainDefaults
-     * 
-     * \return SettingConfig::children
-     */
-    const std::list<SettingConfig>& getChildren() const { return children; }
-    
-    SettingConfig* addChild(std::string key, std::string label);
-    
-    /*!
-     * Get the \p idx th child.
-     * 
-     * This is used to get a specific extruder train in Settingsbase::setExtruderTrainDefaults
-     * 
-     * \param idx The index in the list of children
-     * \return The \p idx th child
-     */
-    const SettingConfig* getChild(unsigned int idx) const
-    {
-        if (idx < children.size())
-        {
-            auto it = children.begin();
-            while (idx > 0) { ++it; idx--; }
-            return &*it;
-        }
-        else 
-            return nullptr;
-    }
-
-private:
-    /*!
-     * Get the (direct) child with key \p key, or create one with key \p key and label \p label as well.
-     * 
-     * \param key the key
-     * \param label the label for creating a new child
-     * \return The existing or newly created child setting.
-     */
-    SettingConfig& getOrCreateChild(std::string key, std::string label);
-public:
-    void debugOutputAllSettings() const;
-};
-}//namespace cura
-#endif//SETTINGS_SETTING_CONTAINER_H

src/settings/SettingRegistry.cpp

@@ -1,383 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#include "SettingRegistry.h"
-
-#include <sstream>
-#include <iostream> // debug IO
-#include <libgen.h> // dirname
-#include <string>
-#include <cstring> // strtok (split string using delimiters) strcpy
-#include <fstream> // ifstream (to see if file exists)
-
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-#include "rapidjson/filereadstream.h"
-#include "../utils/logoutput.h"
-
-namespace cura
-{
-    
-SettingRegistry SettingRegistry::instance; // define settingRegistry
-
-std::string SettingRegistry::toString(rapidjson::Type type)
-{
-    switch (type)
-    {
-        case rapidjson::Type::kNullType: return "null";
-        case rapidjson::Type::kFalseType: return "false";
-        case rapidjson::Type::kTrueType: return "true";
-        case rapidjson::Type::kObjectType: return "object";
-        case rapidjson::Type::kArrayType: return "array";
-        case rapidjson::Type::kStringType: return "string";
-        case rapidjson::Type::kNumberType: return "number";
-        default: return "Unknown";
-    }
-}
-
-
-SettingConfig::SettingConfig(std::string key, std::string label)
-: SettingContainer(key, label)
-{
-//     std::cerr << key << std::endl; // debug output to show all frontend registered settings...
-}
-
-bool SettingRegistry::settingExists(std::string key) const
-{
-    return setting_key_to_config.find(key) != setting_key_to_config.end();
-}
-
-SettingConfig* SettingRegistry::getSettingConfig(std::string key) const
-{
-    auto it = setting_key_to_config.find(key);
-    if (it == setting_key_to_config.end())
-        return nullptr;
-    return it->second;
-}
-
-SettingRegistry::SettingRegistry()
-: setting_definitions("settings", "Settings")
-{
-    // load search paths from environment variable CURA_ENGINE_SEARCH_PATH
-    char* paths = getenv("CURA_ENGINE_SEARCH_PATH");
-    if (paths)
-    {
-#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
-        char delims[] = ":"; // colon
-#else
-        char delims[] = ";"; // semicolon
-#endif
-        char* path = strtok(paths, delims); // search for next path delimited by any of the characters in delims
-        while (path != NULL)
-        {
-            search_paths.emplace(path);
-            path = strtok(NULL, ";:,"); // continue searching in last call to strtok
-        }
-    }
-}
-
-int SettingRegistry::loadJSON(std::string filename, rapidjson::Document& json_document)
-{
-    FILE* f = fopen(filename.c_str(), "rb");
-    if (!f)
-    {
-        cura::logError("Couldn't open JSON file.\n");
-        return 1;
-    }
-    char read_buffer[4096];
-    rapidjson::FileReadStream reader_stream(f, read_buffer, sizeof(read_buffer));
-    json_document.ParseStream(reader_stream);
-    fclose(f);
-    if (json_document.HasParseError())
-    {
-        cura::logError("Error parsing JSON(offset %u): %s\n", (unsigned)json_document.GetErrorOffset(), GetParseError_En(json_document.GetParseError()));
-        return 2;
-    }
-
-    return 0;
-}
-
-/*!
- * Check whether a file exists.
- * from https://techoverflow.net/blog/2013/01/11/cpp-check-if-file-exists/
- * 
- * \param filename The path to a filename to check if it exists
- * \return Whether the file exists.
- */
-bool fexists(const char *filename)
-{
-    std::ifstream ifile(filename);
-    return (bool)ifile;
-}
-
-bool SettingRegistry::getDefinitionFile(const std::string machine_id, std::string& result)
-{
-    for (const std::string& search_path : search_paths)
-    {
-        result = search_path + std::string("/") + machine_id + std::string(".def.json");
-        if (fexists(result.c_str()))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-int SettingRegistry::loadExtruderJSONsettings(unsigned int extruder_nr, SettingsBase* settings_base)
-{
-    if (extruder_nr >= extruder_train_ids.size())
-    {
-        logWarning("Couldn't load extruder.def.json file for extruder %i. Index out of bounds.\n Loading first extruder definition instead.\n", extruder_nr);
-        extruder_nr = 0;
-    }
-    std::string definition_file;
-    bool found = getDefinitionFile(extruder_train_ids[extruder_nr], definition_file);
-    if (!found)
-    {
-        logError("Couldn't find extruder.def.json file for extruder %i.\n", extruder_nr);
-        return -1;
-    }
-    bool warn_base_file_duplicates = false;
-    return loadJSONsettings(definition_file, settings_base, warn_base_file_duplicates);
-}
-
-int SettingRegistry::loadJSONsettings(std::string filename, SettingsBase* settings_base, bool warn_base_file_duplicates)
-{
-    rapidjson::Document json_document;
-    
-    log("Loading %s...\n", filename.c_str());
-
-    int err = loadJSON(filename, json_document);
-    if (err) { return err; }
-
-    { // add parent folder to search paths
-        char filename_cstr[filename.size()];
-        std::strcpy(filename_cstr, filename.c_str()); // copy the string because dirname(.) changes the input string!!!
-        std::string folder_name = std::string(dirname(filename_cstr));
-        search_paths.emplace(folder_name);
-    }
-
-    if (json_document.HasMember("inherits") && json_document["inherits"].IsString())
-    {
-        std::string child_filename;
-        bool found = getDefinitionFile(json_document["inherits"].GetString(), child_filename);
-        if (!found)
-        {
-            cura::logError("Inherited JSON file \"%s\" not found\n", json_document["inherits"].GetString());
-            return -1;
-        }
-        err = loadJSONsettings(child_filename, settings_base, warn_base_file_duplicates); // load child first
-        if (err)
-        {
-            return err;
-        }
-        err = loadJSONsettingsFromDoc(json_document, settings_base, false);
-    }
-    else 
-    {
-        err = loadJSONsettingsFromDoc(json_document, settings_base, warn_base_file_duplicates);
-    }
-
-    if (json_document.HasMember("metadata") && json_document["metadata"].IsObject())
-    {
-        const rapidjson::Value& json_metadata = json_document["metadata"];
-        if (json_metadata.HasMember("machine_extruder_trains") && json_metadata["machine_extruder_trains"].IsObject())
-        {
-            const rapidjson::Value& json_machine_extruder_trains = json_metadata["machine_extruder_trains"];
-            for (rapidjson::Value::ConstMemberIterator extr_train_iterator = json_machine_extruder_trains.MemberBegin(); extr_train_iterator != json_machine_extruder_trains.MemberEnd(); ++extr_train_iterator)
-            {
-                int extruder_train_nr = atoi(extr_train_iterator->name.GetString());
-                if (extruder_train_nr < 0)
-                {
-                    continue;
-                }
-                const rapidjson::Value& json_id = extr_train_iterator->value;
-                if (!json_id.IsString())
-                {
-                    continue;
-                }
-                const char* id = json_id.GetString();
-                if (extruder_train_nr >= (int) extruder_train_ids.size())
-                {
-                    extruder_train_ids.resize(extruder_train_nr + 1);
-                }
-                extruder_train_ids[extruder_train_nr] = std::string(id);
-            }
-        }
-    }
-
-    return err;
-}
-
-int SettingRegistry::loadJSONsettingsFromDoc(rapidjson::Document& json_document, SettingsBase* settings_base, bool warn_duplicates)
-{
-    
-    if (!json_document.IsObject())
-    {
-        cura::logError("JSON file is not an object.\n");
-        return 3;
-    }
-
-    if (json_document.HasMember("settings"))
-    {
-        std::list<std::string> path;
-        handleChildren(json_document["settings"], path, settings_base, warn_duplicates);
-    }
-    
-    if (json_document.HasMember("overrides"))
-    {
-        const rapidjson::Value& json_object_container = json_document["overrides"];
-        for (rapidjson::Value::ConstMemberIterator override_iterator = json_object_container.MemberBegin(); override_iterator != json_object_container.MemberEnd(); ++override_iterator)
-        {
-            std::string setting = override_iterator->name.GetString();
-            SettingConfig* conf = getSettingConfig(setting);
-            if (!conf) //Setting could not be found.
-            {
-                logWarning("Trying to override unknown setting %s.\n", setting.c_str());
-                continue;
-            }
-            _loadSettingValues(conf, override_iterator, settings_base);
-        }
-    }
-    
-    return 0;
-}
-
-void SettingRegistry::handleChildren(const rapidjson::Value& settings_list, std::list<std::string>& path, SettingsBase* settings_base, bool warn_duplicates)
-{
-    if (!settings_list.IsObject())
-    {
-        logError("json settings list is not an object!\n");
-        return;
-    }
-    for (rapidjson::Value::ConstMemberIterator setting_iterator = settings_list.MemberBegin(); setting_iterator != settings_list.MemberEnd(); ++setting_iterator)
-    {
-        handleSetting(setting_iterator, path, settings_base, warn_duplicates);
-        if (setting_iterator->value.HasMember("children"))
-        {
-            std::list<std::string> path_here = path;
-            path_here.push_back(setting_iterator->name.GetString());
-            handleChildren(setting_iterator->value["children"], path_here, settings_base, warn_duplicates);
-        }
-    }
-}
-
-bool SettingRegistry::settingIsUsedByEngine(const rapidjson::Value& setting)
-{
-    if (setting.HasMember("children"))
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
-}
-
-
-void SettingRegistry::handleSetting(const rapidjson::Value::ConstMemberIterator& json_setting_it, std::list<std::string>& path, SettingsBase* settings_base, bool warn_duplicates)
-{
-    const rapidjson::Value& json_setting = json_setting_it->value;
-    if (!json_setting.IsObject())
-    {
-        logError("json setting is not an object!\n");
-        return;
-    }
-    std::string name = json_setting_it->name.GetString();
-    if (json_setting.HasMember("type") && json_setting["type"].IsString() && json_setting["type"].GetString() == std::string("category"))
-    { // skip category objects
-        setting_key_to_config[name] = nullptr; // add the category name to the mapping, but don't instantiate a setting config for it.
-        return;
-    }
-    if (settingIsUsedByEngine(json_setting))
-    {
-        if (!json_setting.HasMember("label") || !json_setting["label"].IsString())
-        {
-            logError("json setting \"%s\" has no label!\n", name.c_str());
-            return;
-        }
-        std::string label = json_setting["label"].GetString();
-        
-        SettingConfig* setting = getSettingConfig(name);
-        if (warn_duplicates && setting)
-        {
-            cura::logWarning("Duplicate definition of setting: %s a.k.a. \"%s\" was already claimed by \"%s\"\n", name.c_str(), label.c_str(), getSettingConfig(name)->getLabel().c_str());
-        }
-        if (!setting)
-        {
-            setting = &addSetting(name, label);
-        }
-        _loadSettingValues(setting, json_setting_it, settings_base);
-    }
-    else
-    {
-        setting_key_to_config[name] = nullptr; // add the setting name to the mapping, but don't instantiate a setting config for it.
-    }
-}
-
-SettingConfig& SettingRegistry::addSetting(std::string name, std::string label)
-{
-    SettingConfig* config = setting_definitions.addChild(name, label);
-
-    setting_key_to_config[name] = config;
-
-    return *config;
-}
-
-void SettingRegistry::loadDefault(const rapidjson::GenericValue< rapidjson::UTF8< char > >::ConstMemberIterator& json_object_it, SettingConfig* config)
-{
-    const rapidjson::Value& setting_content = json_object_it->value;
-    if (setting_content.HasMember("default_value"))
-    {
-        const rapidjson::Value& dflt = setting_content["default_value"];
-        if (dflt.IsString())
-        {
-            config->setDefault(dflt.GetString());
-        }
-        else if (dflt.IsTrue())
-        {
-            config->setDefault("true");
-        }
-        else if (dflt.IsFalse())
-        {
-            config->setDefault("false");
-        }
-        else if (dflt.IsNumber())
-        {
-            std::ostringstream ss;
-            ss << dflt.GetDouble();
-            config->setDefault(ss.str());
-        } // arrays are ignored because machine_extruder_trains needs to be handled separately
-        else 
-        {
-            logWarning("WARNING: Unrecognized data type in JSON: %s has type %s\n", json_object_it->name.GetString(), toString(dflt.GetType()).c_str());
-        }
-    }
-}
-
-
-void SettingRegistry::_loadSettingValues(SettingConfig* config, const rapidjson::GenericValue< rapidjson::UTF8< char > >::ConstMemberIterator& json_object_it, SettingsBase* settings_base)
-{
-    const rapidjson::Value& data = json_object_it->value;
-    /// Fill the setting config object with data we have in the json file.
-    if (data.HasMember("type") && data["type"].IsString())
-    {
-        config->setType(data["type"].GetString());
-    }
-    if (config->getType() == std::string("polygon") || config->getType() == std::string("polygons"))
-    { // skip polygon settings : not implemented yet and not used yet (TODO)
-//         logWarning("WARNING: Loading polygon setting %s not implemented...\n", json_object_it->name.GetString());
-        return;
-    }
-
-    loadDefault(json_object_it, config);
-
-    if (data.HasMember("unit") && data["unit"].IsString())
-    {
-        config->setUnit(data["unit"].GetString());
-    }
-
-    settings_base->_setSetting(config->getKey(), config->getDefaultValue());
-}
-
-}//namespace cura

src/settings/SettingRegistry.h

@@ -1,191 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#ifndef SETTINGS_SETTING_REGISTRY_H
-#define SETTINGS_SETTING_REGISTRY_H
-
-#include <vector>
-#include <unordered_set>
-#include <list>
-#include <unordered_map>
-#include <string>
-#include <iostream> // debug out
-
-#include "SettingConfig.h"
-#include "SettingContainer.h"
-
-#include "../utils/NoCopy.h"
-#include "rapidjson/document.h"
-#include "settings.h"
-
-namespace cura
-{
-
-/*!
- * Setting registry.
- * There is a single global setting registry.
- * This registry contains all known setting keys and (some of) their attributes.
- * The default values are stored and retrieved in case a given setting doesn't get a value from the command line or the frontend.
- */
-class SettingRegistry : NoCopy
-{
-private:
-    static SettingRegistry instance;
-
-    SettingRegistry();
-    
-    std::unordered_map<std::string, SettingConfig*> setting_key_to_config; //!< Mapping from setting keys to their configurations
-
-    SettingContainer setting_definitions; //!< All setting configurations (A flat list)
-    
-    std::vector<std::string> extruder_train_ids; //!< The internal id's of each extruder (the filename without the extension)
-
-    std::unordered_set<std::string> search_paths; //!< The paths to search for json files.
-public:
-    /*!
-     * Get the SettingRegistry.
-     * 
-     * This is a singleton class.
-     * 
-     * \return The SettingRegistry
-     */
-    static SettingRegistry* getInstance() { return &instance; }
-    
-    /*!
-     * Check whether a setting exists, according to the settings json files.
-     * 
-     * \param key The internal key for the setting to test
-     * \return Whether a definition of the setting is recorded in this registry.
-     */
-    bool settingExists(std::string key) const;
-
-    /*!
-     * Get the config of a setting with a given key.
-     * 
-     * \param key the (internal) key for a setting
-     * \return the setting definition values
-     */
-    SettingConfig* getSettingConfig(std::string key) const;
-protected:
-    /*!
-     * Whether this json settings object is a definition of a CuraEngine setting,
-     * or only a shorthand setting to control other settings.
-     * Only settings used by the engine will be recordedd in the registry.
-     * 
-     * \param setting The setting to check whether CuraEngine uses it.
-     * \return Whether CuraEngine uses the setting.
-     */
-    bool settingIsUsedByEngine(const rapidjson::Value& setting);
-
-    /*!
-     * Get the filename for the machine definition with the given id.
-     * Check the directories in SettingRegistry::search_paths.
-     * 
-     * \param machine_id The id and base filename (without extensions) of the machine definition to search for.
-     * \param result The filename of the machine definition
-     * \return Whether we found the file.
-     */
-    bool getDefinitionFile(const std::string machine_id, std::string& result);
-    
-    /*!
-     * Get the default value of a json setting object in the format used internally (c style).
-     * 
-     * \param[in] json_object_it An iterator for a given setting json object
-     * \param[out] config Where the default value is stored
-     */
-    static void loadDefault(const rapidjson::GenericValue< rapidjson::UTF8< char > >::ConstMemberIterator& json_object_it, SettingConfig* config);
-public:
-    /*!
-     * Load settings from a json file and all the parents it inherits from.
-     * 
-     * Uses recursion to load the parent json file.
-     * 
-     * \param filename The filename of the json file to parse
-     * \param settings_base The settings base where to store the default values.
-     * \param warn_base_file_duplicates Whether to warn if there are duplicate definitions in the base file (the .def.json which has no inherits).
-     * \return an error code or zero of succeeded
-     */
-    int loadJSONsettings(std::string filename, SettingsBase* settings_base, bool warn_base_file_duplicates = true);
-    
-    void debugOutputAllSettings() const
-    {
-        setting_definitions.debugOutputAllSettings();
-    }
-
-    /*!
-     * Load settings from the extruder definition json file and all the parents it inherits from.
-     * Use the json file refered to in the machine_extruder_trains attribute of the last loaded machine json file.
-     * 
-     * Uses recursion to load the parent json file.
-     * 
-     * \param extruder_nr The number of the extruder to load
-     * \param settings_base The settings base where to store the default values. (The extruder settings base)
-     * \return an error code or zero of succeeded
-     */
-    int loadExtruderJSONsettings(unsigned int extruder_nr, SettingsBase* settings_base);
-private:
-    
-    /*!
-     * \param type type to convert to string
-     * \return human readable version of json type
-     */
-    static std::string toString(rapidjson::Type type);
-public:
-    /*!
-     * Load a json document.
-     * 
-     * \param filename The filename of the json file to parse
-     * \param json_document (output) the document to be loaded
-     * \return an error code or zero of succeeded
-     */
-    static int loadJSON(std::string filename, rapidjson::Document& json_document);
-private:
-    /*!
-     * Load settings from a single json file.
-     * 
-     * \param filename The filename of the json file to parse
-     * \param settings_base The settings base where to store the default values.
-     * \param warn_duplicates whether to warn for duplicate definitions
-     * \return an error code or zero of succeeded
-     */
-    int loadJSONsettingsFromDoc(rapidjson::Document& json_document, SettingsBase* settings_base, bool warn_duplicates);
-
-    /*!
-     * Create a new SettingConfig and add it to the registry.
-     * 
-     * \param name The internal key of the setting
-     * \param label The human readable name for the frontend
-     * \return The config created
-     */
-    SettingConfig& addSetting(std::string name, std::string label);
-
-    /*!
-     * Load inessential data about the setting, like its type and unit.
-     * 
-     * \param[out] config Where to store the data
-     * \param[in] json_object_it Iterator to a setting json object
-     * \param[out] settings_base The settings base where to store the default values.
-     */
-    void _loadSettingValues(SettingConfig* config, const rapidjson::Value::ConstMemberIterator& json_object_it, SettingsBase* settings_base);
-
-    /*!
-     * Handle a json object which contains a list of settings.
-     * 
-     * \param settings_list The object containing one or more setting definitions
-     * \param path The path of (internal) setting names traversed to get to this object
-     * \param settings_base The settings base where to store the default values.
-     * \param warn_duplicates whether to warn for duplicate setting definitions
-     */
-    void handleChildren(const rapidjson::Value& settings_list, std::list<std::string>& path, SettingsBase* settings_base, bool warn_duplicates);
-    
-    /*!
-     * Handle a json object for a setting.
-     * 
-     * \param json_setting_it Iterator for the setting which contains the key (setting name) and attributes info
-     * \param path The path of (internal) setting names traversed to get to this object
-     * \param settings_base The settings base where to store the default values.
-     * \param warn_duplicates whether to warn for duplicate setting definitions
-     */
-    void handleSetting(const rapidjson::Value::ConstMemberIterator& json_setting_it, std::list<std::string>& path, SettingsBase* settings_base, bool warn_duplicates);
-};
-
-}//namespace cura
-#endif//SETTINGS_SETTING_REGISTRY_H

src/settings/SettingsToGV.h

@@ -1,291 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#ifndef SETTINGS_TO_GV_H
-#define SETTINGS_TO_GV_H
-
-
-#include <stdio.h> // for file output
-#include <sstream>
-#include <iostream> // debug IO
-#include <libgen.h> // dirname
-#include <string>
-#include <algorithm> // find_if
-#include <regex> // regex_search
-#include <cassert>
-#include <fstream>
-#include <set>
-#include <unordered_map>
-
-#include "rapidjson/rapidjson.h"
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-#include "rapidjson/filereadstream.h"
-#include "../utils/logoutput.h"
-#include "SettingRegistry.h"
-
-namespace cura
-{
-
-class SettingsToGv
-{
-    enum class RelationType
-    {
-        PARENT_CHILD,
-        INHERIT_FUNCTION,
-        ERROR_FUNCTION,
-        WARNING_FUNCTION
-    };
-    
-    FILE* out;
-    std::set<std::string> engine_settings;
-    
-    std::unordered_map<std::string, std::string> setting_to_color;
-    bool parent_child_viz, inherit_viz, error_viz, warning_viz, global_only_viz;
-public: 
-    SettingsToGv(std::string output_filename, std::string engine_settings_filename, bool parent_child_viz, bool inherit_viz, bool error_viz, bool warning_viz, bool global_only_viz)
-    : parent_child_viz(parent_child_viz)
-    , inherit_viz(inherit_viz)
-    , error_viz(error_viz)
-    , warning_viz(warning_viz)
-    , global_only_viz(global_only_viz)
-    {
-        out = fopen(output_filename.c_str(), "w");
-        fprintf(out, "digraph G {\n");
-        
-        
-        std::ifstream engine_settings_file(engine_settings_filename.c_str());
-        std::string line;
-        while (std::getline(engine_settings_file, line))
-        {
-            engine_settings.insert(line);
-            //fprintf(out, "%s [color=green];\n", line.c_str());
-        }
-        engine_settings_file.close();
-    }
-private:
-    void generateEdge(const std::string& parent, const std::string& child, RelationType relation_type)
-    {
-        if (global_only_viz)
-        {
-            auto parent_it = setting_to_color.find(parent);
-            if (parent_it != setting_to_color.end())
-            {
-                fprintf(out, "%s [color=%s];\n", parent_it->first.c_str(), parent_it->second.c_str());
-            }
-            auto child_it = setting_to_color.find(child);
-            if (child_it != setting_to_color.end())
-            {
-                fprintf(out, "%s [color=%s];\n", child_it->first.c_str(), child_it->second.c_str());
-            }
-        }
-        else
-        {
-            if (engine_settings.find(parent) != engine_settings.end())
-            {
-                fprintf(out, "%s [color=green];\n", parent.c_str());
-            }
-            if (engine_settings.find(child) != engine_settings.end())
-            {
-                fprintf(out, "%s [color=green];\n", child.c_str());
-            }
-        }
-
-        std::string color;
-        switch (relation_type)
-        {
-            case SettingsToGv::RelationType::INHERIT_FUNCTION:
-                if (!inherit_viz)
-                {
-                    return;
-                }
-                color = "blue";
-                break;
-            case SettingsToGv::RelationType::PARENT_CHILD:
-                if (!parent_child_viz)
-                {
-                    return;
-                }
-                color = "black";
-                break;
-            case SettingsToGv::RelationType::ERROR_FUNCTION:
-                if (!error_viz)
-                {
-                    return;
-                }
-                color = "red";
-                break;
-            case SettingsToGv::RelationType::WARNING_FUNCTION:
-                if (!warning_viz)
-                {
-                    return;
-                }
-                color = "orange";
-                break;
-        }
-        fprintf(out, "edge [color=%s];\n", color.c_str());
-        fprintf(out, "%s -> %s;\n", parent.c_str(), child.c_str());
-    }
-    
-    bool createFunctionEdges(const rapidjson::Value& data, std::string function_key, const std::string& parent, const std::string& name, const RelationType relation_type)
-    {
-        bool generated_edge = false;
-        if (data.HasMember(function_key.c_str()) && data[function_key.c_str()].IsString())
-        {
-            std::string function = data[function_key.c_str()].GetString();
-            
-            std::regex setting_name_regex("[a-zA-Z0-9_]+"); // matches mostly with setting names
-            std::smatch regex_match;
-            while (std::regex_search (function, regex_match, setting_name_regex))
-            {
-                std::string inherited_setting_string = regex_match[0];
-                if (inherited_setting_string == "parent_value")
-                {
-                    generateEdge(parent, name, RelationType::PARENT_CHILD);
-                    generated_edge = true;
-                }
-                else if ( ! std::regex_match(inherited_setting_string, std::regex("[0-9]+")) && // exclude numbers
-                    // result != "parent_value" && 
-                    inherited_setting_string != "if" && inherited_setting_string != "else" && inherited_setting_string != "and" 
-                    && inherited_setting_string != "or" && inherited_setting_string != "math" && inherited_setting_string != "ceil" 
-                    && inherited_setting_string != "int" && inherited_setting_string != "round" && inherited_setting_string != "max" // exclude operators and functions
-                    && inherited_setting_string != "log" // exclude functions
-                    && inherited_setting_string != "grid" && inherited_setting_string != "triangles" // exclude enum values
-                    && inherited_setting_string != "cubic" && inherited_setting_string != "tetrahedral" // exclude enum values
-                    && inherited_setting_string != "raft" // exclude enum values
-                    && function.c_str()[regex_match.position() + regex_match.length()] != '\'') // exclude enum terms
-                {
-                    if (inherited_setting_string == parent)
-                    {
-                        generated_edge = true;
-                        generateEdge(inherited_setting_string, name, RelationType::PARENT_CHILD);
-                    }
-                    else 
-                    {
-                        generateEdge(inherited_setting_string, name, relation_type);
-                    }
-                }
-                function = regex_match.suffix().str();
-            }
-        }
-        return generated_edge;
-    }
-    
-    void parseSetting(const std::string& parent, rapidjson::Value::ConstMemberIterator json_object_it)
-    {
-        std::string name = json_object_it->name.GetString();
-        
-//         std::cerr << "parsed: " << name <<"\n";
-        
-        bool generated_edge = false;
-        
-        const rapidjson::Value& data = json_object_it->value;
-        
-        if (data.HasMember("type") && data["type"].IsString() && data["type"].GetString() != std::string("category"))
-        {
-            if (global_only_viz)
-            {
-                std::string color;
-                if (!data.HasMember("settable_per_mesh") || data["settable_per_mesh"].GetBool() == true)
-                {
-                    color = "green";
-                }
-                else if (data.HasMember("settable_per_mesh") && data["settable_per_mesh"].GetBool() == false)
-                {
-                    if (!data.HasMember("settable_per_extruder") || data["settable_per_extruder"].GetBool() == true)
-                    {
-                        color = "yellow";
-                    }
-                    else if (data.HasMember("settable_per_extruder") && data["settable_per_extruder"].GetBool() == false)
-                    {
-                        if (!data.HasMember("settable_per_meshgroup") || data["settable_per_meshgroup"].GetBool() == true)
-                        {
-                            color = "orange";
-                        }
-                        else if (data.HasMember("settable_per_meshgroup") && data["settable_per_meshgroup"].GetBool() == false)
-                        {
-                            color = "red";
-                        }
-                    }
-                }
-                setting_to_color.emplace(name, color);
-//                 fprintf(out, "%s [color=%s];\n", name.c_str(), color.c_str());
-            }
-            
-            
-            bool generated_edge_inherit = createFunctionEdges(data, "value", parent, name, RelationType::INHERIT_FUNCTION);
-            bool generated_edge_max = createFunctionEdges(data, "maximum_value", parent, name, RelationType::ERROR_FUNCTION);
-            bool generated_edge_min = createFunctionEdges(data, "minimum_value", parent, name, RelationType::ERROR_FUNCTION);
-            bool generated_edge_max_warn = createFunctionEdges(data, "maximum_value_warning", parent, name, RelationType::WARNING_FUNCTION);
-            bool generated_edge_min_warn = createFunctionEdges(data, "minimum_value_warning", parent, name, RelationType::WARNING_FUNCTION);
-            if (generated_edge_inherit || generated_edge_max_warn || generated_edge_min_warn || generated_edge_max || generated_edge_min)
-            {
-                generated_edge = true;
-            }
-            
-            if (!generated_edge && parent != "")
-            {
-                generateEdge(parent, name, RelationType::PARENT_CHILD);
-            }
-        }
-        else
-        {
-            name = "";
-        }
-        
-        // recursive part
-        if (data.HasMember("children") && data["children"].IsObject())
-        {
-            const rapidjson::Value& json_object_container = data["children"];
-            for (rapidjson::Value::ConstMemberIterator setting_iterator = json_object_container.MemberBegin(); setting_iterator != json_object_container.MemberEnd(); ++setting_iterator)
-            {
-                parseSetting(name, setting_iterator);
-            }
-        }
-    }
-    
-    void parseJson(const rapidjson::Document& json_document)
-    {
-        if (json_document.HasMember("settings"))
-        {
-            for (rapidjson::Value::ConstMemberIterator setting_iterator = json_document["settings"].MemberBegin(); setting_iterator != json_document["settings"].MemberEnd(); ++setting_iterator)
-            {
-                parseSetting("", setting_iterator);
-            }
-        }
-    }
-
-    int generateRecursive(std::string filename)
-    {
-        rapidjson::Document json_document;
-        
-        int err = SettingRegistry::loadJSON(filename, json_document);
-        if (err) { return err; }
-        
-        if (json_document.HasMember("inherits"))
-        {
-            std::string filename_copy = std::string(filename.c_str()); // copy the string because dirname(.) changes the input string!!!
-            char* filename_cstr = (char*)filename_copy.c_str();
-            int err = generate(std::string(dirname(filename_cstr)) + std::string("/") + json_document["inherits"].GetString());
-            if (err)
-            {
-                return err;
-            }
-        }
-        parseJson(json_document);
-        return 0;
-    }
-public:
-    int generate(std::string json_filename)
-    {
-        int err = generateRecursive(json_filename);
-        fprintf(out, "}\n");
-        fclose(out);
-        return err;
-    }
-
-
-
-};
-
-} // namespace cura
-
-#endif // SETTINGS_TO_GV_H

src/settings/settings.cpp

@@ -1,455 +0,0 @@
-/** Copyright (C) 2016 Ultimaker - Released under terms of the AGPLv3 License */
-#include <cctype>
-#include <fstream>
-#include <stdio.h>
-#include <sstream> // ostringstream
-#include <regex> // regex parsing for temp flow graph
-#include <string> // stod (string to double)
-#include "../utils/logoutput.h"
-
-#include "settings.h"
-#include "SettingRegistry.h"
-
-namespace cura
-{
-//c++11 no longer defines M_PI, so add our own constant.
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-std::string toString(EGCodeFlavor flavor)
-{
-    switch (flavor)
-    {
-        case EGCodeFlavor::BFB:
-            return "BFB";
-        case EGCodeFlavor::MACH3:
-            return "Mach3";
-        case EGCodeFlavor::MAKERBOT:
-            return "Makerbot";
-        case EGCodeFlavor::ULTIGCODE:
-            return "UltiGCode";
-        case EGCodeFlavor::REPRAP_VOLUMATRIC:
-            return "RepRap(Volumetric)";
-        case EGCodeFlavor::GRIFFIN:
-            return "Griffin";
-        case EGCodeFlavor::REPETIER:
-            return "Repetier";
-        case EGCodeFlavor::REPRAP:
-        default:
-            return "RepRap";
-    }
-}
-
-SettingsBaseVirtual::SettingsBaseVirtual()
-: parent(nullptr)
-{
-}
-
-SettingsBaseVirtual::SettingsBaseVirtual(SettingsBaseVirtual* parent)
-: parent(parent)
-{
-}
-
-SettingsBase::SettingsBase()
-: SettingsBaseVirtual(nullptr)
-{
-}
-
-SettingsBase::SettingsBase(SettingsBaseVirtual* parent)
-: SettingsBaseVirtual(parent)
-{
-}
-
-SettingsMessenger::SettingsMessenger(SettingsBaseVirtual* parent)
-: SettingsBaseVirtual(parent)
-{
-}
-
-void SettingsBase::_setSetting(std::string key, std::string value)
-{
-    setting_values[key] = value;
-}
-
-
-void SettingsBase::setSetting(std::string key, std::string value)
-{
-    if (SettingRegistry::getInstance()->settingExists(key))
-    {
-        _setSetting(key, value);
-    }
-    else
-    {
-        cura::logWarning("Setting an unregistered setting %s to %s\n", key.c_str(), value.c_str());
-        _setSetting(key, value); // Handy when programmers are in the process of introducing a new setting
-    }
-}
-
-void SettingsBase::setSettingInheritBase(std::string key, const SettingsBaseVirtual& parent)
-{
-    setting_inherit_base.emplace(key, &parent);
-}
-
-
-std::string SettingsBase::getSettingString(std::string key) const
-{
-    if (setting_values.find(key) != setting_values.end())
-    {
-        return setting_values.at(key);
-    }
-    if (setting_inherit_base.find(key) != setting_inherit_base.end())
-    {
-        return setting_inherit_base.at(key)->getSettingString(key);
-    }
-    if (parent)
-    {
-        return parent->getSettingString(key);
-    }
-
-    const_cast<SettingsBase&>(*this).setting_values[key] = "";
-    cura::logWarning("Unregistered setting %s\n", key.c_str());
-    return "";
-}
-
-void SettingsMessenger::setSetting(std::string key, std::string value)
-{
-    parent->setSetting(key, value);
-}
-
-void SettingsMessenger::setSettingInheritBase(std::string key, const SettingsBaseVirtual& new_parent)
-{
-    parent->setSettingInheritBase(key, new_parent);
-}
-
-
-std::string SettingsMessenger::getSettingString(std::string key) const
-{
-    return parent->getSettingString(key);
-}
-
-int SettingsBaseVirtual::getSettingAsIndex(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return atoi(value.c_str());
-}
-
-int SettingsBaseVirtual::getSettingAsCount(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return atoi(value.c_str());
-}
-
-unsigned int SettingsBaseVirtual::getSettingAsLayerNumber(std::string key) const
-{
-    const unsigned int indicated_layer_number = stoul(getSettingString(key));
-    if (indicated_layer_number < 1) //Input checking: Layer 0 is not allowed.
-    {
-        cura::logWarning("Invalid layer number %i for setting %s.", indicated_layer_number, key.c_str());
-        return 0; //Assume layer 1.
-    }
-    return indicated_layer_number - 1; //Input starts counting at layer 1, but engine code starts counting at layer 0.
-}
-
-double SettingsBaseVirtual::getSettingInMillimeters(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return atof(value.c_str());
-}
-
-int SettingsBaseVirtual::getSettingInMicrons(std::string key) const
-{
-    return getSettingInMillimeters(key) * 1000.0;
-}
-
-double SettingsBaseVirtual::getSettingInAngleDegrees(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return atof(value.c_str());
-}
-
-double SettingsBaseVirtual::getSettingInAngleRadians(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return atof(value.c_str()) / 180.0 * M_PI;
-}
-
-bool SettingsBaseVirtual::getSettingBoolean(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "on")
-        return true;
-    if (value == "yes")
-        return true;
-    if (value == "true" or value == "True") //Python uses "True"
-        return true;
-    int num = atoi(value.c_str());
-    return num != 0;
-}
-
-double SettingsBaseVirtual::getSettingInDegreeCelsius(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return atof(value.c_str());
-}
-
-double SettingsBaseVirtual::getSettingInMillimetersPerSecond(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return std::max(0.0, atof(value.c_str()));
-}
-
-double SettingsBaseVirtual::getSettingInCubicMillimeters(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return std::max(0.0, atof(value.c_str()));
-}
-
-double SettingsBaseVirtual::getSettingInPercentage(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return std::max(0.0, atof(value.c_str()));
-}
-
-double SettingsBaseVirtual::getSettingInSeconds(std::string key) const
-{
-    std::string value = getSettingString(key);
-    return std::max(0.0, atof(value.c_str()));
-}
-
-DraftShieldHeightLimitation SettingsBaseVirtual::getSettingAsDraftShieldHeightLimitation(const std::string key) const
-{
-    const std::string value = getSettingString(key);
-    if (value == "full")
-    {
-        return DraftShieldHeightLimitation::FULL;
-    }
-    else if (value == "limited")
-    {
-        return DraftShieldHeightLimitation::LIMITED;
-    }
-    return DraftShieldHeightLimitation::FULL; //Default.
-}
-
-FlowTempGraph SettingsBaseVirtual::getSettingAsFlowTempGraph(std::string key) const
-{
-    FlowTempGraph ret;
-    std::string value_string = getSettingString(key);
-    if (value_string.empty())
-    {
-        return ret; //Empty at this point.
-    }
-    std::regex regex("(\\[([^,\\[]*),([^,\\]]*)\\])");
-    // match with:
-    // - the last opening bracket '['
-    // - then a bunch of characters until the first comma
-    // - a comma
-    // - a bunch of cahracters until the first closing bracket ']'
-    // matches with any substring which looks like "[  124.512 , 124.1 ]"
-
-    // default constructor = end-of-sequence:
-    std::regex_token_iterator<std::string::iterator> rend;
-
-    int submatches[] = { 1, 2, 3 }; // match whole pair, first number and second number of a pair
-    std::regex_token_iterator<std::string::iterator> match_iter(value_string.begin(), value_string.end(), regex, submatches);
-    while (match_iter != rend)
-    {
-        match_iter++; // match the whole pair
-        if (match_iter == rend)
-        {
-            break;
-        }
-        std::string first_substring = *match_iter++;
-        std::string second_substring = *match_iter++;
-        try
-        {
-            double first = std::stod(first_substring);
-            double second = std::stod(second_substring);
-            ret.data.emplace_back(first, second);
-        }
-        catch (const std::invalid_argument& e)
-        {
-            logError("Couldn't read 2D graph element [%s,%s] in setting '%s'. Ignored.\n", first_substring.c_str(), second_substring.c_str(), key.c_str());
-        }
-    }
-    return ret;
-}
-
-FMatrix3x3 SettingsBaseVirtual::getSettingAsPointMatrix(std::string key) const
-{
-    FMatrix3x3 ret;
-
-    std::string value_string = getSettingString(key);
-    if (value_string.empty())
-    {
-        return ret; // standard matrix ([1,0,0],[0,1,0],[0,0,1])
-    }
-
-    std::string num("([^,\\] ]*)"); // match with anything but the next ',' ']' or space  and capture the match
-    std::ostringstream row; // match with "[num,num,num]" and ignore whitespace
-    row << "\\s*\\[\\s*" << num << "\\s*,\\s*" << num << "\\s*,\\s*" << num << "\\s*\\]\\s*";
-
-    std::ostringstream matrix; // match with "[row,row,row]" and ignore whitespace
-    matrix << "\\s*\\[" << row.str() << "\\s*,\\s*" << row.str() << "\\s*,\\s*" << row.str() << "\\]\\s*";
-
-    std::regex point_matrix_regex(matrix.str());
-    std::cmatch sub_matches;    // same as std::match_results<const char*> cm;
-    std::regex_match(value_string.c_str(), sub_matches, point_matrix_regex);
-
-    if (sub_matches.size() != 10) // one match for the whole string
-    {
-        logWarning("Mesh transformation matrix could not be parsed!\n\tFormat should be [[f,f,f],[f,f,f],[f,f,f]] allowing whitespace anywhere in between.\n\tWhile what was given was \"%s\".\n", value_string.c_str());
-        return ret; // standard matrix ([1,0,0],[0,1,0],[0,0,1])
-    }
-
-    unsigned int sub_match_idx = 1; // skip the first because the first submatch is the whole string
-    for (unsigned int x = 0; x < 3; x++)
-    {
-        for (unsigned int y = 0; y < 3; y++)
-        {
-            std::sub_match<const char*> sub_match = sub_matches[sub_match_idx];
-            ret.m[y][x] = strtod(std::string(sub_match.str()).c_str(), nullptr);
-            sub_match_idx++;
-        }
-    }
-
-    return ret;
-}
-
-
-EGCodeFlavor SettingsBaseVirtual::getSettingAsGCodeFlavor(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "Griffin")
-        return EGCodeFlavor::GRIFFIN;
-    else if (value == "UltiGCode")
-        return EGCodeFlavor::ULTIGCODE;
-    else if (value == "Makerbot")
-        return EGCodeFlavor::MAKERBOT;
-    else if (value == "BFB")
-        return EGCodeFlavor::BFB;
-    else if (value == "MACH3")
-        return EGCodeFlavor::MACH3;
-    else if (value == "RepRap (Volumatric)")
-        return EGCodeFlavor::REPRAP_VOLUMATRIC;
-    else if (value == "Repetier")
-        return EGCodeFlavor::REPETIER;
-    return EGCodeFlavor::REPRAP;
-}
-
-EFillMethod SettingsBaseVirtual::getSettingAsFillMethod(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "lines")
-        return EFillMethod::LINES;
-    if (value == "grid")
-        return EFillMethod::GRID;
-    if (value == "cubic")
-        return EFillMethod::CUBIC;
-    if (value == "tetrahedral")
-        return EFillMethod::TETRAHEDRAL;
-    if (value == "triangles")
-        return EFillMethod::TRIANGLES;
-    if (value == "concentric")
-        return EFillMethod::CONCENTRIC;
-    if (value == "concentric_3d")
-        return EFillMethod::CONCENTRIC_3D;
-    if (value == "zigzag")
-        return EFillMethod::ZIG_ZAG;
-    return EFillMethod::NONE;
-}
-
-EPlatformAdhesion SettingsBaseVirtual::getSettingAsPlatformAdhesion(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "brim")
-        return EPlatformAdhesion::BRIM;
-    if (value == "raft")
-        return EPlatformAdhesion::RAFT;
-    if (value == "none")
-        return EPlatformAdhesion::NONE;
-    return EPlatformAdhesion::SKIRT;
-}
-
-ESupportType SettingsBaseVirtual::getSettingAsSupportType(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "everywhere")
-        return ESupportType::EVERYWHERE;
-    if (value == "buildplate")
-        return ESupportType::PLATFORM_ONLY;
-    return ESupportType::NONE;
-}
-
-EZSeamType SettingsBaseVirtual::getSettingAsZSeamType(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "random")
-        return EZSeamType::RANDOM;
-    if (value == "shortest")
-        return EZSeamType::SHORTEST;
-    if (value == "back")
-        return EZSeamType::BACK;
-    return EZSeamType::SHORTEST;
-}
-
-ESurfaceMode SettingsBaseVirtual::getSettingAsSurfaceMode(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "normal")
-        return ESurfaceMode::NORMAL;
-    if (value == "surface")
-        return ESurfaceMode::SURFACE;
-    if (value == "both")
-        return ESurfaceMode::BOTH;
-    return ESurfaceMode::NORMAL;
-}
-
-FillPerimeterGapMode SettingsBaseVirtual::getSettingAsFillPerimeterGapMode(std::string key) const
-{
-    std::string value = getSettingString(key);
-    if (value == "nowhere")
-    {
-        return FillPerimeterGapMode::NOWHERE;
-    }
-    if (value == "everywhere")
-    {
-        return FillPerimeterGapMode::EVERYWHERE;
-    }
-    return FillPerimeterGapMode::NOWHERE;
-}
-
-CombingMode SettingsBaseVirtual::getSettingAsCombingMode(std::string key)
-{
-    std::string value = getSettingString(key);
-    if (value == "off")
-    {
-        return CombingMode::OFF;
-    }
-    if (value == "all")
-    {
-        return CombingMode::ALL;
-    }
-    if (value == "noskin")
-    {
-        return CombingMode::NO_SKIN;
-    }
-    return CombingMode::ALL;
-}
-
-SupportDistPriority SettingsBaseVirtual::getSettingAsSupportDistPriority(std::string key)
-{
-    std::string value = getSettingString(key);
-    if (value == "xy_overrides_z")
-    {
-        return SupportDistPriority::XY_OVERRIDES_Z;
-    }
-    if (value == "z_overrides_xy")
-    {
-        return SupportDistPriority::Z_OVERRIDES_XY;
-    }
-    return SupportDistPriority::XY_OVERRIDES_Z;
-}
-
-
-}//namespace cura
-

src/skin.cpp

@@ -1,8 +1,5 @@
 /** Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License */
-#include <cmath> // std::ceil
-
 #include "skin.h"
-#include "utils/math.h"
 #include "utils/polygonUtils.h"
 
 #define MIN_AREA_SIZE (0.4 * 0.4) 
@@ -11,21 +8,21 @@ namespace cura
 {
 
         
-void generateSkins(int layerNr, SliceMeshStorage& mesh, int downSkinCount, int upSkinCount, int wall_line_count, int innermost_wall_line_width, int insetCount, bool no_small_gaps_heuristic)
+void generateSkins(int layerNr, SliceMeshStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount, int wall_line_count, int innermost_wall_extrusion_width, int insetCount, bool no_small_gaps_heuristic, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
 {
-    generateSkinAreas(layerNr, mesh, innermost_wall_line_width, downSkinCount, upSkinCount, wall_line_count, no_small_gaps_heuristic);
+    generateSkinAreas(layerNr, storage, innermost_wall_extrusion_width, downSkinCount, upSkinCount, wall_line_count, no_small_gaps_heuristic);
 
-    SliceLayer* layer = &mesh.layers[layerNr];
+    SliceLayer* layer = &storage.layers[layerNr];
     for(unsigned int partNr=0; partNr<layer->parts.size(); partNr++)
     {
         SliceLayerPart* part = &layer->parts[partNr];
-        generateSkinInsets(part, innermost_wall_line_width, insetCount);
+        generateSkinInsets(part, extrusionWidth, insetCount, avoidOverlappingPerimeters_0, avoidOverlappingPerimeters);
     }
 }
 
-void generateSkinAreas(int layer_nr, SliceMeshStorage& mesh, const int innermost_wall_line_width, int downSkinCount, int upSkinCount, int wall_line_count, bool no_small_gaps_heuristic)
+void generateSkinAreas(int layer_nr, SliceMeshStorage& storage, int innermost_wall_extrusion_width, int downSkinCount, int upSkinCount, int wall_line_count, bool no_small_gaps_heuristic)
 {
-    SliceLayer& layer = mesh.layers[layer_nr];
+    SliceLayer& layer = storage.layers[layer_nr];
     
     if (downSkinCount == 0 && upSkinCount == 0)
     {
@@ -38,23 +35,20 @@ void generateSkinAreas(int layer_nr, SliceMeshStorage& mesh, const int innermost
 
         if (int(part.insets.size()) < wall_line_count)
         {
-            continue; // the last wall is not present, the part should only get inter perimeter gaps, but no skin.
+            continue; // the last wall is not present, the part should only get inter preimeter gaps, but no skin.
         }
 
-        Polygons upskin = part.insets.back().offset(-innermost_wall_line_width / 2);
-        Polygons downskin = (downSkinCount == 0) ? Polygons() : upskin;
+        Polygons upskin = part.insets.back().offset(-innermost_wall_extrusion_width/2);
+        Polygons downskin = (downSkinCount == 0)? Polygons() : upskin;
         if (upSkinCount == 0) upskin = Polygons();
 
-        auto getInsidePolygons = [&part, wall_line_count](SliceLayer& layer2)
+        auto getInsidePolygons = [&part](SliceLayer& layer2)
             {
                 Polygons result;
                 for(SliceLayerPart& part2 : layer2.parts)
                 {
                     if (part.boundaryBox.hit(part2.boundaryBox))
-                    {
-                        unsigned int wall_idx = std::max(0, std::min(wall_line_count, (int) part2.insets.size()) - 1);
-                        result.add(part2.insets[wall_idx]);
-                    }
+                        result.add(part2.insets.back());
                 }
                 return result;
             };
@@ -63,32 +57,32 @@ void generateSkinAreas(int layer_nr, SliceMeshStorage& mesh, const int innermost
         {
             if (static_cast<int>(layer_nr - downSkinCount) >= 0)
             {
-                downskin = downskin.difference(getInsidePolygons(mesh.layers[layer_nr - downSkinCount])); // skin overlaps with the walls
+                downskin = downskin.difference(getInsidePolygons(storage.layers[layer_nr - downSkinCount])); // skin overlaps with the walls
             }
             
-            if (static_cast<int>(layer_nr + upSkinCount) < static_cast<int>(mesh.layers.size()))
+            if (static_cast<int>(layer_nr + upSkinCount) < static_cast<int>(storage.layers.size()))
             {
-                upskin = upskin.difference(getInsidePolygons(mesh.layers[layer_nr + upSkinCount])); // skin overlaps with the walls
+                upskin = upskin.difference(getInsidePolygons(storage.layers[layer_nr + upSkinCount])); // skin overlaps with the walls
             }
         }
         else 
         {
-            if (layer_nr >= downSkinCount && downSkinCount > 0)
+            if (layer_nr > 0 && downSkinCount > 0)
             {
-                Polygons not_air = getInsidePolygons(mesh.layers[layer_nr - 1]);
-                for (int downskin_layer_nr = layer_nr - downSkinCount; downskin_layer_nr < layer_nr - 1; downskin_layer_nr++)
+                Polygons not_air = getInsidePolygons(storage.layers[layer_nr - 1]);
+                for (int downskin_layer_nr = std::max(0, layer_nr - downSkinCount); downskin_layer_nr < layer_nr - 1; downskin_layer_nr++)
                 {
-                    not_air = not_air.intersection(getInsidePolygons(mesh.layers[downskin_layer_nr]));
+                    not_air = not_air.intersection(getInsidePolygons(storage.layers[downskin_layer_nr]));
                 }
                 downskin = downskin.difference(not_air); // skin overlaps with the walls
             }
             
-            if (layer_nr < static_cast<int>(mesh.layers.size()) - 1 - upSkinCount && upSkinCount > 0)
+            if (layer_nr < static_cast<int>(storage.layers.size()) - 1 && upSkinCount > 0)
             {
-                Polygons not_air = getInsidePolygons(mesh.layers[layer_nr + 1]);
-                for (int upskin_layer_nr = layer_nr + 2; upskin_layer_nr < layer_nr + upSkinCount + 1; upskin_layer_nr++)
+                Polygons not_air = getInsidePolygons(storage.layers[layer_nr + 1]);
+                for (int upskin_layer_nr = layer_nr + 2; upskin_layer_nr < std::min(static_cast<int>(storage.layers.size()) - 1, layer_nr + upSkinCount); upskin_layer_nr++)
                 {
-                    not_air = not_air.intersection(getInsidePolygons(mesh.layers[upskin_layer_nr]));
+                    not_air = not_air.intersection(getInsidePolygons(storage.layers[upskin_layer_nr]));
                 }
                 upskin = upskin.difference(not_air); // skin overlaps with the walls
             }
@@ -107,7 +101,7 @@ void generateSkinAreas(int layer_nr, SliceMeshStorage& mesh, const int innermost
 }
 
 
-void generateSkinInsets(SliceLayerPart* part, const int wall_line_width, int insetCount)
+void generateSkinInsets(SliceLayerPart* part, int extrusionWidth, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters)
 {
     if (insetCount == 0)
     {
@@ -121,14 +115,15 @@ void generateSkinInsets(SliceLayerPart* part, const int wall_line_width, int ins
             skin_part.insets.push_back(Polygons());
             if (i == 0)
             {
-                skin_part.insets[0] = skin_part.outline.offset(-wall_line_width / 2);
-            }
-            else
+                PolygonUtils::offsetSafe(skin_part.outline, - extrusionWidth/2, extrusionWidth, skin_part.insets[0], avoidOverlappingPerimeters_0);
+                Polygons in_between = skin_part.outline.difference(skin_part.insets[0].offset(extrusionWidth/2)); 
+                skin_part.perimeterGaps.add(in_between);
+            } else
             {
-                skin_part.insets[i] = skin_part.insets[i - 1].offset(-wall_line_width);
+                PolygonUtils::offsetExtrusionWidth(skin_part.insets[i-1], true, extrusionWidth, skin_part.insets[i], &skin_part.perimeterGaps, avoidOverlappingPerimeters);
             }
             
-            // optimize polygons: remove unnecessary verts
+            // optimize polygons: remove unnnecesary verts
             skin_part.insets[i].simplify();
             if (skin_part.insets[i].size() < 1)
             {
@@ -139,18 +134,9 @@ void generateSkinInsets(SliceLayerPart* part, const int wall_line_width, int ins
     }
 }
 
-void generateInfill(int layerNr, SliceMeshStorage& mesh, const int innermost_wall_line_width, int infill_skin_overlap, int wall_line_count)
+void generateInfill(int layerNr, SliceMeshStorage& storage, int innermost_wall_extrusion_width, int infill_skin_overlap, int wall_line_count)
 {
-    SliceLayer& layer = mesh.layers[layerNr];
-
-    int extra_offset = 0;
-    EFillMethod fill_pattern = mesh.getSettingAsFillMethod("infill_pattern");
-    if ((fill_pattern == EFillMethod::CONCENTRIC || fill_pattern == EFillMethod::CONCENTRIC_3D)
-        && layerNr % 2 == 0
-        && mesh.getSettingInMicrons("infill_line_distance") > mesh.getSettingInMicrons("infill_line_width") * 2)
-    {
-        extra_offset = -innermost_wall_line_width;
-    }
+    SliceLayer& layer = storage.layers[layerNr];
 
     for(SliceLayerPart& part : layer.parts)
     {
@@ -158,7 +144,7 @@ void generateInfill(int layerNr, SliceMeshStorage& mesh, const int innermost_wal
         {
             continue; // the last wall is not present, the part should only get inter preimeter gaps, but no infill.
         }
-        Polygons infill = part.insets.back().offset(extra_offset - innermost_wall_line_width / 2 - infill_skin_overlap);
+        Polygons infill = part.insets.back().offset(-innermost_wall_extrusion_width / 2 - infill_skin_overlap);
 
         for(SliceLayerPart& part2 : layer.parts)
         {
@@ -171,111 +157,18 @@ void generateInfill(int layerNr, SliceMeshStorage& mesh, const int innermost_wal
             }
         }
         infill.removeSmallAreas(MIN_AREA_SIZE);
-
-        Polygons final_infill = infill.offset(infill_skin_overlap);
-
-        if (mesh.getSettingBoolean("infill_hollow"))
-        {
-            part.print_outline = part.print_outline.difference(final_infill);
-        }
-        else
-        {
-            part.infill_area = final_infill;
-        }
+        
+        part.infill_area.push_back(infill.offset(infill_skin_overlap));
     }
 }
 
-void SkinInfillAreaComputation::generateGradualInfill(SliceMeshStorage& mesh, unsigned int gradual_infill_step_height, unsigned int max_infill_steps)
+void combineInfillLayers(SliceMeshStorage& storage,unsigned int amount)
 {
-    // no early-out for this function; it needs to initialize the [infill_area_per_combine_per_density]
-    float layer_skip_count = 8; // skip every so many layers as to ignore small gaps in the model making computation more easy
-    if (!mesh.getSettingBoolean("skin_no_small_gaps_heuristic"))
-    {
-        layer_skip_count = 1;
-    }
-    unsigned int gradual_infill_step_layer_count = round_divide(gradual_infill_step_height, mesh.getSettingInMicrons("layer_height")); // The difference in layer count between consecutive density infill areas
-
-    // make gradual_infill_step_height divisable by layer_skip_count
-    float n_skip_steps_per_gradual_step = std::max(1.0f, std::ceil(gradual_infill_step_layer_count / layer_skip_count)); // only decrease layer_skip_count to make it a divisor of gradual_infill_step_layer_count
-    layer_skip_count = gradual_infill_step_layer_count / n_skip_steps_per_gradual_step;
-
-
-    size_t min_layer = mesh.getSettingAsCount("bottom_layers");
-    size_t max_layer = mesh.layers.size() - 1 - mesh.getSettingAsCount("top_layers");
-
-    for (size_t layer_idx = 0; layer_idx < mesh.layers.size(); layer_idx++)
-    { // loop also over layers which don't contain infill cause of bottom_ and top_layer to initialize their infill_area_per_combine_per_density
-        SliceLayer& layer = mesh.layers[layer_idx];
-
-        for (SliceLayerPart& part : layer.parts)
-        {
-            assert(part.infill_area_per_combine_per_density.size() == 0 && "infill_area_per_combine_per_density is supposed to be uninitialized");
-
-            const Polygons& infill_area = part.getOwnInfillArea();
-
-            if (infill_area.size() == 0 || layer_idx < min_layer || layer_idx > max_layer)
-            { // initialize infill_area_per_combine_per_density empty
-                part.infill_area_per_combine_per_density.emplace_back(); // create a new infill_area_per_combine
-                part.infill_area_per_combine_per_density.back().emplace_back(); // put empty infill area in the newly constructed infill_area_per_combine
-                // note: no need to copy part.infill_area, cause it's the empty vector anyway
-                continue;
-            }
-            Polygons less_dense_infill = infill_area; // one step less dense with each infill_step
-            for (unsigned int infill_step = 0; infill_step < max_infill_steps; infill_step++)
-            {
-                size_t min_layer = layer_idx + infill_step * gradual_infill_step_layer_count + layer_skip_count;
-                size_t max_layer = layer_idx + (infill_step + 1) * gradual_infill_step_layer_count;
-
-                for (float upper_layer_idx = min_layer; static_cast<unsigned int>(upper_layer_idx) <= max_layer; upper_layer_idx += layer_skip_count)
-                {
-                    if (static_cast<unsigned int>(upper_layer_idx) >= mesh.layers.size())
-                    {
-                        less_dense_infill.clear();
-                        break;
-                    }
-                    SliceLayer& upper_layer = mesh.layers[static_cast<unsigned int>(upper_layer_idx)];
-                    Polygons relevent_upper_polygons;
-                    for (SliceLayerPart& upper_layer_part : upper_layer.parts)
-                    {
-                        if (!upper_layer_part.boundaryBox.hit(part.boundaryBox))
-                        {
-                            continue;
-                        }
-                        relevent_upper_polygons.add(upper_layer_part.getOwnInfillArea());
-                    }
-                    less_dense_infill = less_dense_infill.intersection(relevent_upper_polygons);
-                }
-                if (less_dense_infill.size() == 0)
-                {
-                    break;
-                }
-                // add new infill_area_per_combine for the current density
-                part.infill_area_per_combine_per_density.emplace_back();
-                std::vector<Polygons>& infill_area_per_combine_current_density = part.infill_area_per_combine_per_density.back();
-                const Polygons more_dense_infill = infill_area.difference(less_dense_infill);
-                infill_area_per_combine_current_density.push_back(more_dense_infill);
-
-                if (less_dense_infill.size() == 0)
-                {
-                    break;
-                }
-            }
-            part.infill_area_per_combine_per_density.emplace_back();
-            std::vector<Polygons>& infill_area_per_combine_current_density = part.infill_area_per_combine_per_density.back();
-            infill_area_per_combine_current_density.push_back(infill_area);
-            part.infill_area_own = nullptr; // clear infill_area_own, it's not needed any more.
-            assert(part.infill_area_per_combine_per_density.size() != 0 && "infill_area_per_combine_per_density is now initialized");
-        }
-    }
-}
-
-void combineInfillLayers(SliceMeshStorage& mesh, unsigned int amount)
-{
-    if (mesh.layers.empty() || mesh.layers.size() - 1 < static_cast<size_t>(mesh.getSettingAsCount("top_layers")) || mesh.getSettingAsCount("infill_line_distance") <= 0) //No infill is even generated.
+    if(amount <= 1) //If we must combine 1 layer, nothing needs to be combined. Combining 0 layers is invalid.
     {
         return;
     }
-    if(amount <= 1) //If we must combine 1 layer, nothing needs to be combined. Combining 0 layers is invalid.
+    if(storage.layers.empty() || storage.layers.size() - 1 < static_cast<size_t>(storage.getSettingAsCount("top_layers")) || storage.getSettingAsCount("infill_line_distance") <= 0) //No infill is even generated.
     {
         return;
     }
@@ -283,57 +176,72 @@ void combineInfillLayers(SliceMeshStorage& mesh, unsigned int amount)
     divisible index. Otherwise we get some parts that have infill at divisible
     layers and some at non-divisible layers. Those layers would then miss each
     other. */
-    size_t min_layer = mesh.getSettingAsCount("bottom_layers") + amount - 1;
+    size_t min_layer = storage.getSettingAsCount("bottom_layers") + amount - 1;
     min_layer -= min_layer % amount; //Round upwards to the nearest layer divisible by infill_sparse_combine.
-    size_t max_layer = mesh.layers.size() - 1 - mesh.getSettingAsCount("top_layers");
+    size_t max_layer = storage.layers.size() - 1 - storage.getSettingAsCount("top_layers");
     max_layer -= max_layer % amount; //Round downwards to the nearest layer divisible by infill_sparse_combine.
     for(size_t layer_idx = min_layer;layer_idx <= max_layer;layer_idx += amount) //Skip every few layers, but extrude more.
     {
-        SliceLayer* layer = &mesh.layers[layer_idx];
-        for(unsigned int combine_count_here = 1; combine_count_here < amount; combine_count_here++)
+        SliceLayer* layer = &storage.layers[layer_idx];
+
+        for(unsigned int n = 1;n < amount;n++)
         {
-            if(layer_idx < combine_count_here)
+            if(layer_idx < n)
             {
                 break;
             }
 
-            size_t lower_layer_idx = layer_idx - combine_count_here;
-            if (lower_layer_idx < min_layer)
+            SliceLayer* layer2 = &storage.layers[layer_idx - n];
+            for(SliceLayerPart& part : layer->parts)
             {
-                break;
-            }
-            SliceLayer* lower_layer = &mesh.layers[lower_layer_idx];
-            for (SliceLayerPart& part : layer->parts)
-            {
-                for (unsigned int density_idx = 0; density_idx < part.infill_area_per_combine_per_density.size(); density_idx++)
-                { // go over each density of gradual infill (these density areas overlap!)
-                    std::vector<Polygons>& infill_area_per_combine = part.infill_area_per_combine_per_density[density_idx];
-                    Polygons result;
-                    for (SliceLayerPart& lower_layer_part : lower_layer->parts)
+                Polygons result;
+                for(SliceLayerPart& part2 : layer2->parts)
+                {
+                    if(part.boundaryBox.hit(part2.boundaryBox))
                     {
-                        if (part.boundaryBox.hit(lower_layer_part.boundaryBox))
-                        {
-
-                            Polygons intersection = infill_area_per_combine[combine_count_here - 1].intersection(lower_layer_part.infill_area).offset(-200).offset(200);
-                            result.add(intersection); // add area to be thickened
-                            infill_area_per_combine[combine_count_here - 1] = infill_area_per_combine[combine_count_here - 1].difference(intersection); // remove thickened area from less thick layer here
-                            if (density_idx < lower_layer_part.infill_area_per_combine_per_density.size())
-                            { // only remove from *same density* areas on layer below
-                                // If there are no same density areas, then it's ok to print them anyway
-                                // Don't remove other density areas
-                                unsigned int lower_density_idx = density_idx;
-                                std::vector<Polygons>& lower_infill_area_per_combine = lower_layer_part.infill_area_per_combine_per_density[lower_density_idx];
-                                lower_infill_area_per_combine[0] = lower_infill_area_per_combine[0].difference(intersection); // remove thickened area from lower (thickened) layer
-                            }
-                        }
+                        Polygons intersection = part.infill_area[n - 1].intersection(part2.infill_area[0]).offset(-200).offset(200);
+                        result.add(intersection);
+                        part.infill_area[n - 1] = part.infill_area[n - 1].difference(intersection);
+                        part2.infill_area[0] = part2.infill_area[0].difference(intersection);
                     }
-
-                    infill_area_per_combine.push_back(result);
                 }
+
+                part.infill_area.push_back(result);
             }
         }
     }
 }
 
 
+void generatePerimeterGaps(int layer_nr, SliceMeshStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount)
+{
+    SliceLayer& layer = storage.layers[layer_nr];
+    
+    for (SliceLayerPart& part : layer.parts) 
+    { // handle gaps between perimeters etc.
+        if (downSkinCount > 0 && upSkinCount > 0 && // note: if both are zero or less, then all gaps will be used
+            layer_nr >= downSkinCount && layer_nr < static_cast<int>(storage.layers.size() - upSkinCount)) // remove gaps which appear within print, i.e. not on the bottom most or top most skin
+        {
+            Polygons outlines_above;
+            for (SliceLayerPart& part_above : storage.layers[layer_nr + upSkinCount].parts)
+            {
+                if (part.boundaryBox.hit(part_above.boundaryBox))
+                {
+                    outlines_above.add(part_above.outline);
+                }
+            }
+            Polygons outlines_below;
+            for (SliceLayerPart& part_below : storage.layers[layer_nr - downSkinCount].parts)
+            {
+                if (part.boundaryBox.hit(part_below.boundaryBox))
+                {
+                    outlines_below.add(part_below.outline);
+                }
+            }
+            part.perimeterGaps = part.perimeterGaps.intersection(outlines_above.xorPolygons(outlines_below));
+        }
+        part.perimeterGaps.removeSmallAreas(MIN_AREA_SIZE);
+    }
+}
+
 }//namespace cura

src/skin.h

@@ -6,64 +6,72 @@
 
 namespace cura 
 {
+
+/*!
+ * Generate the gap areas which occur between consecutive insets.
+ * 
+ * \param layerNr The index of the layer for which to generate the gaps.
+ * \param storage The storage where the layer outline information (input) is stored and where the gap areas (output) are stored.
+ * \param extrusionWidth extrusionWidth
+ * \param downSkinCount The number of layers of bottom gaps
+ * \param upSkinCount The number of layers of top gaps
+ */
+void generatePerimeterGaps(int layerNr, SliceMeshStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount);
+
 /*!
  * Generate the skin areas and its insets.
  * 
  * \param layerNr The index of the layer for which to generate the skins.
- * \param mesh The storage where the layer outline information (input) is stored and where the skin insets and fill areas (output) are stored.
+ * \param storage The storage where the layer outline information (input) is stored and where the skin insets and fill areas (output) are stored.
+ * \param extrusionWidth extrusionWidth
  * \param downSkinCount The number of layers of bottom skin
  * \param upSkinCount The number of layers of top skin
  * \param wall_line_count The number of walls, i.e. the number of the wall from which to offset.
- * \param innermost_wall_line_width The line width of the inner most wall
+ * \param innermost_wall_extrusion_width The line width of the inner most wall
  * \param insetCount The number of perimeters to surround the skin
  * \param no_small_gaps_heuristic A heuristic which assumes there will be no small gaps between bottom and top skin with a z size smaller than the skin size itself
+ * \param avoidOverlappingPerimeters_0 Whether to remove the parts of the first perimeters where it have overlap with itself (and store the gaps thus created in the \p storage)
+ * \param avoidOverlappingPerimeters Whether to remove the parts of two consecutive perimeters where they have overlap (and store the gaps thus created in the \p storage)
  */
-void generateSkins(int layerNr, SliceMeshStorage& mesh, int downSkinCount, int upSkinCount, int wall_line_count, int innermost_wall_line_width, int insetCount, bool no_small_gaps_heuristic);
+void generateSkins(int layerNr, SliceMeshStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount, int wall_line_count, int innermost_wall_extrusion_width, int insetCount, bool no_small_gaps_heuristic, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters);
 
 /*!
  * Generate the skin areas (outlines)
  * 
  * \param layerNr The index of the layer for which to generate the skins.
- * \param mesh The storage where the layer outline information (input) is stored
- * and where the skin outline (output) is stored.
- * \param innermost_wall_line_width The line width of the walls around the skin, by which
- * we must inset for each wall.
- * \param downSkinCount The number of layers of bottom skin.
- * \param upSkinCount The number of layers of top skin.
- * \param wall_line_count The number of walls, i.e. the number of the wall from
- * which to offset.
- * \param no_small_gaps_heuristic A heuristic which assumes there will be no
- * small gaps between bottom and top skin with a z size smaller than the skin
- * size itself.
+ * \param storage The storage where the layer outline information (input) is stored and where the skin outline (output) is stored.
+ * \param extrusionWidth extrusionWidth
+ * \param downSkinCount The number of layers of bottom skin
+ * \param upSkinCount The number of layers of top skin
+ * \param wall_line_count The number of walls, i.e. the number of the wall from which to offset.
+ * \param no_small_gaps_heuristic A heuristic which assumes there will be no small gaps between bottom and top skin with a z size smaller than the skin size itself
  */
-void generateSkinAreas(int layerNr, SliceMeshStorage& mesh, const int innermost_wall_line_width, int downSkinCount, int upSkinCount, int wall_line_count, bool no_small_gaps_heuristic);
+void generateSkinAreas(int layerNr, SliceMeshStorage& storage, int extrusionWidth, int downSkinCount, int upSkinCount, int wall_line_count, bool no_small_gaps_heuristic);
 
 /*!
  * Generate the skin insets.
  * 
  * \param layerNr The index of the layer for which to generate the skins.
- * \param part The part where the skin outline information (input) is stored and
- * where the skin insets (output) are stored.
- * \param wall_line_width The width of the perimeters around the skin.
- * \param insetCount The number of perimeters to surround the skin.
+ * \param part The part where the skin outline information (input) is stored and where the skin insets (output) are stored.
+ * \param extrusionWidth extrusionWidth
+ * \param insetCount The number of perimeters to surround the skin
+ * \param avoidOverlappingPerimeters_0 Whether to remove the parts of the first perimeters where it have overlap with itself (and store the gaps thus created in the \p storage)
+ * \param avoidOverlappingPerimeters Whether to remove the parts of two consecutive perimeters where they have overlap (and store the gaps thus created in the \p storage)
  */
-void generateSkinInsets(SliceLayerPart* part, const int wall_line_width, int insetCount);
+void generateSkinInsets(SliceLayerPart* part, int extrusionWidth, int insetCount, bool avoidOverlappingPerimeters_0, bool avoidOverlappingPerimeters);
 
 /*!
  * Generate Infill by offsetting from the last wall.
  * 
  * The walls should already be generated.
  * 
- * After this function has been called on a layer of a mesh, each SliceLayerPart of that layer should have an infill_area consisting of exactly one Polygons : the normal uncombined infill area.
- * 
  * \param layerNr The index of the layer for which to generate the infill
- * \param mesh The storage where the layer outline information (input) is stored and where the skin outline (output) is stored.
  * \param part The part where the insets (input) are stored and where the infill (output) is stored.
- * \param innermost_wall_line_width width of the innermost wall lines
+ * \param innermost_wall_extrusion_width width of the innermost wall lines
  * \param infill_skin_overlap overlap distance between infill and skin
  * \param wall_line_count The number of walls, i.e. the number of the wall from which to offset.
  */
-void generateInfill(int layerNr, SliceMeshStorage& mesh, const int innermost_wall_line_width, int infill_skin_overlap, int wall_line_count);
+void generateInfill(int layerNr, SliceMeshStorage& storage, int innermost_wall_extrusion_width, int infill_skin_overlap, int wall_line_count);
 
 /*!
  * \brief Combines the infill of multiple layers for a specified mesh.
@@ -72,32 +80,10 @@ void generateInfill(int layerNr, SliceMeshStorage& mesh, const int innermost_wal
  * multiplied such that the infill should fill up again to the full height of
  * all combined layers.
  * 
- * \param mesh The mesh to combine the infill layers of.
+ * \param storage The mesh to combine the infill layers of.
  * \param amount The number of layers to combine.
  */
-void combineInfillLayers(SliceMeshStorage& mesh, unsigned int amount);
-
-/*!
- * Class containing all skin and infill area computation functions
- */
-class SkinInfillAreaComputation
-{
-public:
-    /*!
-     * Generate infill areas which cause a gradually less dense infill structure from top to bottom.
-     * 
-     * The areas generated overlap, so that more dense infill adds on to less dense infill.
-     * That way you don't have infill lines which are broken when they cross a border between separated infill areas - if they would be as such.
-     * 
-     * This function also guarantees that the SliceLayerPart::infill_area_per_combine_per_density is initialized with at least one item.
-     * The last item in the list will be equal to the infill_area after this function.
-     * 
-     * \param gradual_infill_step_height // The height difference between consecutive density infill areas
-     * \param max_infill_steps the maximum exponent of division of infill density. At 5 the least dense infill will be 2^4 * infill_line_distance i.e. one 16th as dense
-     */
-    static void generateGradualInfill(SliceMeshStorage& mesh, unsigned int gradual_infill_step_height, unsigned int max_infill_steps);
-    
-};
+void combineInfillLayers(SliceMeshStorage& storage,unsigned int amount);
 
 }//namespace cura