more clang warnings enabled, performance measuring
Succesfull build on mingw-w64 fix sandboxes Mingw fixes and full parallel support tree gen.
This commit is contained in:
tamasmeszaros
parent
7d25d8c677
commit
7e0199746e
@ -13,13 +13,13 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(DEFINED ENV{SLIC3R_STATIC})
|
if(DEFINED ENV{SLIC3R_STATIC})
|
||||||
set(SLIC3R_STATIC_INITIAL $ENV{SLIC3R_STATIC})
|
set(SLIC3R_STATIC_INITIAL $ENV{SLIC3R_STATIC})
|
||||||
else()
|
else()
|
||||||
if (MSVC OR MINGW OR APPLE)
|
if (MSVC OR MINGW OR APPLE)
|
||||||
set(SLIC3R_STATIC_INITIAL 1)
|
set(SLIC3R_STATIC_INITIAL 1)
|
||||||
else()
|
else()
|
||||||
set(SLIC3R_STATIC_INITIAL 0)
|
set(SLIC3R_STATIC_INITIAL 0)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
option(SLIC3R_STATIC "Compile PrusaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
|
option(SLIC3R_STATIC "Compile PrusaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
|
||||||
@ -54,13 +54,19 @@ endif ()
|
|||||||
|
|
||||||
if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
|
if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
|
||||||
set(IS_CLANG_CL TRUE)
|
set(IS_CLANG_CL TRUE)
|
||||||
|
|
||||||
|
# clang-cl can interpret SYSTEM header paths if -imsvc is used
|
||||||
|
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-imsvc")
|
||||||
|
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall \
|
||||||
|
-Wno-old-style-cast -Wno-reserved-id-macro -Wno-c++98-compat-pedantic")
|
||||||
else ()
|
else ()
|
||||||
set(IS_CLANG_CL FALSE)
|
set(IS_CLANG_CL FALSE)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
if (SLIC3R_MSVC_COMPILE_PARALLEL AND NOT IS_CLANG_CL)
|
if (SLIC3R_MSVC_COMPILE_PARALLEL AND NOT IS_CLANG_CL)
|
||||||
add_compile_options(/MP)
|
add_compile_options(/MP)
|
||||||
endif ()
|
endif ()
|
||||||
# /bigobj (Increase Number of Sections in .Obj file)
|
# /bigobj (Increase Number of Sections in .Obj file)
|
||||||
# error C3859: virtual memory range for PCH exceeded; please recompile with a command line option of '-Zm90' or greater
|
# error C3859: virtual memory range for PCH exceeded; please recompile with a command line option of '-Zm90' or greater
|
||||||
@ -68,6 +74,10 @@ if (MSVC)
|
|||||||
add_compile_options(-bigobj -Zm520 /Zi)
|
add_compile_options(-bigobj -Zm520 /Zi)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
if (MINGW)
|
||||||
|
add_compile_options(-Wa,-mbig-obj)
|
||||||
|
endif ()
|
||||||
|
|
||||||
# Display and check CMAKE_PREFIX_PATH
|
# Display and check CMAKE_PREFIX_PATH
|
||||||
message(STATUS "SLIC3R_STATIC: ${SLIC3R_STATIC}")
|
message(STATUS "SLIC3R_STATIC: ${SLIC3R_STATIC}")
|
||||||
if (NOT "${CMAKE_PREFIX_PATH}" STREQUAL "")
|
if (NOT "${CMAKE_PREFIX_PATH}" STREQUAL "")
|
||||||
@ -107,17 +117,17 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|||||||
# WIN10SDK_PATH is used to point CMake to the WIN10 SDK installation directory.
|
# WIN10SDK_PATH is used to point CMake to the WIN10 SDK installation directory.
|
||||||
# We pick it from environment if it is not defined in another way
|
# We pick it from environment if it is not defined in another way
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
if(NOT DEFINED WIN10SDK_PATH)
|
if(NOT DEFINED WIN10SDK_PATH)
|
||||||
if(DEFINED ENV{WIN10SDK_PATH})
|
if(DEFINED ENV{WIN10SDK_PATH})
|
||||||
set(WIN10SDK_PATH "$ENV{WIN10SDK_PATH}")
|
set(WIN10SDK_PATH "$ENV{WIN10SDK_PATH}")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
if(DEFINED WIN10SDK_PATH AND NOT EXISTS "${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h")
|
if(DEFINED WIN10SDK_PATH AND NOT EXISTS "${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h")
|
||||||
message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}")
|
message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}")
|
||||||
message("${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h was not found")
|
message("${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h was not found")
|
||||||
message("STL fixing by the Netfabb service will not be compiled")
|
message("STL fixing by the Netfabb service will not be compiled")
|
||||||
unset(WIN10SDK_PATH)
|
unset(WIN10SDK_PATH)
|
||||||
endif()
|
endif()
|
||||||
if(WIN10SDK_PATH)
|
if(WIN10SDK_PATH)
|
||||||
message("Building with Win10 Netfabb STL fixing service support")
|
message("Building with Win10 Netfabb STL fixing service support")
|
||||||
add_definitions(-DHAS_WIN10SDK)
|
add_definitions(-DHAS_WIN10SDK)
|
||||||
@ -155,7 +165,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
|
if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
|
if (NOT MINGW)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
|
||||||
|
endif ()
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder" )
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder" )
|
||||||
|
|
||||||
# On GCC and Clang, no return from a non-void function is a warning only. Here, we make it an error.
|
# On GCC and Clang, no return from a non-void function is a warning only. Here, we make it an error.
|
||||||
@ -201,9 +213,12 @@ include_directories(${LIBDIR_BIN}/platform)
|
|||||||
include_directories(${LIBDIR}/clipper ${LIBDIR}/polypartition)
|
include_directories(${LIBDIR}/clipper ${LIBDIR}/polypartition)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
# BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
|
add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
|
||||||
add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
|
if(MSVC)
|
||||||
endif()
|
# BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
|
||||||
|
add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 )
|
||||||
|
endif(MSVC)
|
||||||
|
endif(WIN32)
|
||||||
|
|
||||||
add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
|
add_definitions(-DwxUSE_UNICODE -D_UNICODE -DUNICODE -DWXINTL_NO_GETTEXT_MACRO)
|
||||||
|
|
||||||
@ -234,7 +249,7 @@ if(SLIC3R_STATIC)
|
|||||||
# set(Boost_USE_STATIC_RUNTIME ON)
|
# set(Boost_USE_STATIC_RUNTIME ON)
|
||||||
endif()
|
endif()
|
||||||
#set(Boost_DEBUG ON)
|
#set(Boost_DEBUG ON)
|
||||||
# set(Boost_COMPILER "-vc120")
|
# set(Boost_COMPILER "-mgw81")
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
# boost::process was introduced first in version 1.64.0
|
# boost::process was introduced first in version 1.64.0
|
||||||
set(MINIMUM_BOOST_VERSION "1.64.0")
|
set(MINIMUM_BOOST_VERSION "1.64.0")
|
||||||
|
|||||||
5
deps/CMakeLists.txt
vendored
5
deps/CMakeLists.txt
vendored
@ -76,7 +76,10 @@ elseif (APPLE)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
include("deps-macos.cmake")
|
include("deps-macos.cmake")
|
||||||
else ()
|
elseif (MINGW)
|
||||||
|
message(STATUS "Building for MinGW...")
|
||||||
|
include("deps-mingw.cmake")
|
||||||
|
else()
|
||||||
include("deps-linux.cmake")
|
include("deps-linux.cmake")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
76
deps/deps-mingw.cmake
vendored
Normal file
76
deps/deps-mingw.cmake
vendored
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
set(DEP_CMAKE_OPTS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
|
||||||
|
set(DEP_BOOST_TOOLSET "gcc")
|
||||||
|
set(DEP_BITS 64)
|
||||||
|
|
||||||
|
find_package(Git REQUIRED)
|
||||||
|
|
||||||
|
# TODO make sure to build tbb with -flifetime-dse=1
|
||||||
|
include("deps-unix-common.cmake")
|
||||||
|
|
||||||
|
ExternalProject_Add(dep_boost
|
||||||
|
EXCLUDE_FROM_ALL 1
|
||||||
|
URL "https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz"
|
||||||
|
URL_HASH SHA256=882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9
|
||||||
|
BUILD_IN_SOURCE 1
|
||||||
|
CONFIGURE_COMMAND bootstrap.bat
|
||||||
|
BUILD_COMMAND b2.exe
|
||||||
|
-j "${NPROC}"
|
||||||
|
--with-system
|
||||||
|
--with-filesystem
|
||||||
|
--with-thread
|
||||||
|
--with-log
|
||||||
|
--with-locale
|
||||||
|
--with-regex
|
||||||
|
"--prefix=${DESTDIR}/usr/local"
|
||||||
|
"address-model=${DEPS_BITS}"
|
||||||
|
"toolset=${DEP_BOOST_TOOLSET}"
|
||||||
|
link=static
|
||||||
|
define=BOOST_USE_WINAPI_VERSION=0x0502
|
||||||
|
variant=release
|
||||||
|
threading=multi
|
||||||
|
boost.locale.icu=off
|
||||||
|
"${DEP_BOOST_DEBUG}" release install
|
||||||
|
INSTALL_COMMAND "" # b2 does that already
|
||||||
|
)
|
||||||
|
|
||||||
|
ExternalProject_Add(dep_libcurl
|
||||||
|
EXCLUDE_FROM_ALL 1
|
||||||
|
URL "https://curl.haxx.se/download/curl-7.58.0.tar.gz"
|
||||||
|
URL_HASH SHA256=cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115
|
||||||
|
CMAKE_ARGS
|
||||||
|
-DBUILD_SHARED_LIBS=OFF
|
||||||
|
-DBUILD_TESTING=OFF
|
||||||
|
-DCURL_STATICLIB=ON
|
||||||
|
-DCURL_STATIC_CRT=ON
|
||||||
|
-DENABLE_THREADED_RESOLVER=ON
|
||||||
|
-DCURL_DISABLE_FTP=ON
|
||||||
|
-DCURL_DISABLE_LDAP=ON
|
||||||
|
-DCURL_DISABLE_LDAPS=ON
|
||||||
|
-DCURL_DISABLE_TELNET=ON
|
||||||
|
-DCURL_DISABLE_DICT=ON
|
||||||
|
-DCURL_DISABLE_FILE=ON
|
||||||
|
-DCURL_DISABLE_TFTP=ON
|
||||||
|
-DCURL_DISABLE_RTSP=ON
|
||||||
|
-DCURL_DISABLE_POP3=ON
|
||||||
|
-DCURL_DISABLE_IMAP=ON
|
||||||
|
-DCURL_DISABLE_SMTP=ON
|
||||||
|
-DCURL_DISABLE_GOPHER=ON
|
||||||
|
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
||||||
|
${DEP_CMAKE_OPTS}
|
||||||
|
)
|
||||||
|
|
||||||
|
ExternalProject_Add(dep_wxwidgets
|
||||||
|
EXCLUDE_FROM_ALL 1
|
||||||
|
GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets"
|
||||||
|
GIT_TAG v3.1.1-patched
|
||||||
|
# URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2"
|
||||||
|
# URL_HASH SHA256=c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e
|
||||||
|
# PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}\\wxwidgets-pngprefix.h" src\\png\\pngprefix.h
|
||||||
|
CMAKE_ARGS
|
||||||
|
-DBUILD_SHARED_LIBS=OFF
|
||||||
|
-DwxUSE_LIBPNG=builtin
|
||||||
|
-DwxUSE_ZLIB=builtin
|
||||||
|
-DwxUSE_OPENGL=ON
|
||||||
|
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
||||||
|
${DEP_CMAKE_OPTS}
|
||||||
|
)
|
||||||
7
deps/deps-unix-common.cmake
vendored
7
deps/deps-unix-common.cmake
vendored
@ -1,6 +1,12 @@
|
|||||||
|
|
||||||
# The unix common part expects DEP_CMAKE_OPTS to be set
|
# The unix common part expects DEP_CMAKE_OPTS to be set
|
||||||
|
|
||||||
|
if (MINGW)
|
||||||
|
set(TBB_MINGW_WORKAROUND "-flifetime-dse=1")
|
||||||
|
else ()
|
||||||
|
set(TBB_MINGW_WORKAROUND "")
|
||||||
|
endif ()
|
||||||
|
|
||||||
ExternalProject_Add(dep_tbb
|
ExternalProject_Add(dep_tbb
|
||||||
EXCLUDE_FROM_ALL 1
|
EXCLUDE_FROM_ALL 1
|
||||||
URL "https://github.com/wjakob/tbb/archive/a0dc9bf76d0120f917b641ed095360448cabc85b.tar.gz"
|
URL "https://github.com/wjakob/tbb/archive/a0dc9bf76d0120f917b641ed095360448cabc85b.tar.gz"
|
||||||
@ -8,6 +14,7 @@ ExternalProject_Add(dep_tbb
|
|||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DTBB_BUILD_SHARED=OFF
|
-DTBB_BUILD_SHARED=OFF
|
||||||
-DTBB_BUILD_TESTS=OFF
|
-DTBB_BUILD_TESTS=OFF
|
||||||
|
-DCMAKE_CXX_FLAGS=${TBB_MINGW_WORKAROUND}
|
||||||
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
||||||
${DEP_CMAKE_OPTS}
|
${DEP_CMAKE_OPTS}
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
add_subdirectory(slabasebed)
|
add_subdirectory(slabasebed)
|
||||||
|
add_subdirectory(slasupporttree)
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
#include <libslic3r/libslic3r.h>
|
#include <libslic3r/libslic3r.h>
|
||||||
#include <libslic3r/TriangleMesh.hpp>
|
#include <libslic3r/TriangleMesh.hpp>
|
||||||
#include <libslic3r/Tesselate.hpp>
|
#include <libslic3r/Tesselate.hpp>
|
||||||
|
#include <libslic3r/ClipperUtils.hpp>
|
||||||
#include <libslic3r/SLA/SLABasePool.hpp>
|
#include <libslic3r/SLA/SLABasePool.hpp>
|
||||||
#include <libslic3r/SLA/SLABoilerPlate.hpp>
|
#include <libslic3r/SLA/SLABoilerPlate.hpp>
|
||||||
#include <libnest2d/tools/benchmark.h>
|
#include <libnest2d/tools/benchmark.h>
|
||||||
@ -16,7 +17,7 @@ const std::string USAGE_STR = {
|
|||||||
namespace Slic3r { namespace sla {
|
namespace Slic3r { namespace sla {
|
||||||
|
|
||||||
Contour3D create_base_pool(const Polygons &ground_layer,
|
Contour3D create_base_pool(const Polygons &ground_layer,
|
||||||
const Polygons &holes = {},
|
const ExPolygons &holes = {},
|
||||||
const PoolConfig& cfg = PoolConfig());
|
const PoolConfig& cfg = PoolConfig());
|
||||||
|
|
||||||
Contour3D walls(const Polygon& floor_plate, const Polygon& ceiling,
|
Contour3D walls(const Polygon& floor_plate, const Polygon& ceiling,
|
||||||
@ -43,22 +44,22 @@ int main(const int argc, const char *argv[]) {
|
|||||||
model.ReadSTLFile(argv[1]);
|
model.ReadSTLFile(argv[1]);
|
||||||
model.align_to_origin();
|
model.align_to_origin();
|
||||||
|
|
||||||
Polygons ground_slice;
|
ExPolygons ground_slice;
|
||||||
sla::base_plate(model, ground_slice, 0.1f);
|
sla::base_plate(model, ground_slice, 0.1f);
|
||||||
if(ground_slice.empty()) return EXIT_FAILURE;
|
if(ground_slice.empty()) return EXIT_FAILURE;
|
||||||
|
|
||||||
Polygon gndfirst; gndfirst = ground_slice.front();
|
ground_slice = offset_ex(ground_slice, 0.5);
|
||||||
sla::offset_with_breakstick_holes(gndfirst, 0.5, 10, 0.3);
|
ExPolygon gndfirst; gndfirst = ground_slice.front();
|
||||||
|
sla::breakstick_holes(gndfirst, 0.5, 10, 0.3);
|
||||||
|
|
||||||
sla::Contour3D mesh;
|
sla::Contour3D mesh;
|
||||||
|
|
||||||
|
|
||||||
bench.start();
|
bench.start();
|
||||||
|
|
||||||
sla::PoolConfig cfg;
|
sla::PoolConfig cfg;
|
||||||
cfg.min_wall_height_mm = 0;
|
cfg.min_wall_height_mm = 0;
|
||||||
cfg.edge_radius_mm = 0;
|
cfg.edge_radius_mm = 0;
|
||||||
mesh = sla::create_base_pool(ground_slice, {}, cfg);
|
mesh = sla::create_base_pool(to_polygons(ground_slice), {}, cfg);
|
||||||
|
|
||||||
bench.stop();
|
bench.stop();
|
||||||
|
|
||||||
@ -75,7 +76,7 @@ int main(const int argc, const char *argv[]) {
|
|||||||
if(std::abs(a) < 1e-6) std::cout << "degenerate triangle" << std::endl;
|
if(std::abs(a) < 1e-6) std::cout << "degenerate triangle" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
// basepool.write_ascii("out.stl");
|
// basepool.write_ascii("out.stl");
|
||||||
|
|
||||||
std::fstream outstream("out.obj", std::fstream::out);
|
std::fstream outstream("out.obj", std::fstream::out);
|
||||||
mesh.to_obj(outstream);
|
mesh.to_obj(outstream);
|
||||||
|
|||||||
2
sandboxes/slasupporttree/CMakeLists.txt
Normal file
2
sandboxes/slasupporttree/CMakeLists.txt
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
add_executable(slasupporttree slasupporttree.cpp)
|
||||||
|
target_link_libraries(slasupporttree libslic3r ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
|
||||||
42
sandboxes/slasupporttree/slasupporttree.cpp
Normal file
42
sandboxes/slasupporttree/slasupporttree.cpp
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
#include <iostream>
|
||||||
|
#include <fstream>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include <libslic3r/libslic3r.h>
|
||||||
|
#include <libslic3r/Model.hpp>
|
||||||
|
#include <libslic3r/Tesselate.hpp>
|
||||||
|
#include <libslic3r/ClipperUtils.hpp>
|
||||||
|
#include <libslic3r/SLA/SLAAutoSupports.hpp>
|
||||||
|
#include <libslic3r/SLA/SLASupportTree.hpp>
|
||||||
|
#include <libslic3r/SLAPrint.hpp>
|
||||||
|
#include <libslic3r/MTUtils.hpp>
|
||||||
|
|
||||||
|
#include <tbb/parallel_for.h>
|
||||||
|
#include <tbb/mutex.h>
|
||||||
|
#include <future>
|
||||||
|
|
||||||
|
const std::string USAGE_STR = {
|
||||||
|
"Usage: slasupporttree stlfilename.stl"
|
||||||
|
};
|
||||||
|
|
||||||
|
int main(const int argc, const char *argv[]) {
|
||||||
|
using namespace Slic3r;
|
||||||
|
using std::cout; using std::endl;
|
||||||
|
|
||||||
|
if(argc < 2) {
|
||||||
|
cout << USAGE_STR << endl;
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
DynamicPrintConfig config;
|
||||||
|
|
||||||
|
Model model = Model::read_from_file(argv[1], &config);
|
||||||
|
|
||||||
|
SLAPrint print;
|
||||||
|
|
||||||
|
print.apply(model, config);
|
||||||
|
print.process();
|
||||||
|
|
||||||
|
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
@ -47,7 +47,7 @@ if (SLIC3R_GUI)
|
|||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
else ()
|
else ()
|
||||||
find_package(wxWidgets 3.1 REQUIRED COMPONENTS base core adv html gl)
|
find_package(wxWidgets 3.1 REQUIRED COMPONENTS html adv gl core base)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
@ -56,6 +56,9 @@ if (SLIC3R_GUI)
|
|||||||
|
|
||||||
include(${wxWidgets_USE_FILE})
|
include(${wxWidgets_USE_FILE})
|
||||||
|
|
||||||
|
# list(REMOVE_ITEM wxWidgets_LIBRARIES oleacc)
|
||||||
|
message(STATUS "wx libs: ${wxWidgets_LIBRARIES}")
|
||||||
|
|
||||||
add_subdirectory(slic3r)
|
add_subdirectory(slic3r)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -65,12 +68,18 @@ endif()
|
|||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.rc @ONLY)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.rc @ONLY)
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.manifest @ONLY)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.manifest @ONLY)
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
|
||||||
if (MSVC)
|
if (WIN32)
|
||||||
add_library(PrusaSlicer SHARED PrusaSlicer.cpp PrusaSlicer.hpp)
|
add_library(PrusaSlicer SHARED PrusaSlicer.cpp PrusaSlicer.hpp)
|
||||||
else ()
|
else ()
|
||||||
add_executable(PrusaSlicer PrusaSlicer.cpp PrusaSlicer.hpp)
|
add_executable(PrusaSlicer PrusaSlicer.cpp PrusaSlicer.hpp)
|
||||||
endif ()
|
endif ()
|
||||||
if (NOT MSVC)
|
|
||||||
|
if (MINGW)
|
||||||
|
target_link_options(PrusaSlicer PUBLIC "-Wl,-allow-multiple-definition")
|
||||||
|
set_target_properties(PrusaSlicer PROPERTIES PREFIX "")
|
||||||
|
endif (MINGW)
|
||||||
|
|
||||||
|
if (NOT WIN32)
|
||||||
# Binary name on unix like systems (OSX, Linux)
|
# Binary name on unix like systems (OSX, Linux)
|
||||||
set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
|
set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
|
||||||
endif ()
|
endif ()
|
||||||
@ -91,11 +100,12 @@ endif ()
|
|||||||
|
|
||||||
# Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
|
# Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
|
||||||
if (SLIC3R_GUI)
|
if (SLIC3R_GUI)
|
||||||
target_link_libraries(PrusaSlicer libslic3r_gui ${wxWidgets_LIBRARIES})
|
# target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi libslic3r_gui ${wxWidgets_LIBRARIES})
|
||||||
|
target_link_libraries(PrusaSlicer libslic3r_gui ${wxWidgets_LIBRARIES})
|
||||||
|
|
||||||
# Configure libcurl and its dependencies OpenSSL & zlib
|
# Configure libcurl and its dependencies OpenSSL & zlib
|
||||||
find_package(CURL REQUIRED)
|
find_package(CURL REQUIRED)
|
||||||
if (NOT MSVC)
|
if (NOT WIN32)
|
||||||
# Required by libcurl
|
# Required by libcurl
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
@ -123,7 +133,7 @@ if (SLIC3R_GUI)
|
|||||||
target_link_options(PrusaSlicer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
target_link_options(PrusaSlicer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
||||||
target_link_libraries(PrusaSlicer user32.lib Setupapi.lib OpenGL32.Lib GlU32.Lib)
|
target_link_libraries(PrusaSlicer user32.lib Setupapi.lib OpenGL32.Lib GlU32.Lib)
|
||||||
elseif (MINGW)
|
elseif (MINGW)
|
||||||
target_link_libraries(PrusaSlicer -lopengl32)
|
target_link_libraries(PrusaSlicer opengl32 ws2_32 uxtheme setupapi)
|
||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
target_link_libraries(PrusaSlicer "-framework OpenGL")
|
target_link_libraries(PrusaSlicer "-framework OpenGL")
|
||||||
else ()
|
else ()
|
||||||
@ -133,10 +143,16 @@ endif ()
|
|||||||
|
|
||||||
# On Windows, a shim application is required to produce a console / non console version of the Slic3r application.
|
# On Windows, a shim application is required to produce a console / non console version of the Slic3r application.
|
||||||
# Also the shim may load the Mesa software OpenGL renderer if the default renderer does not support OpenGL 2.0 and higher.
|
# Also the shim may load the Mesa software OpenGL renderer if the default renderer does not support OpenGL 2.0 and higher.
|
||||||
if (MSVC)
|
if (WIN32)
|
||||||
|
if (MINGW)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
|
||||||
|
endif()
|
||||||
|
|
||||||
add_executable(PrusaSlicer_app_gui WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.rc)
|
add_executable(PrusaSlicer_app_gui WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.rc)
|
||||||
# Generate debug symbols even in release mode.
|
# Generate debug symbols even in release mode.
|
||||||
target_link_options(PrusaSlicer_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
if(MSVC)
|
||||||
|
target_link_options(PrusaSlicer_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
||||||
|
endif()
|
||||||
target_compile_definitions(PrusaSlicer_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
|
target_compile_definitions(PrusaSlicer_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
|
||||||
add_dependencies(PrusaSlicer_app_gui PrusaSlicer)
|
add_dependencies(PrusaSlicer_app_gui PrusaSlicer)
|
||||||
set_target_properties(PrusaSlicer_app_gui PROPERTIES OUTPUT_NAME "prusa-slicer")
|
set_target_properties(PrusaSlicer_app_gui PROPERTIES OUTPUT_NAME "prusa-slicer")
|
||||||
@ -144,7 +160,9 @@ if (MSVC)
|
|||||||
|
|
||||||
add_executable(PrusaSlicer_app_console PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.rc)
|
add_executable(PrusaSlicer_app_console PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer.rc)
|
||||||
# Generate debug symbols even in release mode.
|
# Generate debug symbols even in release mode.
|
||||||
|
if (MSVC)
|
||||||
target_link_options(PrusaSlicer_app_console PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
target_link_options(PrusaSlicer_app_console PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
|
||||||
|
endif ()
|
||||||
target_compile_definitions(PrusaSlicer_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE)
|
target_compile_definitions(PrusaSlicer_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE)
|
||||||
add_dependencies(PrusaSlicer_app_console PrusaSlicer)
|
add_dependencies(PrusaSlicer_app_console PrusaSlicer)
|
||||||
set_target_properties(PrusaSlicer_app_console PROPERTIES OUTPUT_NAME "prusa-slicer-console")
|
set_target_properties(PrusaSlicer_app_console PROPERTIES OUTPUT_NAME "prusa-slicer-console")
|
||||||
@ -152,7 +170,7 @@ if (MSVC)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# Link the resources dir to where Slic3r GUI expects it
|
# Link the resources dir to where Slic3r GUI expects it
|
||||||
if (MSVC)
|
if (WIN32)
|
||||||
if (CMAKE_CONFIGURATION_TYPES)
|
if (CMAKE_CONFIGURATION_TYPES)
|
||||||
foreach (CONF ${CMAKE_CONFIGURATION_TYPES})
|
foreach (CONF ${CMAKE_CONFIGURATION_TYPES})
|
||||||
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${CONF}" WIN_CONF_OUTPUT_DIR)
|
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${CONF}" WIN_CONF_OUTPUT_DIR)
|
||||||
|
|||||||
@ -53,28 +53,28 @@ using namespace Slic3r;
|
|||||||
|
|
||||||
PrinterTechnology get_printer_technology(const DynamicConfig &config)
|
PrinterTechnology get_printer_technology(const DynamicConfig &config)
|
||||||
{
|
{
|
||||||
const ConfigOptionEnum<PrinterTechnology> *opt = config.option<ConfigOptionEnum<PrinterTechnology>>("printer_technology");
|
const ConfigOptionEnum<PrinterTechnology> *opt = config.option<ConfigOptionEnum<PrinterTechnology>>("printer_technology");
|
||||||
return (opt == nullptr) ? ptUnknown : opt->value;
|
return (opt == nullptr) ? ptUnknown : opt->value;
|
||||||
}
|
}
|
||||||
|
|
||||||
int CLI::run(int argc, char **argv)
|
int CLI::run(int argc, char **argv)
|
||||||
{
|
{
|
||||||
if (! this->setup(argc, argv))
|
if (! this->setup(argc, argv))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
m_extra_config.apply(m_config, true);
|
m_extra_config.apply(m_config, true);
|
||||||
m_extra_config.normalize();
|
m_extra_config.normalize();
|
||||||
|
|
||||||
bool start_gui = m_actions.empty() &&
|
bool start_gui = m_actions.empty() &&
|
||||||
// cutting transformations are setting an "export" action.
|
// cutting transformations are setting an "export" action.
|
||||||
std::find(m_transforms.begin(), m_transforms.end(), "cut") == m_transforms.end() &&
|
std::find(m_transforms.begin(), m_transforms.end(), "cut") == m_transforms.end() &&
|
||||||
std::find(m_transforms.begin(), m_transforms.end(), "cut_x") == m_transforms.end() &&
|
std::find(m_transforms.begin(), m_transforms.end(), "cut_x") == m_transforms.end() &&
|
||||||
std::find(m_transforms.begin(), m_transforms.end(), "cut_y") == m_transforms.end();
|
std::find(m_transforms.begin(), m_transforms.end(), "cut_y") == m_transforms.end();
|
||||||
PrinterTechnology printer_technology = get_printer_technology(m_extra_config);
|
PrinterTechnology printer_technology = get_printer_technology(m_extra_config);
|
||||||
const std::vector<std::string> &load_configs = m_config.option<ConfigOptionStrings>("load", true)->values;
|
const std::vector<std::string> &load_configs = m_config.option<ConfigOptionStrings>("load", true)->values;
|
||||||
|
|
||||||
// load config files supplied via --load
|
// load config files supplied via --load
|
||||||
for (auto const &file : load_configs) {
|
for (auto const &file : load_configs) {
|
||||||
if (! boost::filesystem::exists(file)) {
|
if (! boost::filesystem::exists(file)) {
|
||||||
if (m_config.opt_bool("ignore_nonexistent_config")) {
|
if (m_config.opt_bool("ignore_nonexistent_config")) {
|
||||||
continue;
|
continue;
|
||||||
@ -136,7 +136,7 @@ int CLI::run(int argc, char **argv)
|
|||||||
m_print_config.normalize();
|
m_print_config.normalize();
|
||||||
|
|
||||||
if (printer_technology == ptUnknown)
|
if (printer_technology == ptUnknown)
|
||||||
printer_technology = std::find(m_actions.begin(), m_actions.end(), "export_sla") == m_actions.end() ? ptFFF : ptSLA;
|
printer_technology = std::find(m_actions.begin(), m_actions.end(), "export_sla") == m_actions.end() ? ptFFF : ptSLA;
|
||||||
|
|
||||||
// Initialize full print configs for both the FFF and SLA technologies.
|
// Initialize full print configs for both the FFF and SLA technologies.
|
||||||
FullPrintConfig fff_print_config;
|
FullPrintConfig fff_print_config;
|
||||||
@ -149,8 +149,8 @@ int CLI::run(int argc, char **argv)
|
|||||||
if (opt_key == "merge") {
|
if (opt_key == "merge") {
|
||||||
Model m;
|
Model m;
|
||||||
for (auto &model : m_models)
|
for (auto &model : m_models)
|
||||||
for (ModelObject *o : model.objects)
|
for (ModelObject *o : model.objects)
|
||||||
m.add_object(*o);
|
m.add_object(*o);
|
||||||
// Rearrange instances unless --dont-arrange is supplied
|
// Rearrange instances unless --dont-arrange is supplied
|
||||||
if (! m_config.opt_bool("dont_arrange")) {
|
if (! m_config.opt_bool("dont_arrange")) {
|
||||||
m.add_default_instances();
|
m.add_default_instances();
|
||||||
@ -162,8 +162,8 @@ int CLI::run(int argc, char **argv)
|
|||||||
this->has_print_action() ? &bb : nullptr
|
this->has_print_action() ? &bb : nullptr
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
m_models.clear();
|
m_models.clear();
|
||||||
m_models.emplace_back(std::move(m));
|
m_models.emplace_back(std::move(m));
|
||||||
} else if (opt_key == "duplicate") {
|
} else if (opt_key == "duplicate") {
|
||||||
const BoundingBoxf &bb = fff_print_config.bed_shape.values;
|
const BoundingBoxf &bb = fff_print_config.bed_shape.values;
|
||||||
for (auto &model : m_models) {
|
for (auto &model : m_models) {
|
||||||
@ -192,11 +192,11 @@ int CLI::run(int argc, char **argv)
|
|||||||
// this affects instances:
|
// this affects instances:
|
||||||
model.center_instances_around_point(m_config.option<ConfigOptionPoint>("center")->value);
|
model.center_instances_around_point(m_config.option<ConfigOptionPoint>("center")->value);
|
||||||
// this affects volumes:
|
// this affects volumes:
|
||||||
//FIXME Vojtech: Who knows why the complete model should be aligned with Z as a single rigid body?
|
//FIXME Vojtech: Who knows why the complete model should be aligned with Z as a single rigid body?
|
||||||
//model.align_to_ground();
|
//model.align_to_ground();
|
||||||
BoundingBoxf3 bbox;
|
BoundingBoxf3 bbox;
|
||||||
for (ModelObject *model_object : model.objects)
|
for (ModelObject *model_object : model.objects)
|
||||||
// We are interested into the Z span only, therefore it is sufficient to measure the bounding box of the 1st instance only.
|
// We are interested into the Z span only, therefore it is sufficient to measure the bounding box of the 1st instance only.
|
||||||
bbox.merge(model_object->instance_bounding_box(0, false));
|
bbox.merge(model_object->instance_bounding_box(0, false));
|
||||||
for (ModelObject *model_object : model.objects)
|
for (ModelObject *model_object : model.objects)
|
||||||
for (ModelInstance *model_instance : model_object->instances)
|
for (ModelInstance *model_instance : model_object->instances)
|
||||||
@ -207,7 +207,7 @@ int CLI::run(int argc, char **argv)
|
|||||||
for (auto &model : m_models) {
|
for (auto &model : m_models) {
|
||||||
BoundingBoxf3 bb = model.bounding_box();
|
BoundingBoxf3 bb = model.bounding_box();
|
||||||
// this affects volumes:
|
// this affects volumes:
|
||||||
model.translate(-(bb.min.x() - p.x()), -(bb.min.y() - p.y()), -bb.min.z());
|
model.translate(-(bb.min.x() - p.x()), -(bb.min.y() - p.y()), -bb.min.z());
|
||||||
}
|
}
|
||||||
} else if (opt_key == "dont_arrange") {
|
} else if (opt_key == "dont_arrange") {
|
||||||
// do nothing - this option alters other transform options
|
// do nothing - this option alters other transform options
|
||||||
@ -245,8 +245,8 @@ int CLI::run(int argc, char **argv)
|
|||||||
std::vector<Model> new_models;
|
std::vector<Model> new_models;
|
||||||
for (auto &model : m_models) {
|
for (auto &model : m_models) {
|
||||||
model.translate(0, 0, -model.bounding_box().min.z()); // align to z = 0
|
model.translate(0, 0, -model.bounding_box().min.z()); // align to z = 0
|
||||||
size_t num_objects = model.objects.size();
|
size_t num_objects = model.objects.size();
|
||||||
for (size_t i = 0; i < num_objects; ++ i) {
|
for (size_t i = 0; i < num_objects; ++ i) {
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
if (opt_key == "cut_x") {
|
if (opt_key == "cut_x") {
|
||||||
@ -257,9 +257,9 @@ int CLI::run(int argc, char **argv)
|
|||||||
o->cut(Z, m_config.opt_float("cut"), &out);
|
o->cut(Z, m_config.opt_float("cut"), &out);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
model.objects.front()->cut(0, m_config.opt_float("cut"), true, true, true);
|
model.objects.front()->cut(0, m_config.opt_float("cut"), true, true, true);
|
||||||
#endif
|
#endif
|
||||||
model.delete_object(size_t(0));
|
model.delete_object(size_t(0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -303,7 +303,7 @@ int CLI::run(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (opt_key == "repair") {
|
} else if (opt_key == "repair") {
|
||||||
// Models are repaired by default.
|
// Models are repaired by default.
|
||||||
//for (auto &model : m_models)
|
//for (auto &model : m_models)
|
||||||
// model.repair();
|
// model.repair();
|
||||||
} else {
|
} else {
|
||||||
@ -354,14 +354,14 @@ int CLI::run(int argc, char **argv)
|
|||||||
boost::nowide::cerr << "error: cannot export SLA slices for a SLA configuration" << std::endl;
|
boost::nowide::cerr << "error: cannot export SLA slices for a SLA configuration" << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
// Make a copy of the model if the current action is not the last action, as the model may be
|
// Make a copy of the model if the current action is not the last action, as the model may be
|
||||||
// modified by the centering and such.
|
// modified by the centering and such.
|
||||||
Model model_copy;
|
Model model_copy;
|
||||||
bool make_copy = &opt_key != &m_actions.back();
|
bool make_copy = &opt_key != &m_actions.back();
|
||||||
for (Model &model_in : m_models) {
|
for (Model &model_in : m_models) {
|
||||||
if (make_copy)
|
if (make_copy)
|
||||||
model_copy = model_in;
|
model_copy = model_in;
|
||||||
Model &model = make_copy ? model_copy : model_in;
|
Model &model = make_copy ? model_copy : model_in;
|
||||||
// If all objects have defined instances, their relative positions will be
|
// If all objects have defined instances, their relative positions will be
|
||||||
// honored when printing (they will be only centered, unless --dont-arrange
|
// honored when printing (they will be only centered, unless --dont-arrange
|
||||||
// is supplied); if any object has no instances, it will get a default one
|
// is supplied); if any object has no instances, it will get a default one
|
||||||
@ -381,7 +381,7 @@ int CLI::run(int argc, char **argv)
|
|||||||
if (! m_config.opt_bool("dont_arrange")) {
|
if (! m_config.opt_bool("dont_arrange")) {
|
||||||
//FIXME make the min_object_distance configurable.
|
//FIXME make the min_object_distance configurable.
|
||||||
model.arrange_objects(fff_print.config().min_object_distance());
|
model.arrange_objects(fff_print.config().min_object_distance());
|
||||||
model.center_instances_around_point(m_config.option<ConfigOptionPoint>("center")->value);
|
model.center_instances_around_point(m_config.option<ConfigOptionPoint>("center")->value);
|
||||||
}
|
}
|
||||||
if (printer_technology == ptFFF) {
|
if (printer_technology == ptFFF) {
|
||||||
for (auto* mo : model.objects)
|
for (auto* mo : model.objects)
|
||||||
@ -398,24 +398,24 @@ int CLI::run(int argc, char **argv)
|
|||||||
else
|
else
|
||||||
try {
|
try {
|
||||||
std::string outfile_final;
|
std::string outfile_final;
|
||||||
print->process();
|
print->process();
|
||||||
if (printer_technology == ptFFF) {
|
if (printer_technology == ptFFF) {
|
||||||
// The outfile is processed by a PlaceholderParser.
|
// The outfile is processed by a PlaceholderParser.
|
||||||
outfile = fff_print.export_gcode(outfile, nullptr);
|
outfile = fff_print.export_gcode(outfile, nullptr);
|
||||||
outfile_final = fff_print.print_statistics().finalize_output_path(outfile);
|
outfile_final = fff_print.print_statistics().finalize_output_path(outfile);
|
||||||
} else {
|
} else {
|
||||||
outfile = sla_print.output_filepath(outfile);
|
outfile = sla_print.output_filepath(outfile);
|
||||||
// We need to finalize the filename beforehand because the export function sets the filename inside the zip metadata
|
// We need to finalize the filename beforehand because the export function sets the filename inside the zip metadata
|
||||||
outfile_final = sla_print.print_statistics().finalize_output_path(outfile);
|
outfile_final = sla_print.print_statistics().finalize_output_path(outfile);
|
||||||
sla_print.export_raster(outfile_final);
|
sla_print.export_raster(outfile_final);
|
||||||
}
|
}
|
||||||
if (outfile != outfile_final && Slic3r::rename_file(outfile, outfile_final) != 0) {
|
if (outfile != outfile_final && Slic3r::rename_file(outfile, outfile_final) != 0) {
|
||||||
boost::nowide::cerr << "Renaming file " << outfile << " to " << outfile_final << " failed" << std::endl;
|
boost::nowide::cerr << "Renaming file " << outfile << " to " << outfile_final << " failed" << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
boost::nowide::cout << "Slicing result exported to " << outfile << std::endl;
|
boost::nowide::cout << "Slicing result exported to " << outfile << std::endl;
|
||||||
} catch (const std::exception &ex) {
|
} catch (const std::exception &ex) {
|
||||||
boost::nowide::cerr << ex.what() << std::endl;
|
boost::nowide::cerr << ex.what() << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
@ -455,41 +455,41 @@ int CLI::run(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (start_gui) {
|
if (start_gui) {
|
||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
// #ifdef USE_WX
|
// #ifdef USE_WX
|
||||||
GUI::GUI_App *gui = new GUI::GUI_App();
|
GUI::GUI_App *gui = new GUI::GUI_App();
|
||||||
// gui->autosave = m_config.opt_string("autosave");
|
// gui->autosave = m_config.opt_string("autosave");
|
||||||
GUI::GUI_App::SetInstance(gui);
|
GUI::GUI_App::SetInstance(gui);
|
||||||
gui->CallAfter([gui, this, &load_configs] {
|
gui->CallAfter([gui, this, &load_configs] {
|
||||||
if (!gui->initialized()) {
|
if (!gui->initialized()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#if 0
|
#if 0
|
||||||
// Load the cummulative config over the currently active profiles.
|
// Load the cummulative config over the currently active profiles.
|
||||||
//FIXME if multiple configs are loaded, only the last one will have an effect.
|
//FIXME if multiple configs are loaded, only the last one will have an effect.
|
||||||
// We need to decide what to do about loading of separate presets (just print preset, just filament preset etc).
|
// We need to decide what to do about loading of separate presets (just print preset, just filament preset etc).
|
||||||
// As of now only the full configs are supported here.
|
// As of now only the full configs are supported here.
|
||||||
if (!m_print_config.empty())
|
if (!m_print_config.empty())
|
||||||
gui->mainframe->load_config(m_print_config);
|
gui->mainframe->load_config(m_print_config);
|
||||||
#endif
|
#endif
|
||||||
if (! load_configs.empty())
|
if (! load_configs.empty())
|
||||||
// Load the last config to give it a name at the UI. The name of the preset may be later
|
// Load the last config to give it a name at the UI. The name of the preset may be later
|
||||||
// changed by loading an AMF or 3MF.
|
// changed by loading an AMF or 3MF.
|
||||||
//FIXME this is not strictly correct, as one may pass a print/filament/printer profile here instead of a full config.
|
//FIXME this is not strictly correct, as one may pass a print/filament/printer profile here instead of a full config.
|
||||||
gui->mainframe->load_config_file(load_configs.back());
|
gui->mainframe->load_config_file(load_configs.back());
|
||||||
// If loading a 3MF file, the config is loaded from the last one.
|
// If loading a 3MF file, the config is loaded from the last one.
|
||||||
if (! m_input_files.empty())
|
if (! m_input_files.empty())
|
||||||
gui->plater()->load_files(m_input_files, true, true);
|
gui->plater()->load_files(m_input_files, true, true);
|
||||||
if (! m_extra_config.empty())
|
if (! m_extra_config.empty())
|
||||||
gui->mainframe->load_config(m_extra_config);
|
gui->mainframe->load_config(m_extra_config);
|
||||||
});
|
});
|
||||||
return wxEntry(argc, argv);
|
return wxEntry(argc, argv);
|
||||||
#else /* SLIC3R_GUI */
|
#else /* SLIC3R_GUI */
|
||||||
// No GUI support. Just print out a help.
|
// No GUI support. Just print out a help.
|
||||||
this->print_help(false);
|
this->print_help(false);
|
||||||
// If started without a parameter, consider it to be OK, otherwise report an error code (no action etc).
|
// If started without a parameter, consider it to be OK, otherwise report an error code (no action etc).
|
||||||
return (argc == 0) ? 0 : 1;
|
return (argc == 0) ? 0 : 1;
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -539,18 +539,18 @@ bool CLI::setup(int argc, char **argv)
|
|||||||
// If any option is unsupported, print usage and abort immediately.
|
// If any option is unsupported, print usage and abort immediately.
|
||||||
t_config_option_keys opt_order;
|
t_config_option_keys opt_order;
|
||||||
if (! m_config.read_cli(argc, argv, &m_input_files, &opt_order)) {
|
if (! m_config.read_cli(argc, argv, &m_input_files, &opt_order)) {
|
||||||
// Separate error message reported by the CLI parser from the help.
|
// Separate error message reported by the CLI parser from the help.
|
||||||
boost::nowide::cerr << std::endl;
|
boost::nowide::cerr << std::endl;
|
||||||
this->print_help();
|
this->print_help();
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
// Parse actions and transform options.
|
||||||
|
for (auto const &opt_key : opt_order) {
|
||||||
|
if (cli_actions_config_def.has(opt_key))
|
||||||
|
m_actions.emplace_back(opt_key);
|
||||||
|
else if (cli_transform_config_def.has(opt_key))
|
||||||
|
m_transforms.emplace_back(opt_key);
|
||||||
}
|
}
|
||||||
// Parse actions and transform options.
|
|
||||||
for (auto const &opt_key : opt_order) {
|
|
||||||
if (cli_actions_config_def.has(opt_key))
|
|
||||||
m_actions.emplace_back(opt_key);
|
|
||||||
else if (cli_transform_config_def.has(opt_key))
|
|
||||||
m_transforms.emplace_back(opt_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
const ConfigOptionInt *opt_loglevel = m_config.opt<ConfigOptionInt>("loglevel");
|
const ConfigOptionInt *opt_loglevel = m_config.opt<ConfigOptionInt>("loglevel");
|
||||||
@ -563,15 +563,15 @@ bool CLI::setup(int argc, char **argv)
|
|||||||
for (const std::pair<t_config_option_key, ConfigOptionDef> &optdef : *options)
|
for (const std::pair<t_config_option_key, ConfigOptionDef> &optdef : *options)
|
||||||
m_config.optptr(optdef.first, true);
|
m_config.optptr(optdef.first, true);
|
||||||
|
|
||||||
set_data_dir(m_config.opt_string("datadir"));
|
set_data_dir(m_config.opt_string("datadir"));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const
|
void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const
|
||||||
{
|
{
|
||||||
boost::nowide::cout
|
boost::nowide::cout
|
||||||
<< SLIC3R_BUILD_ID << " " << "based on Slic3r"
|
<< SLIC3R_BUILD_ID << " " << "based on Slic3r"
|
||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
<< " (with GUI support)"
|
<< " (with GUI support)"
|
||||||
#else /* SLIC3R_GUI */
|
#else /* SLIC3R_GUI */
|
||||||
@ -596,7 +596,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
|
|||||||
|
|
||||||
if (include_print_options) {
|
if (include_print_options) {
|
||||||
boost::nowide::cout << std::endl;
|
boost::nowide::cout << std::endl;
|
||||||
print_config_def.print_cli_help(boost::nowide::cout, true, [printer_technology](const ConfigOptionDef &def)
|
print_config_def.print_cli_help(boost::nowide::cout, true, [printer_technology](const ConfigOptionDef &def)
|
||||||
{ return printer_technology == ptAny || def.printer_technology == ptAny || printer_technology == def.printer_technology; });
|
{ return printer_technology == ptAny || def.printer_technology == ptAny || printer_technology == def.printer_technology; });
|
||||||
} else {
|
} else {
|
||||||
boost::nowide::cout
|
boost::nowide::cout
|
||||||
@ -613,14 +613,14 @@ bool CLI::export_models(IO::ExportFormat format)
|
|||||||
switch (format) {
|
switch (format) {
|
||||||
case IO::AMF: success = Slic3r::store_amf(path.c_str(), &model, nullptr); break;
|
case IO::AMF: success = Slic3r::store_amf(path.c_str(), &model, nullptr); break;
|
||||||
case IO::OBJ: success = Slic3r::store_obj(path.c_str(), &model); break;
|
case IO::OBJ: success = Slic3r::store_obj(path.c_str(), &model); break;
|
||||||
case IO::STL: success = Slic3r::store_stl(path.c_str(), &model, true); break;
|
case IO::STL: success = Slic3r::store_stl(path.c_str(), &model, true); break;
|
||||||
case IO::TMF: success = Slic3r::store_3mf(path.c_str(), &model, nullptr); break;
|
case IO::TMF: success = Slic3r::store_3mf(path.c_str(), &model, nullptr); break;
|
||||||
default: assert(false); break;
|
default: assert(false); break;
|
||||||
}
|
}
|
||||||
if (success)
|
if (success)
|
||||||
std::cout << "File exported to " << path << std::endl;
|
std::cout << "File exported to " << path << std::endl;
|
||||||
else {
|
else {
|
||||||
std::cerr << "File export to " << path << " failed" << std::endl;
|
std::cerr << "File export to " << path << " failed" << std::endl;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -634,12 +634,12 @@ std::string CLI::output_filepath(const Model &model, IO::ExportFormat format) co
|
|||||||
case IO::AMF: ext = ".zip.amf"; break;
|
case IO::AMF: ext = ".zip.amf"; break;
|
||||||
case IO::OBJ: ext = ".obj"; break;
|
case IO::OBJ: ext = ".obj"; break;
|
||||||
case IO::STL: ext = ".stl"; break;
|
case IO::STL: ext = ".stl"; break;
|
||||||
case IO::TMF: ext = ".3mf"; break;
|
case IO::TMF: ext = ".3mf"; break;
|
||||||
default: assert(false); break;
|
default: assert(false); break;
|
||||||
};
|
};
|
||||||
auto proposed_path = boost::filesystem::path(model.propose_export_file_name_and_path(ext));
|
auto proposed_path = boost::filesystem::path(model.propose_export_file_name_and_path(ext));
|
||||||
// use --output when available
|
// use --output when available
|
||||||
std::string cmdline_param = m_config.opt_string("output");
|
std::string cmdline_param = m_config.opt_string("output");
|
||||||
if (! cmdline_param.empty()) {
|
if (! cmdline_param.empty()) {
|
||||||
// if we were supplied a directory, use it and append our automatically generated filename
|
// if we were supplied a directory, use it and append our automatically generated filename
|
||||||
boost::filesystem::path cmdline_path(cmdline_param);
|
boost::filesystem::path cmdline_path(cmdline_param);
|
||||||
@ -651,20 +651,20 @@ std::string CLI::output_filepath(const Model &model, IO::ExportFormat format) co
|
|||||||
return proposed_path.string();
|
return proposed_path.string();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
__declspec(dllexport) int __stdcall slic3r_main(int argc, wchar_t **argv)
|
__declspec(dllexport) int __stdcall slic3r_main(int argc, wchar_t **argv)
|
||||||
{
|
{
|
||||||
// Convert wchar_t arguments to UTF8.
|
// Convert wchar_t arguments to UTF8.
|
||||||
std::vector<std::string> argv_narrow;
|
std::vector<std::string> argv_narrow;
|
||||||
std::vector<char*> argv_ptrs(argc + 1, nullptr);
|
std::vector<char*> argv_ptrs(argc + 1, nullptr);
|
||||||
for (size_t i = 0; i < argc; ++ i)
|
for (size_t i = 0; i < argc; ++ i)
|
||||||
argv_narrow.emplace_back(boost::nowide::narrow(argv[i]));
|
argv_narrow.emplace_back(boost::nowide::narrow(argv[i]));
|
||||||
for (size_t i = 0; i < argc; ++ i)
|
for (size_t i = 0; i < argc; ++ i)
|
||||||
argv_ptrs[i] = const_cast<char*>(argv_narrow[i].data());
|
argv_ptrs[i] = const_cast<char*>(argv_narrow[i].data());
|
||||||
// Call the UTF8 main.
|
// Call the UTF8 main.
|
||||||
return CLI().run(argc, argv_ptrs.data());
|
return CLI().run(argc, argv_ptrs.data());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else /* _MSC_VER */
|
#else /* _MSC_VER */
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
|
|||||||
@ -10,10 +10,10 @@
|
|||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
// Let the NVIDIA and AMD know we want to use their graphics card
|
// Let the NVIDIA and AMD know we want to use their graphics card
|
||||||
// on a dual graphics card system.
|
// on a dual graphics card system.
|
||||||
__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
|
__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
|
||||||
__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
|
__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
|
||||||
}
|
}
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
|
|
||||||
@ -21,7 +21,7 @@ extern "C"
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
#include <GL/GL.h>
|
#include <GL/GL.h>
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
@ -36,97 +36,97 @@ extern "C"
|
|||||||
class OpenGLVersionCheck
|
class OpenGLVersionCheck
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
std::string version;
|
std::string version;
|
||||||
std::string glsl_version;
|
std::string glsl_version;
|
||||||
std::string vendor;
|
std::string vendor;
|
||||||
std::string renderer;
|
std::string renderer;
|
||||||
|
|
||||||
HINSTANCE hOpenGL = nullptr;
|
HINSTANCE hOpenGL = nullptr;
|
||||||
bool success = false;
|
bool success = false;
|
||||||
|
|
||||||
bool load_opengl_dll()
|
bool load_opengl_dll()
|
||||||
{
|
{
|
||||||
MSG msg = {0};
|
MSG msg = {0};
|
||||||
WNDCLASS wc = {0};
|
WNDCLASS wc = {0};
|
||||||
wc.lpfnWndProc = OpenGLVersionCheck::supports_opengl2_wndproc;
|
wc.lpfnWndProc = OpenGLVersionCheck::supports_opengl2_wndproc;
|
||||||
wc.hInstance = (HINSTANCE)GetModuleHandle(nullptr);
|
wc.hInstance = (HINSTANCE)GetModuleHandle(nullptr);
|
||||||
wc.hbrBackground = (HBRUSH)(COLOR_BACKGROUND);
|
wc.hbrBackground = (HBRUSH)(COLOR_BACKGROUND);
|
||||||
wc.lpszClassName = L"PrusaSlicer_opengl_version_check";
|
wc.lpszClassName = L"PrusaSlicer_opengl_version_check";
|
||||||
wc.style = CS_OWNDC;
|
wc.style = CS_OWNDC;
|
||||||
if (RegisterClass(&wc)) {
|
if (RegisterClass(&wc)) {
|
||||||
HWND hwnd = CreateWindowW(wc.lpszClassName, L"PrusaSlicer_opengl_version_check", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, wc.hInstance, (LPVOID)this);
|
HWND hwnd = CreateWindowW(wc.lpszClassName, L"PrusaSlicer_opengl_version_check", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, wc.hInstance, (LPVOID)this);
|
||||||
if (hwnd) {
|
if (hwnd) {
|
||||||
message_pump_exit = false;
|
message_pump_exit = false;
|
||||||
while (GetMessage(&msg, NULL, 0, 0 ) > 0 && ! message_pump_exit)
|
while (GetMessage(&msg, NULL, 0, 0 ) > 0 && ! message_pump_exit)
|
||||||
DispatchMessage(&msg);
|
DispatchMessage(&msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return this->success;
|
return this->success;
|
||||||
}
|
}
|
||||||
|
|
||||||
void unload_opengl_dll()
|
void unload_opengl_dll()
|
||||||
{
|
{
|
||||||
if (this->hOpenGL) {
|
if (this->hOpenGL) {
|
||||||
BOOL released = FreeLibrary(this->hOpenGL);
|
BOOL released = FreeLibrary(this->hOpenGL);
|
||||||
if (released)
|
if (released)
|
||||||
printf("System OpenGL library released\n");
|
printf("System OpenGL library released\n");
|
||||||
else
|
else
|
||||||
printf("System OpenGL library NOT released\n");
|
printf("System OpenGL library NOT released\n");
|
||||||
this->hOpenGL = nullptr;
|
this->hOpenGL = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_version_greater_or_equal_to(unsigned int major, unsigned int minor) const
|
bool is_version_greater_or_equal_to(unsigned int major, unsigned int minor) const
|
||||||
{
|
{
|
||||||
// printf("is_version_greater_or_equal_to, version: %s\n", version.c_str());
|
// printf("is_version_greater_or_equal_to, version: %s\n", version.c_str());
|
||||||
std::vector<std::string> tokens;
|
std::vector<std::string> tokens;
|
||||||
boost::split(tokens, version, boost::is_any_of(" "), boost::token_compress_on);
|
boost::split(tokens, version, boost::is_any_of(" "), boost::token_compress_on);
|
||||||
if (tokens.empty())
|
if (tokens.empty())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
std::vector<std::string> numbers;
|
std::vector<std::string> numbers;
|
||||||
boost::split(numbers, tokens[0], boost::is_any_of("."), boost::token_compress_on);
|
boost::split(numbers, tokens[0], boost::is_any_of("."), boost::token_compress_on);
|
||||||
|
|
||||||
unsigned int gl_major = 0;
|
unsigned int gl_major = 0;
|
||||||
unsigned int gl_minor = 0;
|
unsigned int gl_minor = 0;
|
||||||
if (numbers.size() > 0)
|
if (numbers.size() > 0)
|
||||||
gl_major = ::atoi(numbers[0].c_str());
|
gl_major = ::atoi(numbers[0].c_str());
|
||||||
if (numbers.size() > 1)
|
if (numbers.size() > 1)
|
||||||
gl_minor = ::atoi(numbers[1].c_str());
|
gl_minor = ::atoi(numbers[1].c_str());
|
||||||
// printf("Major: %d, minor: %d\n", gl_major, gl_minor);
|
// printf("Major: %d, minor: %d\n", gl_major, gl_minor);
|
||||||
if (gl_major < major)
|
if (gl_major < major)
|
||||||
return false;
|
return false;
|
||||||
else if (gl_major > major)
|
else if (gl_major > major)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return gl_minor >= minor;
|
return gl_minor >= minor;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static bool message_pump_exit;
|
static bool message_pump_exit;
|
||||||
|
|
||||||
void check(HWND hWnd)
|
void check(HWND hWnd)
|
||||||
{
|
{
|
||||||
hOpenGL = LoadLibraryExW(L"opengl32.dll", nullptr, 0);
|
hOpenGL = LoadLibraryExW(L"opengl32.dll", nullptr, 0);
|
||||||
if (hOpenGL == nullptr) {
|
if (hOpenGL == nullptr) {
|
||||||
printf("Failed loading the system opengl32.dll\n");
|
printf("Failed loading the system opengl32.dll\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef HGLRC (WINAPI *Func_wglCreateContext)(HDC);
|
typedef HGLRC (WINAPI *Func_wglCreateContext)(HDC);
|
||||||
typedef BOOL (WINAPI *Func_wglMakeCurrent )(HDC, HGLRC);
|
typedef BOOL (WINAPI *Func_wglMakeCurrent )(HDC, HGLRC);
|
||||||
typedef BOOL (WINAPI *Func_wglDeleteContext)(HGLRC);
|
typedef BOOL (WINAPI *Func_wglDeleteContext)(HGLRC);
|
||||||
typedef GLubyte* (WINAPI *Func_glGetString )(GLenum);
|
typedef GLubyte* (WINAPI *Func_glGetString )(GLenum);
|
||||||
|
|
||||||
Func_wglCreateContext wglCreateContext = (Func_wglCreateContext)GetProcAddress(hOpenGL, "wglCreateContext");
|
Func_wglCreateContext wglCreateContext = (Func_wglCreateContext)GetProcAddress(hOpenGL, "wglCreateContext");
|
||||||
Func_wglMakeCurrent wglMakeCurrent = (Func_wglMakeCurrent) GetProcAddress(hOpenGL, "wglMakeCurrent");
|
Func_wglMakeCurrent wglMakeCurrent = (Func_wglMakeCurrent) GetProcAddress(hOpenGL, "wglMakeCurrent");
|
||||||
Func_wglDeleteContext wglDeleteContext = (Func_wglDeleteContext)GetProcAddress(hOpenGL, "wglDeleteContext");
|
Func_wglDeleteContext wglDeleteContext = (Func_wglDeleteContext)GetProcAddress(hOpenGL, "wglDeleteContext");
|
||||||
Func_glGetString glGetString = (Func_glGetString) GetProcAddress(hOpenGL, "glGetString");
|
Func_glGetString glGetString = (Func_glGetString) GetProcAddress(hOpenGL, "glGetString");
|
||||||
|
|
||||||
if (wglCreateContext == nullptr || wglMakeCurrent == nullptr || wglDeleteContext == nullptr || glGetString == nullptr) {
|
if (wglCreateContext == nullptr || wglMakeCurrent == nullptr || wglDeleteContext == nullptr || glGetString == nullptr) {
|
||||||
printf("Failed loading the system opengl32.dll: The library is invalid.\n");
|
printf("Failed loading the system opengl32.dll: The library is invalid.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
PIXELFORMATDESCRIPTOR pfd =
|
PIXELFORMATDESCRIPTOR pfd =
|
||||||
{
|
{
|
||||||
@ -149,152 +149,155 @@ protected:
|
|||||||
};
|
};
|
||||||
|
|
||||||
HDC ourWindowHandleToDeviceContext = ::GetDC(hWnd);
|
HDC ourWindowHandleToDeviceContext = ::GetDC(hWnd);
|
||||||
// Gdi32.dll
|
// Gdi32.dll
|
||||||
int letWindowsChooseThisPixelFormat = ::ChoosePixelFormat(ourWindowHandleToDeviceContext, &pfd);
|
int letWindowsChooseThisPixelFormat = ::ChoosePixelFormat(ourWindowHandleToDeviceContext, &pfd);
|
||||||
// Gdi32.dll
|
// Gdi32.dll
|
||||||
SetPixelFormat(ourWindowHandleToDeviceContext, letWindowsChooseThisPixelFormat, &pfd);
|
SetPixelFormat(ourWindowHandleToDeviceContext, letWindowsChooseThisPixelFormat, &pfd);
|
||||||
// Opengl32.dll
|
// Opengl32.dll
|
||||||
HGLRC glcontext = wglCreateContext(ourWindowHandleToDeviceContext);
|
HGLRC glcontext = wglCreateContext(ourWindowHandleToDeviceContext);
|
||||||
wglMakeCurrent(ourWindowHandleToDeviceContext, glcontext);
|
wglMakeCurrent(ourWindowHandleToDeviceContext, glcontext);
|
||||||
// Opengl32.dll
|
// Opengl32.dll
|
||||||
const char *data = (const char*)glGetString(GL_VERSION);
|
const char *data = (const char*)glGetString(GL_VERSION);
|
||||||
if (data != nullptr)
|
if (data != nullptr)
|
||||||
this->version = data;
|
this->version = data;
|
||||||
// printf("check -version: %s\n", version.c_str());
|
// printf("check -version: %s\n", version.c_str());
|
||||||
data = (const char*)glGetString(0x8B8C); // GL_SHADING_LANGUAGE_VERSION
|
data = (const char*)glGetString(0x8B8C); // GL_SHADING_LANGUAGE_VERSION
|
||||||
if (data != nullptr)
|
if (data != nullptr)
|
||||||
this->glsl_version = data;
|
this->glsl_version = data;
|
||||||
data = (const char*)glGetString(GL_VENDOR);
|
data = (const char*)glGetString(GL_VENDOR);
|
||||||
if (data != nullptr)
|
if (data != nullptr)
|
||||||
this->vendor = data;
|
this->vendor = data;
|
||||||
data = (const char*)glGetString(GL_RENDERER);
|
data = (const char*)glGetString(GL_RENDERER);
|
||||||
if (data != nullptr)
|
if (data != nullptr)
|
||||||
this->renderer = data;
|
this->renderer = data;
|
||||||
// Opengl32.dll
|
// Opengl32.dll
|
||||||
wglDeleteContext(glcontext);
|
wglDeleteContext(glcontext);
|
||||||
::ReleaseDC(hWnd, ourWindowHandleToDeviceContext);
|
::ReleaseDC(hWnd, ourWindowHandleToDeviceContext);
|
||||||
this->success = true;
|
this->success = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static LRESULT CALLBACK supports_opengl2_wndproc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
static LRESULT CALLBACK supports_opengl2_wndproc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
switch(message)
|
switch(message)
|
||||||
{
|
{
|
||||||
case WM_CREATE:
|
case WM_CREATE:
|
||||||
{
|
{
|
||||||
CREATESTRUCT *pCreate = reinterpret_cast<CREATESTRUCT*>(lParam);
|
CREATESTRUCT *pCreate = reinterpret_cast<CREATESTRUCT*>(lParam);
|
||||||
OpenGLVersionCheck *ogl_data = reinterpret_cast<OpenGLVersionCheck*>(pCreate->lpCreateParams);
|
OpenGLVersionCheck *ogl_data = reinterpret_cast<OpenGLVersionCheck*>(pCreate->lpCreateParams);
|
||||||
ogl_data->check(hWnd);
|
ogl_data->check(hWnd);
|
||||||
DestroyWindow(hWnd);
|
DestroyWindow(hWnd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
case WM_NCDESTROY:
|
case WM_NCDESTROY:
|
||||||
message_pump_exit = true;
|
message_pump_exit = true;
|
||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
return DefWindowProc(hWnd, message, wParam, lParam);
|
return DefWindowProc(hWnd, message, wParam, lParam);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
bool OpenGLVersionCheck::message_pump_exit = false;
|
bool OpenGLVersionCheck::message_pump_exit = false;
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv);
|
typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv);
|
||||||
Slic3rMainFunc slic3r_main = nullptr;
|
Slic3rMainFunc slic3r_main = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
#ifdef SLIC3R_WRAPPER_NOCONSOLE
|
#ifdef SLIC3R_WRAPPER_NOCONSOLE
|
||||||
int APIENTRY wWinMain(HINSTANCE /* hInstance */, HINSTANCE /* hPrevInstance */, PWSTR /* lpCmdLine */, int /* nCmdShow */)
|
int APIENTRY wWinMain(HINSTANCE /* hInstance */, HINSTANCE /* hPrevInstance */, PWSTR /* lpCmdLine */, int /* nCmdShow */)
|
||||||
{
|
{
|
||||||
int argc;
|
int argc;
|
||||||
wchar_t **argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
|
wchar_t **argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
|
||||||
#else
|
#else
|
||||||
int wmain(int argc, wchar_t **argv)
|
int wmain(int argc, wchar_t **argv)
|
||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::vector<wchar_t*> argv_extended;
|
std::vector<wchar_t*> argv_extended;
|
||||||
argv_extended.emplace_back(argv[0]);
|
argv_extended.emplace_back(argv[0]);
|
||||||
|
|
||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
// Here one may push some additional parameters based on the wrapper type.
|
// Here one may push some additional parameters based on the wrapper type.
|
||||||
bool force_mesa = false;
|
bool force_mesa = false;
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
for (int i = 1; i < argc; ++ i) {
|
for (int i = 1; i < argc; ++ i) {
|
||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
if (wcscmp(argv[i], L"--sw-renderer") == 0)
|
if (wcscmp(argv[i], L"--sw-renderer") == 0)
|
||||||
force_mesa = true;
|
force_mesa = true;
|
||||||
else if (wcscmp(argv[i], L"--no-sw-renderer") == 0)
|
else if (wcscmp(argv[i], L"--no-sw-renderer") == 0)
|
||||||
force_mesa = false;
|
force_mesa = false;
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
argv_extended.emplace_back(argv[i]);
|
argv_extended.emplace_back(argv[i]);
|
||||||
}
|
}
|
||||||
argv_extended.emplace_back(nullptr);
|
argv_extended.emplace_back(nullptr);
|
||||||
|
|
||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
OpenGLVersionCheck opengl_version_check;
|
OpenGLVersionCheck opengl_version_check;
|
||||||
bool load_mesa =
|
bool load_mesa =
|
||||||
// Forced from the command line.
|
// Forced from the command line.
|
||||||
force_mesa ||
|
force_mesa ||
|
||||||
// Running over a rempote desktop, and the RemoteFX is not enabled, therefore Windows will only provide SW OpenGL 1.1 context.
|
// Running over a rempote desktop, and the RemoteFX is not enabled, therefore Windows will only provide SW OpenGL 1.1 context.
|
||||||
// In that case, use Mesa.
|
// In that case, use Mesa.
|
||||||
::GetSystemMetrics(SM_REMOTESESSION) ||
|
::GetSystemMetrics(SM_REMOTESESSION) ||
|
||||||
// Try to load the default OpenGL driver and test its context version.
|
// Try to load the default OpenGL driver and test its context version.
|
||||||
! opengl_version_check.load_opengl_dll() || ! opengl_version_check.is_version_greater_or_equal_to(2, 0);
|
! opengl_version_check.load_opengl_dll() || ! opengl_version_check.is_version_greater_or_equal_to(2, 0);
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
|
|
||||||
wchar_t path_to_exe[MAX_PATH + 1] = { 0 };
|
wchar_t path_to_exe[MAX_PATH + 1] = { 0 };
|
||||||
::GetModuleFileNameW(nullptr, path_to_exe, MAX_PATH);
|
::GetModuleFileNameW(nullptr, path_to_exe, MAX_PATH);
|
||||||
wchar_t drive[_MAX_DRIVE];
|
wchar_t drive[_MAX_DRIVE];
|
||||||
wchar_t dir[_MAX_DIR];
|
wchar_t dir[_MAX_DIR];
|
||||||
wchar_t fname[_MAX_FNAME];
|
wchar_t fname[_MAX_FNAME];
|
||||||
wchar_t ext[_MAX_EXT];
|
wchar_t ext[_MAX_EXT];
|
||||||
_wsplitpath(path_to_exe, drive, dir, fname, ext);
|
_wsplitpath(path_to_exe, drive, dir, fname, ext);
|
||||||
_wmakepath(path_to_exe, drive, dir, nullptr, nullptr);
|
_wmakepath(path_to_exe, drive, dir, nullptr, nullptr);
|
||||||
|
|
||||||
#ifdef SLIC3R_GUI
|
#ifdef SLIC3R_GUI
|
||||||
// https://wiki.qt.io/Cross_compiling_Mesa_for_Windows
|
// https://wiki.qt.io/Cross_compiling_Mesa_for_Windows
|
||||||
// http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/
|
// http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/
|
||||||
if (load_mesa) {
|
if (load_mesa) {
|
||||||
opengl_version_check.unload_opengl_dll();
|
opengl_version_check.unload_opengl_dll();
|
||||||
wchar_t path_to_mesa[MAX_PATH + 1] = { 0 };
|
wchar_t path_to_mesa[MAX_PATH + 1] = { 0 };
|
||||||
wcscpy(path_to_mesa, path_to_exe);
|
wcscpy(path_to_mesa, path_to_exe);
|
||||||
wcscat(path_to_mesa, L"mesa\\opengl32.dll");
|
wcscat(path_to_mesa, L"mesa\\opengl32.dll");
|
||||||
printf("Loading MESA OpenGL library: %S\n", path_to_mesa);
|
printf("Loading MESA OpenGL library: %S\n", path_to_mesa);
|
||||||
HINSTANCE hInstance_OpenGL = LoadLibraryExW(path_to_mesa, nullptr, 0);
|
HINSTANCE hInstance_OpenGL = LoadLibraryExW(path_to_mesa, nullptr, 0);
|
||||||
if (hInstance_OpenGL == nullptr) {
|
if (hInstance_OpenGL == nullptr) {
|
||||||
printf("MESA OpenGL library was not loaded\n");
|
printf("MESA OpenGL library was not loaded\n");
|
||||||
} else
|
} else
|
||||||
printf("MESA OpenGL library was loaded sucessfully\n");
|
printf("MESA OpenGL library was loaded sucessfully\n");
|
||||||
}
|
}
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
|
|
||||||
|
|
||||||
wchar_t path_to_slic3r[MAX_PATH + 1] = { 0 };
|
wchar_t path_to_slic3r[MAX_PATH + 1] = { 0 };
|
||||||
wcscpy(path_to_slic3r, path_to_exe);
|
wcscpy(path_to_slic3r, path_to_exe);
|
||||||
wcscat(path_to_slic3r, L"PrusaSlicer.dll");
|
wcscat(path_to_slic3r, L"PrusaSlicer.dll");
|
||||||
// printf("Loading Slic3r library: %S\n", path_to_slic3r);
|
// printf("Loading Slic3r library: %S\n", path_to_slic3r);
|
||||||
HINSTANCE hInstance_Slic3r = LoadLibraryExW(path_to_slic3r, nullptr, 0);
|
HINSTANCE hInstance_Slic3r = LoadLibraryExW(path_to_slic3r, nullptr, 0);
|
||||||
if (hInstance_Slic3r == nullptr) {
|
if (hInstance_Slic3r == nullptr) {
|
||||||
printf("PrusaSlicer.dll was not loaded\n");
|
printf("PrusaSlicer.dll was not loaded\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// resolve function address here
|
// resolve function address here
|
||||||
slic3r_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,
|
slic3r_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r,
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
// there is just a single calling conversion, therefore no mangling of the function name.
|
// there is just a single calling conversion, therefore no mangling of the function name.
|
||||||
"slic3r_main"
|
"slic3r_main"
|
||||||
#else // stdcall calling convention declaration
|
#else // stdcall calling convention declaration
|
||||||
"_slic3r_main@8"
|
"_slic3r_main@8"
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
if (slic3r_main == nullptr) {
|
if (slic3r_main == nullptr) {
|
||||||
printf("could not locate the function slic3r_main in PrusaSlicer.dll\n");
|
printf("could not locate the function slic3r_main in PrusaSlicer.dll\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
// argc minus the trailing nullptr of the argv
|
// argc minus the trailing nullptr of the argv
|
||||||
return slic3r_main((int)argv_extended.size() - 1, argv_extended.data());
|
return slic3r_main((int)argv_extended.size() - 1, argv_extended.data());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,6 +74,10 @@ if (MSVC)
|
|||||||
windows/unistd.cpp
|
windows/unistd.cpp
|
||||||
windows/getopt.c
|
windows/getopt.c
|
||||||
)
|
)
|
||||||
|
elseif (MINGW)
|
||||||
|
set(AVRDUDE_SOURCES ${AVRDUDE_SOURCES}
|
||||||
|
windows/utf8.c
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(avrdude-conf-gen conf-generate.cpp)
|
add_executable(avrdude-conf-gen conf-generate.cpp)
|
||||||
@ -98,5 +102,7 @@ target_link_libraries(avrdude-slic3r avrdude)
|
|||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
target_compile_definitions(avrdude PRIVATE WIN32NATIVE=1)
|
target_compile_definitions(avrdude PRIVATE WIN32NATIVE=1)
|
||||||
target_include_directories(avrdude SYSTEM PRIVATE windows) # So that sources find the getopt.h windows drop-in
|
if(MSVC)
|
||||||
|
target_include_directories(avrdude SYSTEM PRIVATE windows) # So that sources find the getopt.h windows drop-in
|
||||||
|
endif(MSVC)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
|
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
|
||||||
|
|
||||||
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(_MSC_VER)
|
||||||
|
|
||||||
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
|
||||||
* if you want the limit (max/min) macros for int types.
|
* if you want the limit (max/min) macros for int types.
|
||||||
|
|||||||
@ -38,6 +38,10 @@ struct ArgvUtf8 : std::vector<char*>
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
|
||||||
int wmain(int argc_w, wchar_t *argv_w[])
|
int wmain(int argc_w, wchar_t *argv_w[])
|
||||||
{
|
{
|
||||||
ArgvUtf8 argv_utf8(argc_w, argv_w);
|
ArgvUtf8 argv_utf8(argc_w, argv_w);
|
||||||
|
|||||||
@ -63,7 +63,7 @@ extern "C" {
|
|||||||
#define STDOUT_FILENO 1
|
#define STDOUT_FILENO 1
|
||||||
#define STDERR_FILENO 2
|
#define STDERR_FILENO 2
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#if defined(_MSC_VER) && defined(__clang__)
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
struct timezone;
|
struct timezone;
|
||||||
struct timeval;
|
struct timeval;
|
||||||
|
|||||||
@ -14,57 +14,53 @@
|
|||||||
|
|
||||||
namespace igl
|
namespace igl
|
||||||
{
|
{
|
||||||
// Templates:
|
// Templates:
|
||||||
// T should be a matrix that implements .size(), and operator(int i)
|
// T should be a matrix that implements .size(), and operator(int i)
|
||||||
template <typename T>
|
template <typename T>
|
||||||
class SortableRow
|
class SortableRow
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
T data;
|
T data;
|
||||||
public:
|
public:
|
||||||
SortableRow():data(){};
|
SortableRow():data(){};
|
||||||
SortableRow(const T & data):data(data){};
|
SortableRow(const T & data):data(data){};
|
||||||
bool operator<(const SortableRow & that) const
|
bool operator<(const SortableRow & that) const
|
||||||
{
|
{
|
||||||
// Get reference so that I can use parenthesis
|
|
||||||
const SortableRow<T> & THIS = *this;
|
|
||||||
// Lexicographical
|
// Lexicographical
|
||||||
int minc = (THIS.data.size() < that.data.size()?
|
int minc = (this->data.size() < that.data.size()?
|
||||||
THIS.data.size() : that.data.size());
|
this->data.size() : that.data.size());
|
||||||
// loop over columns
|
// loop over columns
|
||||||
for(int i = 0;i<minc;i++)
|
for(int i = 0;i<minc;i++)
|
||||||
{
|
{
|
||||||
if(THIS.data(i) == that.data(i))
|
if(this->data(i) == that.data(i))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
return THIS.data(i) < that.data(i);
|
return this->data(i) < that.data(i);
|
||||||
}
|
}
|
||||||
// All characters the same, comes done to length
|
// All characters the same, comes done to length
|
||||||
return THIS.data.size()<that.data.size();
|
return this->data.size()<that.data.size();
|
||||||
};
|
};
|
||||||
bool operator==(const SortableRow & that) const
|
bool operator==(const SortableRow & that) const
|
||||||
{
|
{
|
||||||
// Get reference so that I can use parenthesis
|
if(this->data.size() != that.data.size())
|
||||||
const SortableRow<T> & THIS = *this;
|
|
||||||
if(THIS.data.size() != that.data.size())
|
|
||||||
{
|
{
|
||||||
return false;
|
|
||||||
}
|
|
||||||
for(int i = 0;i<THIS.data.size();i++)
|
|
||||||
{
|
|
||||||
if(THIS.data(i) != that.data(i))
|
|
||||||
{
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
for(int i = 0;i<this->data.size();i++)
|
||||||
|
{
|
||||||
|
if(this->data(i) != that.data(i))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
bool operator!=(const SortableRow & that) const
|
bool operator!=(const SortableRow & that) const
|
||||||
{
|
{
|
||||||
return !(*this == that);
|
return !(*this == that);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -337,7 +337,15 @@ merge(const TMultiShape<PolygonImpl>& shapes)
|
|||||||
//#define DISABLE_BOOST_SERIALIZE
|
//#define DISABLE_BOOST_SERIALIZE
|
||||||
//#define DISABLE_BOOST_UNSERIALIZE
|
//#define DISABLE_BOOST_UNSERIALIZE
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable: 4244)
|
||||||
|
#pragma warning(disable: 4267)
|
||||||
|
#endif
|
||||||
// All other operators and algorithms are implemented with boost
|
// All other operators and algorithms are implemented with boost
|
||||||
#include <libnest2d/utils/boost_alg.hpp>
|
#include <libnest2d/utils/boost_alg.hpp>
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // CLIPPER_BACKEND_HPP
|
#endif // CLIPPER_BACKEND_HPP
|
||||||
|
|||||||
@ -133,8 +133,18 @@ protected:
|
|||||||
PConfig m_pconf; // Placement configuration
|
PConfig m_pconf; // Placement configuration
|
||||||
TBin m_bin;
|
TBin m_bin;
|
||||||
double m_bin_area;
|
double m_bin_area;
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable: 4244)
|
||||||
|
#pragma warning(disable: 4267)
|
||||||
|
#endif
|
||||||
SpatIndex m_rtree; // spatial index for the normal (bigger) objects
|
SpatIndex m_rtree; // spatial index for the normal (bigger) objects
|
||||||
SpatIndex m_smallsrtree; // spatial index for only the smaller items
|
SpatIndex m_smallsrtree; // spatial index for only the smaller items
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
double m_norm; // A coefficient to scale distances
|
double m_norm; // A coefficient to scale distances
|
||||||
MultiPolygon m_merged_pile; // The already merged pile (vector of items)
|
MultiPolygon m_merged_pile; // The already merged pile (vector of items)
|
||||||
Box m_pilebb; // The bounding box of the merged pile.
|
Box m_pilebb; // The bounding box of the merged pile.
|
||||||
|
|||||||
@ -5,6 +5,10 @@ include(PrecompiledHeader)
|
|||||||
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY)
|
||||||
|
|
||||||
|
if (MINGW)
|
||||||
|
add_compile_options(-Wa,-mbig-obj)
|
||||||
|
endif ()
|
||||||
|
|
||||||
add_library(libslic3r STATIC
|
add_library(libslic3r STATIC
|
||||||
pchheader.cpp
|
pchheader.cpp
|
||||||
pchheader.hpp
|
pchheader.hpp
|
||||||
|
|||||||
@ -102,45 +102,60 @@ private:
|
|||||||
class ToolOrdering
|
class ToolOrdering
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ToolOrdering() {}
|
ToolOrdering() {}
|
||||||
|
|
||||||
// For the use case when each object is printed separately
|
// For the use case when each object is printed separately
|
||||||
// (print.config.complete_objects is true).
|
// (print.config.complete_objects is true).
|
||||||
ToolOrdering(const PrintObject &object, unsigned int first_extruder = (unsigned int)-1, bool prime_multi_material = false);
|
ToolOrdering(const PrintObject &object, unsigned int first_extruder = (unsigned int)-1, bool prime_multi_material = false);
|
||||||
|
|
||||||
// For the use case when all objects are printed at once.
|
// For the use case when all objects are printed at once.
|
||||||
// (print.config.complete_objects is false).
|
// (print.config.complete_objects is false).
|
||||||
ToolOrdering(const Print &print, unsigned int first_extruder = (unsigned int)-1, bool prime_multi_material = false);
|
ToolOrdering(const Print &print, unsigned int first_extruder = (unsigned int)-1, bool prime_multi_material = false);
|
||||||
|
|
||||||
void clear() { m_layer_tools.clear(); }
|
void clear() { m_layer_tools.clear(); }
|
||||||
|
|
||||||
// Get the first extruder printing, including the extruder priming areas, returns -1 if there is no layer printed.
|
// Get the first extruder printing, including the extruder priming areas, returns -1 if there is no layer printed.
|
||||||
unsigned int first_extruder() const { return m_first_printing_extruder; }
|
unsigned int first_extruder() const { return m_first_printing_extruder; }
|
||||||
|
|
||||||
// Get the first extruder printing the layer_tools, returns -1 if there is no layer printed.
|
// Get the first extruder printing the layer_tools, returns -1 if there is no layer printed.
|
||||||
unsigned int last_extruder() const { return m_last_printing_extruder; }
|
unsigned int last_extruder() const { return m_last_printing_extruder; }
|
||||||
|
|
||||||
// For a multi-material print, the printing extruders are ordered in the order they shall be primed.
|
// For a multi-material print, the printing extruders are ordered in the order they shall be primed.
|
||||||
const std::vector<unsigned int>& all_extruders() const { return m_all_printing_extruders; }
|
const std::vector<unsigned int>& all_extruders() const { return m_all_printing_extruders; }
|
||||||
|
|
||||||
// Find LayerTools with the closest print_z.
|
template<class Self> static auto tools_for_layer(Self& self, coordf_t print_z) -> decltype (*self.m_layer_tools.begin())
|
||||||
LayerTools& tools_for_layer(coordf_t print_z);
|
{
|
||||||
const LayerTools& tools_for_layer(coordf_t print_z) const
|
auto it_layer_tools = std::lower_bound(self.m_layer_tools.begin(), self.m_layer_tools.end(), LayerTools(print_z - EPSILON));
|
||||||
{ return *const_cast<const LayerTools*>(&const_cast<const ToolOrdering*>(this)->tools_for_layer(print_z)); }
|
assert(it_layer_tools != self.m_layer_tools.end());
|
||||||
|
coordf_t dist_min = std::abs(it_layer_tools->print_z - print_z);
|
||||||
|
for (++ it_layer_tools; it_layer_tools != self.m_layer_tools.end(); ++it_layer_tools) {
|
||||||
|
coordf_t d = std::abs(it_layer_tools->print_z - print_z);
|
||||||
|
if (d >= dist_min)
|
||||||
|
break;
|
||||||
|
dist_min = d;
|
||||||
|
}
|
||||||
|
-- it_layer_tools;
|
||||||
|
assert(dist_min < EPSILON);
|
||||||
|
return *it_layer_tools;
|
||||||
|
}
|
||||||
|
|
||||||
const LayerTools& front() const { return m_layer_tools.front(); }
|
// Find LayerTools with the closest print_z.
|
||||||
const LayerTools& back() const { return m_layer_tools.back(); }
|
LayerTools& tools_for_layer(coordf_t print_z) { return tools_for_layer(*this, print_z); }
|
||||||
std::vector<LayerTools>::const_iterator begin() const { return m_layer_tools.begin(); }
|
const LayerTools& tools_for_layer(coordf_t print_z) const { return tools_for_layer(*this, print_z); }
|
||||||
std::vector<LayerTools>::const_iterator end() const { return m_layer_tools.end(); }
|
|
||||||
bool empty() const { return m_layer_tools.empty(); }
|
const LayerTools& front() const { return m_layer_tools.front(); }
|
||||||
std::vector<LayerTools>& layer_tools() { return m_layer_tools; }
|
const LayerTools& back() const { return m_layer_tools.back(); }
|
||||||
bool has_wipe_tower() const { return ! m_layer_tools.empty() && m_first_printing_extruder != (unsigned int)-1 && m_layer_tools.front().wipe_tower_partitions > 0; }
|
std::vector<LayerTools>::const_iterator begin() const { return m_layer_tools.begin(); }
|
||||||
|
std::vector<LayerTools>::const_iterator end() const { return m_layer_tools.end(); }
|
||||||
|
bool empty() const { return m_layer_tools.empty(); }
|
||||||
|
std::vector<LayerTools>& layer_tools() { return m_layer_tools; }
|
||||||
|
bool has_wipe_tower() const { return ! m_layer_tools.empty() && m_first_printing_extruder != (unsigned int)-1 && m_layer_tools.front().wipe_tower_partitions > 0; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void initialize_layers(std::vector<coordf_t> &zs);
|
void initialize_layers(std::vector<coordf_t> &zs);
|
||||||
void collect_extruders(const PrintObject &object);
|
void collect_extruders(const PrintObject &object);
|
||||||
void reorder_extruders(unsigned int last_extruder_id);
|
void reorder_extruders(unsigned int last_extruder_id);
|
||||||
void fill_wipe_tower_partitions(const PrintConfig &config, coordf_t object_bottom_z);
|
void fill_wipe_tower_partitions(const PrintConfig &config, coordf_t object_bottom_z);
|
||||||
void collect_extruder_statistics(bool prime_multi_material);
|
void collect_extruder_statistics(bool prime_multi_material);
|
||||||
|
|
||||||
std::vector<LayerTools> m_layer_tools;
|
std::vector<LayerTools> m_layer_tools;
|
||||||
|
|||||||
@ -85,8 +85,8 @@ void PrintConfigDef::init_common_params()
|
|||||||
"The gap closing operation may reduce the final print resolution, therefore it is advisable to keep the value reasonably low.");
|
"The gap closing operation may reduce the final print resolution, therefore it is advisable to keep the value reasonably low.");
|
||||||
def->sidetext = L("mm");
|
def->sidetext = L("mm");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloat(0.049));
|
def->set_default_value(new ConfigOptionFloat(0.049));
|
||||||
|
|
||||||
def = this->add("print_host", coString);
|
def = this->add("print_host", coString);
|
||||||
def->label = L("Hostname, IP or URL");
|
def->label = L("Hostname, IP or URL");
|
||||||
@ -117,9 +117,9 @@ void PrintConfigDef::init_fff_params()
|
|||||||
// Maximum extruder temperature, bumped to 1500 to support printing of glass.
|
// Maximum extruder temperature, bumped to 1500 to support printing of glass.
|
||||||
const int max_temp = 1500;
|
const int max_temp = 1500;
|
||||||
|
|
||||||
def = this->add("avoid_crossing_perimeters", coBool);
|
def = this->add("avoid_crossing_perimeters", coBool);
|
||||||
def->label = L("Avoid crossing perimeters");
|
def->label = L("Avoid crossing perimeters");
|
||||||
def->tooltip = L("Optimize travel moves in order to minimize the crossing of perimeters. "
|
def->tooltip = L("Optimize travel moves in order to minimize the crossing of perimeters. "
|
||||||
"This is mostly useful with Bowden extruders which suffer from oozing. "
|
"This is mostly useful with Bowden extruders which suffer from oozing. "
|
||||||
"This feature slows down both the print and the G-code generation.");
|
"This feature slows down both the print and the G-code generation.");
|
||||||
def->mode = comExpert;
|
def->mode = comExpert;
|
||||||
@ -178,7 +178,7 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->tooltip = L("Bridging angle override. If left to zero, the bridging angle will be calculated "
|
def->tooltip = L("Bridging angle override. If left to zero, the bridging angle will be calculated "
|
||||||
"automatically. Otherwise the provided angle will be used for all bridges. "
|
"automatically. Otherwise the provided angle will be used for all bridges. "
|
||||||
"Use 180° for zero angle.");
|
"Use 180° for zero angle.");
|
||||||
def->sidetext = L("°");
|
def->sidetext = L("°");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloat(0.));
|
def->set_default_value(new ConfigOptionFloat(0.));
|
||||||
@ -200,9 +200,9 @@ void PrintConfigDef::init_fff_params()
|
|||||||
"although default settings are usually good and you should experiment "
|
"although default settings are usually good and you should experiment "
|
||||||
"with cooling (use a fan) before tweaking this.");
|
"with cooling (use a fan) before tweaking this.");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->max = 2;
|
def->max = 2;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloat(1));
|
def->set_default_value(new ConfigOptionFloat(1));
|
||||||
|
|
||||||
def = this->add("bridge_speed", coFloat);
|
def = this->add("bridge_speed", coFloat);
|
||||||
def->label = L("Bridges");
|
def->label = L("Bridges");
|
||||||
@ -677,7 +677,7 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->tooltip = L("This string is edited by RammingDialog and contains ramming specific parameters.");
|
def->tooltip = L("This string is edited by RammingDialog and contains ramming specific parameters.");
|
||||||
def->mode = comExpert;
|
def->mode = comExpert;
|
||||||
def->set_default_value(new ConfigOptionStrings { "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0|"
|
def->set_default_value(new ConfigOptionStrings { "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0|"
|
||||||
" 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" });
|
" 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" });
|
||||||
|
|
||||||
def = this->add("filament_unload_time", coFloats);
|
def = this->add("filament_unload_time", coFloats);
|
||||||
def->label = L("Filament unload time");
|
def->label = L("Filament unload time");
|
||||||
@ -1072,85 +1072,85 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->mode = comExpert;
|
def->mode = comExpert;
|
||||||
def->set_default_value(new ConfigOptionBool(false));
|
def->set_default_value(new ConfigOptionBool(false));
|
||||||
|
|
||||||
def = this->add("silent_mode", coBool);
|
def = this->add("silent_mode", coBool);
|
||||||
def->label = L("Supports stealth mode");
|
def->label = L("Supports stealth mode");
|
||||||
def->tooltip = L("The firmware supports stealth mode");
|
def->tooltip = L("The firmware supports stealth mode");
|
||||||
def->mode = comExpert;
|
def->mode = comExpert;
|
||||||
def->set_default_value(new ConfigOptionBool(true));
|
def->set_default_value(new ConfigOptionBool(true));
|
||||||
|
|
||||||
const int machine_limits_opt_width = 7;
|
const int machine_limits_opt_width = 7;
|
||||||
{
|
{
|
||||||
struct AxisDefault {
|
struct AxisDefault {
|
||||||
std::string name;
|
std::string name;
|
||||||
std::vector<double> max_feedrate;
|
std::vector<double> max_feedrate;
|
||||||
std::vector<double> max_acceleration;
|
std::vector<double> max_acceleration;
|
||||||
std::vector<double> max_jerk;
|
std::vector<double> max_jerk;
|
||||||
};
|
};
|
||||||
std::vector<AxisDefault> axes {
|
std::vector<AxisDefault> axes {
|
||||||
// name, max_feedrate, max_acceleration, max_jerk
|
// name, max_feedrate, max_acceleration, max_jerk
|
||||||
{ "x", { 500., 200. }, { 9000., 1000. }, { 10. , 10. } },
|
{ "x", { 500., 200. }, { 9000., 1000. }, { 10. , 10. } },
|
||||||
{ "y", { 500., 200. }, { 9000., 1000. }, { 10. , 10. } },
|
{ "y", { 500., 200. }, { 9000., 1000. }, { 10. , 10. } },
|
||||||
{ "z", { 12., 12. }, { 500., 200. }, { 0.2, 0.4 } },
|
{ "z", { 12., 12. }, { 500., 200. }, { 0.2, 0.4 } },
|
||||||
{ "e", { 120., 120. }, { 10000., 5000. }, { 2.5, 2.5 } }
|
{ "e", { 120., 120. }, { 10000., 5000. }, { 2.5, 2.5 } }
|
||||||
};
|
};
|
||||||
for (const AxisDefault &axis : axes) {
|
for (const AxisDefault &axis : axes) {
|
||||||
std::string axis_upper = boost::to_upper_copy<std::string>(axis.name);
|
std::string axis_upper = boost::to_upper_copy<std::string>(axis.name);
|
||||||
// Add the machine feedrate limits for XYZE axes. (M203)
|
// Add the machine feedrate limits for XYZE axes. (M203)
|
||||||
def = this->add("machine_max_feedrate_" + axis.name, coFloats);
|
def = this->add("machine_max_feedrate_" + axis.name, coFloats);
|
||||||
def->full_label = (boost::format("Maximum feedrate %1%") % axis_upper).str();
|
def->full_label = (boost::format("Maximum feedrate %1%") % axis_upper).str();
|
||||||
(void)L("Maximum feedrate X");
|
(void)L("Maximum feedrate X");
|
||||||
(void)L("Maximum feedrate Y");
|
(void)L("Maximum feedrate Y");
|
||||||
(void)L("Maximum feedrate Z");
|
(void)L("Maximum feedrate Z");
|
||||||
(void)L("Maximum feedrate E");
|
(void)L("Maximum feedrate E");
|
||||||
def->category = L("Machine limits");
|
def->category = L("Machine limits");
|
||||||
def->tooltip = (boost::format("Maximum feedrate of the %1% axis") % axis_upper).str();
|
def->tooltip = (boost::format("Maximum feedrate of the %1% axis") % axis_upper).str();
|
||||||
(void)L("Maximum feedrate of the X axis");
|
(void)L("Maximum feedrate of the X axis");
|
||||||
(void)L("Maximum feedrate of the Y axis");
|
(void)L("Maximum feedrate of the Y axis");
|
||||||
(void)L("Maximum feedrate of the Z axis");
|
(void)L("Maximum feedrate of the Z axis");
|
||||||
(void)L("Maximum feedrate of the E axis");
|
(void)L("Maximum feedrate of the E axis");
|
||||||
def->sidetext = L("mm/s");
|
def->sidetext = L("mm/s");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->width = machine_limits_opt_width;
|
def->width = machine_limits_opt_width;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloats(axis.max_feedrate));
|
def->set_default_value(new ConfigOptionFloats(axis.max_feedrate));
|
||||||
// Add the machine acceleration limits for XYZE axes (M201)
|
// Add the machine acceleration limits for XYZE axes (M201)
|
||||||
def = this->add("machine_max_acceleration_" + axis.name, coFloats);
|
def = this->add("machine_max_acceleration_" + axis.name, coFloats);
|
||||||
def->full_label = (boost::format("Maximum acceleration %1%") % axis_upper).str();
|
def->full_label = (boost::format("Maximum acceleration %1%") % axis_upper).str();
|
||||||
(void)L("Maximum acceleration X");
|
(void)L("Maximum acceleration X");
|
||||||
(void)L("Maximum acceleration Y");
|
(void)L("Maximum acceleration Y");
|
||||||
(void)L("Maximum acceleration Z");
|
(void)L("Maximum acceleration Z");
|
||||||
(void)L("Maximum acceleration E");
|
(void)L("Maximum acceleration E");
|
||||||
def->category = L("Machine limits");
|
def->category = L("Machine limits");
|
||||||
def->tooltip = (boost::format("Maximum acceleration of the %1% axis") % axis_upper).str();
|
def->tooltip = (boost::format("Maximum acceleration of the %1% axis") % axis_upper).str();
|
||||||
(void)L("Maximum acceleration of the X axis");
|
(void)L("Maximum acceleration of the X axis");
|
||||||
(void)L("Maximum acceleration of the Y axis");
|
(void)L("Maximum acceleration of the Y axis");
|
||||||
(void)L("Maximum acceleration of the Z axis");
|
(void)L("Maximum acceleration of the Z axis");
|
||||||
(void)L("Maximum acceleration of the E axis");
|
(void)L("Maximum acceleration of the E axis");
|
||||||
def->sidetext = L("mm/s²");
|
def->sidetext = L("mm/s²");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->width = machine_limits_opt_width;
|
def->width = machine_limits_opt_width;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloats(axis.max_acceleration));
|
def->set_default_value(new ConfigOptionFloats(axis.max_acceleration));
|
||||||
// Add the machine jerk limits for XYZE axes (M205)
|
// Add the machine jerk limits for XYZE axes (M205)
|
||||||
def = this->add("machine_max_jerk_" + axis.name, coFloats);
|
def = this->add("machine_max_jerk_" + axis.name, coFloats);
|
||||||
def->full_label = (boost::format("Maximum jerk %1%") % axis_upper).str();
|
def->full_label = (boost::format("Maximum jerk %1%") % axis_upper).str();
|
||||||
(void)L("Maximum jerk X");
|
(void)L("Maximum jerk X");
|
||||||
(void)L("Maximum jerk Y");
|
(void)L("Maximum jerk Y");
|
||||||
(void)L("Maximum jerk Z");
|
(void)L("Maximum jerk Z");
|
||||||
(void)L("Maximum jerk E");
|
(void)L("Maximum jerk E");
|
||||||
def->category = L("Machine limits");
|
def->category = L("Machine limits");
|
||||||
def->tooltip = (boost::format("Maximum jerk of the %1% axis") % axis_upper).str();
|
def->tooltip = (boost::format("Maximum jerk of the %1% axis") % axis_upper).str();
|
||||||
(void)L("Maximum jerk of the X axis");
|
(void)L("Maximum jerk of the X axis");
|
||||||
(void)L("Maximum jerk of the Y axis");
|
(void)L("Maximum jerk of the Y axis");
|
||||||
(void)L("Maximum jerk of the Z axis");
|
(void)L("Maximum jerk of the Z axis");
|
||||||
(void)L("Maximum jerk of the E axis");
|
(void)L("Maximum jerk of the E axis");
|
||||||
def->sidetext = L("mm/s");
|
def->sidetext = L("mm/s");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->width = machine_limits_opt_width;
|
def->width = machine_limits_opt_width;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloats(axis.max_jerk));
|
def->set_default_value(new ConfigOptionFloats(axis.max_jerk));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// M205 S... [mm/sec]
|
// M205 S... [mm/sec]
|
||||||
def = this->add("machine_min_extruding_rate", coFloats);
|
def = this->add("machine_min_extruding_rate", coFloats);
|
||||||
@ -1159,9 +1159,9 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->tooltip = L("Minimum feedrate when extruding (M205 S)");
|
def->tooltip = L("Minimum feedrate when extruding (M205 S)");
|
||||||
def->sidetext = L("mm/s");
|
def->sidetext = L("mm/s");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->width = machine_limits_opt_width;
|
def->width = machine_limits_opt_width;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloats{ 0., 0. });
|
def->set_default_value(new ConfigOptionFloats{ 0., 0. });
|
||||||
|
|
||||||
// M205 T... [mm/sec]
|
// M205 T... [mm/sec]
|
||||||
def = this->add("machine_min_travel_rate", coFloats);
|
def = this->add("machine_min_travel_rate", coFloats);
|
||||||
@ -1170,9 +1170,9 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->tooltip = L("Minimum travel feedrate (M205 T)");
|
def->tooltip = L("Minimum travel feedrate (M205 T)");
|
||||||
def->sidetext = L("mm/s");
|
def->sidetext = L("mm/s");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->width = machine_limits_opt_width;
|
def->width = machine_limits_opt_width;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloats{ 0., 0. });
|
def->set_default_value(new ConfigOptionFloats{ 0., 0. });
|
||||||
|
|
||||||
// M204 S... [mm/sec^2]
|
// M204 S... [mm/sec^2]
|
||||||
def = this->add("machine_max_acceleration_extruding", coFloats);
|
def = this->add("machine_max_acceleration_extruding", coFloats);
|
||||||
@ -1181,7 +1181,7 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->tooltip = L("Maximum acceleration when extruding (M204 S)");
|
def->tooltip = L("Maximum acceleration when extruding (M204 S)");
|
||||||
def->sidetext = L("mm/s²");
|
def->sidetext = L("mm/s²");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->width = machine_limits_opt_width;
|
def->width = machine_limits_opt_width;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloats{ 1500., 1250. });
|
def->set_default_value(new ConfigOptionFloats{ 1500., 1250. });
|
||||||
|
|
||||||
@ -1192,7 +1192,7 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->tooltip = L("Maximum acceleration when retracting (M204 T)");
|
def->tooltip = L("Maximum acceleration when retracting (M204 T)");
|
||||||
def->sidetext = L("mm/s²");
|
def->sidetext = L("mm/s²");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
def->width = machine_limits_opt_width;
|
def->width = machine_limits_opt_width;
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloats{ 1500., 1250. });
|
def->set_default_value(new ConfigOptionFloats{ 1500., 1250. });
|
||||||
|
|
||||||
@ -1436,9 +1436,9 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->gui_flags = "serialized";
|
def->gui_flags = "serialized";
|
||||||
def->multiline = true;
|
def->multiline = true;
|
||||||
def->full_width = true;
|
def->full_width = true;
|
||||||
def->height = 6;
|
def->height = 6;
|
||||||
def->mode = comExpert;
|
def->mode = comExpert;
|
||||||
def->set_default_value(new ConfigOptionStrings());
|
def->set_default_value(new ConfigOptionStrings());
|
||||||
|
|
||||||
def = this->add("printer_model", coString);
|
def = this->add("printer_model", coString);
|
||||||
def->label = L("Printer type");
|
def->label = L("Printer type");
|
||||||
@ -1774,7 +1774,7 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->label = L("Temperature variation");
|
def->label = L("Temperature variation");
|
||||||
def->tooltip = L("Temperature difference to be applied when an extruder is not active. "
|
def->tooltip = L("Temperature difference to be applied when an extruder is not active. "
|
||||||
"Enables a full-height \"sacrificial\" skirt on which the nozzles are periodically wiped.");
|
"Enables a full-height \"sacrificial\" skirt on which the nozzles are periodically wiped.");
|
||||||
def->sidetext = "∆°C";
|
def->sidetext = "∆°C";
|
||||||
def->min = -max_temp;
|
def->min = -max_temp;
|
||||||
def->max = max_temp;
|
def->max = max_temp;
|
||||||
def->mode = comExpert;
|
def->mode = comExpert;
|
||||||
@ -1816,7 +1816,7 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->label = L("Single Extruder Multi Material");
|
def->label = L("Single Extruder Multi Material");
|
||||||
def->tooltip = L("The printer multiplexes filaments into a single hot end.");
|
def->tooltip = L("The printer multiplexes filaments into a single hot end.");
|
||||||
def->mode = comExpert;
|
def->mode = comExpert;
|
||||||
def->set_default_value(new ConfigOptionBool(false));
|
def->set_default_value(new ConfigOptionBool(false));
|
||||||
|
|
||||||
def = this->add("single_extruder_multi_material_priming", coBool);
|
def = this->add("single_extruder_multi_material_priming", coBool);
|
||||||
def->label = L("Prime all printing extruders");
|
def->label = L("Prime all printing extruders");
|
||||||
@ -1878,8 +1878,8 @@ void PrintConfigDef::init_fff_params()
|
|||||||
// def->min = 0;
|
// def->min = 0;
|
||||||
def->enum_values.push_back("0");
|
def->enum_values.push_back("0");
|
||||||
def->enum_values.push_back("0.2");
|
def->enum_values.push_back("0.2");
|
||||||
def->enum_labels.push_back(L("0 (soluble)"));
|
def->enum_labels.push_back(L("0 (soluble)"));
|
||||||
def->enum_labels.push_back(L("0.2 (detachable)"));
|
def->enum_labels.push_back(L("0.2 (detachable)"));
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
def->set_default_value(new ConfigOptionFloat(0.2));
|
def->set_default_value(new ConfigOptionFloat(0.2));
|
||||||
|
|
||||||
@ -1968,7 +1968,7 @@ void PrintConfigDef::init_fff_params()
|
|||||||
def->enum_values.push_back("rectilinear");
|
def->enum_values.push_back("rectilinear");
|
||||||
def->enum_values.push_back("rectilinear-grid");
|
def->enum_values.push_back("rectilinear-grid");
|
||||||
def->enum_values.push_back("honeycomb");
|
def->enum_values.push_back("honeycomb");
|
||||||
def->enum_labels.push_back(L("Rectilinear"));
|
def->enum_labels.push_back(L("Rectilinear"));
|
||||||
def->enum_labels.push_back(L("Rectilinear grid"));
|
def->enum_labels.push_back(L("Rectilinear grid"));
|
||||||
def->enum_labels.push_back(L("Honeycomb"));
|
def->enum_labels.push_back(L("Honeycomb"));
|
||||||
def->mode = comAdvanced;
|
def->mode = comAdvanced;
|
||||||
@ -2242,45 +2242,45 @@ void PrintConfigDef::init_fff_params()
|
|||||||
|
|
||||||
// Declare retract values for filament profile, overriding the printer's extruder profile.
|
// Declare retract values for filament profile, overriding the printer's extruder profile.
|
||||||
for (const char *opt_key : {
|
for (const char *opt_key : {
|
||||||
// floats
|
// floats
|
||||||
"retract_length", "retract_lift", "retract_lift_above", "retract_lift_below", "retract_speed", "deretract_speed", "retract_restart_extra", "retract_before_travel",
|
"retract_length", "retract_lift", "retract_lift_above", "retract_lift_below", "retract_speed", "deretract_speed", "retract_restart_extra", "retract_before_travel",
|
||||||
// bools
|
// bools
|
||||||
"retract_layer_change", "wipe",
|
"retract_layer_change", "wipe",
|
||||||
// percents
|
// percents
|
||||||
"retract_before_wipe"}) {
|
"retract_before_wipe"}) {
|
||||||
auto it_opt = options.find(opt_key);
|
auto it_opt = options.find(opt_key);
|
||||||
assert(it_opt != options.end());
|
assert(it_opt != options.end());
|
||||||
def = this->add_nullable(std::string("filament_") + opt_key, it_opt->second.type);
|
def = this->add_nullable(std::string("filament_") + opt_key, it_opt->second.type);
|
||||||
def->label = it_opt->second.label;
|
def->label = it_opt->second.label;
|
||||||
def->full_label = it_opt->second.full_label;
|
def->full_label = it_opt->second.full_label;
|
||||||
def->tooltip = it_opt->second.tooltip;
|
def->tooltip = it_opt->second.tooltip;
|
||||||
def->sidetext = it_opt->second.sidetext;
|
def->sidetext = it_opt->second.sidetext;
|
||||||
def->mode = it_opt->second.mode;
|
def->mode = it_opt->second.mode;
|
||||||
switch (def->type) {
|
switch (def->type) {
|
||||||
case coFloats : def->set_default_value(new ConfigOptionFloatsNullable (static_cast<const ConfigOptionFloats* >(it_opt->second.default_value.get())->values)); break;
|
case coFloats : def->set_default_value(new ConfigOptionFloatsNullable (static_cast<const ConfigOptionFloats* >(it_opt->second.default_value.get())->values)); break;
|
||||||
case coPercents : def->set_default_value(new ConfigOptionPercentsNullable(static_cast<const ConfigOptionPercents*>(it_opt->second.default_value.get())->values)); break;
|
case coPercents : def->set_default_value(new ConfigOptionPercentsNullable(static_cast<const ConfigOptionPercents*>(it_opt->second.default_value.get())->values)); break;
|
||||||
case coBools : def->set_default_value(new ConfigOptionBoolsNullable (static_cast<const ConfigOptionBools* >(it_opt->second.default_value.get())->values)); break;
|
case coBools : def->set_default_value(new ConfigOptionBoolsNullable (static_cast<const ConfigOptionBools* >(it_opt->second.default_value.get())->values)); break;
|
||||||
default: assert(false);
|
default: assert(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintConfigDef::init_extruder_retract_keys()
|
void PrintConfigDef::init_extruder_retract_keys()
|
||||||
{
|
{
|
||||||
m_extruder_retract_keys = {
|
m_extruder_retract_keys = {
|
||||||
"deretract_speed",
|
"deretract_speed",
|
||||||
"retract_before_travel",
|
"retract_before_travel",
|
||||||
"retract_before_wipe",
|
"retract_before_wipe",
|
||||||
"retract_layer_change",
|
"retract_layer_change",
|
||||||
"retract_length",
|
"retract_length",
|
||||||
"retract_lift",
|
"retract_lift",
|
||||||
"retract_lift_above",
|
"retract_lift_above",
|
||||||
"retract_lift_below",
|
"retract_lift_below",
|
||||||
"retract_restart_extra",
|
"retract_restart_extra",
|
||||||
"retract_speed",
|
"retract_speed",
|
||||||
"wipe"
|
"wipe"
|
||||||
};
|
};
|
||||||
assert(std::is_sorted(m_extruder_retract_keys.begin(), m_extruder_retract_keys.end()));
|
assert(std::is_sorted(m_extruder_retract_keys.begin(), m_extruder_retract_keys.end()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintConfigDef::init_sla_params()
|
void PrintConfigDef::init_sla_params()
|
||||||
@ -2865,8 +2865,8 @@ void DynamicPrintConfig::normalize()
|
|||||||
std::string DynamicPrintConfig::validate()
|
std::string DynamicPrintConfig::validate()
|
||||||
{
|
{
|
||||||
// Full print config is initialized from the defaults.
|
// Full print config is initialized from the defaults.
|
||||||
const ConfigOption *opt = this->option("printer_technology", false);
|
const ConfigOption *opt = this->option("printer_technology", false);
|
||||||
auto printer_technology = (opt == nullptr) ? ptFFF : static_cast<PrinterTechnology>(dynamic_cast<const ConfigOptionEnumGeneric*>(opt)->value);
|
auto printer_technology = (opt == nullptr) ? ptFFF : static_cast<PrinterTechnology>(dynamic_cast<const ConfigOptionEnumGeneric*>(opt)->value);
|
||||||
switch (printer_technology) {
|
switch (printer_technology) {
|
||||||
case ptFFF:
|
case ptFFF:
|
||||||
{
|
{
|
||||||
@ -3282,7 +3282,7 @@ CLIMiscConfigDef::CLIMiscConfigDef()
|
|||||||
def->tooltip = L("Messages with severity lower or eqal to the loglevel will be printed out. 0:trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal");
|
def->tooltip = L("Messages with severity lower or eqal to the loglevel will be printed out. 0:trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal");
|
||||||
def->min = 0;
|
def->min = 0;
|
||||||
|
|
||||||
#if defined(_MSC_VER) && defined(SLIC3R_GUI)
|
#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(SLIC3R_GUI)
|
||||||
def = this->add("sw_renderer", coBool);
|
def = this->add("sw_renderer", coBool);
|
||||||
def->label = L("Render with a software renderer");
|
def->label = L("Render with a software renderer");
|
||||||
def->tooltip = L("Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver.");
|
def->tooltip = L("Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver.");
|
||||||
@ -3298,11 +3298,11 @@ DynamicPrintAndCLIConfig::PrintAndCLIConfigDef DynamicPrintAndCLIConfig::s_def;
|
|||||||
|
|
||||||
void DynamicPrintAndCLIConfig::handle_legacy(t_config_option_key &opt_key, std::string &value) const
|
void DynamicPrintAndCLIConfig::handle_legacy(t_config_option_key &opt_key, std::string &value) const
|
||||||
{
|
{
|
||||||
if (cli_actions_config_def .options.find(opt_key) == cli_actions_config_def .options.end() &&
|
if (cli_actions_config_def .options.find(opt_key) == cli_actions_config_def .options.end() &&
|
||||||
cli_transform_config_def.options.find(opt_key) == cli_transform_config_def.options.end() &&
|
cli_transform_config_def.options.find(opt_key) == cli_transform_config_def.options.end() &&
|
||||||
cli_misc_config_def .options.find(opt_key) == cli_misc_config_def .options.end()) {
|
cli_misc_config_def .options.find(opt_key) == cli_misc_config_def .options.end()) {
|
||||||
PrintConfigDef::handle_legacy(opt_key, value);
|
PrintConfigDef::handle_legacy(opt_key, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#include "igl/random_points_on_mesh.h"
|
//#include "igl/random_points_on_mesh.h"
|
||||||
#include "igl/AABB.h"
|
//#include "igl/AABB.h"
|
||||||
|
|
||||||
#include <tbb/parallel_for.h>
|
#include <tbb/parallel_for.h>
|
||||||
|
|
||||||
@ -101,7 +101,7 @@ static std::vector<SLAAutoSupports::MyLayer> make_layers(
|
|||||||
std::vector<SLAAutoSupports::MyLayer> layers;
|
std::vector<SLAAutoSupports::MyLayer> layers;
|
||||||
layers.reserve(slices.size());
|
layers.reserve(slices.size());
|
||||||
for (size_t i = 0; i < slices.size(); ++ i)
|
for (size_t i = 0; i < slices.size(); ++ i)
|
||||||
layers.emplace_back(i, heights[i]);
|
layers.emplace_back(i, heights[i]);
|
||||||
|
|
||||||
// FIXME: calculate actual pixel area from printer config:
|
// FIXME: calculate actual pixel area from printer config:
|
||||||
//const float pixel_area = pow(wxGetApp().preset_bundle->project_config.option<ConfigOptionFloat>("display_width") / wxGetApp().preset_bundle->project_config.option<ConfigOptionInt>("display_pixels_x"), 2.f); //
|
//const float pixel_area = pow(wxGetApp().preset_bundle->project_config.option<ConfigOptionFloat>("display_width") / wxGetApp().preset_bundle->project_config.option<ConfigOptionInt>("display_pixels_x"), 2.f); //
|
||||||
@ -114,47 +114,47 @@ static std::vector<SLAAutoSupports::MyLayer> make_layers(
|
|||||||
if ((layer_id % 8) == 0)
|
if ((layer_id % 8) == 0)
|
||||||
// Don't call the following function too often as it flushes CPU write caches due to synchronization primitves.
|
// Don't call the following function too often as it flushes CPU write caches due to synchronization primitves.
|
||||||
throw_on_cancel();
|
throw_on_cancel();
|
||||||
SLAAutoSupports::MyLayer &layer = layers[layer_id];
|
SLAAutoSupports::MyLayer &layer = layers[layer_id];
|
||||||
const ExPolygons &islands = slices[layer_id];
|
const ExPolygons &islands = slices[layer_id];
|
||||||
//FIXME WTF?
|
//FIXME WTF?
|
||||||
const float height = (layer_id>2 ? heights[layer_id-3] : heights[0]-(heights[1]-heights[0]));
|
const float height = (layer_id>2 ? heights[layer_id-3] : heights[0]-(heights[1]-heights[0]));
|
||||||
layer.islands.reserve(islands.size());
|
layer.islands.reserve(islands.size());
|
||||||
for (const ExPolygon &island : islands) {
|
for (const ExPolygon &island : islands) {
|
||||||
float area = float(island.area() * SCALING_FACTOR * SCALING_FACTOR);
|
float area = float(island.area() * SCALING_FACTOR * SCALING_FACTOR);
|
||||||
if (area >= pixel_area)
|
if (area >= pixel_area)
|
||||||
//FIXME this is not a correct centroid of a polygon with holes.
|
//FIXME this is not a correct centroid of a polygon with holes.
|
||||||
layer.islands.emplace_back(layer, island, get_extents(island.contour), Slic3r::unscale(island.contour.centroid()).cast<float>(), area, height);
|
layer.islands.emplace_back(layer, island, get_extents(island.contour), Slic3r::unscale(island.contour.centroid()).cast<float>(), area, height);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Calculate overlap of successive layers. Link overlapping islands.
|
// Calculate overlap of successive layers. Link overlapping islands.
|
||||||
tbb::parallel_for(tbb::blocked_range<size_t>(1, layers.size(), 8),
|
tbb::parallel_for(tbb::blocked_range<size_t>(1, layers.size(), 8),
|
||||||
[&layers, &heights, throw_on_cancel](const tbb::blocked_range<size_t>& range) {
|
[&layers, &heights, throw_on_cancel](const tbb::blocked_range<size_t>& range) {
|
||||||
for (size_t layer_id = range.begin(); layer_id < range.end(); ++layer_id) {
|
for (size_t layer_id = range.begin(); layer_id < range.end(); ++layer_id) {
|
||||||
if ((layer_id % 2) == 0)
|
if ((layer_id % 2) == 0)
|
||||||
// Don't call the following function too often as it flushes CPU write caches due to synchronization primitves.
|
// Don't call the following function too often as it flushes CPU write caches due to synchronization primitves.
|
||||||
throw_on_cancel();
|
throw_on_cancel();
|
||||||
SLAAutoSupports::MyLayer &layer_above = layers[layer_id];
|
SLAAutoSupports::MyLayer &layer_above = layers[layer_id];
|
||||||
SLAAutoSupports::MyLayer &layer_below = layers[layer_id - 1];
|
SLAAutoSupports::MyLayer &layer_below = layers[layer_id - 1];
|
||||||
//FIXME WTF?
|
//FIXME WTF?
|
||||||
const float layer_height = (layer_id!=0 ? heights[layer_id]-heights[layer_id-1] : heights[0]);
|
const float layer_height = (layer_id!=0 ? heights[layer_id]-heights[layer_id-1] : heights[0]);
|
||||||
const float safe_angle = 5.f * (float(M_PI)/180.f); // smaller number - less supports
|
const float safe_angle = 5.f * (float(M_PI)/180.f); // smaller number - less supports
|
||||||
const float between_layers_offset = float(scale_(layer_height / std::tan(safe_angle)));
|
const float between_layers_offset = float(scale_(layer_height / std::tan(safe_angle)));
|
||||||
const float slope_angle = 75.f * (float(M_PI)/180.f); // smaller number - less supports
|
const float slope_angle = 75.f * (float(M_PI)/180.f); // smaller number - less supports
|
||||||
const float slope_offset = float(scale_(layer_height / std::tan(slope_angle)));
|
const float slope_offset = float(scale_(layer_height / std::tan(slope_angle)));
|
||||||
//FIXME This has a quadratic time complexity, it will be excessively slow for many tiny islands.
|
//FIXME This has a quadratic time complexity, it will be excessively slow for many tiny islands.
|
||||||
for (SLAAutoSupports::Structure &top : layer_above.islands) {
|
for (SLAAutoSupports::Structure &top : layer_above.islands) {
|
||||||
for (SLAAutoSupports::Structure &bottom : layer_below.islands) {
|
for (SLAAutoSupports::Structure &bottom : layer_below.islands) {
|
||||||
float overlap_area = top.overlap_area(bottom);
|
float overlap_area = top.overlap_area(bottom);
|
||||||
if (overlap_area > 0) {
|
if (overlap_area > 0) {
|
||||||
top.islands_below.emplace_back(&bottom, overlap_area);
|
top.islands_below.emplace_back(&bottom, overlap_area);
|
||||||
bottom.islands_above.emplace_back(&top, overlap_area);
|
bottom.islands_above.emplace_back(&top, overlap_area);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (! top.islands_below.empty()) {
|
if (! top.islands_below.empty()) {
|
||||||
Polygons top_polygons = to_polygons(*top.polygon);
|
Polygons top_polygons = to_polygons(*top.polygon);
|
||||||
Polygons bottom_polygons = top.polygons_below();
|
Polygons bottom_polygons = top.polygons_below();
|
||||||
top.overhangs = diff_ex(top_polygons, bottom_polygons);
|
top.overhangs = diff_ex(top_polygons, bottom_polygons);
|
||||||
if (! top.overhangs.empty()) {
|
if (! top.overhangs.empty()) {
|
||||||
top.overhangs_area = 0.f;
|
top.overhangs_area = 0.f;
|
||||||
@ -170,15 +170,15 @@ static std::vector<SLAAutoSupports::MyLayer> make_layers(
|
|||||||
ExPolygons overhangs_sorted;
|
ExPolygons overhangs_sorted;
|
||||||
for (auto &p : expolys_with_areas)
|
for (auto &p : expolys_with_areas)
|
||||||
overhangs_sorted.emplace_back(std::move(*p.first));
|
overhangs_sorted.emplace_back(std::move(*p.first));
|
||||||
top.overhangs = std::move(overhangs_sorted);
|
top.overhangs = std::move(overhangs_sorted);
|
||||||
top.overhangs_area *= float(SCALING_FACTOR * SCALING_FACTOR);
|
top.overhangs_area *= float(SCALING_FACTOR * SCALING_FACTOR);
|
||||||
top.overhangs_slopes = diff_ex(top_polygons, offset(bottom_polygons, slope_offset));
|
top.overhangs_slopes = diff_ex(top_polygons, offset(bottom_polygons, slope_offset));
|
||||||
top.dangling_areas = diff_ex(top_polygons, offset(bottom_polygons, between_layers_offset));
|
top.dangling_areas = diff_ex(top_polygons, offset(bottom_polygons, between_layers_offset));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return layers;
|
return layers;
|
||||||
}
|
}
|
||||||
@ -207,7 +207,7 @@ void SLAAutoSupports::process(const std::vector<ExPolygons>& slices, const std::
|
|||||||
support_force_bottom[i] = layer_bottom->islands[i].supports_force_total();
|
support_force_bottom[i] = layer_bottom->islands[i].supports_force_total();
|
||||||
}
|
}
|
||||||
for (Structure &top : layer_top->islands)
|
for (Structure &top : layer_top->islands)
|
||||||
for (Structure::Link &bottom_link : top.islands_below) {
|
for (Structure::Link &bottom_link : top.islands_below) {
|
||||||
Structure &bottom = *bottom_link.island;
|
Structure &bottom = *bottom_link.island;
|
||||||
//float centroids_dist = (bottom.centroid - top.centroid).norm();
|
//float centroids_dist = (bottom.centroid - top.centroid).norm();
|
||||||
// Penalization resulting from centroid offset:
|
// Penalization resulting from centroid offset:
|
||||||
@ -224,10 +224,10 @@ void SLAAutoSupports::process(const std::vector<ExPolygons>& slices, const std::
|
|||||||
for (Structure &below : layer_bottom->islands) {
|
for (Structure &below : layer_bottom->islands) {
|
||||||
float below_support_force = support_force_bottom[&below - layer_bottom->islands.data()];
|
float below_support_force = support_force_bottom[&below - layer_bottom->islands.data()];
|
||||||
float above_overlap_area = 0.f;
|
float above_overlap_area = 0.f;
|
||||||
for (Structure::Link &above_link : below.islands_above)
|
for (Structure::Link &above_link : below.islands_above)
|
||||||
above_overlap_area += above_link.overlap_area;
|
above_overlap_area += above_link.overlap_area;
|
||||||
for (Structure::Link &above_link : below.islands_above)
|
for (Structure::Link &above_link : below.islands_above)
|
||||||
above_link.island->supports_force_inherited += below_support_force * above_link.overlap_area / above_overlap_area;
|
above_link.island->supports_force_inherited += below_support_force * above_link.overlap_area / above_overlap_area;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Now iterate over all polygons and append new points if needed.
|
// Now iterate over all polygons and append new points if needed.
|
||||||
@ -464,7 +464,7 @@ void SLAAutoSupports::uniformly_cover(const ExPolygons& islands, Structure& stru
|
|||||||
//FIXME share the random generator. The random generator may be not so cheap to initialize, also we don't want the random generator to be restarted for each polygon.
|
//FIXME share the random generator. The random generator may be not so cheap to initialize, also we don't want the random generator to be restarted for each polygon.
|
||||||
std::random_device rd;
|
std::random_device rd;
|
||||||
std::mt19937 rng(rd());
|
std::mt19937 rng(rd());
|
||||||
std::vector<Vec2f> raw_samples = sample_expolygon_with_boundary(islands, samples_per_mm2, 5.f / poisson_radius, rng);
|
std::vector<Vec2f> raw_samples = sample_expolygon_with_boundary(islands, samples_per_mm2, 5.f / poisson_radius, rng);
|
||||||
std::vector<Vec2f> poisson_samples;
|
std::vector<Vec2f> poisson_samples;
|
||||||
for (size_t iter = 0; iter < 4; ++ iter) {
|
for (size_t iter = 0; iter < 4; ++ iter) {
|
||||||
poisson_samples = poisson_disk_from_samples(raw_samples, poisson_radius,
|
poisson_samples = poisson_disk_from_samples(raw_samples, poisson_radius,
|
||||||
@ -481,21 +481,21 @@ void SLAAutoSupports::uniformly_cover(const ExPolygons& islands, Structure& stru
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SLA_AUTOSUPPORTS_DEBUG
|
#ifdef SLA_AUTOSUPPORTS_DEBUG
|
||||||
{
|
{
|
||||||
static int irun = 0;
|
static int irun = 0;
|
||||||
Slic3r::SVG svg(debug_out_path("SLA_supports-uniformly_cover-%d.svg", irun ++), get_extents(islands));
|
Slic3r::SVG svg(debug_out_path("SLA_supports-uniformly_cover-%d.svg", irun ++), get_extents(islands));
|
||||||
for (const ExPolygon &island : islands)
|
for (const ExPolygon &island : islands)
|
||||||
svg.draw(island);
|
svg.draw(island);
|
||||||
for (const Vec2f &pt : raw_samples)
|
for (const Vec2f &pt : raw_samples)
|
||||||
svg.draw(Point(scale_(pt.x()), scale_(pt.y())), "red");
|
svg.draw(Point(scale_(pt.x()), scale_(pt.y())), "red");
|
||||||
for (const Vec2f &pt : poisson_samples)
|
for (const Vec2f &pt : poisson_samples)
|
||||||
svg.draw(Point(scale_(pt.x()), scale_(pt.y())), "blue");
|
svg.draw(Point(scale_(pt.x()), scale_(pt.y())), "blue");
|
||||||
}
|
}
|
||||||
#endif /* NDEBUG */
|
#endif /* NDEBUG */
|
||||||
|
|
||||||
// assert(! poisson_samples.empty());
|
// assert(! poisson_samples.empty());
|
||||||
if (poisson_samples_target < poisson_samples.size()) {
|
if (poisson_samples_target < poisson_samples.size()) {
|
||||||
std::shuffle(poisson_samples.begin(), poisson_samples.end(), rng);
|
std::shuffle(poisson_samples.begin(), poisson_samples.end(), rng);
|
||||||
poisson_samples.erase(poisson_samples.begin() + poisson_samples_target, poisson_samples.end());
|
poisson_samples.erase(poisson_samples.begin() + poisson_samples_target, poisson_samples.end());
|
||||||
}
|
}
|
||||||
for (const Vec2f &pt : poisson_samples) {
|
for (const Vec2f &pt : poisson_samples) {
|
||||||
|
|||||||
@ -85,7 +85,7 @@ using Portion = std::tuple<double, double>;
|
|||||||
|
|
||||||
// Set this to true to enable full parallelism in this module.
|
// Set this to true to enable full parallelism in this module.
|
||||||
// Only the well tested parts will be concurrent if this is set to false.
|
// Only the well tested parts will be concurrent if this is set to false.
|
||||||
const constexpr bool USE_FULL_CONCURRENCY = false;
|
const constexpr bool USE_FULL_CONCURRENCY = true;
|
||||||
|
|
||||||
template<bool> struct _ccr {};
|
template<bool> struct _ccr {};
|
||||||
|
|
||||||
@ -948,6 +948,8 @@ public:
|
|||||||
{
|
{
|
||||||
if (meshcache_valid) return meshcache;
|
if (meshcache_valid) return meshcache;
|
||||||
|
|
||||||
|
std::cout << "merging mesh" << std::endl;
|
||||||
|
|
||||||
Contour3D merged;
|
Contour3D merged;
|
||||||
|
|
||||||
for (auto &head : m_heads) {
|
for (auto &head : m_heads) {
|
||||||
@ -1194,7 +1196,7 @@ class SLASupportTree::Algorithm {
|
|||||||
// Now a and b vectors are perpendicular to v and to each other.
|
// Now a and b vectors are perpendicular to v and to each other.
|
||||||
// Together they define the plane where we have to iterate with the
|
// Together they define the plane where we have to iterate with the
|
||||||
// given angles in the 'phis' vector
|
// given angles in the 'phis' vector
|
||||||
ccr_par::enumerate(phis.begin(), phis.end(),
|
ccr_seq::enumerate(phis.begin(), phis.end(),
|
||||||
[&hits, &m, sd, r_pin, r_back, s, a, b, c]
|
[&hits, &m, sd, r_pin, r_back, s, a, b, c]
|
||||||
(double phi, size_t i)
|
(double phi, size_t i)
|
||||||
{
|
{
|
||||||
@ -1297,7 +1299,7 @@ class SLASupportTree::Algorithm {
|
|||||||
// Hit results
|
// Hit results
|
||||||
std::array<HitResult, SAMPLES> hits;
|
std::array<HitResult, SAMPLES> hits;
|
||||||
|
|
||||||
ccr_par::enumerate(phis.begin(), phis.end(),
|
ccr_seq::enumerate(phis.begin(), phis.end(),
|
||||||
[&m, a, b, sd, dir, r, s, ins_check, &hits]
|
[&m, a, b, sd, dir, r, s, ins_check, &hits]
|
||||||
(double phi, size_t i)
|
(double phi, size_t i)
|
||||||
{
|
{
|
||||||
@ -2448,7 +2450,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void merge_result() { m_result.merge_and_cleanup(); }
|
void merge_result() { /*m_result.merge_and_cleanup();*/ }
|
||||||
};
|
};
|
||||||
|
|
||||||
bool SLASupportTree::generate(const std::vector<SupportPoint> &support_points,
|
bool SLASupportTree::generate(const std::vector<SupportPoint> &support_points,
|
||||||
@ -2588,7 +2590,7 @@ SLASupportTree::SLASupportTree(double gnd_lvl): m_impl(new Impl()) {
|
|||||||
|
|
||||||
const TriangleMesh &SLASupportTree::merged_mesh() const
|
const TriangleMesh &SLASupportTree::merged_mesh() const
|
||||||
{
|
{
|
||||||
return get().merged_mesh();
|
return m_impl->merged_mesh();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SLASupportTree::merged_mesh_with_pad(TriangleMesh &outmesh) const {
|
void SLASupportTree::merged_mesh_with_pad(TriangleMesh &outmesh) const {
|
||||||
|
|||||||
@ -198,9 +198,9 @@ EigenMesh3D::EigenMesh3D(const TriangleMesh& tmesh): m_aabb(new AABBImpl()) {
|
|||||||
F.resize(stl.stats.number_of_facets, 3);
|
F.resize(stl.stats.number_of_facets, 3);
|
||||||
for (unsigned int i = 0; i < stl.stats.number_of_facets; ++i) {
|
for (unsigned int i = 0; i < stl.stats.number_of_facets; ++i) {
|
||||||
const stl_facet &facet = stl.facet_start[i];
|
const stl_facet &facet = stl.facet_start[i];
|
||||||
V.block<1, 3>(3 * i + 0, 0) = facet.vertex[0].cast<double>();
|
V.block<1, 3>(3 * i + 0, 0) = facet.vertex[0].cast<double>();
|
||||||
V.block<1, 3>(3 * i + 1, 0) = facet.vertex[1].cast<double>();
|
V.block<1, 3>(3 * i + 1, 0) = facet.vertex[1].cast<double>();
|
||||||
V.block<1, 3>(3 * i + 2, 0) = facet.vertex[2].cast<double>();
|
V.block<1, 3>(3 * i + 2, 0) = facet.vertex[2].cast<double>();
|
||||||
F(i, 0) = int(3*i+0);
|
F(i, 0) = int(3*i+0);
|
||||||
F(i, 1) = int(3*i+1);
|
F(i, 1) = int(3*i+1);
|
||||||
F(i, 2) = int(3*i+2);
|
F(i, 2) = int(3*i+2);
|
||||||
@ -306,6 +306,7 @@ PointSet normals(const PointSet& points,
|
|||||||
|
|
||||||
PointSet ret(range.size(), 3);
|
PointSet ret(range.size(), 3);
|
||||||
|
|
||||||
|
// for (size_t ridx = 0; ridx < range.size(); ++ridx)
|
||||||
tbb::parallel_for(size_t(0), range.size(),
|
tbb::parallel_for(size_t(0), range.size(),
|
||||||
[&ret, &range, &mesh, &points, thr, eps](size_t ridx)
|
[&ret, &range, &mesh, &points, thr, eps](size_t ridx)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -16,6 +16,12 @@
|
|||||||
// For geometry algorithms with native Clipper types (no copies and conversions)
|
// For geometry algorithms with native Clipper types (no copies and conversions)
|
||||||
#include <libnest2d/backends/clipper/geometries.hpp>
|
#include <libnest2d/backends/clipper/geometries.hpp>
|
||||||
|
|
||||||
|
#define SLAPRINT_DO_BENCHMARK
|
||||||
|
|
||||||
|
#ifdef SLAPRINT_DO_BENCHMARK
|
||||||
|
#include <libnest2d/tools/benchmark.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
//#include <tbb/spin_mutex.h>//#include "tbb/mutex.h"
|
//#include <tbb/spin_mutex.h>//#include "tbb/mutex.h"
|
||||||
|
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
@ -365,7 +371,7 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, DynamicPrintConfig con
|
|||||||
// Synchronize Object's config.
|
// Synchronize Object's config.
|
||||||
bool object_config_changed = model_object.config != model_object_new.config;
|
bool object_config_changed = model_object.config != model_object_new.config;
|
||||||
if (object_config_changed)
|
if (object_config_changed)
|
||||||
static_cast<DynamicPrintConfig&>(model_object.config) = static_cast<const DynamicPrintConfig&>(model_object_new.config);
|
static_cast<DynamicPrintConfig&>(model_object.config) = static_cast<const DynamicPrintConfig&>(model_object_new.config);
|
||||||
if (! object_diff.empty() || object_config_changed) {
|
if (! object_diff.empty() || object_config_changed) {
|
||||||
SLAPrintObjectConfig new_config = m_default_object_config;
|
SLAPrintObjectConfig new_config = m_default_object_config;
|
||||||
normalize_and_apply_config(new_config, model_object.config);
|
normalize_and_apply_config(new_config, model_object.config);
|
||||||
@ -425,9 +431,9 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, DynamicPrintConfig con
|
|||||||
|
|
||||||
print_object->set_instances(std::move(new_instances));
|
print_object->set_instances(std::move(new_instances));
|
||||||
|
|
||||||
SLAPrintObjectConfig new_config = m_default_object_config;
|
SLAPrintObjectConfig new_config = m_default_object_config;
|
||||||
normalize_and_apply_config(new_config, model_object.config);
|
normalize_and_apply_config(new_config, model_object.config);
|
||||||
print_object->config_apply(new_config, true);
|
print_object->config_apply(new_config, true);
|
||||||
print_objects_new.emplace_back(print_object);
|
print_objects_new.emplace_back(print_object);
|
||||||
new_objects = true;
|
new_objects = true;
|
||||||
}
|
}
|
||||||
@ -948,20 +954,20 @@ void SLAPrint::process()
|
|||||||
throw_if_canceled();
|
throw_if_canceled();
|
||||||
|
|
||||||
// Create the unified mesh
|
// Create the unified mesh
|
||||||
auto rc = SlicingStatus::RELOAD_SCENE;
|
// auto rc = SlicingStatus::RELOAD_SCENE;
|
||||||
|
|
||||||
// This is to prevent "Done." being displayed during merged_mesh()
|
// This is to prevent "Done." being displayed during merged_mesh()
|
||||||
m_report_status(*this, -1, L("Visualizing supports"));
|
// m_report_status(*this, -1, L("Visualizing supports"));
|
||||||
po.m_supportdata->support_tree_ptr->merged_mesh();
|
// po.m_supportdata->support_tree_ptr->merged_mesh();
|
||||||
|
|
||||||
BOOST_LOG_TRIVIAL(debug) << "Processed support point count "
|
BOOST_LOG_TRIVIAL(debug) << "Processed support point count "
|
||||||
<< po.m_supportdata->support_points.size();
|
<< po.m_supportdata->support_points.size();
|
||||||
|
|
||||||
// Check the mesh for later troubleshooting.
|
// Check the mesh for later troubleshooting.
|
||||||
if(po.support_mesh().empty())
|
// if(po.support_mesh().empty())
|
||||||
BOOST_LOG_TRIVIAL(warning) << "Support mesh is empty";
|
// BOOST_LOG_TRIVIAL(warning) << "Support mesh is empty";
|
||||||
|
|
||||||
m_report_status(*this, -1, L("Visualizing supports"), rc);
|
// m_report_status(*this, -1, L("Visualizing supports"), rc);
|
||||||
};
|
};
|
||||||
|
|
||||||
// This step generates the sla base pad
|
// This step generates the sla base pad
|
||||||
@ -970,6 +976,10 @@ void SLAPrint::process()
|
|||||||
// and before the supports had been sliced. (or the slicing has to be
|
// and before the supports had been sliced. (or the slicing has to be
|
||||||
// repeated)
|
// repeated)
|
||||||
|
|
||||||
|
std::cout << "Should only merge mesh after this" << std::endl;
|
||||||
|
po.m_supportdata->support_tree_ptr->merged_mesh();
|
||||||
|
m_report_status(*this, -1, L("Visualizing supports"), SlicingStatus::RELOAD_SCENE);
|
||||||
|
|
||||||
if(po.m_config.pad_enable.getBool())
|
if(po.m_config.pad_enable.getBool())
|
||||||
{
|
{
|
||||||
// Get the distilled pad configuration from the config
|
// Get the distilled pad configuration from the config
|
||||||
@ -1429,7 +1439,7 @@ void SLAPrint::process()
|
|||||||
if(canceled()) return;
|
if(canceled()) return;
|
||||||
|
|
||||||
// Sequential version (for testing)
|
// Sequential version (for testing)
|
||||||
// for(unsigned l = 0; l < lvlcnt; ++l) process_level(l);
|
// for(unsigned l = 0; l < lvlcnt; ++l) lvlfn(l);
|
||||||
|
|
||||||
// Print all the layers in parallel
|
// Print all the layers in parallel
|
||||||
tbb::parallel_for<unsigned, decltype(lvlfn)>(0, lvlcnt, lvlfn);
|
tbb::parallel_for<unsigned, decltype(lvlfn)>(0, lvlcnt, lvlfn);
|
||||||
@ -1446,44 +1456,48 @@ void SLAPrint::process()
|
|||||||
using slaposFn = std::function<void(SLAPrintObject&)>;
|
using slaposFn = std::function<void(SLAPrintObject&)>;
|
||||||
using slapsFn = std::function<void(void)>;
|
using slapsFn = std::function<void(void)>;
|
||||||
|
|
||||||
std::array<slaposFn, slaposCount> pobj_program =
|
slaposFn pobj_program[] =
|
||||||
{
|
{
|
||||||
slice_model,
|
slice_model, support_points, support_tree, base_pool, slice_supports
|
||||||
support_points,
|
|
||||||
support_tree,
|
|
||||||
base_pool,
|
|
||||||
slice_supports
|
|
||||||
};
|
};
|
||||||
|
|
||||||
std::array<slapsFn, slapsCount> print_program =
|
// We want to first process all objects...
|
||||||
{
|
std::vector<SLAPrintObjectStep> level1_obj_steps = {
|
||||||
merge_slices_and_eval_stats,
|
slaposObjectSlice, slaposSupportPoints, slaposSupportTree, slaposBasePool
|
||||||
rasterize
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// and then slice all supports to allow preview to be displayed ASAP
|
||||||
|
std::vector<SLAPrintObjectStep> level2_obj_steps = {
|
||||||
|
slaposSliceSupports
|
||||||
|
};
|
||||||
|
|
||||||
|
slapsFn print_program[] = { merge_slices_and_eval_stats, rasterize };
|
||||||
|
SLAPrintStep print_steps[] = { slapsMergeSlicesAndEval, slapsRasterize };
|
||||||
|
|
||||||
double st = min_objstatus;
|
double st = min_objstatus;
|
||||||
unsigned incr = 0;
|
|
||||||
|
|
||||||
BOOST_LOG_TRIVIAL(info) << "Start slicing process.";
|
BOOST_LOG_TRIVIAL(info) << "Start slicing process.";
|
||||||
|
|
||||||
// TODO: this loop could run in parallel but should not exhaust all the CPU
|
#ifdef SLAPRINT_DO_BENCHMARK
|
||||||
// power available
|
Benchmark bench;
|
||||||
// Calculate the support structures first before slicing the supports,
|
#else
|
||||||
// so that the preview will get displayed ASAP for all objects.
|
struct {
|
||||||
std::vector<SLAPrintObjectStep> step_ranges = {slaposObjectSlice,
|
void start() {} void stop() {} double getElapsedSec() { return .0; }
|
||||||
slaposSliceSupports,
|
} bench;
|
||||||
slaposCount};
|
#endif
|
||||||
|
|
||||||
for (size_t idx_range = 0; idx_range + 1 < step_ranges.size(); ++idx_range) {
|
std::array<double, slaposCount + slapsCount> step_times {};
|
||||||
|
|
||||||
|
auto apply_steps_on_objects =
|
||||||
|
[this, &st, ostepd, &pobj_program, &step_times, &bench]
|
||||||
|
(const std::vector<SLAPrintObjectStep> &steps)
|
||||||
|
{
|
||||||
|
unsigned incr = 0;
|
||||||
for (SLAPrintObject *po : m_objects) {
|
for (SLAPrintObject *po : m_objects) {
|
||||||
|
|
||||||
BOOST_LOG_TRIVIAL(info)
|
for (SLAPrintObjectStep currentstep : steps) {
|
||||||
<< "Slicing object " << po->model_object()->name;
|
|
||||||
|
|
||||||
for (int s = int(step_ranges[idx_range]);
|
Benchmark bench;
|
||||||
s < int(step_ranges[idx_range + 1]);
|
|
||||||
++s) {
|
|
||||||
auto currentstep = static_cast<SLAPrintObjectStep>(s);
|
|
||||||
|
|
||||||
// Cancellation checking. Each step will check for
|
// Cancellation checking. Each step will check for
|
||||||
// cancellation on its own and return earlier gracefully.
|
// cancellation on its own and return earlier gracefully.
|
||||||
@ -1493,12 +1507,12 @@ void SLAPrint::process()
|
|||||||
|
|
||||||
st += incr * ostepd;
|
st += incr * ostepd;
|
||||||
|
|
||||||
if (po->m_stepmask[currentstep]
|
if (po->m_stepmask[currentstep] && po->set_started(currentstep)) {
|
||||||
&& po->set_started(currentstep)) {
|
m_report_status(*this, st, OBJ_STEP_LABELS(currentstep));
|
||||||
m_report_status(*this,
|
bench.start();
|
||||||
st,
|
|
||||||
OBJ_STEP_LABELS(currentstep));
|
|
||||||
pobj_program[currentstep](*po);
|
pobj_program[currentstep](*po);
|
||||||
|
bench.stop();
|
||||||
|
step_times[currentstep] += bench.getElapsedSec();
|
||||||
throw_if_canceled();
|
throw_if_canceled();
|
||||||
po->set_done(currentstep);
|
po->set_done(currentstep);
|
||||||
}
|
}
|
||||||
@ -1506,26 +1520,27 @@ void SLAPrint::process()
|
|||||||
incr = OBJ_STEP_LEVELS[currentstep];
|
incr = OBJ_STEP_LEVELS[currentstep];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
std::array<SLAPrintStep, slapsCount> printsteps = {
|
|
||||||
slapsMergeSlicesAndEval, slapsRasterize
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
apply_steps_on_objects(level1_obj_steps);
|
||||||
|
apply_steps_on_objects(level2_obj_steps);
|
||||||
|
|
||||||
|
SLAPrintStep printsteps[] = { slapsMergeSlicesAndEval, slapsRasterize };
|
||||||
|
|
||||||
// this would disable the rasterization step
|
// this would disable the rasterization step
|
||||||
// m_stepmask[slapsRasterize] = false;
|
// std::fill(m_stepmask.begin(), m_stepmask.end(), false);
|
||||||
|
|
||||||
double pstd = (100 - max_objstatus) / 100.0;
|
double pstd = (100 - max_objstatus) / 100.0;
|
||||||
st = max_objstatus;
|
st = max_objstatus;
|
||||||
for(size_t s = 0; s < print_program.size(); ++s) {
|
for(SLAPrintStep currentstep : printsteps) {
|
||||||
auto currentstep = printsteps[s];
|
|
||||||
|
|
||||||
throw_if_canceled();
|
throw_if_canceled();
|
||||||
|
|
||||||
if(m_stepmask[currentstep] && set_started(currentstep))
|
if (m_stepmask[currentstep] && set_started(currentstep)) {
|
||||||
{
|
|
||||||
m_report_status(*this, st, PRINT_STEP_LABELS(currentstep));
|
m_report_status(*this, st, PRINT_STEP_LABELS(currentstep));
|
||||||
|
bench.start();
|
||||||
print_program[currentstep]();
|
print_program[currentstep]();
|
||||||
|
bench.stop();
|
||||||
|
step_times[slaposCount + currentstep] += bench.getElapsedSec();
|
||||||
throw_if_canceled();
|
throw_if_canceled();
|
||||||
set_done(currentstep);
|
set_done(currentstep);
|
||||||
}
|
}
|
||||||
@ -1535,6 +1550,21 @@ void SLAPrint::process()
|
|||||||
|
|
||||||
// If everything vent well
|
// If everything vent well
|
||||||
m_report_status(*this, 100, L("Slicing done"));
|
m_report_status(*this, 100, L("Slicing done"));
|
||||||
|
|
||||||
|
#ifdef SLAPRINT_DO_BENCHMARK
|
||||||
|
std::string csvbenchstr;
|
||||||
|
for (size_t i = 0; i < size_t(slaposCount); ++i)
|
||||||
|
csvbenchstr += OBJ_STEP_LABELS(i) + ";";
|
||||||
|
|
||||||
|
for (size_t i = 0; i < size_t(slapsCount); ++i)
|
||||||
|
csvbenchstr += PRINT_STEP_LABELS(i) + ";";
|
||||||
|
|
||||||
|
csvbenchstr += "\n";
|
||||||
|
for (double t : step_times) csvbenchstr += std::to_string(t) + ";";
|
||||||
|
|
||||||
|
std::cout << "Performance stats: \n" << csvbenchstr << std::endl;
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys, bool &invalidate_all_model_objects)
|
bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys, bool &invalidate_all_model_objects)
|
||||||
|
|||||||
@ -11,13 +11,14 @@
|
|||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/slider.h>
|
#include <wx/slider.h>
|
||||||
#include <wx/menu.h>
|
#include <wx/menu.h>
|
||||||
|
#include <wx/wx.h>
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
enum class ModelVolumeType : int;
|
enum class ModelVolumeType : int;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef double coordf_t;
|
typedef double coordf_t;
|
||||||
@ -92,23 +93,23 @@ public:
|
|||||||
|
|
||||||
class wxDataViewTreeCtrlComboPopup: public wxDataViewTreeCtrl, public wxComboPopup
|
class wxDataViewTreeCtrlComboPopup: public wxDataViewTreeCtrl, public wxComboPopup
|
||||||
{
|
{
|
||||||
static const unsigned int DefaultWidth;
|
static const unsigned int DefaultWidth;
|
||||||
static const unsigned int DefaultHeight;
|
static const unsigned int DefaultHeight;
|
||||||
static const unsigned int DefaultItemHeight;
|
static const unsigned int DefaultItemHeight;
|
||||||
|
|
||||||
wxString m_text;
|
wxString m_text;
|
||||||
int m_cnt_open_items{0};
|
int m_cnt_open_items{0};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual bool Create(wxWindow* parent);
|
virtual bool Create(wxWindow* parent);
|
||||||
virtual wxWindow* GetControl() { return this; }
|
virtual wxWindow* GetControl() { return this; }
|
||||||
virtual void SetStringValue(const wxString& value) { m_text = value; }
|
virtual void SetStringValue(const wxString& value) { m_text = value; }
|
||||||
virtual wxString GetStringValue() const { return m_text; }
|
virtual wxString GetStringValue() const { return m_text; }
|
||||||
// virtual wxSize GetAdjustedSize(int minWidth, int prefHeight, int maxHeight);
|
// virtual wxSize GetAdjustedSize(int minWidth, int prefHeight, int maxHeight);
|
||||||
|
|
||||||
virtual void OnKeyEvent(wxKeyEvent& evt);
|
virtual void OnKeyEvent(wxKeyEvent& evt);
|
||||||
void OnDataViewTreeCtrlSelection(wxCommandEvent& evt);
|
void OnDataViewTreeCtrlSelection(wxCommandEvent& evt);
|
||||||
void SetItemsCnt(int cnt) { m_cnt_open_items = cnt; }
|
void SetItemsCnt(int cnt) { m_cnt_open_items = cnt; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -177,8 +178,8 @@ WX_DEFINE_ARRAY_PTR(ObjectDataViewModelNode*, MyObjectTreeModelNodePtrArray);
|
|||||||
|
|
||||||
class ObjectDataViewModelNode
|
class ObjectDataViewModelNode
|
||||||
{
|
{
|
||||||
ObjectDataViewModelNode* m_parent;
|
ObjectDataViewModelNode* m_parent;
|
||||||
MyObjectTreeModelNodePtrArray m_children;
|
MyObjectTreeModelNodePtrArray m_children;
|
||||||
wxBitmap m_empty_bmp;
|
wxBitmap m_empty_bmp;
|
||||||
size_t m_volumes_cnt = 0;
|
size_t m_volumes_cnt = 0;
|
||||||
std::vector< std::string > m_opt_categories;
|
std::vector< std::string > m_opt_categories;
|
||||||
@ -211,16 +212,16 @@ public:
|
|||||||
#endif //__WXGTK__
|
#endif //__WXGTK__
|
||||||
|
|
||||||
set_action_icon();
|
set_action_icon();
|
||||||
}
|
}
|
||||||
|
|
||||||
ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
|
ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
|
||||||
const wxString& sub_obj_name,
|
const wxString& sub_obj_name,
|
||||||
const wxBitmap& bmp,
|
const wxBitmap& bmp,
|
||||||
const wxString& extruder,
|
const wxString& extruder,
|
||||||
const int idx = -1 ) :
|
const int idx = -1 ) :
|
||||||
m_parent (parent),
|
m_parent (parent),
|
||||||
m_name (sub_obj_name),
|
m_name (sub_obj_name),
|
||||||
m_type (itVolume),
|
m_type (itVolume),
|
||||||
m_idx (idx),
|
m_idx (idx),
|
||||||
m_extruder (extruder)
|
m_extruder (extruder)
|
||||||
{
|
{
|
||||||
@ -235,125 +236,125 @@ public:
|
|||||||
set_action_icon();
|
set_action_icon();
|
||||||
}
|
}
|
||||||
|
|
||||||
ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
|
ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
|
||||||
const t_layer_height_range& layer_range,
|
const t_layer_height_range& layer_range,
|
||||||
const int idx = -1,
|
const int idx = -1,
|
||||||
const wxString& extruder = wxEmptyString );
|
const wxString& extruder = wxEmptyString );
|
||||||
|
|
||||||
ObjectDataViewModelNode(ObjectDataViewModelNode* parent, const ItemType type);
|
ObjectDataViewModelNode(ObjectDataViewModelNode* parent, const ItemType type);
|
||||||
|
|
||||||
~ObjectDataViewModelNode()
|
~ObjectDataViewModelNode()
|
||||||
{
|
{
|
||||||
// free all our children nodes
|
// free all our children nodes
|
||||||
size_t count = m_children.GetCount();
|
size_t count = m_children.GetCount();
|
||||||
for (size_t i = 0; i < count; i++)
|
for (size_t i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
ObjectDataViewModelNode *child = m_children[i];
|
ObjectDataViewModelNode *child = m_children[i];
|
||||||
delete child;
|
delete child;
|
||||||
}
|
}
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
// Indicate that the object was deleted.
|
// Indicate that the object was deleted.
|
||||||
m_idx = -2;
|
m_idx = -2;
|
||||||
#endif /* NDEBUG */
|
#endif /* NDEBUG */
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsContainer() const
|
bool IsContainer() const
|
||||||
{
|
{
|
||||||
return m_container;
|
return m_container;
|
||||||
}
|
}
|
||||||
|
|
||||||
ObjectDataViewModelNode* GetParent()
|
ObjectDataViewModelNode* GetParent()
|
||||||
{
|
{
|
||||||
assert(m_parent == nullptr || m_parent->valid());
|
assert(m_parent == nullptr || m_parent->valid());
|
||||||
return m_parent;
|
return m_parent;
|
||||||
}
|
}
|
||||||
MyObjectTreeModelNodePtrArray& GetChildren()
|
MyObjectTreeModelNodePtrArray& GetChildren()
|
||||||
{
|
{
|
||||||
return m_children;
|
return m_children;
|
||||||
}
|
}
|
||||||
ObjectDataViewModelNode* GetNthChild(unsigned int n)
|
ObjectDataViewModelNode* GetNthChild(unsigned int n)
|
||||||
{
|
{
|
||||||
return m_children.Item(n);
|
return m_children.Item(n);
|
||||||
}
|
}
|
||||||
void Insert(ObjectDataViewModelNode* child, unsigned int n)
|
void Insert(ObjectDataViewModelNode* child, unsigned int n)
|
||||||
{
|
{
|
||||||
if (!m_container)
|
if (!m_container)
|
||||||
m_container = true;
|
m_container = true;
|
||||||
m_children.Insert(child, n);
|
m_children.Insert(child, n);
|
||||||
}
|
}
|
||||||
void Append(ObjectDataViewModelNode* child)
|
void Append(ObjectDataViewModelNode* child)
|
||||||
{
|
{
|
||||||
if (!m_container)
|
if (!m_container)
|
||||||
m_container = true;
|
m_container = true;
|
||||||
m_children.Add(child);
|
m_children.Add(child);
|
||||||
}
|
}
|
||||||
void RemoveAllChildren()
|
void RemoveAllChildren()
|
||||||
{
|
{
|
||||||
if (GetChildCount() == 0)
|
if (GetChildCount() == 0)
|
||||||
return;
|
return;
|
||||||
for (int id = int(GetChildCount()) - 1; id >= 0; --id)
|
for (int id = int(GetChildCount()) - 1; id >= 0; --id)
|
||||||
{
|
{
|
||||||
if (m_children.Item(id)->GetChildCount() > 0)
|
if (m_children.Item(id)->GetChildCount() > 0)
|
||||||
m_children[id]->RemoveAllChildren();
|
m_children[id]->RemoveAllChildren();
|
||||||
auto node = m_children[id];
|
auto node = m_children[id];
|
||||||
m_children.RemoveAt(id);
|
m_children.RemoveAt(id);
|
||||||
delete node;
|
delete node;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GetChildCount() const
|
size_t GetChildCount() const
|
||||||
{
|
{
|
||||||
return m_children.GetCount();
|
return m_children.GetCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SetValue(const wxVariant &variant, unsigned int col);
|
bool SetValue(const wxVariant &variant, unsigned int col);
|
||||||
|
|
||||||
void SetBitmap(const wxBitmap &icon) { m_bmp = icon; }
|
void SetBitmap(const wxBitmap &icon) { m_bmp = icon; }
|
||||||
const wxBitmap& GetBitmap() const { return m_bmp; }
|
const wxBitmap& GetBitmap() const { return m_bmp; }
|
||||||
const wxString& GetName() const { return m_name; }
|
const wxString& GetName() const { return m_name; }
|
||||||
ItemType GetType() const { return m_type; }
|
ItemType GetType() const { return m_type; }
|
||||||
void SetIdx(const int& idx);
|
void SetIdx(const int& idx);
|
||||||
int GetIdx() const { return m_idx; }
|
int GetIdx() const { return m_idx; }
|
||||||
t_layer_height_range GetLayerRange() const { return m_layer_range; }
|
t_layer_height_range GetLayerRange() const { return m_layer_range; }
|
||||||
|
|
||||||
// use this function only for childrens
|
// use this function only for childrens
|
||||||
void AssignAllVal(ObjectDataViewModelNode& from_node)
|
void AssignAllVal(ObjectDataViewModelNode& from_node)
|
||||||
{
|
{
|
||||||
// ! Don't overwrite other values because of equality of this values for all children --
|
// ! Don't overwrite other values because of equality of this values for all children --
|
||||||
m_name = from_node.m_name;
|
m_name = from_node.m_name;
|
||||||
m_bmp = from_node.m_bmp;
|
m_bmp = from_node.m_bmp;
|
||||||
m_idx = from_node.m_idx;
|
m_idx = from_node.m_idx;
|
||||||
m_extruder = from_node.m_extruder;
|
m_extruder = from_node.m_extruder;
|
||||||
m_type = from_node.m_type;
|
m_type = from_node.m_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SwapChildrens(int frst_id, int scnd_id) {
|
bool SwapChildrens(int frst_id, int scnd_id) {
|
||||||
if (GetChildCount() < 2 ||
|
if (GetChildCount() < 2 ||
|
||||||
frst_id < 0 || (size_t)frst_id >= GetChildCount() ||
|
frst_id < 0 || (size_t)frst_id >= GetChildCount() ||
|
||||||
scnd_id < 0 || (size_t)scnd_id >= GetChildCount())
|
scnd_id < 0 || (size_t)scnd_id >= GetChildCount())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
ObjectDataViewModelNode new_scnd = *GetNthChild(frst_id);
|
ObjectDataViewModelNode new_scnd = *GetNthChild(frst_id);
|
||||||
ObjectDataViewModelNode new_frst = *GetNthChild(scnd_id);
|
ObjectDataViewModelNode new_frst = *GetNthChild(scnd_id);
|
||||||
|
|
||||||
new_scnd.m_idx = m_children.Item(scnd_id)->m_idx;
|
new_scnd.m_idx = m_children.Item(scnd_id)->m_idx;
|
||||||
new_frst.m_idx = m_children.Item(frst_id)->m_idx;
|
new_frst.m_idx = m_children.Item(frst_id)->m_idx;
|
||||||
|
|
||||||
m_children.Item(frst_id)->AssignAllVal(new_frst);
|
m_children.Item(frst_id)->AssignAllVal(new_frst);
|
||||||
m_children.Item(scnd_id)->AssignAllVal(new_scnd);
|
m_children.Item(scnd_id)->AssignAllVal(new_scnd);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set action icons for node
|
// Set action icons for node
|
||||||
void set_action_icon();
|
void set_action_icon();
|
||||||
|
|
||||||
void update_settings_digest_bitmaps();
|
void update_settings_digest_bitmaps();
|
||||||
bool update_settings_digest(const std::vector<std::string>& categories);
|
bool update_settings_digest(const std::vector<std::string>& categories);
|
||||||
int volume_type() const { return int(m_volume_type); }
|
int volume_type() const { return int(m_volume_type); }
|
||||||
void msw_rescale();
|
void msw_rescale();
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
bool valid();
|
bool valid();
|
||||||
#endif /* NDEBUG */
|
#endif /* NDEBUG */
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -369,7 +370,7 @@ wxDECLARE_EVENT(wxCUSTOMEVT_LAST_VOLUME_IS_DELETED, wxCommandEvent);
|
|||||||
|
|
||||||
class ObjectDataViewModel :public wxDataViewModel
|
class ObjectDataViewModel :public wxDataViewModel
|
||||||
{
|
{
|
||||||
std::vector<ObjectDataViewModelNode*> m_objects;
|
std::vector<ObjectDataViewModelNode*> m_objects;
|
||||||
std::vector<wxBitmap*> m_volume_bmps;
|
std::vector<wxBitmap*> m_volume_bmps;
|
||||||
wxBitmap* m_warning_bmp;
|
wxBitmap* m_warning_bmp;
|
||||||
|
|
||||||
@ -379,7 +380,7 @@ public:
|
|||||||
ObjectDataViewModel();
|
ObjectDataViewModel();
|
||||||
~ObjectDataViewModel();
|
~ObjectDataViewModel();
|
||||||
|
|
||||||
wxDataViewItem Add( const wxString &name,
|
wxDataViewItem Add( const wxString &name,
|
||||||
const int extruder,
|
const int extruder,
|
||||||
const bool has_errors = false);
|
const bool has_errors = false);
|
||||||
wxDataViewItem AddVolumeChild( const wxDataViewItem &parent_item,
|
wxDataViewItem AddVolumeChild( const wxDataViewItem &parent_item,
|
||||||
@ -395,20 +396,20 @@ public:
|
|||||||
const t_layer_height_range& layer_range,
|
const t_layer_height_range& layer_range,
|
||||||
const int extruder = 0,
|
const int extruder = 0,
|
||||||
const int index = -1);
|
const int index = -1);
|
||||||
wxDataViewItem Delete(const wxDataViewItem &item);
|
wxDataViewItem Delete(const wxDataViewItem &item);
|
||||||
wxDataViewItem DeleteLastInstance(const wxDataViewItem &parent_item, size_t num);
|
wxDataViewItem DeleteLastInstance(const wxDataViewItem &parent_item, size_t num);
|
||||||
void DeleteAll();
|
void DeleteAll();
|
||||||
void DeleteChildren(wxDataViewItem& parent);
|
void DeleteChildren(wxDataViewItem& parent);
|
||||||
void DeleteVolumeChildren(wxDataViewItem& parent);
|
void DeleteVolumeChildren(wxDataViewItem& parent);
|
||||||
void DeleteSettings(const wxDataViewItem& parent);
|
void DeleteSettings(const wxDataViewItem& parent);
|
||||||
wxDataViewItem GetItemById(int obj_idx);
|
wxDataViewItem GetItemById(int obj_idx);
|
||||||
wxDataViewItem GetItemById(const int obj_idx, const int sub_obj_idx, const ItemType parent_type);
|
wxDataViewItem GetItemById(const int obj_idx, const int sub_obj_idx, const ItemType parent_type);
|
||||||
wxDataViewItem GetItemByVolumeId(int obj_idx, int volume_idx);
|
wxDataViewItem GetItemByVolumeId(int obj_idx, int volume_idx);
|
||||||
wxDataViewItem GetItemByInstanceId(int obj_idx, int inst_idx);
|
wxDataViewItem GetItemByInstanceId(int obj_idx, int inst_idx);
|
||||||
wxDataViewItem GetItemByLayerId(int obj_idx, int layer_idx);
|
wxDataViewItem GetItemByLayerId(int obj_idx, int layer_idx);
|
||||||
wxDataViewItem GetItemByLayerRange(const int obj_idx, const t_layer_height_range& layer_range);
|
wxDataViewItem GetItemByLayerRange(const int obj_idx, const t_layer_height_range& layer_range);
|
||||||
int GetItemIdByLayerRange(const int obj_idx, const t_layer_height_range& layer_range);
|
int GetItemIdByLayerRange(const int obj_idx, const t_layer_height_range& layer_range);
|
||||||
int GetIdByItem(const wxDataViewItem& item) const;
|
int GetIdByItem(const wxDataViewItem& item) const;
|
||||||
int GetIdByItemAndType(const wxDataViewItem& item, const ItemType type) const;
|
int GetIdByItemAndType(const wxDataViewItem& item, const ItemType type) const;
|
||||||
int GetObjectIdByItem(const wxDataViewItem& item) const;
|
int GetObjectIdByItem(const wxDataViewItem& item) const;
|
||||||
int GetVolumeIdByItem(const wxDataViewItem& item) const;
|
int GetVolumeIdByItem(const wxDataViewItem& item) const;
|
||||||
@ -418,23 +419,23 @@ public:
|
|||||||
int GetRowByItem(const wxDataViewItem& item) const;
|
int GetRowByItem(const wxDataViewItem& item) const;
|
||||||
bool IsEmpty() { return m_objects.empty(); }
|
bool IsEmpty() { return m_objects.empty(); }
|
||||||
|
|
||||||
// helper method for wxLog
|
// helper method for wxLog
|
||||||
|
|
||||||
wxString GetName(const wxDataViewItem &item) const;
|
wxString GetName(const wxDataViewItem &item) const;
|
||||||
wxBitmap& GetBitmap(const wxDataViewItem &item) const;
|
wxBitmap& GetBitmap(const wxDataViewItem &item) const;
|
||||||
|
|
||||||
// helper methods to change the model
|
// helper methods to change the model
|
||||||
|
|
||||||
virtual unsigned int GetColumnCount() const override { return 3;}
|
virtual unsigned int GetColumnCount() const override { return 3;}
|
||||||
virtual wxString GetColumnType(unsigned int col) const override{ return wxT("string"); }
|
virtual wxString GetColumnType(unsigned int col) const override{ return wxT("string"); }
|
||||||
|
|
||||||
virtual void GetValue( wxVariant &variant,
|
virtual void GetValue( wxVariant &variant,
|
||||||
const wxDataViewItem &item,
|
const wxDataViewItem &item,
|
||||||
unsigned int col) const override;
|
unsigned int col) const override;
|
||||||
virtual bool SetValue( const wxVariant &variant,
|
virtual bool SetValue( const wxVariant &variant,
|
||||||
const wxDataViewItem &item,
|
const wxDataViewItem &item,
|
||||||
unsigned int col) override;
|
unsigned int col) override;
|
||||||
bool SetValue( const wxVariant &variant,
|
bool SetValue( const wxVariant &variant,
|
||||||
const int item_idx,
|
const int item_idx,
|
||||||
unsigned int col);
|
unsigned int col);
|
||||||
|
|
||||||
@ -444,18 +445,18 @@ public:
|
|||||||
const int new_volume_id,
|
const int new_volume_id,
|
||||||
const wxDataViewItem &parent);
|
const wxDataViewItem &parent);
|
||||||
|
|
||||||
virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const override;
|
virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const override;
|
||||||
|
|
||||||
virtual wxDataViewItem GetParent(const wxDataViewItem &item) const override;
|
virtual wxDataViewItem GetParent(const wxDataViewItem &item) const override;
|
||||||
// get object item
|
// get object item
|
||||||
wxDataViewItem GetTopParent(const wxDataViewItem &item) const;
|
wxDataViewItem GetTopParent(const wxDataViewItem &item) const;
|
||||||
virtual bool IsContainer(const wxDataViewItem &item) const override;
|
virtual bool IsContainer(const wxDataViewItem &item) const override;
|
||||||
virtual unsigned int GetChildren(const wxDataViewItem &parent,
|
virtual unsigned int GetChildren(const wxDataViewItem &parent,
|
||||||
wxDataViewItemArray &array) const override;
|
wxDataViewItemArray &array) const override;
|
||||||
void GetAllChildren(const wxDataViewItem &parent,wxDataViewItemArray &array) const;
|
void GetAllChildren(const wxDataViewItem &parent,wxDataViewItemArray &array) const;
|
||||||
// Is the container just a header or an item with all columns
|
// Is the container just a header or an item with all columns
|
||||||
// In our case it is an item with all columns
|
// In our case it is an item with all columns
|
||||||
virtual bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const override { return true; }
|
virtual bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const override { return true; }
|
||||||
|
|
||||||
ItemType GetItemType(const wxDataViewItem &item) const ;
|
ItemType GetItemType(const wxDataViewItem &item) const ;
|
||||||
wxDataViewItem GetItemByType( const wxDataViewItem &parent_item,
|
wxDataViewItem GetItemByType( const wxDataViewItem &parent_item,
|
||||||
@ -542,88 +543,88 @@ private:
|
|||||||
class MyCustomRenderer : public wxDataViewCustomRenderer
|
class MyCustomRenderer : public wxDataViewCustomRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// This renderer can be either activatable or editable, for demonstration
|
// This renderer can be either activatable or editable, for demonstration
|
||||||
// purposes. In real programs, you should select whether the user should be
|
// purposes. In real programs, you should select whether the user should be
|
||||||
// able to activate or edit the cell and it doesn't make sense to switch
|
// able to activate or edit the cell and it doesn't make sense to switch
|
||||||
// between the two -- but this is just an example, so it doesn't stop us.
|
// between the two -- but this is just an example, so it doesn't stop us.
|
||||||
explicit MyCustomRenderer(wxDataViewCellMode mode)
|
explicit MyCustomRenderer(wxDataViewCellMode mode)
|
||||||
: wxDataViewCustomRenderer("string", mode, wxALIGN_CENTER)
|
: wxDataViewCustomRenderer("string", mode, wxALIGN_CENTER)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
virtual bool Render(wxRect rect, wxDC *dc, int state) override/*wxOVERRIDE*/
|
virtual bool Render(wxRect rect, wxDC *dc, int state) override/*wxOVERRIDE*/
|
||||||
{
|
{
|
||||||
dc->SetBrush(*wxLIGHT_GREY_BRUSH);
|
dc->SetBrush(*wxLIGHT_GREY_BRUSH);
|
||||||
dc->SetPen(*wxTRANSPARENT_PEN);
|
dc->SetPen(*wxTRANSPARENT_PEN);
|
||||||
|
|
||||||
rect.Deflate(2);
|
rect.Deflate(2);
|
||||||
dc->DrawRoundedRectangle(rect, 5);
|
dc->DrawRoundedRectangle(rect, 5);
|
||||||
|
|
||||||
RenderText(m_value,
|
RenderText(m_value,
|
||||||
0, // no offset
|
0, // no offset
|
||||||
wxRect(dc->GetTextExtent(m_value)).CentreIn(rect),
|
wxRect(dc->GetTextExtent(m_value)).CentreIn(rect),
|
||||||
dc,
|
dc,
|
||||||
state);
|
state);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool ActivateCell(const wxRect& WXUNUSED(cell),
|
virtual bool ActivateCell(const wxRect& WXUNUSED(cell),
|
||||||
wxDataViewModel *WXUNUSED(model),
|
wxDataViewModel *WXUNUSED(model),
|
||||||
const wxDataViewItem &WXUNUSED(item),
|
const wxDataViewItem &WXUNUSED(item),
|
||||||
unsigned int WXUNUSED(col),
|
unsigned int WXUNUSED(col),
|
||||||
const wxMouseEvent *mouseEvent) override/*wxOVERRIDE*/
|
const wxMouseEvent *mouseEvent) override/*wxOVERRIDE*/
|
||||||
{
|
{
|
||||||
wxString position;
|
wxString position;
|
||||||
if (mouseEvent)
|
if (mouseEvent)
|
||||||
position = wxString::Format("via mouse at %d, %d", mouseEvent->m_x, mouseEvent->m_y);
|
position = wxString::Format("via mouse at %d, %d", mouseEvent->m_x, mouseEvent->m_y);
|
||||||
else
|
else
|
||||||
position = "from keyboard";
|
position = "from keyboard";
|
||||||
// wxLogMessage("MyCustomRenderer ActivateCell() %s", position);
|
// wxLogMessage("MyCustomRenderer ActivateCell() %s", position);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual wxSize GetSize() const override/*wxOVERRIDE*/
|
virtual wxSize GetSize() const override/*wxOVERRIDE*/
|
||||||
{
|
{
|
||||||
return wxSize(60, 20);
|
return wxSize(60, 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool SetValue(const wxVariant &value) override/*wxOVERRIDE*/
|
virtual bool SetValue(const wxVariant &value) override/*wxOVERRIDE*/
|
||||||
{
|
{
|
||||||
m_value = value.GetString();
|
m_value = value.GetString();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool GetValue(wxVariant &WXUNUSED(value)) const override/*wxOVERRIDE*/{ return true; }
|
virtual bool GetValue(wxVariant &WXUNUSED(value)) const override/*wxOVERRIDE*/{ return true; }
|
||||||
|
|
||||||
virtual bool HasEditorCtrl() const override/*wxOVERRIDE*/{ return true; }
|
virtual bool HasEditorCtrl() const override/*wxOVERRIDE*/{ return true; }
|
||||||
|
|
||||||
virtual wxWindow*
|
virtual wxWindow*
|
||||||
CreateEditorCtrl(wxWindow* parent,
|
CreateEditorCtrl(wxWindow* parent,
|
||||||
wxRect labelRect,
|
wxRect labelRect,
|
||||||
const wxVariant& value) override/*wxOVERRIDE*/
|
const wxVariant& value) override/*wxOVERRIDE*/
|
||||||
{
|
{
|
||||||
wxTextCtrl* text = new wxTextCtrl(parent, wxID_ANY, value,
|
wxTextCtrl* text = new wxTextCtrl(parent, wxID_ANY, value,
|
||||||
labelRect.GetPosition(),
|
labelRect.GetPosition(),
|
||||||
labelRect.GetSize(),
|
labelRect.GetSize(),
|
||||||
wxTE_PROCESS_ENTER);
|
wxTE_PROCESS_ENTER);
|
||||||
text->SetInsertionPointEnd();
|
text->SetInsertionPointEnd();
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool
|
virtual bool
|
||||||
GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value) override/*wxOVERRIDE*/
|
GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value) override/*wxOVERRIDE*/
|
||||||
{
|
{
|
||||||
wxTextCtrl* text = wxDynamicCast(ctrl, wxTextCtrl);
|
wxTextCtrl* text = wxDynamicCast(ctrl, wxTextCtrl);
|
||||||
if (!text)
|
if (!text)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
value = text->GetValue();
|
value = text->GetValue();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxString m_value;
|
wxString m_value;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -726,8 +727,8 @@ public:
|
|||||||
EnableTickManipulation(false);
|
EnableTickManipulation(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_horizontal() const { return m_style == wxSL_HORIZONTAL; }
|
bool is_horizontal() const { return m_style == wxSL_HORIZONTAL; }
|
||||||
bool is_one_layer() const { return m_is_one_layer; }
|
bool is_one_layer() const { return m_is_one_layer; }
|
||||||
bool is_lower_at_min() const { return m_lower_value == m_min_value; }
|
bool is_lower_at_min() const { return m_lower_value == m_min_value; }
|
||||||
bool is_higher_at_max() const { return m_higher_value == m_max_value; }
|
bool is_higher_at_max() const { return m_higher_value == m_max_value; }
|
||||||
bool is_full_span() const { return this->is_lower_at_min() && this->is_higher_at_max(); }
|
bool is_full_span() const { return this->is_lower_at_min() && this->is_higher_at_max(); }
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
#define slic3r_Utils_Time_hpp_
|
#define slic3r_Utils_Time_hpp_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <time.h>
|
#include <ctime>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace Utils {
|
namespace Utils {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user