mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 07:27:41 -06:00
NEW: add calibration
Change-Id: I03e5489a67042e7f76f5a42260a289d540b5a63a (cherry picked from commit cbac2c639db830eb779b1979c8d6b4eb3decb7e6)
This commit is contained in:
parent
ff3f78cfb5
commit
1f54aaf22b
35 changed files with 38647 additions and 54 deletions
|
@ -21,6 +21,7 @@
|
|||
#include "Monitor.hpp"
|
||||
#include "Auxiliary.hpp"
|
||||
#include "Project.hpp"
|
||||
#include "CalibrationPanel.hpp"
|
||||
#include "UnsavedChangesDialog.hpp"
|
||||
#include "Widgets/SideButton.hpp"
|
||||
#include "Widgets/SideMenuPopup.hpp"
|
||||
|
@ -28,7 +29,6 @@
|
|||
// BBS
|
||||
#include "BBLTopbar.hpp"
|
||||
|
||||
|
||||
#define ENABEL_PRINT_ALL 0
|
||||
|
||||
class Notebook;
|
||||
|
@ -220,7 +220,8 @@ public:
|
|||
tpPreview = 2,
|
||||
tpMonitor = 3,
|
||||
tpProject = 4,
|
||||
toDebugTool = 5,
|
||||
tpCalibration = 5,
|
||||
toDebugTool = 6,
|
||||
};
|
||||
|
||||
//BBS: add slice&&print status update logic
|
||||
|
@ -338,7 +339,12 @@ public:
|
|||
|
||||
//AuxiliaryPanel* m_auxiliary{ nullptr };
|
||||
ProjectPanel* m_project{ nullptr };
|
||||
<<<<<<< HEAD (88f268 FIX: wipe tower is not generated with different filament lay)
|
||||
|
||||
=======
|
||||
CalibrationPanel* m_calibration{ nullptr };
|
||||
DebugToolDialog* m_debug_tool_dlg{ nullptr };
|
||||
>>>>>>> CHANGE (cbac2c NEW: add calibration)
|
||||
WebViewPanel* m_webview { nullptr };
|
||||
wxLogWindow* m_log_window { nullptr };
|
||||
// BBS
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue