mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 14:20:58 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3956fcc836 | ||
|
|
f4f43535e5 | ||
|
|
843e8c40e6 | ||
|
|
db4e2f7ced |
+3
-18
@@ -7,15 +7,9 @@ CheckOptions:
|
|||||||
misc-include-cleaner.UnusedIncludes: false
|
misc-include-cleaner.UnusedIncludes: false
|
||||||
# Headers that declare a symbol but are not the one to include: per-platform
|
# Headers that declare a symbol but are not the one to include: per-platform
|
||||||
# implementations of wxWidgets and Boost.Thread (a Linux run would suggest the
|
# implementations of wxWidgets and Boost.Thread (a Linux run would suggest the
|
||||||
# GTK or pthread one), library internals and forward declarations (MSVC's STL
|
# GTK or pthread one), library internals and forward declarations, CPython's
|
||||||
# __msvc_* and the Windows UCRT's corecrt_* included), CPython's headers behind
|
# headers behind Python.h, curl's behind curl.h, oneTBB's behind tbb/, and
|
||||||
# Python.h (python3.x/ on Linux and macOS, libpython/include/ on Windows),
|
|
||||||
# curl's behind curl.h, oneTBB's behind tbb/, and
|
|
||||||
# admesh's stl.h, which the include path also exposes without its directory.
|
# admesh's stl.h, which the include path also exposes without its directory.
|
||||||
# Clipper's own clipper.hpp is only included through libslic3r/clipper.hpp or
|
|
||||||
# clipper_z.hpp, which configure it first, and Boost.Polygon's headers only
|
|
||||||
# work through boost/polygon/polygon.hpp or voronoi.hpp. minilzo's config
|
|
||||||
# headers are internal to minilzo.h.
|
|
||||||
# FFmpeg's C headers are left alone because they are only included inside
|
# FFmpeg's C headers are left alone because they are only included inside
|
||||||
# extern "C", which an inserted include would miss. OS-specific headers (GLib,
|
# extern "C", which an inserted include would miss. OS-specific headers (GLib,
|
||||||
# GTK, D-Bus, POSIX, the Windows SDK) are only used inside platform #if blocks,
|
# GTK, D-Bus, POSIX, the Windows SDK) are only used inside platform #if blocks,
|
||||||
@@ -29,11 +23,7 @@ CheckOptions:
|
|||||||
.*[/\\]impl[/\\].*;
|
.*[/\\]impl[/\\].*;
|
||||||
.*_fwd\.hpp;
|
.*_fwd\.hpp;
|
||||||
python3\.[0-9]+[/\\].*;
|
python3\.[0-9]+[/\\].*;
|
||||||
libpython[/\\]include[/\\].*;
|
|
||||||
bits[/\\].*;
|
bits[/\\].*;
|
||||||
corecrt_.*\.h;
|
|
||||||
__msvc_.*\.hpp;
|
|
||||||
boost[/\\]multiprecision[/\\]fwd\.hpp;
|
|
||||||
imconfig\.h;
|
imconfig\.h;
|
||||||
expat_external\.h;
|
expat_external\.h;
|
||||||
admesh[/\\]stl\.h;
|
admesh[/\\]stl\.h;
|
||||||
@@ -54,9 +44,4 @@ CheckOptions:
|
|||||||
fcntl\.h;
|
fcntl\.h;
|
||||||
termios\.h;
|
termios\.h;
|
||||||
[/\\](um|shared)[/\\].*;
|
[/\\](um|shared)[/\\].*;
|
||||||
sal\.h;
|
sal\.h
|
||||||
clipper[/\\]clipper\.hpp;
|
|
||||||
png(lib)?conf\.h;
|
|
||||||
mcut[/\\]platform\.h;
|
|
||||||
boost[/\\]polygon[/\\].*;
|
|
||||||
lzo(conf|defs)\.h
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ on:
|
|||||||
|
|
||||||
|
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '15 2 * * *' # 10:15 AM Singapore time (UTC+8), when macOS runners are least busy
|
- cron: '0 17 * * *' # run once a day at 1 AM Singapore time (UTC+8)
|
||||||
|
|
||||||
workflow_dispatch: # allows for manual dispatch
|
workflow_dispatch: # allows for manual dispatch
|
||||||
inputs:
|
inputs:
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
# Reports the newest push build of main that was not cancelled, for the README badge.
|
|
||||||
name: Main build status
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_run:
|
|
||||||
workflows: ["Build all"]
|
|
||||||
types: [completed]
|
|
||||||
branches: [main]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
actions: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
status:
|
|
||||||
if: github.repository == 'OrcaSlicer/OrcaSlicer'
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- env:
|
|
||||||
GH_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
for attempt in 1 2 3; do
|
|
||||||
conclusion=$(gh api "repos/${{ github.repository }}/actions/workflows/build_all.yml/runs?branch=main&event=push&status=completed&per_page=100" \
|
|
||||||
--jq '[.workflow_runs[] | select(.conclusion != "cancelled")][0].conclusion') && break
|
|
||||||
sleep 10
|
|
||||||
done
|
|
||||||
echo "Latest finished push build of main: $conclusion"
|
|
||||||
[ "$conclusion" = success ]
|
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<a href="https://trendshift.io/repositories/15552" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15552" alt="OrcaSlicer%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/15552" target="_blank"><img src="https://trendshift.io/api/badge/repositories/15552" alt="OrcaSlicer%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||
[](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml)
|
[](https://github.com/OrcaSlicer/OrcaSlicer/stargazers) [](https://github.com/OrcaSlicer/OrcaSlicer/actions/workflows/build_all.yml)
|
||||||
|
|
||||||
OrcaSlicer: an open source Next-Gen Slicing Software for Precision 3D Prints.
|
OrcaSlicer: an open source Next-Gen Slicing Software for Precision 3D Prints.
|
||||||
Optimize your prints with ultra-fast slicing, intelligent support generation, and seamless printer compatibility—engineered for perfection.
|
Optimize your prints with ultra-fast slicing, intelligent support generation, and seamless printer compatibility—engineered for perfection.
|
||||||
|
|||||||
@@ -20,49 +20,6 @@
|
|||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
#endif /* WIN32 */
|
#endif /* WIN32 */
|
||||||
|
|
||||||
#include <map>
|
|
||||||
#include <vector>
|
|
||||||
#include "libslic3r/PrintBase.hpp"
|
|
||||||
#include "slic3r/Utils/json_diff.hpp"
|
|
||||||
#include <boost/date_time/posix_time/posix_time_duration.hpp>
|
|
||||||
#include <cerrno>
|
|
||||||
#include <utility>
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/fstream.hpp>
|
|
||||||
#include "libslic3r/LocalesUtils.hpp"
|
|
||||||
#include <fstream>
|
|
||||||
#include <exception>
|
|
||||||
#include <set>
|
|
||||||
#include "libslic3r/Color.hpp"
|
|
||||||
#include "libslic3r/TriangleSelector.hpp"
|
|
||||||
#include <algorithm>
|
|
||||||
#include "libslic3r/Format/bbs_3mf.hpp"
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include "libslic3r/Point.hpp"
|
|
||||||
#include "libslic3r_version.h"
|
|
||||||
#include "libslic3r/Semver.hpp"
|
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
|
||||||
#include "libslic3r/BoundingBox.hpp"
|
|
||||||
#include "libslic3r/CustomGCode.hpp"
|
|
||||||
#include <memory>
|
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
|
||||||
#include <iterator>
|
|
||||||
#include "libslic3r/ClipperUtils.hpp"
|
|
||||||
#include "libslic3r/GCode/WipeTowerEstimate.hpp"
|
|
||||||
#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
|
|
||||||
#include <functional>
|
|
||||||
#include "libslic3r/Arrange.hpp"
|
|
||||||
#include "libslic3r/Polygon.hpp"
|
|
||||||
#include "libslic3r/GCode/ThumbnailData.hpp"
|
|
||||||
#include "slic3r/GUI/3DScene.hpp"
|
|
||||||
#include "slic3r/GUI/GLShader.hpp"
|
|
||||||
#include <cassert>
|
|
||||||
#include <boost/filesystem/exception.hpp>
|
|
||||||
#include <signal.h>
|
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|||||||
@@ -1,14 +1,7 @@
|
|||||||
#ifndef SLIC3R_HPP
|
#ifndef SLIC3R_HPP
|
||||||
#define SLIC3R_HPP
|
#define SLIC3R_HPP
|
||||||
|
|
||||||
#include <map>
|
|
||||||
#include "libslic3r/BoundingBox.hpp"
|
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
|
||||||
#include "libslic3r/Format/bbs_3mf.hpp"
|
|
||||||
#include "libslic3r/GCode/ThumbnailData.hpp"
|
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "libslic3r/Config.hpp"
|
#include "libslic3r/Config.hpp"
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
|
|||||||
@@ -8,28 +8,6 @@
|
|||||||
#define NANOSVGRAST_IMPLEMENTATION
|
#define NANOSVGRAST_IMPLEMENTATION
|
||||||
#include "nanosvg/nanosvgrast.h"
|
#include "nanosvg/nanosvgrast.h"
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <map>
|
|
||||||
#include "libslic3r/Point.hpp"
|
|
||||||
#include "libslic3r/libslic3r.h"
|
|
||||||
#include "libslic3r/Polygon.hpp"
|
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
|
||||||
#include <utility>
|
|
||||||
#include "libslic3r/CustomGCode.hpp"
|
|
||||||
#include <iterator>
|
|
||||||
#include <boost/smart_ptr/make_shared_object.hpp>
|
|
||||||
#include <boost/smart_ptr/shared_ptr.hpp>
|
|
||||||
#include <boost/log/core/record_view.hpp>
|
|
||||||
#include <boost/log/expressions/message.hpp>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <exception>
|
|
||||||
#include "libslic3r/PlaceholderParser.hpp"
|
|
||||||
#include <boost/program_options/options_description.hpp>
|
|
||||||
#include <boost/program_options/value_semantic.hpp>
|
|
||||||
#include <boost/program_options/variables_map.hpp>
|
|
||||||
#include <boost/program_options/errors.hpp>
|
|
||||||
|
|
||||||
#include "libslic3r/BoundingBox.hpp"
|
#include "libslic3r/BoundingBox.hpp"
|
||||||
#include "libslic3r/GCode.hpp"
|
#include "libslic3r/GCode.hpp"
|
||||||
#include "libslic3r/GCode/WipeTower.hpp"
|
#include "libslic3r/GCode/WipeTower.hpp"
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
#include <iosfwd>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|||||||
@@ -4,19 +4,9 @@
|
|||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/directory.hpp>
|
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <boost/program_options.hpp>
|
#include <boost/program_options.hpp>
|
||||||
#include <boost/program_options/options_description.hpp>
|
|
||||||
#include <boost/program_options/value_semantic.hpp>
|
|
||||||
#include <boost/program_options/variables_map.hpp>
|
|
||||||
#include <boost/program_options/errors.hpp>
|
|
||||||
#include <exception>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <memory>
|
|
||||||
#include "libslic3r/Config.hpp"
|
|
||||||
|
|
||||||
using namespace Slic3r;
|
using namespace Slic3r;
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = boost::filesystem;
|
||||||
|
|||||||
@@ -11,19 +11,13 @@
|
|||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/nowide/fstream.hpp>
|
#include <boost/nowide/fstream.hpp>
|
||||||
#include "nlohmann/json.hpp"
|
#include "nlohmann/json.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstddef>
|
|
||||||
#include <exception>
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "libslic3r/Config.hpp"
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <stdexcept>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
#define VGCODE_COLORPRINT_HPP
|
#define VGCODE_COLORPRINT_HPP
|
||||||
|
|
||||||
#include "../include/Types.hpp"
|
#include "../include/Types.hpp"
|
||||||
#include <cstdint>
|
|
||||||
#include <array>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -7,10 +7,7 @@
|
|||||||
|
|
||||||
#include "../include/Types.hpp"
|
#include "../include/Types.hpp"
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cfloat>
|
#include <cfloat>
|
||||||
#include <vector>
|
|
||||||
#include <cstddef>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
#define VGCODE_GCODEINPUTDATA_HPP
|
#define VGCODE_GCODEINPUTDATA_HPP
|
||||||
|
|
||||||
#include "PathVertex.hpp"
|
#include "PathVertex.hpp"
|
||||||
#include <vector>
|
|
||||||
#include "Types.hpp"
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -7,9 +7,7 @@
|
|||||||
|
|
||||||
#include "Types.hpp"
|
#include "Types.hpp"
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cfloat>
|
#include <cfloat>
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
#ifndef VGCODE_TYPES_HPP
|
#ifndef VGCODE_TYPES_HPP
|
||||||
#define VGCODE_TYPES_HPP
|
#define VGCODE_TYPES_HPP
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
#define VGCODE_ENABLE_COG_AND_TOOL_MARKERS 0
|
#define VGCODE_ENABLE_COG_AND_TOOL_MARKERS 0
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|||||||
@@ -7,10 +7,7 @@
|
|||||||
|
|
||||||
#include "Types.hpp"
|
#include "Types.hpp"
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,6 @@
|
|||||||
#define VGCODE_BITSET_HPP
|
#define VGCODE_BITSET_HPP
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <cstddef>
|
|
||||||
#include <type_traits>
|
|
||||||
#include <utility>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|||||||
@@ -7,13 +7,8 @@
|
|||||||
#include "Utils.hpp"
|
#include "Utils.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <cfloat>
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <cstddef>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,6 @@
|
|||||||
///|/ libvgcode is released under the terms of the AGPLv3 or higher
|
///|/ libvgcode is released under the terms of the AGPLv3 or higher
|
||||||
///|/
|
///|/
|
||||||
#include "ExtrusionRoles.hpp"
|
#include "ExtrusionRoles.hpp"
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <array>
|
|
||||||
#include <utility>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -7,10 +7,7 @@
|
|||||||
|
|
||||||
#include "../include/Types.hpp"
|
#include "../include/Types.hpp"
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -9,11 +9,6 @@
|
|||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <cstdint>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <vector>
|
|
||||||
#include <iterator>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -6,11 +6,6 @@
|
|||||||
#define VGCODE_LAYERS_HPP
|
#define VGCODE_LAYERS_HPP
|
||||||
|
|
||||||
#include "Range.hpp"
|
#include "Range.hpp"
|
||||||
#include <cstdint>
|
|
||||||
#include <cstddef>
|
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <array>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include <cctype>
|
#include <cctype>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <string>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,6 @@
|
|||||||
#include "OpenGLUtils.hpp"
|
#include "OpenGLUtils.hpp"
|
||||||
#include "Utils.hpp"
|
#include "Utils.hpp"
|
||||||
|
|
||||||
#include <cstdint>
|
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <cstddef>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
///|/ libvgcode is released under the terms of the AGPLv3 or higher
|
///|/ libvgcode is released under the terms of the AGPLv3 or higher
|
||||||
///|/
|
///|/
|
||||||
#include "../include/PathVertex.hpp"
|
#include "../include/PathVertex.hpp"
|
||||||
#include "../include/Types.hpp"
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
#include "Range.hpp"
|
#include "Range.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "../include/Types.hpp"
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
#include "SegmentTemplate.hpp"
|
#include "SegmentTemplate.hpp"
|
||||||
#include "OpenGLUtils.hpp"
|
#include "OpenGLUtils.hpp"
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,6 @@
|
|||||||
|
|
||||||
#include "../include/Types.hpp"
|
#include "../include/Types.hpp"
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
#include "Utils.hpp"
|
#include "Utils.hpp"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include "../include/Types.hpp"
|
|
||||||
|
|
||||||
#if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
|
#if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
#include "../include/Types.hpp"
|
#include "../include/Types.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,6 @@
|
|||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <vector>
|
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
#define VGCODE_UTILS_HPP
|
#define VGCODE_UTILS_HPP
|
||||||
|
|
||||||
#include "../include/Types.hpp"
|
#include "../include/Types.hpp"
|
||||||
#include <vector>
|
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define STDVEC_MEMSIZE(NAME, TYPE) NAME.capacity() * ((sizeof(TYPE) + __alignof(TYPE) - 1) / __alignof(TYPE)) * __alignof(TYPE)
|
#define STDVEC_MEMSIZE(NAME, TYPE) NAME.capacity() * ((sizeof(TYPE) + __alignof(TYPE) - 1) / __alignof(TYPE)) * __alignof(TYPE)
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
///|/ libvgcode is released under the terms of the AGPLv3 or higher
|
///|/ libvgcode is released under the terms of the AGPLv3 or higher
|
||||||
///|/
|
///|/
|
||||||
#include "ViewRange.hpp"
|
#include "ViewRange.hpp"
|
||||||
#include "../include/Types.hpp"
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#define VGCODE_VIEWRANGE_HPP
|
#define VGCODE_VIEWRANGE_HPP
|
||||||
|
|
||||||
#include "Range.hpp"
|
#include "Range.hpp"
|
||||||
#include "../include/Types.hpp"
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -4,12 +4,6 @@
|
|||||||
///|/
|
///|/
|
||||||
#include "../include/Viewer.hpp"
|
#include "../include/Viewer.hpp"
|
||||||
#include "ViewerImpl.hpp"
|
#include "ViewerImpl.hpp"
|
||||||
#include <string>
|
|
||||||
#include <utility>
|
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <cstddef>
|
|
||||||
#include <vector>
|
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -9,26 +9,14 @@
|
|||||||
#include "OpenGLUtils.hpp"
|
#include "OpenGLUtils.hpp"
|
||||||
#include "Utils.hpp"
|
#include "Utils.hpp"
|
||||||
|
|
||||||
#include <cstdint>
|
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <array>
|
|
||||||
#include "../include/PathVertex.hpp"
|
|
||||||
#include "Bitset.hpp"
|
|
||||||
#include "../include/ColorPrint.hpp"
|
|
||||||
#include <cfloat>
|
|
||||||
#include <iterator>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <optional>
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <type_traits>
|
|
||||||
#include <vector>
|
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
namespace libvgcode {
|
namespace libvgcode {
|
||||||
|
|
||||||
|
|||||||
@@ -8,12 +8,6 @@
|
|||||||
#include "Settings.hpp"
|
#include "Settings.hpp"
|
||||||
#include "SegmentTemplate.hpp"
|
#include "SegmentTemplate.hpp"
|
||||||
#include "OptionTemplate.hpp"
|
#include "OptionTemplate.hpp"
|
||||||
#include "../include/Types.hpp"
|
|
||||||
#include <vector>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
|
||||||
#include <map>
|
|
||||||
#include <array>
|
|
||||||
#if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
|
#if VGCODE_ENABLE_COG_AND_TOOL_MARKERS
|
||||||
#include "CogMarker.hpp"
|
#include "CogMarker.hpp"
|
||||||
#include "ToolMarker.hpp"
|
#include "ToolMarker.hpp"
|
||||||
|
|||||||
@@ -1,21 +1,5 @@
|
|||||||
#include "Snapshot.hpp"
|
#include "Snapshot.hpp"
|
||||||
|
|
||||||
#include <fstream>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <algorithm>
|
|
||||||
#include <ios>
|
|
||||||
#include <ostream>
|
|
||||||
#include <string>
|
|
||||||
#include <cassert>
|
|
||||||
#include <map>
|
|
||||||
#include <set>
|
|
||||||
#include <boost/filesystem/directory.hpp>
|
|
||||||
#include <cstring>
|
|
||||||
#include <boost/filesystem/file_status.hpp>
|
|
||||||
#include "libslic3r/Exception.hpp"
|
|
||||||
#include "slic3r/Config/Version.hpp"
|
|
||||||
#include <exception>
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
@@ -42,10 +26,7 @@
|
|||||||
#include "../GUI/MainFrame.hpp"
|
#include "../GUI/MainFrame.hpp"
|
||||||
#include "../GUI/MsgDialog.hpp"
|
#include "../GUI/MsgDialog.hpp"
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <utility>
|
|
||||||
#include <wx/richmsgdlg.h>
|
#include <wx/richmsgdlg.h>
|
||||||
#include <wx/string.h>
|
|
||||||
|
|
||||||
#define SLIC3R_SNAPSHOTS_DIR "snapshots"
|
#define SLIC3R_SNAPSHOTS_DIR "snapshots"
|
||||||
#define SLIC3R_SNAPSHOT_FILE "snapshot.ini"
|
#define SLIC3R_SNAPSHOT_FILE "snapshot.ini"
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
#ifndef slic3r_GUI_Snapshot_
|
#ifndef slic3r_GUI_Snapshot_
|
||||||
#define slic3r_GUI_Snapshot_
|
#define slic3r_GUI_Snapshot_
|
||||||
|
|
||||||
#include <ctime>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -1,21 +1,9 @@
|
|||||||
#include "Version.hpp"
|
#include "Version.hpp"
|
||||||
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/optional/optional.hpp>
|
|
||||||
#include <algorithm>
|
|
||||||
#include <boost/filesystem/directory.hpp>
|
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
#include <boost/filesystem/operations.hpp>
|
||||||
#include <boost/nowide/fstream.hpp>
|
#include <boost/nowide/fstream.hpp>
|
||||||
#include "libslic3r/Semver.hpp"
|
|
||||||
#include <cstring>
|
|
||||||
#include <string>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <vector>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <utility>
|
|
||||||
#include "libslic3r/Exception.hpp"
|
|
||||||
|
|
||||||
#include "libslic3r/libslic3r.h"
|
#include "libslic3r/libslic3r.h"
|
||||||
#include "libslic3r/Config.hpp"
|
#include "libslic3r/Config.hpp"
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#ifndef slic3r_GUI_ConfigIndex_
|
#ifndef slic3r_GUI_ConfigIndex_
|
||||||
#define slic3r_GUI_ConfigIndex_
|
#define slic3r_GUI_ConfigIndex_
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
|
#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
|
||||||
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
||||||
#include <wx/dcbuffer.h>
|
#include <wx/dcbuffer.h>
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/wx.h>
|
#include <wx/wx.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include "slic3r/GUI/GUI_Utils.hpp"
|
#include "slic3r/GUI/GUI_Utils.hpp"
|
||||||
#include "slic3r/GUI/Widgets/Button.hpp"
|
#include "slic3r/GUI/Widgets/Button.hpp"
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "Widgets/TextInput.hpp"
|
#include "Widgets/TextInput.hpp"
|
||||||
#include "Widgets/HyperLink.hpp"
|
#include "Widgets/HyperLink.hpp"
|
||||||
#include "slic3r/Utils/CalibUtils.hpp"
|
#include "slic3r/Utils/CalibUtils.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
#include "slic3r/GUI/Widgets/AnimaController.hpp"
|
#include "slic3r/GUI/Widgets/AnimaController.hpp"
|
||||||
#include "slic3r/GUI/Widgets/Label.hpp"
|
#include "slic3r/GUI/Widgets/Label.hpp"
|
||||||
#include "slic3r/GUI/Widgets/ComboBox.hpp"
|
#include "slic3r/GUI/Widgets/ComboBox.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include "slic3r/GUI/GUI_Utils.hpp"
|
#include "slic3r/GUI/GUI_Utils.hpp"
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
#include "Widgets/CheckBox.hpp"
|
#include "Widgets/CheckBox.hpp"
|
||||||
|
|
||||||
#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
|
#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/dialog.h>
|
#include <wx/dialog.h>
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
#include <wx/colour.h>
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include "libslic3r/CAD/SketchEngine.hpp"
|
#include "libslic3r/CAD/SketchEngine.hpp"
|
||||||
|
|||||||
@@ -34,7 +34,6 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <wx/accel.h>
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/chartype.h>
|
#include <wx/chartype.h>
|
||||||
|
|||||||
@@ -6,24 +6,6 @@
|
|||||||
#include "Lazy.hpp"
|
#include "Lazy.hpp"
|
||||||
#include "SelectMachinePop.hpp"
|
#include "SelectMachinePop.hpp"
|
||||||
#include "Widgets/SideTools.hpp"
|
#include "Widgets/SideTools.hpp"
|
||||||
#include <wx/string.h>
|
|
||||||
#include "libslic3r/calib.hpp"
|
|
||||||
#include <wx/panel.h>
|
|
||||||
#include "slic3r/GUI/wxExtensions.hpp"
|
|
||||||
#include "slic3r/GUI/DeviceManager.hpp"
|
|
||||||
#include <wx/gdicmn.h>
|
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/dc.h>
|
|
||||||
#include "slic3r/GUI/Widgets/PopupWindow.hpp"
|
|
||||||
#include <cstddef>
|
|
||||||
#include <wx/sizer.h>
|
|
||||||
#include <wx/scrolwin.h>
|
|
||||||
#include <wx/timer.h>
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
#include <memory>
|
|
||||||
#include <map>
|
|
||||||
#include "slic3r/GUI/StagedBuild.hpp"
|
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "Widgets/Label.hpp"
|
#include "Widgets/Label.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
#include <exception>
|
#include <exception>
|
||||||
#include <stdexcept>
|
|
||||||
|
|
||||||
#include "libslic3r/Exception.hpp"
|
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
class ConfigError : public Slic3r::RuntimeError {
|
class ConfigError : public Slic3r::RuntimeError {
|
||||||
|
|||||||
@@ -24,7 +24,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
#include <wx/string.h>
|
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
||||||
|
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <wx/dcclient.h>
|
#include <wx/dcclient.h>
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "libslic3r/ProjectTask.hpp"
|
#include "libslic3r/ProjectTask.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
||||||
|
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include "slic3r/GUI/Widgets/Label.hpp"
|
#include "slic3r/GUI/Widgets/Label.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -14,16 +14,9 @@
|
|||||||
#include "slic3r/GUI/Widgets/StaticBox.hpp"
|
#include "slic3r/GUI/Widgets/StaticBox.hpp"
|
||||||
#include "slic3r/GUI/Widgets/AnimaController.hpp"
|
#include "slic3r/GUI/Widgets/AnimaController.hpp"
|
||||||
|
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/gdicmn.h>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
#include <unordered_map>
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/simplebook.h>
|
#include <wx/simplebook.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <wx/string.h>
|
|
||||||
#include <wx/sizer.h>
|
|
||||||
|
|
||||||
// Previous definitions
|
// Previous definitions
|
||||||
class Button;
|
class Button;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include "slic3r/GUI/GUI_Utils.hpp"
|
#include "slic3r/GUI/GUI_Utils.hpp"
|
||||||
#include "slic3r/GUI/wxExtensions.hpp"
|
#include "slic3r/GUI/wxExtensions.hpp"
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "ParamsDialog.hpp"
|
#include "ParamsDialog.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "wx/hyperlink.h"
|
#include "wx/hyperlink.h"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -6,14 +6,10 @@
|
|||||||
#include <set>
|
#include <set>
|
||||||
|
|
||||||
#include <wx/bitmap.h>
|
#include <wx/bitmap.h>
|
||||||
#include <wx/button.h>
|
|
||||||
#include <wx/dataview.h>
|
#include <wx/dataview.h>
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/menu.h>
|
#include <wx/menu.h>
|
||||||
#include <wx/file.h>
|
#include <wx/file.h>
|
||||||
#include <wx/dir.h>
|
#include <wx/dir.h>
|
||||||
#include <wx/window.h>
|
|
||||||
#include <wx/string.h>
|
|
||||||
|
|
||||||
#include "AuxiliaryDataViewModel.hpp"
|
#include "AuxiliaryDataViewModel.hpp"
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,6 @@
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <wx/arrstr.h>
|
|
||||||
#include <wx/dc.h>
|
#include <wx/dc.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include "ConfigManipulation.hpp"
|
#include "ConfigManipulation.hpp"
|
||||||
|
|
||||||
#include <wx/arrstr.h>
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
|||||||
@@ -1,21 +1,15 @@
|
|||||||
#ifndef slic3r_GUI_ObjectTableSettings_hpp_
|
#ifndef slic3r_GUI_ObjectTableSettings_hpp_
|
||||||
#define slic3r_GUI_ObjectTableSettings_hpp_
|
#define slic3r_GUI_ObjectTableSettings_hpp_
|
||||||
|
|
||||||
#include <map>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/sizer.h>
|
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
|
||||||
|
|
||||||
class wxBoxSizer;
|
class wxBoxSizer;
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
class DynamicPrintConfig;
|
class DynamicPrintConfig;
|
||||||
class ModelObject;
|
|
||||||
class ModelConfig;
|
class ModelConfig;
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
class ConfigOptionsGroup;
|
class ConfigOptionsGroup;
|
||||||
|
|||||||
@@ -32,7 +32,6 @@
|
|||||||
#include "slic3r/GUI/3DScene.hpp"
|
#include "slic3r/GUI/3DScene.hpp"
|
||||||
#include "libslic3r/Config.hpp"
|
#include "libslic3r/Config.hpp"
|
||||||
#include "libslic3r/Line.hpp"
|
#include "libslic3r/Line.hpp"
|
||||||
#include <wx/string.h>
|
|
||||||
#include <wx/utils.h>
|
#include <wx/utils.h>
|
||||||
#include "libslic3r/TriangleMesh.hpp"
|
#include "libslic3r/TriangleMesh.hpp"
|
||||||
#include "slic3r/GUI/MeshUtils.hpp"
|
#include "slic3r/GUI/MeshUtils.hpp"
|
||||||
|
|||||||
@@ -75,7 +75,6 @@
|
|||||||
#include <boost/filesystem/operations.hpp>
|
#include <boost/filesystem/operations.hpp>
|
||||||
#include "slic3r/GUI/Jobs/Worker.hpp"
|
#include "slic3r/GUI/Jobs/Worker.hpp"
|
||||||
#include <cfloat>
|
#include <cfloat>
|
||||||
#include <wx/string.h>
|
|
||||||
#ifndef IMGUI_DEFINE_MATH_OPERATORS
|
#ifndef IMGUI_DEFINE_MATH_OPERATORS
|
||||||
#define IMGUI_DEFINE_MATH_OPERATORS
|
#define IMGUI_DEFINE_MATH_OPERATORS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
#include "libslic3r/Geometry.hpp"
|
#include "libslic3r/Geometry.hpp"
|
||||||
#include <wx/intl.h>
|
#include <wx/intl.h>
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
#include <wx/string.h>
|
|
||||||
#include <wx/utils.h>
|
#include <wx/utils.h>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|||||||
@@ -24,7 +24,6 @@
|
|||||||
#include "slic3r/GUI/GLShader.hpp"
|
#include "slic3r/GUI/GLShader.hpp"
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include "libslic3r/Geometry.hpp"
|
#include "libslic3r/Geometry.hpp"
|
||||||
#include <wx/string.h>
|
|
||||||
#include <wx/utils.h>
|
#include <wx/utils.h>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|||||||
@@ -1,16 +1,11 @@
|
|||||||
#ifndef slic3r_GizmoObjectManipulation_hpp_
|
#ifndef slic3r_GizmoObjectManipulation_hpp_
|
||||||
#define slic3r_GizmoObjectManipulation_hpp_
|
#define slic3r_GizmoObjectManipulation_hpp_
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "libslic3r/Point.hpp"
|
#include "libslic3r/Point.hpp"
|
||||||
#include "libslic3r/Geometry.hpp"
|
#include "libslic3r/Geometry.hpp"
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
#include <utility>
|
|
||||||
#include <wx/string.h>
|
|
||||||
|
|
||||||
#include "slic3r/GUI/GUI_Geometry.hpp"
|
#include "slic3r/GUI/GUI_Geometry.hpp"
|
||||||
|
|
||||||
@@ -19,7 +14,6 @@
|
|||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
|
||||||
class ImGuiWrapper;
|
|
||||||
class Selection;
|
class Selection;
|
||||||
class GLCanvas3D;
|
class GLCanvas3D;
|
||||||
|
|
||||||
|
|||||||
@@ -1,26 +1,13 @@
|
|||||||
#ifndef PLATERWORKER_HPP
|
#ifndef PLATERWORKER_HPP
|
||||||
#define PLATERWORKER_HPP
|
#define PLATERWORKER_HPP
|
||||||
|
|
||||||
#include <future>
|
|
||||||
#include <functional>
|
|
||||||
#include <exception>
|
|
||||||
#include <boost/log/trivial.hpp>
|
|
||||||
#include <ios>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|
||||||
#include "Worker.hpp"
|
#include "Worker.hpp"
|
||||||
#include "BusyCursorJob.hpp"
|
#include "BusyCursorJob.hpp"
|
||||||
|
|
||||||
#include "slic3r/GUI/Jobs/Job.hpp"
|
|
||||||
#include <memory>
|
|
||||||
#include <string>
|
|
||||||
#include <utility>
|
|
||||||
#include <wx/app.h>
|
|
||||||
#include <wx/event.h>
|
|
||||||
|
|
||||||
#include "slic3r/GUI/GUI.hpp"
|
#include "slic3r/GUI/GUI.hpp"
|
||||||
#include "slic3r/GUI/GUI_Utils.hpp"
|
|
||||||
#include "slic3r/GUI/I18N.hpp"
|
#include "slic3r/GUI/I18N.hpp"
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
|||||||
@@ -3,14 +3,7 @@
|
|||||||
|
|
||||||
#include "SLAImportJob.hpp"
|
#include "SLAImportJob.hpp"
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <algorithm>
|
|
||||||
#include "libslic3r/Point.hpp"
|
|
||||||
#include <string>
|
|
||||||
#include <wx/dialog.h>
|
#include <wx/dialog.h>
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/gdicmn.h>
|
|
||||||
#include <wx/filedlg.h>
|
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
#include <wx/combobox.h>
|
#include <wx/combobox.h>
|
||||||
#include <wx/filename.h>
|
#include <wx/filename.h>
|
||||||
|
|||||||
@@ -34,7 +34,6 @@
|
|||||||
#include "Widgets/StaticLine.hpp"
|
#include "Widgets/StaticLine.hpp"
|
||||||
#include "Widgets/TabCtrl.hpp"
|
#include "Widgets/TabCtrl.hpp"
|
||||||
#include <wx/notebook.h>
|
#include <wx/notebook.h>
|
||||||
#include <wx/string.h>
|
|
||||||
#include <wx/wx.h>
|
#include <wx/wx.h>
|
||||||
#include <wx/treebase.h>
|
#include <wx/treebase.h>
|
||||||
#include <wx/simplebook.h>
|
#include <wx/simplebook.h>
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <wx/display.h>
|
#include <wx/display.h>
|
||||||
#include <wx/gdicmn.h>
|
|
||||||
#include <wx/popupwin.h>
|
#include <wx/popupwin.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/timer.h>
|
#include <wx/timer.h>
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "MainFrame.hpp"
|
#include "MainFrame.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
#include <wx/arrstr.h>
|
#include <wx/arrstr.h>
|
||||||
#include "slic3r/GUI/GUI_Utils.hpp"
|
#include "slic3r/GUI/GUI_Utils.hpp"
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
#ifndef PARTSKIPCOMMON_H
|
#ifndef PARTSKIPCOMMON_H
|
||||||
#define PARTSKIPCOMMON_H
|
#define PARTSKIPCOMMON_H
|
||||||
|
|
||||||
#include <utility>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#include "libslic3r/Config.hpp"
|
#include "libslic3r/Config.hpp"
|
||||||
#include "libslic3r_version.h"
|
#include "libslic3r_version.h"
|
||||||
|
|
||||||
#include <boost/assert/source_location.hpp>
|
|
||||||
#include <boost/optional/optional.hpp>
|
#include <boost/optional/optional.hpp>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <boost/algorithm/string/join.hpp>
|
#include <boost/algorithm/string/join.hpp>
|
||||||
|
|||||||
@@ -21,7 +21,6 @@
|
|||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
#include "Widgets/Label.hpp"
|
#include "Widgets/Label.hpp"
|
||||||
#include "Widgets/TextInput.hpp"
|
#include "Widgets/TextInput.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#include "Jobs/BoostThreadWorker.hpp"
|
#include "Jobs/BoostThreadWorker.hpp"
|
||||||
#include "Jobs/PlaterWorker.hpp"
|
#include "Jobs/PlaterWorker.hpp"
|
||||||
|
|
||||||
#include <wx/containr.h>
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
#include "Widgets/Label.hpp"
|
#include "Widgets/Label.hpp"
|
||||||
|
|
||||||
#include "slic3r/GUI/Widgets/StaticBox.hpp"
|
#include "slic3r/GUI/Widgets/StaticBox.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include "slic3r/GUI/wxExtensions.hpp"
|
#include "slic3r/GUI/wxExtensions.hpp"
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
#include <slic3r/GUI/Widgets/SideTools.hpp>
|
#include <slic3r/GUI/Widgets/SideTools.hpp>
|
||||||
#include <slic3r/GUI/Widgets/Label.hpp>
|
#include <slic3r/GUI/Widgets/Label.hpp>
|
||||||
#include <slic3r/GUI/I18N.hpp>
|
#include <slic3r/GUI/I18N.hpp>
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
#define slic3r_UpgradePanel_hpp_
|
#define slic3r_UpgradePanel_hpp_
|
||||||
|
|
||||||
#include "slic3r/GUI/wxExtensions.hpp"
|
#include "slic3r/GUI/wxExtensions.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/dynarray.h>
|
#include <wx/dynarray.h>
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
#include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
|
#include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
|
||||||
#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
|
#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h"
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
#include "../DeviceManager.hpp"
|
#include "../DeviceManager.hpp"
|
||||||
#include "slic3r/GUI/Event.hpp"
|
#include "slic3r/GUI/Event.hpp"
|
||||||
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
#include "slic3r/GUI/DeviceCore/DevConfig.h"
|
#include "slic3r/GUI/DeviceCore/DevConfig.h"
|
||||||
#include "slic3r/GUI/DeviceCore/DevManager.h"
|
#include "slic3r/GUI/DeviceCore/DevManager.h"
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include "slic3r/GUI/Event.hpp"
|
#include "slic3r/GUI/Event.hpp"
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
#include "slic3r/GUI/Event.hpp"
|
#include "slic3r/GUI/Event.hpp"
|
||||||
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "slic3r/GUI/DeviceCore/DevDefs.h"
|
#include "slic3r/GUI/DeviceCore/DevDefs.h"
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#include "AnimaController.hpp"
|
#include "AnimaController.hpp"
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "slic3r/GUI/Widgets/StaticBox.hpp"
|
#include "slic3r/GUI/Widgets/StaticBox.hpp"
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
#include "StaticBox.hpp"
|
#include "StaticBox.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#include "CheckBox.hpp"
|
#include "CheckBox.hpp"
|
||||||
|
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/tglbtn.h>
|
#include <wx/tglbtn.h>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/tglbtn.h>
|
#include <wx/tglbtn.h>
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/GUI/I18N.hpp"
|
#include "slic3r/GUI/I18N.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/arrstr.h>
|
#include <wx/arrstr.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
#include "TextInput.hpp"
|
#include "TextInput.hpp"
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/arrstr.h>
|
#include <wx/arrstr.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/dynarray.h>
|
#include <wx/dynarray.h>
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <wx/arrstr.h>
|
#include <wx/arrstr.h>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <wx/containr.h>
|
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "TextInput.hpp"
|
#include "TextInput.hpp"
|
||||||
#include "DropDown.hpp"
|
#include "DropDown.hpp"
|
||||||
#include <wx/containr.h>
|
|
||||||
#include <wx/ctrlsub.h>
|
#include <wx/ctrlsub.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#include "../MsgDialog.hpp"
|
#include "../MsgDialog.hpp"
|
||||||
#include "json_diff.hpp"
|
#include "json_diff.hpp"
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
#include "../SelectMachine.hpp"
|
#include "../SelectMachine.hpp"
|
||||||
#include "../DeviceManager.hpp"
|
#include "../DeviceManager.hpp"
|
||||||
#include "slic3r/GUI/Event.hpp"
|
#include "slic3r/GUI/Event.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
#include "../GUI_App.hpp"
|
#include "../GUI_App.hpp"
|
||||||
#include "../DeviceCore/DevFilaSystem.h"
|
#include "../DeviceCore/DevFilaSystem.h"
|
||||||
|
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include "slic3r/GUI/Widgets/StepCtrl.hpp"
|
#include "slic3r/GUI/Widgets/StepCtrl.hpp"
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#include "../DeviceManager.hpp"
|
#include "../DeviceManager.hpp"
|
||||||
#include "slic3r/GUI/Event.hpp"
|
#include "slic3r/GUI/Event.hpp"
|
||||||
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
#include "slic3r/GUI/AmsMappingPopup.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
|
|
||||||
#include "slic3r/GUI/I18N.hpp"
|
#include "slic3r/GUI/I18N.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#include "RadioBox.hpp"
|
#include "RadioBox.hpp"
|
||||||
|
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
#include <wx/anybutton.h>
|
|
||||||
#include <wx/checklst.h>
|
#include <wx/checklst.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user