3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 06:57:36 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

NEW: add calibration

Browse source 
Change-Id: I03e5489a67042e7f76f5a42260a289d540b5a63a
(cherry picked from commit cbac2c639db830eb779b1979c8d6b4eb3decb7e6)
This commit is contained in:
liz.li 2023-04-23 09:04:55 +08:00 • committed by Lane.Wei
parent ff3f78cfb5
commit 1f54aaf22b
35 changed files with 38647 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/MainFrame.cpp
View file

@ -1021,6 +1021,20 @@ void MainFrame::init_tabpanel()
m_project->SetBackgroundColour(*wxWHITE);
m_tabpanel->AddPage(m_project, _L("Project"), std::string("tab_auxiliary_avtice"), std::string("tab_auxiliary_avtice"));
<<<<<<< HEAD (88f268 FIX: wipe tower is not generated with different filament lay)
=======
m_calibration = new CalibrationPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
m_calibration->SetBackgroundColour(*wxWHITE);
m_tabpanel->AddPage(m_calibration, _L("Calibration"), std::string("tab_monitor_active"), std::string("tab_monitor_active"));
#if !BBL_RELEASE_TO_PUBLIC
m_debug_tool_dlg = new DebugToolDialog(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
m_debug_tool_dlg->SetBackgroundColour(*wxWHITE);
m_debug_tool_dlg->Hide();
m_tabpanel->AddPage(m_debug_tool_dlg, _L("Debug"), "debugtool", "debugtool");
#endif
>>>>>>> CHANGE (cbac2c NEW: add calibration)
if (m_plater) {
// load initial config
auto full_config = wxGetApp().preset_bundle->full_config();