amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: fix the conflict

Browse source 
Change-Id: Id5f2bf11344e9d42302420d167daa3af1c3c1845
This commit is contained in:
zhimin.zeng 2023-05-30 09:44:09 +08:00 committed by Lane.Wei
parent c1c990051d
commit 032bf107b8
3 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/PrintConfig.hpp
View file

@ -756,14 +756,11 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionFloat, overhang_1_4_speed))
((ConfigOptionFloat, overhang_2_4_speed))
((ConfigOptionFloat, overhang_3_4_speed))
<<<<<<< HEAD (88f268 FIX: wipe tower is not generated with different filament lay)
((ConfigOptionFloat, overhang_4_4_speed))
((ConfigOptionFloatOrPercent, sparse_infill_anchor))
((ConfigOptionFloatOrPercent, sparse_infill_anchor_max))
=======
((ConfigOptionFloat, overhang_4_4_speed))
//calib
((ConfigOptionFloat, print_flow_ratio)))
>>>>>>> CHANGE (cbac2c NEW: add calibration)
PRINT_CONFIG_CLASS_DEFINE(
MachineEnvelopeConfig,

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

@ -1021,20 +1021,10 @@ 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();

4
src/slic3r/GUI/MainFrame.hpp
View file

@ -339,12 +339,8 @@ 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