mirror of
https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git
synced 2025-09-23 04:53:12 +08:00
slic3r: Fix missing includes
Fix a lot of "undeclared" errors during compilation on top of the current GNOME 45 Flatpak SDK.
This commit is contained in:
parent
4c836314a6
commit
d310e4ca34
@ -4,6 +4,8 @@
|
|||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "libslic3r/Preset.hpp"
|
#include "libslic3r/Preset.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
#include <wx/colordlg.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
#include "CalibUtils.hpp"
|
#include "CalibUtils.hpp"
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "GUI_Utils.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
#include "DeviceManager.hpp"
|
#include "DeviceManager.hpp"
|
||||||
#include "wx/clrpicker.h"
|
#include "wx/clrpicker.h"
|
||||||
|
#include "wx/colourdata.h"
|
||||||
#include "Widgets/RadioBox.hpp"
|
#include "Widgets/RadioBox.hpp"
|
||||||
#include "Widgets/Button.hpp"
|
#include "Widgets/Button.hpp"
|
||||||
#include "Widgets/RoundedRectangle.hpp"
|
#include "Widgets/RoundedRectangle.hpp"
|
||||||
|
@ -21,6 +21,8 @@
|
|||||||
#include <wx/arrstr.h>
|
#include <wx/arrstr.h>
|
||||||
#include <wx/tglbtn.h>
|
#include <wx/tglbtn.h>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
|
@ -3,6 +3,10 @@
|
|||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
#include "libslic3r/Format/bbs_3mf.hpp"
|
#include "libslic3r/Format/bbs_3mf.hpp"
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
|
#include <wx/log.h>
|
||||||
|
|
||||||
const static std::array<wxString, 4> s_default_folders = {
|
const static std::array<wxString, 4> s_default_folders = {
|
||||||
_L("Model Pictures"),
|
_L("Model Pictures"),
|
||||||
_L("Bill of Materials"),
|
_L("Bill of Materials"),
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
|
||||||
#include <filesystem>
|
#include <boost/filesystem.hpp>
|
||||||
|
|
||||||
class AuxiliaryModelNode;
|
class AuxiliaryModelNode;
|
||||||
WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray);
|
WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray);
|
||||||
|
@ -4,6 +4,8 @@
|
|||||||
|
|
||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
|
|
||||||
|
#include <boost/property_tree/ptree.hpp>
|
||||||
|
|
||||||
namespace pt = boost::property_tree;
|
namespace pt = boost::property_tree;
|
||||||
typedef pt::ptree JSON;
|
typedef pt::ptree JSON;
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define BBLSTATUSBAR_HPP
|
#define BBLSTATUSBAR_HPP
|
||||||
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
|
#include <wx/sizer.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <regex>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "BBLTopbar.hpp"
|
#include "BBLTopbar.hpp"
|
||||||
#include "wx/artprov.h"
|
#include "wx/artprov.h"
|
||||||
#include "wx/aui/framemanager.h"
|
#include "wx/aui/framemanager.h"
|
||||||
|
#include "wx/display.h"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "GUI.hpp"
|
#include "GUI.hpp"
|
||||||
@ -10,6 +11,8 @@
|
|||||||
#include "WebViewDialog.hpp"
|
#include "WebViewDialog.hpp"
|
||||||
#include "PartPlate.hpp"
|
#include "PartPlate.hpp"
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#define TOPBAR_ICON_SIZE 18
|
#define TOPBAR_ICON_SIZE 18
|
||||||
#define TOPBAR_TITLE_WIDTH 300
|
#define TOPBAR_TITLE_WIDTH 300
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
|
||||||
#include <wx/wx.h>
|
#include <wx/wx.h>
|
||||||
|
#include <wx/mstream.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/statbox.h>
|
#include <wx/statbox.h>
|
||||||
#include "wx/evtloop.h"
|
#include "wx/evtloop.h"
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
#include <wx/bitmap.h>
|
#include <wx/bitmap.h>
|
||||||
#include <wx/image.h>
|
#include <wx/image.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
|
#include <wx/timer.h>
|
||||||
#include <wx/gbsizer.h>
|
#include <wx/gbsizer.h>
|
||||||
#include <wx/webrequest.h>
|
#include <wx/webrequest.h>
|
||||||
#include <wx/hyperlink.h>
|
#include <wx/hyperlink.h>
|
||||||
|
@ -5,7 +5,9 @@
|
|||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <openssl/md5.h>
|
#include <openssl/md5.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
#include <boost/nowide/cstdio.hpp>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
#include <wx/tooltip.h>
|
||||||
#include "libslic3r/PresetBundle.hpp"
|
#include "libslic3r/PresetBundle.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define slic3r_DeviceManager_hpp_
|
#define slic3r_DeviceManager_hpp_
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <mutex>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "MsgDialog.hpp"
|
#include "MsgDialog.hpp"
|
||||||
#include "libslic3r/Preset.hpp"
|
#include "libslic3r/Preset.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include "GCodeViewer.hpp"
|
#include "GCodeViewer.hpp"
|
||||||
|
|
||||||
#include "libslic3r/BuildVolume.hpp"
|
#include "libslic3r/BuildVolume.hpp"
|
||||||
|
#include "libslic3r/ClipperUtils.hpp"
|
||||||
#include "libslic3r/Print.hpp"
|
#include "libslic3r/Print.hpp"
|
||||||
#include "libslic3r/Geometry.hpp"
|
#include "libslic3r/Geometry.hpp"
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
|
|
||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
@ -6,6 +6,9 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
|
#include <wx/colour.h>
|
||||||
|
#include <wx/font.h>
|
||||||
|
|
||||||
class wxImage;
|
class wxImage;
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
@ -27,6 +27,8 @@
|
|||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <boost/nowide/convert.hpp>
|
#include <boost/nowide/convert.hpp>
|
||||||
|
#include <boost/property_tree/ptree.hpp>
|
||||||
|
#include <boost/property_tree/json_parser.hpp>
|
||||||
|
|
||||||
#include <wx/stdpaths.h>
|
#include <wx/stdpaths.h>
|
||||||
#include <wx/imagpng.h>
|
#include <wx/imagpng.h>
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define slic3r_GUI_Colors_hpp_
|
#define slic3r_GUI_Colors_hpp_
|
||||||
|
|
||||||
#include "imgui/imgui.h"
|
#include "imgui/imgui.h"
|
||||||
|
#include <array>
|
||||||
|
|
||||||
enum RenderCol_ {
|
enum RenderCol_ {
|
||||||
RenderCol_3D_Background = 0,
|
RenderCol_3D_Background = 0,
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
// To show a message box if GUI initialization ends up with an exception thrown.
|
// To show a message box if GUI initialization ends up with an exception thrown.
|
||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
#include <boost/nowide/iostream.hpp>
|
#include <boost/nowide/iostream.hpp>
|
||||||
#include <boost/nowide/convert.hpp>
|
#include <boost/nowide/convert.hpp>
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#include "wx/clipbrd.h"
|
#include "wx/clipbrd.h"
|
||||||
|
#include "wx/display.h"
|
||||||
|
|
||||||
#include "SelectMachine.hpp"
|
#include "SelectMachine.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
namespace Slic3r::GUI {
|
namespace Slic3r::GUI {
|
||||||
|
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
#include "slic3r/GUI/GLCanvas3D.hpp"
|
#include "slic3r/GUI/GLCanvas3D.hpp"
|
||||||
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
|
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
|
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
|
||||||
#include "GLGizmoText.hpp"
|
#include "GLGizmoText.hpp"
|
||||||
|
#include "libslic3r/ClipperUtils.hpp"
|
||||||
#include "slic3r/GUI/GLCanvas3D.hpp"
|
#include "slic3r/GUI/GLCanvas3D.hpp"
|
||||||
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
|
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
@ -14,6 +15,8 @@
|
|||||||
|
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
#ifndef IMGUI_DEFINE_MATH_OPERATORS
|
#ifndef IMGUI_DEFINE_MATH_OPERATORS
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "HMS.hpp"
|
#include "HMS.hpp"
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#ifndef slic3r_Http_App_hpp_
|
#ifndef slic3r_Http_App_hpp_
|
||||||
#define slic3r_Http_App_hpp_
|
#define slic3r_Http_App_hpp_
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <stack>
|
#include <stack>
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "TickCode.hpp"
|
#include "TickCode.hpp"
|
||||||
#include <imgui/imgui.h>
|
#include <imgui/imgui.h>
|
||||||
|
#include <wx/slider.h>
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
|
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
|
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
|
wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel)
|
BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel)
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#define ImageGrid_h
|
#define ImageGrid_h
|
||||||
|
|
||||||
#include <wx/window.h>
|
#include <wx/window.h>
|
||||||
|
#include <wx/timer.h>
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
|
|
||||||
#include "Widgets/StateColor.hpp"
|
#include "Widgets/StateColor.hpp"
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include <boost/filesystem/path.hpp>
|
#include <boost/filesystem/path.hpp>
|
||||||
#include <boost/filesystem/operations.hpp>
|
#include <boost/filesystem/operations.hpp>
|
||||||
|
#include "libslic3r/PrintConfig.hpp"
|
||||||
#include "PlaterJob.hpp"
|
#include "PlaterJob.hpp"
|
||||||
|
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = boost::filesystem;
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <wx/string.h>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef __UpgradeNetworkJob_HPP__
|
#ifndef __UpgradeNetworkJob_HPP__
|
||||||
#define __UpgradeNetworkJob_HPP__
|
#define __UpgradeNetworkJob_HPP__
|
||||||
|
|
||||||
|
#include <boost/filesystem.hpp>
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include "Job.hpp"
|
#include "Job.hpp"
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
|
#include <boost/property_tree/ptree.hpp>
|
||||||
|
|
||||||
#include "libslic3r/Print.hpp"
|
#include "libslic3r/Print.hpp"
|
||||||
#include "libslic3r/Polygon.hpp"
|
#include "libslic3r/Polygon.hpp"
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
|
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
#include "libslic3r/PrintConfig.hpp"
|
||||||
|
|
||||||
|
#include <boost/property_tree/ptree_fwd.hpp>
|
||||||
|
|
||||||
#include <wx/frame.h>
|
#include <wx/frame.h>
|
||||||
#include <wx/settings.h>
|
#include <wx/settings.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
@ -7,6 +7,8 @@
|
|||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
|
||||||
|
#include <wx/display.h>
|
||||||
|
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = boost::filesystem;
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
#ifndef MediaFilePanel_h
|
#ifndef MediaFilePanel_h
|
||||||
#define MediaFilePanel_h
|
#define MediaFilePanel_h
|
||||||
|
|
||||||
|
#include <set>
|
||||||
|
|
||||||
#include "GUI_Utils.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
|
|
||||||
|
@ -9,6 +9,9 @@
|
|||||||
#include "DownloadProgressDialog.hpp"
|
#include "DownloadProgressDialog.hpp"
|
||||||
|
|
||||||
#include <boost/filesystem/string_file.hpp>
|
#include <boost/filesystem/string_file.hpp>
|
||||||
|
#include <boost/lexical_cast.hpp>
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
#include <boost/nowide/cstdio.hpp>
|
||||||
#include <boost/nowide/utf8_codecvt.hpp>
|
#include <boost/nowide/utf8_codecvt.hpp>
|
||||||
#undef pid_t
|
#undef pid_t
|
||||||
#include <boost/process.hpp>
|
#include <boost/process.hpp>
|
||||||
@ -19,6 +22,8 @@
|
|||||||
#include <sys/shm.h>
|
#include <sys/shm.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <wx/clipbrd.h>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define slic3r_MonitorPage_hpp_
|
#define slic3r_MonitorPage_hpp_
|
||||||
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
|
#include <wx/sizer.h>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include "slic3r/Utils/Http.hpp"
|
#include "slic3r/Utils/Http.hpp"
|
||||||
#include "libslic3r/AppConfig.hpp"
|
#include "libslic3r/AppConfig.hpp"
|
||||||
#include <boost/asio/ip/address.hpp>
|
#include <boost/asio/ip/address.hpp>
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
//#ifdef _WIN32
|
//#ifdef _WIN32
|
||||||
|
|
||||||
#include <wx/bookctrl.h>
|
#include <wx/bookctrl.h>
|
||||||
|
#include <wx/sizer.h>
|
||||||
|
|
||||||
class ModeSizer;
|
class ModeSizer;
|
||||||
class ScalableButton;
|
class ScalableButton;
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef slic3r_GUI_ObjectDataViewModel_hpp_
|
#ifndef slic3r_GUI_ObjectDataViewModel_hpp_
|
||||||
#define slic3r_GUI_ObjectDataViewModel_hpp_
|
#define slic3r_GUI_ObjectDataViewModel_hpp_
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include <wx/dataview.h>
|
#include <wx/dataview.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
@ -23,7 +23,9 @@
|
|||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/statline.h>
|
#include <wx/statline.h>
|
||||||
#include <wx/scrolwin.h>
|
#include <wx/scrolwin.h>
|
||||||
|
#include <wx/timer.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
|
#include <wx/wupdlock.h>
|
||||||
|
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "GUI_Utils.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include <boost/filesystem/operations.hpp>
|
#include <boost/filesystem/operations.hpp>
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <boost/nowide/convert.hpp>
|
#include <boost/nowide/convert.hpp>
|
||||||
|
#include <boost/nowide/cstdio.hpp>
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
|
|
||||||
#include "libslic3r/libslic3r.h"
|
#include "libslic3r/libslic3r.h"
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define slic3r_PresetComboBoxes_hpp_
|
#define slic3r_PresetComboBoxes_hpp_
|
||||||
|
|
||||||
//#include <wx/bmpcbox.h>
|
//#include <wx/bmpcbox.h>
|
||||||
|
#include <wx/colourdata.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/clrpicker.h>
|
#include <wx/clrpicker.h>
|
||||||
|
|
||||||
|
@ -8,9 +8,13 @@
|
|||||||
#include "../BitmapCache.hpp"
|
#include "../BitmapCache.hpp"
|
||||||
|
|
||||||
#include <boost/algorithm/hex.hpp>
|
#include <boost/algorithm/hex.hpp>
|
||||||
|
#include <boost/endian/conversion.hpp>
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
#include <boost/uuid/detail/md5.hpp>
|
#include <boost/uuid/detail/md5.hpp>
|
||||||
#include <boost/regex.hpp>
|
#include <boost/regex.hpp>
|
||||||
|
|
||||||
|
#include <wx/mstream.h>
|
||||||
|
|
||||||
#include "nlohmann/json.hpp"
|
#include "nlohmann/json.hpp"
|
||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#define BAMBU_DYNAMIC
|
#define BAMBU_DYNAMIC
|
||||||
#include "BambuTunnel.h"
|
#include "BambuTunnel.h"
|
||||||
|
|
||||||
|
#include <wx/bitmap.h>
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
|
|
||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "Widgets/Label.hpp"
|
#include "Widgets/Label.hpp"
|
||||||
#include "Widgets/WebView.hpp"
|
#include "Widgets/WebView.hpp"
|
||||||
#include <wx/webview.h>
|
#include <wx/webview.h>
|
||||||
|
#include <wx/progdlg.h>
|
||||||
#include <wx/simplebook.h>
|
#include <wx/simplebook.h>
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
@ -21,6 +21,8 @@
|
|||||||
#include <wx/arrstr.h>
|
#include <wx/arrstr.h>
|
||||||
#include <wx/tglbtn.h>
|
#include <wx/tglbtn.h>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include <wx/progdlg.h>
|
#include <wx/progdlg.h>
|
||||||
#include <wx/clipbrd.h>
|
#include <wx/clipbrd.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
#include <wx/mstream.h>
|
||||||
#include <miniz.h>
|
#include <miniz.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "Plater.hpp"
|
#include "Plater.hpp"
|
||||||
|
@ -4,6 +4,8 @@
|
|||||||
#include "Widgets/Label.hpp"
|
#include "Widgets/Label.hpp"
|
||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
|
||||||
|
@ -17,6 +17,8 @@
|
|||||||
#include "RecenterDialog.hpp"
|
#include "RecenterDialog.hpp"
|
||||||
#include "CalibUtils.hpp"
|
#include "CalibUtils.hpp"
|
||||||
#include <slic3r/GUI/Widgets/ProgressDialog.hpp>
|
#include <slic3r/GUI/Widgets/ProgressDialog.hpp>
|
||||||
|
#include <wx/display.h>
|
||||||
|
#include <wx/mstream.h>
|
||||||
#include <wx/sstream.h>
|
#include <wx/sstream.h>
|
||||||
#include <wx/zstream.h>
|
#include <wx/zstream.h>
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "TabButton.hpp"
|
#include "TabButton.hpp"
|
||||||
#include "Widgets/Label.hpp"
|
#include "Widgets/Label.hpp"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(TabButton, StaticBox)
|
BEGIN_EVENT_TABLE(TabButton, StaticBox)
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "wx/cmdline.h"
|
#include "wx/cmdline.h"
|
||||||
#include "wx/notifmsg.h"
|
#include "wx/notifmsg.h"
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
#include "wx/timer.h"
|
||||||
#include "wx/webview.h"
|
#include "wx/webview.h"
|
||||||
|
|
||||||
#if wxUSE_WEBVIEW_IE
|
#if wxUSE_WEBVIEW_IE
|
||||||
|
@ -7,6 +7,9 @@
|
|||||||
#include "libslic3r_version.h"
|
#include "libslic3r_version.h"
|
||||||
#include "../Utils/Http.hpp"
|
#include "../Utils/Http.hpp"
|
||||||
|
|
||||||
|
#include <boost/property_tree/ptree.hpp>
|
||||||
|
#include <boost/property_tree/json_parser.hpp>
|
||||||
|
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/toolbar.h>
|
#include <wx/toolbar.h>
|
||||||
#include <wx/textdlg.h>
|
#include <wx/textdlg.h>
|
||||||
|
@ -6,6 +6,9 @@
|
|||||||
|
|
||||||
#include <wx/simplebook.h>
|
#include <wx/simplebook.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include "CalibUtils.hpp"
|
#include "CalibUtils.hpp"
|
||||||
|
|
||||||
namespace Slic3r { namespace GUI {
|
namespace Slic3r { namespace GUI {
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#include "AxisCtrlButton.hpp"
|
#include "AxisCtrlButton.hpp"
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
|
#include "libslic3r/libslic3r.h"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal)));
|
StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal)));
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "Button.hpp"
|
#include "Button.hpp"
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(Button, StaticBox)
|
BEGIN_EVENT_TABLE(Button, StaticBox)
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#include "DropDown.hpp"
|
#include "DropDown.hpp"
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
|
|
||||||
|
#include <wx/display.h>
|
||||||
|
#include <wx/dcbuffer.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
#ifdef __WXGTK__
|
#ifdef __WXGTK__
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#ifndef slic3r_GUI_DropDown_hpp_
|
#ifndef slic3r_GUI_DropDown_hpp_
|
||||||
#define slic3r_GUI_DropDown_hpp_
|
#define slic3r_GUI_DropDown_hpp_
|
||||||
|
|
||||||
|
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
#include "StateHandler.hpp"
|
#include "StateHandler.hpp"
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#include "ErrorMsgStaticText.hpp"
|
#include "ErrorMsgStaticText.hpp"
|
||||||
|
#include <wx/dcclient.h>
|
||||||
|
|
||||||
ErrorMsgStaticText::ErrorMsgStaticText() {}
|
ErrorMsgStaticText::ErrorMsgStaticText() {}
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#ifndef _WX_ERRORMSGSTATTEXT_H_
|
#ifndef _WX_ERRORMSGSTATTEXT_H_
|
||||||
#define _WX_ERRORMSGSTATTEXT_H_
|
#define _WX_ERRORMSGSTATTEXT_H_
|
||||||
|
|
||||||
|
#include <wx/panel.h>
|
||||||
#include "wx/stattext.h"
|
#include "wx/stattext.h"
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel
|
class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include "StaticBox.hpp"
|
#include "StaticBox.hpp"
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox)
|
BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox)
|
||||||
|
@ -2,6 +2,9 @@
|
|||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
#include "StaticBox.hpp"
|
#include "StaticBox.hpp"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
|
#include <wx/settings.h>
|
||||||
|
|
||||||
wxFont Label::sysFont(int size, bool bold)
|
wxFont Label::sysFont(int size, bool bold)
|
||||||
{
|
{
|
||||||
//#ifdef __linux__
|
//#ifdef __linux__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "ProgressBar.hpp"
|
#include "ProgressBar.hpp"
|
||||||
#include "../I18N.hpp"
|
#include "../I18N.hpp"
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define slic3r_GUI_PROGRESSDIALOG_hpp_
|
#define slic3r_GUI_PROGRESSDIALOG_hpp_
|
||||||
|
|
||||||
#include "wx/dialog.h"
|
#include "wx/dialog.h"
|
||||||
|
#include "wx/progdlg.h"
|
||||||
#include "wx/weakref.h"
|
#include "wx/weakref.h"
|
||||||
#include "wx/simplebook.h"
|
#include "wx/simplebook.h"
|
||||||
#include "Button.hpp"
|
#include "Button.hpp"
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "RoundedRectangle.hpp"
|
#include "RoundedRectangle.hpp"
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel)
|
BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "SideButton.hpp"
|
#include "SideButton.hpp"
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(SideButton, wxPanel)
|
BEGIN_EVENT_TABLE(SideButton, wxPanel)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "SideMenuPopup.hpp"
|
#include "SideMenuPopup.hpp"
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
|
|
||||||
|
#include <wx/display.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
#include "../GUI_App.hpp"
|
#include "../GUI_App.hpp"
|
||||||
|
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
#ifndef slic3r_GUI_SpinInput_hpp_
|
#ifndef slic3r_GUI_SpinInput_hpp_
|
||||||
#define slic3r_GUI_SpinInput_hpp_
|
#define slic3r_GUI_SpinInput_hpp_
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
|
#include <wx/timer.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
|
#include <wx/valtext.h>
|
||||||
#include "StaticBox.hpp"
|
#include "StaticBox.hpp"
|
||||||
|
|
||||||
class Button;
|
class Button;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#include <wx/window.h>
|
||||||
#include "StateHandler.hpp"
|
#include "StateHandler.hpp"
|
||||||
|
|
||||||
wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent);
|
wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent);
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#ifndef slic3r_GUI_StateHandler_hpp_
|
#ifndef slic3r_GUI_StateHandler_hpp_
|
||||||
#define slic3r_GUI_StateHandler_hpp_
|
#define slic3r_GUI_StateHandler_hpp_
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
|
|
||||||
#include "StateColor.hpp"
|
#include "StateColor.hpp"
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "StaticBox.hpp"
|
#include "StaticBox.hpp"
|
||||||
#include "../GUI.hpp"
|
#include "../GUI.hpp"
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(StaticBox, wxWindow)
|
BEGIN_EVENT_TABLE(StaticBox, wxWindow)
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
#include "StateColor.hpp"
|
#include "StateColor.hpp"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(StaticLine, wxWindow)
|
BEGIN_EVENT_TABLE(StaticLine, wxWindow)
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
#include <wx/dc.h>
|
||||||
|
#include <wx/pen.h>
|
||||||
|
|
||||||
#include "StepCtrl.hpp"
|
#include "StepCtrl.hpp"
|
||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
|
|
||||||
|
@ -5,7 +5,9 @@
|
|||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
#include "../Utils/MacDarkMode.hpp"
|
#include "../Utils/MacDarkMode.hpp"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
#include <wx/dcmemory.h>
|
||||||
|
|
||||||
SwitchButton::SwitchButton(wxWindow* parent, wxWindowID id)
|
SwitchButton::SwitchButton(wxWindow* parent, wxWindowID id)
|
||||||
: wxBitmapToggleButton(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxBU_EXACTFIT)
|
: wxBitmapToggleButton(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxBU_EXACTFIT)
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#include <wx/dc.h>
|
||||||
#include "TabCtrl.hpp"
|
#include "TabCtrl.hpp"
|
||||||
|
|
||||||
wxDEFINE_EVENT( wxEVT_TAB_SEL_CHANGING, wxCommandEvent );
|
wxDEFINE_EVENT( wxEVT_TAB_SEL_CHANGING, wxCommandEvent );
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#define slic3r_GUI_TempInput_hpp_
|
#define slic3r_GUI_TempInput_hpp_
|
||||||
|
|
||||||
#include "../wxExtensions.hpp"
|
#include "../wxExtensions.hpp"
|
||||||
|
#include <wx/stattext.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
#include "StaticBox.hpp"
|
#include "StaticBox.hpp"
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
#include "TextCtrl.h"
|
#include "TextCtrl.h"
|
||||||
|
|
||||||
|
#include <wx/dcclient.h>
|
||||||
#include <wx/dcgraph.h>
|
#include <wx/dcgraph.h>
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(TextInput, wxPanel)
|
BEGIN_EVENT_TABLE(TextInput, wxPanel)
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/Utils/MacDarkMode.hpp"
|
#include "slic3r/Utils/MacDarkMode.hpp"
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
|
||||||
#include <wx/webviewarchivehandler.h>
|
#include <wx/webviewarchivehandler.h>
|
||||||
#include <wx/webviewfshandler.h>
|
#include <wx/webviewfshandler.h>
|
||||||
#if wxUSE_WEBVIEW_EDGE
|
#if wxUSE_WEBVIEW_EDGE
|
||||||
|
@ -11,9 +11,6 @@
|
|||||||
#include "slic3r/Utils/ColorSpaceConvert.hpp"
|
#include "slic3r/Utils/ColorSpaceConvert.hpp"
|
||||||
#include "MainFrame.hpp"
|
#include "MainFrame.hpp"
|
||||||
|
|
||||||
#include <wx/sizer.h>
|
|
||||||
|
|
||||||
|
|
||||||
using namespace Slic3r::GUI;
|
using namespace Slic3r::GUI;
|
||||||
|
|
||||||
int scale(const int val) { return val * Slic3r::GUI::wxGetApp().em_unit() / 10; }
|
int scale(const int val) { return val * Slic3r::GUI::wxGetApp().em_unit() / 10; }
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "GUI_Utils.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
|
|
||||||
|
#include <wx/sizer.h>
|
||||||
#include <wx/spinctrl.h>
|
#include <wx/spinctrl.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include <wx/bmpcbox.h>
|
#include <wx/bmpcbox.h>
|
||||||
#include <wx/statbmp.h>
|
#include <wx/statbmp.h>
|
||||||
#include <wx/popupwin.h>
|
#include <wx/popupwin.h>
|
||||||
|
#include <wx/scrolwin.h>
|
||||||
#include <wx/spinctrl.h>
|
#include <wx/spinctrl.h>
|
||||||
#include <wx/artprov.h>
|
#include <wx/artprov.h>
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "ColorSpaceConvert.hpp"
|
#include "ColorSpaceConvert.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
const static float param_13 = 1.0f / 3.0f;
|
const static float param_13 = 1.0f / 3.0f;
|
||||||
const static float param_16116 = 16.0f / 116.0f;
|
const static float param_16116 = 16.0f / 116.0f;
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef slic3r_Utils_ColorSpaceConvert_hpp_
|
#ifndef slic3r_Utils_ColorSpaceConvert_hpp_
|
||||||
#define slic3r_Utils_ColorSpaceConvert_hpp_
|
#define slic3r_Utils_ColorSpaceConvert_hpp_
|
||||||
|
|
||||||
|
#include <tuple>
|
||||||
|
|
||||||
std::tuple<int, int, int> rgb_to_yuv(float r, float g, float b);
|
std::tuple<int, int, int> rgb_to_yuv(float r, float g, float b);
|
||||||
double PivotRGB(double n);
|
double PivotRGB(double n);
|
||||||
double PivotXYZ(double n);
|
double PivotXYZ(double n);
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "FileHelp.hpp"
|
#include "FileHelp.hpp"
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
#include <regex>
|
#include <regex>
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace Utils {
|
namespace Utils {
|
||||||
|
@ -1,11 +1,15 @@
|
|||||||
#ifndef __Http_hpp__
|
#ifndef __Http_hpp__
|
||||||
#define __Http_hpp__
|
#define __Http_hpp__
|
||||||
|
|
||||||
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <boost/filesystem/path.hpp>
|
#include <boost/filesystem/path.hpp>
|
||||||
|
|
||||||
|
#include "libslic3r/Exception.hpp"
|
||||||
|
#include "libslic3r_version.h"
|
||||||
|
|
||||||
#define MAX_SIZE_TO_FILE 3*1024
|
#define MAX_SIZE_TO_FILE 3*1024
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
@ -12,6 +12,10 @@
|
|||||||
|
|
||||||
#include <libslic3r/Utils.hpp>
|
#include <libslic3r/Utils.hpp>
|
||||||
|
|
||||||
|
#include <boost/log/trivial.hpp>
|
||||||
|
#include <boost/nowide/iostream.hpp>
|
||||||
|
#include <boost/nowide/fstream.hpp>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using json = nlohmann::json;
|
using json = nlohmann::json;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user