diff --git a/resources/calib/FlowRate/flowrate_coarse.3mf b/resources/calib/FlowRate/flowrate_coarse.3mf new file mode 100644 index 0000000..a0f1298 Binary files /dev/null and b/resources/calib/FlowRate/flowrate_coarse.3mf differ diff --git a/resources/calib/FlowRate/flowrate_fine.3mf b/resources/calib/FlowRate/flowrate_fine.3mf new file mode 100644 index 0000000..6eed2aa Binary files /dev/null and b/resources/calib/FlowRate/flowrate_fine.3mf differ diff --git a/resources/calib/filament_flow/flowrate-test-pass1.3mf b/resources/calib/filament_flow/flowrate-test-pass1.3mf deleted file mode 100644 index 8f1a1b5..0000000 Binary files a/resources/calib/filament_flow/flowrate-test-pass1.3mf and /dev/null differ diff --git a/resources/calib/filament_flow/flowrate-test-pass2.3mf b/resources/calib/filament_flow/flowrate-test-pass2.3mf deleted file mode 100644 index 4d1d0c3..0000000 Binary files a/resources/calib/filament_flow/flowrate-test-pass2.3mf and /dev/null differ diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index a8189d9..1693318 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1572,7 +1572,7 @@ void MainFrame::init_menubar_as_editor() //auto calibrationMenu = generate_calibration_menu(); auto calibrationMenu = new wxMenu(); auto flowrate_menu = new wxMenu(); - append_menu_item(flowrate_menu, wxID_ANY, _L("Pass 1"), _L("Flow rate test - Pass 1"), [this](wxCommandEvent &) { + append_menu_item(flowrate_menu, wxID_ANY, _L("Coarse"), _L("Flow rate test - Pass 1"), [this](wxCommandEvent &) { if (m_plater) m_plater->calib_flowrate(1); }, @@ -1582,7 +1582,7 @@ void MainFrame::init_menubar_as_editor() ; }, this); - append_menu_item(flowrate_menu, wxID_ANY, _L("Pass 2"), _L("Flow rate test - Pass 2"), [this](wxCommandEvent &) { + append_menu_item(flowrate_menu, wxID_ANY, _L("Fine"), _L("Flow rate test - Pass 2"), [this](wxCommandEvent &) { if (m_plater) m_plater->calib_flowrate(2); }, diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 969eec0..e964757 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5413,10 +5413,10 @@ void Plater::calib_flowrate(int pass) if (pass == 1) add_model_calibration(false, - (boost::filesystem::path(Slic3r::resources_dir()) / "calib" / "filament_flow" / "flowrate-test-pass1.3mf").string()); + (boost::filesystem::path(Slic3r::resources_dir()) / "calib" / "FlowRate" / "flowrate_coarse.3mf").string()); else add_model_calibration(false, - (boost::filesystem::path(Slic3r::resources_dir()) / "calib" / "filament_flow" / "flowrate-test-pass2.3mf").string()); + (boost::filesystem::path(Slic3r::resources_dir()) / "calib" / "FlowRate" / "flowrate_fine.3mf").string()); } //B34