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:
Bastien Nocera 2023-12-21 10:10:46 +01:00 committed by Lane.Wei
parent 4c836314a6
commit d310e4ca34
88 changed files with 140 additions and 7 deletions

View File

@ -4,6 +4,8 @@
#include "GUI_App.hpp"
#include "libslic3r/Preset.hpp"
#include "I18N.hpp"
#include <boost/log/trivial.hpp>
#include <wx/colordlg.h>
#include <wx/dcgraph.h>
#include "CalibUtils.hpp"

View File

@ -6,6 +6,7 @@
#include "GUI_Utils.hpp"
#include "DeviceManager.hpp"
#include "wx/clrpicker.h"
#include "wx/colourdata.h"
#include "Widgets/RadioBox.hpp"
#include "Widgets/Button.hpp"
#include "Widgets/RoundedRectangle.hpp"

View File

@ -21,6 +21,8 @@
#include <wx/arrstr.h>
#include <wx/tglbtn.h>
#include <boost/log/trivial.hpp>
#include "wxExtensions.hpp"
#include "GUI_App.hpp"
#include "GUI_ObjectList.hpp"

View File

@ -3,6 +3,10 @@
#include "libslic3r/Model.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 = {
_L("Model Pictures"),
_L("Bill of Materials"),

View File

@ -8,7 +8,7 @@
#include "I18N.hpp"
#include <filesystem>
#include <boost/filesystem.hpp>
class AuxiliaryModelNode;
WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray);

View File

@ -4,6 +4,8 @@
#include "libslic3r/Utils.hpp"
#include <boost/property_tree/ptree.hpp>
namespace pt = boost::property_tree;
typedef pt::ptree JSON;

View File

@ -2,6 +2,7 @@
#define BBLSTATUSBAR_HPP
#include <wx/panel.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <memory>

View File

