calibration project name, and over-bridge -> above the bridges

#4295

resources/calibration/over-bridge_tuning/over-bridge_tuning.html

@@ -25,8 +25,8 @@ <h1>Ironing Pattern Calibration</h1>
 </table>
 
 <p><strong>You need to do the filament flow calibration and the bridge flow ratio before this one.</strong> It's better if you have done the filament temperature calibration as well.</p>
-<p>This calibration method will print test samples with various levels of over-bridge flow ratio, between 100 and 125. Choose the lowest value on which the top surface is smooth without rough "holes". Begin with the over-bridge calibraiton.</p>
-<p>If the over-bridge calibration is not conclusive (same holes on all samples), then set it to 110% and use the top flow calibration. This setting is a bit more unpredictable so it's best to not move it far away from 100%.</p>
+<p>This calibration method will print test samples with various levels of above-bridge flow ratio, between 100 and 125. Choose the lowest value on which the top surface is smooth without rough "holes". Begin with the above-bridge calibraiton.</p>
+<p>If the above-bridge calibration is not conclusive (same holes on all samples), then set it to 110% and use the top flow calibration. This setting is a bit more unpredictable so it's best to not move it far away from 100%.</p>
 <h2>Results</h2>
 <table width="100%">
 <tbody>
@@ -46,10 +46,10 @@ <h4>Example:</h4>
 <td style="text-align: center;">Flat</td>
 </tr>
 </table>
-Here, we can see that artifacts exist until the over-bridge flow was set to 115. It was flat from the flow calibration, if it's not now, it's because the bridges below the top surfaces are dropping a bit, and so it leaves more volume to fill afterwards. Here, 115 should be enough, but 120 is a more safe bet.
+Here, we can see that artifacts exist until the above-bridge flow was set to 115. It was flat from the flow calibration, if it's not now, it's because the bridges below the top surfaces are dropping a bit, and so it leaves more volume to fill afterwards. Here, 115 should be enough, but 120 is a more safe bet.
 
-<h2>Advice</h2>
-<p>TODO</p>
+<!-- <h2>Advice</h2> -->
+<!-- <p>TODO</p> -->
 </ul>
 <h2>Notes</h2>
 <p>This test set the setting "Complete individual objects" to true, so you may want to reset your print settings afterwards</p>

src/slic3r/GUI/CalibrationFlowDialog.cpp

@@ -35,12 +35,25 @@ void CalibrationFlowDialog::create_buttons(wxStdDialogButtonSizer* buttons){
     buttons->Add(bt);
 }
 
+void CalibrationFlowDialog::create_geometry_10(wxCommandEvent &event_args)
+{
+    Plater *plat = this->main_frame->plater();
+    if (!plat->new_project(L("Flow 10 percent calibration")))
+        return;
+    create_geometry(80.f, 10.f);
+}
+
+void CalibrationFlowDialog::create_geometry_2_5(wxCommandEvent &event_args)
+{
+    Plater *plat = this->main_frame->plater();
+    if (!plat->new_project(L("Flow 2 percent calibration")))
+        return;
+    create_geometry(92.f, 2.F);
+}
 
 void CalibrationFlowDialog::create_geometry(float start, float delta) {
     Plater* plat = this->main_frame->plater();
     Model& model = plat->model();
-    if (!plat->new_project(L("Flow calibration")))
-        return;
 
     //GLCanvas3D::set_warning_freeze(true);
     bool autocenter = gui_app->app_config->get("autocenter") == "1";

src/slic3r/GUI/CalibrationFlowDialog.hpp

@@ -16,8 +16,8 @@ class CalibrationFlowDialog : public CalibrationAbstractDialog
 protected:
     void create_buttons(wxStdDialogButtonSizer* sizer) override;
     void create_geometry(float start, float delta);
-    void create_geometry_10(wxCommandEvent& event_args) { create_geometry(80.f, 10.f); }
-    void create_geometry_2_5(wxCommandEvent& event_args) { create_geometry(92.f, 2.F); }
+    void create_geometry_10(wxCommandEvent& event_args);
+    void create_geometry_2_5(wxCommandEvent& event_args);
 
 };
 

src/slic3r/GUI/CalibrationOverBridgeDialog.cpp

@@ -27,25 +27,29 @@ namespace Slic3r {
 namespace GUI {
 
 void CalibrationOverBridgeDialog::create_buttons(wxStdDialogButtonSizer* buttons){
-    wxButton* bt1 = new wxButton(this, wxID_FILE1, _L("Over-Bridge calibration"));
-    wxButton* bt2 = new wxButton(this, wxID_FILE1, _L("Top flow calibration"));
+    wxButton* bt1 = new wxButton(this, wxID_FILE1, _L("'Above the Bridges' flow calibration"));
+    wxButton* bt2 = new wxButton(this, wxID_FILE1, _L("'Top Fill' flow calibration"));
     bt1->Bind(wxEVT_BUTTON, &CalibrationOverBridgeDialog::create_geometry1, this);
     bt2->Bind(wxEVT_BUTTON, &CalibrationOverBridgeDialog::create_geometry2, this);
     buttons->Add(bt1);
     buttons->Add(bt2);
 }
 
 void CalibrationOverBridgeDialog::create_geometry1(wxCommandEvent& event_args) {
+    Plater* plat = this->main_frame->plater();
+    if (!plat->new_project(L("'Above the Bridges flow calibration")))
+        return;
     create_geometry(true);
 }
 void CalibrationOverBridgeDialog::create_geometry2(wxCommandEvent& event_args) {
+    Plater* plat = this->main_frame->plater();
+    if (!plat->new_project(L("Top Fill flow calibration")))
+        return;
     create_geometry(false);
 }
 void CalibrationOverBridgeDialog::create_geometry(bool over_bridge) {
     Plater* plat = this->main_frame->plater();
     Model& model = plat->model();
-    if (!plat->new_project(L("Over-bridge calibration")))
-        return;
 
     //GLCanvas3D::set_warning_freeze(true);
     bool autocenter = gui_app->app_config->get("autocenter") == "1";