@ -12,7 +12,7 @@
#include "I18N.hpp"
#include <iostream>
#include <regex>
namespace Slic3r {

View File

@ -1,6 +1,7 @@
#include "BBLTopbar.hpp"
#include "wx/artprov.h"
#include "wx/aui/framemanager.h"
#include "wx/display.h"
#include "I18N.hpp"
#include "GUI_App.hpp"
#include "GUI.hpp"
@ -10,6 +11,8 @@
#include "WebViewDialog.hpp"
#include "PartPlate.hpp"
#include <boost/log/trivial.hpp>
#define TOPBAR_ICON_SIZE 18
#define TOPBAR_TITLE_WIDTH 300

View File

@ -2,6 +2,7 @@
#include "GUI_App.hpp"
#include <wx/wx.h>
#include <wx/mstream.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include "wx/evtloop.h"

View File

@ -8,6 +8,7 @@
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/sizer.h>
#include <wx/timer.h>
#include <wx/gbsizer.h>
#include <wx/webrequest.h>
#include <wx/hyperlink.h>

View File

@ -5,7 +5,9 @@
#include <unordered_set>
#include <openssl/md5.h>
#include <openssl/evp.h>
#include <boost/nowide/cstdio.hpp>
#include <wx/dcgraph.h>
#include <wx/tooltip.h>
#include "libslic3r/PresetBundle.hpp"
#include "I18N.hpp"
#include "GUI_App.hpp"

View File

@ -2,6 +2,7 @@
#define slic3r_DeviceManager_hpp_
#include <map>
#include <mutex>
#include <vector>
#include <string>
#include <memory>

View File

@ -3,6 +3,7 @@
#include "MsgDialog.hpp"
#include "libslic3r/Preset.hpp"
#include "I18N.hpp"
#include <boost/log/trivial.hpp>
#include <wx/dcgraph.h>
namespace Slic3r { namespace GUI {

View File

@ -2,6 +2,7 @@
#include "GCodeViewer.hpp"
#include "libslic3r/BuildVolume.hpp"
#include "libslic3r/ClipperUtils.hpp"
#include "libslic3r/Print.hpp"
#include "libslic3r/Geometry.hpp"
#include "libslic3r/Model.hpp"

View File

@ -27,6 +27,7 @@
#include "libslic3r/Utils.hpp"
#include "GUI_App.hpp"
#include <boost/log/trivial.hpp>
#include <wx/dcgraph.h>
namespace Slic3r {
namespace GUI {

View File

@ -6,6 +6,9 @@
#include <vector>
#include <thread>
#include <wx/colour.h>
#include <wx/font.h>
class wxImage;
namespace Slic3r {

View File

@ -27,6 +27,8 @@
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.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/imagpng.h>

View File

@ -2,6 +2,7 @@
#define slic3r_GUI_Colors_hpp_
#include "imgui/imgui.h"
#include <array>
enum RenderCol_ {
RenderCol_3D_Background = 0,

View File

@ -13,6 +13,7 @@
// To show a message box if GUI initialization ends up with an exception thrown.
#include <wx/msgdlg.h>
#include <boost/log/trivial.hpp>
#include <boost/nowide/iostream.hpp>
#include <boost/nowide/convert.hpp>

View File

@ -1,4 +1,5 @@
#include "wx/clipbrd.h"
#include "wx/display.h"
#include "SelectMachine.hpp"
#include "I18N.hpp"

View File

@ -18,6 +18,7 @@
#include <GL/glew.h>
#include <boost/log/trivial.hpp>
namespace Slic3r::GUI {

View File

@ -3,6 +3,8 @@
#include "slic3r/GUI/GLCanvas3D.hpp"
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
#include <boost/log/trivial.hpp>
#include <GL/glew.h>
#include "slic3r/GUI/GUI_App.hpp"

View File

@ -1,5 +1,6 @@
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
#include "GLGizmoText.hpp"
#include "libslic3r/ClipperUtils.hpp"
#include "slic3r/GUI/GLCanvas3D.hpp"
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
#include "slic3r/GUI/GUI_App.hpp"
@ -14,6 +15,8 @@
#include <numeric>
#include <boost/log/trivial.hpp>
#include <GL/glew.h>
#ifndef IMGUI_DEFINE_MATH_OPERATORS

View File

@ -1,6 +1,6 @@
#include "HMS.hpp"
#include <boost/log/trivial.hpp>
namespace Slic3r {
namespace GUI {

View File

@ -1,6 +1,7 @@
#ifndef slic3r_Http_App_hpp_
#define slic3r_Http_App_hpp_
#include <iostream>
#include <mutex>
#include <stack>

View File

@ -3,6 +3,7 @@
#include "TickCode.hpp"
#include <imgui/imgui.h>
#include <wx/slider.h>
#include <set>

View File

@ -8,6 +8,8 @@
#include <wx/dcgraph.h>
#include <boost/log/trivial.hpp>
wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel)

View File

@ -9,6 +9,7 @@
#define ImageGrid_h
#include <wx/window.h>
#include <wx/timer.h>
#include <boost/shared_ptr.hpp>
#include "Widgets/StateColor.hpp"

View File

@ -3,6 +3,7 @@
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include "libslic3r/PrintConfig.hpp"
#include "PlaterJob.hpp"
namespace fs = boost::filesystem;

View File

@ -3,6 +3,7 @@
#include <string>
#include <functional>
#include <wx/string.h>
namespace Slic3r {

View File

@ -1,6 +1,8 @@
#ifndef __UpgradeNetworkJob_HPP__
#define __UpgradeNetworkJob_HPP__
#include <boost/filesystem.hpp>
#include <boost/log/trivial.hpp>
#include <functional>
#include "Job.hpp"

View File

@ -15,6 +15,7 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/log/trivial.hpp>
#include <boost/property_tree/ptree.hpp>
#include "libslic3r/Print.hpp"
#include "libslic3r/Polygon.hpp"

View File

@ -3,6 +3,8 @@
#include "libslic3r/PrintConfig.hpp"
#include <boost/property_tree/ptree_fwd.hpp>
#include <wx/frame.h>
#include <wx/settings.h>
#include <wx/string.h>

View File

@ -7,6 +7,8 @@
#include "libslic3r/Utils.hpp"
#include "I18N.hpp"
#include <wx/display.h>
namespace fs = boost::filesystem;
namespace Slic3r { namespace GUI {

View File

@ -8,6 +8,8 @@
#ifndef MediaFilePanel_h
#define MediaFilePanel_h
#include <set>
#include "GUI_Utils.hpp"
#include "wxExtensions.hpp"

View File

@ -9,6 +9,9 @@
#include "DownloadProgressDialog.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>
#undef pid_t
#include <boost/process.hpp>
@ -19,6 +22,8 @@
#include <sys/shm.h>
#endif
#include <wx/clipbrd.h>
namespace Slic3r {
namespace GUI {

View File

@ -2,6 +2,7 @@
#define slic3r_MonitorPage_hpp_
#include <wx/panel.h>
#include <wx/sizer.h>
namespace Slic3r {
namespace GUI {

View File

@ -8,7 +8,7 @@
#include "slic3r/Utils/Http.hpp"
#include "libslic3r/AppConfig.hpp"
#include <boost/asio/ip/address.hpp>
#include <boost/log/trivial.hpp>
namespace Slic3r {
namespace GUI {

View File

@ -4,6 +4,7 @@
//#ifdef _WIN32
#include <wx/bookctrl.h>
#include <wx/sizer.h>
class ModeSizer;
class ScalableButton;

View File

@ -1,6 +1,8 @@
#ifndef slic3r_GUI_ObjectDataViewModel_hpp_
#define slic3r_GUI_ObjectDataViewModel_hpp_
#include <boost/log/trivial.hpp>
#include <wx/dataview.h>
#include <vector>
#include <map>

View File

@ -23,7 +23,9 @@
#include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/scrolwin.h>
#include <wx/timer.h>
#include <wx/panel.h>
#include <wx/wupdlock.h>
#include "wxExtensions.hpp"
#include "GUI_Utils.hpp"

View File

@ -12,6 +12,7 @@
#include <boost/filesystem/operations.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/convert.hpp>
#include <boost/nowide/cstdio.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include "libslic3r/libslic3r.h"

View File

@ -2,6 +2,7 @@
#define slic3r_PresetComboBoxes_hpp_
//#include <wx/bmpcbox.h>
#include <wx/colourdata.h>
#include <wx/gdicmn.h>
#include <wx/clrpicker.h>

View File

@ -8,9 +8,13 @@
#include "../BitmapCache.hpp"
#include <boost/algorithm/hex.hpp>
#include <boost/endian/conversion.hpp>
#include <boost/log/trivial.hpp>
#include <boost/uuid/detail/md5.hpp>
#include <boost/regex.hpp>
#include <wx/mstream.h>
#include "nlohmann/json.hpp"
#include <cstring>

View File

@ -4,6 +4,7 @@
#define BAMBU_DYNAMIC
#include "BambuTunnel.h"
#include <wx/bitmap.h>
#include <wx/event.h>
#include <boost/thread.hpp>

View File

@ -6,6 +6,7 @@
#include "Widgets/Label.hpp"
#include "Widgets/WebView.hpp"
#include <wx/webview.h>
#include <wx/progdlg.h>
#include <wx/simplebook.h>
namespace Slic3r { namespace GUI {

View File

@ -21,6 +21,8 @@
#include <wx/arrstr.h>
#include <wx/tglbtn.h>
#include <boost/log/trivial.hpp>
#include "wxExtensions.hpp"
#include "GUI_App.hpp"
#include "GUI_ObjectList.hpp"

View File

@ -4,6 +4,7 @@
#include <vector>
#include <string>
#include <boost/algorithm/string.hpp>
#include <boost/log/trivial.hpp>
#include <wx/sizer.h>
#include <wx/stattext.h>

View File

@ -17,6 +17,7 @@
#include <wx/progdlg.h>
#include <wx/clipbrd.h>
#include <wx/dcgraph.h>
#include <wx/mstream.h>
#include <miniz.h>
#include <algorithm>
#include "Plater.hpp"

View File

@ -4,6 +4,8 @@
#include "Widgets/Label.hpp"
#include "libslic3r/Utils.hpp"
#include <boost/log/trivial.hpp>
namespace Slic3r {
namespace GUI {

View File

@ -17,6 +17,8 @@
#include "RecenterDialog.hpp"
#include "CalibUtils.hpp"
#include <slic3r/GUI/Widgets/ProgressDialog.hpp>
#include <wx/display.h>
#include <wx/mstream.h>
#include <wx/sstream.h>
#include <wx/zstream.h>

View File

@ -1,6 +1,7 @@
#include "TabButton.hpp"
#include "Widgets/Label.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(TabButton, StaticBox)

View File

@ -6,6 +6,7 @@
#include "wx/cmdline.h"
#include "wx/notifmsg.h"
#include "wx/settings.h"
#include "wx/timer.h"
#include "wx/webview.h"
#if wxUSE_WEBVIEW_IE

View File

@ -7,6 +7,9 @@
#include "libslic3r_version.h"
#include "../Utils/Http.hpp"
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
#include <wx/sizer.h>
#include <wx/toolbar.h>
#include <wx/textdlg.h>

View File

@ -6,6 +6,9 @@
#include <wx/simplebook.h>
#include <wx/dcgraph.h>
#include <boost/log/trivial.hpp>
#include "CalibUtils.hpp"
namespace Slic3r { namespace GUI {

View File

@ -1,6 +1,8 @@
#include "AxisCtrlButton.hpp"
#include "Label.hpp"
#include "libslic3r/libslic3r.h"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal)));

View File

@ -1,6 +1,7 @@
#include "Button.hpp"
#include "Label.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(Button, StaticBox)

View File

@ -1,6 +1,8 @@
#include "DropDown.hpp"
#include "Label.hpp"
#include <wx/display.h>
#include <wx/dcbuffer.h>
#include <wx/dcgraph.h>
#ifdef __WXGTK__

View File

@ -1,6 +1,7 @@
#ifndef slic3r_GUI_DropDown_hpp_
#define slic3r_GUI_DropDown_hpp_
#include <boost/date_time/posix_time/posix_time.hpp>
#include <wx/stattext.h>
#include "../wxExtensions.hpp"
#include "StateHandler.hpp"

View File

@ -1,4 +1,5 @@
#include "ErrorMsgStaticText.hpp"
#include <wx/dcclient.h>
ErrorMsgStaticText::ErrorMsgStaticText() {}

View File

@ -2,6 +2,7 @@
#ifndef _WX_ERRORMSGSTATTEXT_H_
#define _WX_ERRORMSGSTATTEXT_H_
#include <wx/panel.h>
#include "wx/stattext.h"
class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel

View File

@ -3,6 +3,7 @@
#include "StaticBox.hpp"
#include "../wxExtensions.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox)

View File

@ -2,6 +2,9 @@
#include "Label.hpp"
#include "StaticBox.hpp"
#include <wx/dcclient.h>
#include <wx/settings.h>
wxFont Label::sysFont(int size, bool bold)
{
//#ifdef __linux__

View File

@ -1,5 +1,6 @@
#include "ProgressBar.hpp"
#include "../I18N.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
#include "Label.hpp"

View File

@ -2,6 +2,7 @@
#define slic3r_GUI_PROGRESSDIALOG_hpp_
#include "wx/dialog.h"
#include "wx/progdlg.h"
#include "wx/weakref.h"
#include "wx/simplebook.h"
#include "Button.hpp"

View File

@ -1,5 +1,6 @@
#include "RoundedRectangle.hpp"
#include "../wxExtensions.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel)

View File

@ -1,6 +1,7 @@
#include "SideButton.hpp"
#include "Label.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(SideButton, wxPanel)

View File

@ -1,6 +1,7 @@
#include "SideMenuPopup.hpp"
#include "Label.hpp"
#include <wx/display.h>
#include <wx/dcgraph.h>
#include "../GUI_App.hpp"

View File

@ -1,7 +1,10 @@
#ifndef slic3r_GUI_SpinInput_hpp_
#define slic3r_GUI_SpinInput_hpp_
#include <wx/dcclient.h>
#include <wx/timer.h>
#include <wx/textctrl.h>
#include <wx/valtext.h>
#include "StaticBox.hpp"
class Button;

View File

@ -1,3 +1,4 @@
#include <wx/window.h>
#include "StateHandler.hpp"
wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent);

View File

@ -1,6 +1,7 @@
#ifndef slic3r_GUI_StateHandler_hpp_
#define slic3r_GUI_StateHandler_hpp_
#include <memory>
#include <wx/event.h>
#include "StateColor.hpp"

View File

@ -1,5 +1,6 @@
#include "StaticBox.hpp"
#include "../GUI.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(StaticBox, wxWindow)

View File

@ -2,6 +2,7 @@
#include "Label.hpp"
#include "StateColor.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(StaticLine, wxWindow)

View File

@ -1,3 +1,6 @@
#include <wx/dc.h>
#include <wx/pen.h>
#include "StepCtrl.hpp"
#include "Label.hpp"

View File

@ -5,7 +5,9 @@
#include "../wxExtensions.hpp"
#include "../Utils/MacDarkMode.hpp"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
#include <wx/dcmemory.h>
SwitchButton::SwitchButton(wxWindow* parent, wxWindowID id)
: wxBitmapToggleButton(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxBU_EXACTFIT)

View File

@ -1,3 +1,4 @@
#include <wx/dc.h>
#include "TabCtrl.hpp"
wxDEFINE_EVENT( wxEVT_TAB_SEL_CHANGING, wxCommandEvent );

View File

@ -2,6 +2,7 @@
#define slic3r_GUI_TempInput_hpp_
#include "../wxExtensions.hpp"
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include "StaticBox.hpp"

View File

@ -2,6 +2,7 @@
#include "Label.hpp"
#include "TextCtrl.h"
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(TextInput, wxPanel)

View File

@ -2,6 +2,8 @@
#include "slic3r/GUI/GUI_App.hpp"
#include "slic3r/Utils/MacDarkMode.hpp"
#include <boost/log/trivial.hpp>
#include <wx/webviewarchivehandler.h>
#include <wx/webviewfshandler.h>
#if wxUSE_WEBVIEW_EDGE

View File

@ -11,9 +11,6 @@
#include "slic3r/Utils/ColorSpaceConvert.hpp"
#include "MainFrame.hpp"
#include <wx/sizer.h>
using namespace Slic3r::GUI;
int scale(const int val) { return val * Slic3r::GUI::wxGetApp().em_unit() / 10; }

View File

@ -3,6 +3,7 @@
#include "GUI_Utils.hpp"
#include <wx/sizer.h>
#include <wx/spinctrl.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>

View File

@ -10,6 +10,7 @@
#include <wx/bmpcbox.h>
#include <wx/statbmp.h>
#include <wx/popupwin.h>
#include <wx/scrolwin.h>
#include <wx/spinctrl.h>
#include <wx/artprov.h>

View File

@ -1,6 +1,7 @@
#include "ColorSpaceConvert.hpp"
#include <algorithm>
#include <cmath>
const static float param_13 = 1.0f / 3.0f;
const static float param_16116 = 16.0f / 116.0f;

View File

@ -1,6 +1,8 @@
#ifndef 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);
double PivotRGB(double n);
double PivotXYZ(double n);

View File

@ -1,5 +1,6 @@
#include "FileHelp.hpp"
#include <boost/filesystem.hpp>
#include <boost/log/trivial.hpp>
#include <regex>
namespace Slic3r {
namespace Utils {

View File

@ -1,11 +1,15 @@
#ifndef __Http_hpp__
#define __Http_hpp__
#include <map>
#include <memory>
#include <string>
#include <functional>
#include <boost/filesystem/path.hpp>
#include "libslic3r/Exception.hpp"
#include "libslic3r_version.h"
#define MAX_SIZE_TO_FILE 3*1024
namespace Slic3r {

View File

@ -12,6 +12,10 @@
#include <libslic3r/Utils.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/iostream.hpp>
#include <boost/nowide/fstream.hpp>
using namespace std;
using json = nlohmann::json;