ENH: change image and text

Change-Id: I8844cde95f75d999079cd2c091247dc555a3fc2c

src/slic3r/GUI/CaliHistoryDialog.cpp

@@ -32,7 +32,7 @@ static wxString get_preset_name_by_filament_id(std::string filament_id)
 }
 
 HistoryWindow::HistoryWindow(wxWindow* parent, const std::vector<PACalibResult>& calib_results_history)
-    : DPIDialog(parent, wxID_ANY, _L("Dynamic Pressure Control Calibration Result"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+    : DPIDialog(parent, wxID_ANY, _L("Flow Dynamics Calibration Result"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
     , m_calib_results_history(calib_results_history)
 {
     this->SetBackgroundColour(*wxWHITE);
@@ -182,7 +182,7 @@ void HistoryWindow::reqeust_history_result(MachineObject* obj)
         float nozzle_value = get_nozzle_value();
         if (nozzle_value > 0) {
             CalibUtils::emit_get_PA_calib_infos(nozzle_value);
-            m_tips->SetLabel("Refreshing the historical Dynamic Pressure Control records");
+            m_tips->SetLabel("Refreshing the historical Flow Dynamics Calibration records");
             BOOST_LOG_TRIVIAL(info) << "request calib history";
         }
     }
@@ -300,7 +300,7 @@ float HistoryWindow::get_nozzle_value()
 
 
 EditCalibrationHistoryDialog::EditCalibrationHistoryDialog(wxWindow* parent, const PACalibResult& result)
-    : DPIDialog(parent, wxID_ANY, _L("Edit Dynamic Pressure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+    : DPIDialog(parent, wxID_ANY, _L("Edit Flow Dynamics Calibration"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
     , m_new_result(result)
 {
     this->SetBackgroundColour(*wxWHITE);

src/slic3r/GUI/CalibrationPanel.cpp

@@ -19,7 +19,7 @@ wxString get_calibration_type_name(CalibMode cali_mode)
 {
     switch (cali_mode) {
     case CalibMode::Calib_PA_Line:
-        return _L("Dynamic Pressure Control");
+        return _L("Flow Dynamics");
     case CalibMode::Calib_Flow_Rate:
         return _L("Flow Rate");
     case CalibMode::Calib_Vol_speed_Tower:

src/slic3r/GUI/CalibrationWizard.cpp

@@ -562,7 +562,7 @@ void PressureAdvanceWizard::on_cali_save()
         else {
             assert(false);
         }
-        MessageDialog msg_dlg(nullptr, _L("Dynamic Pressure Control calibration result has been saved to the printer"), wxEmptyString, wxOK);
+        MessageDialog msg_dlg(nullptr, _L("Flow Dynamics Calibration result has been saved to the printer"), wxEmptyString, wxOK);
         msg_dlg.ShowModal();
     }
     show_step(start_step);

src/slic3r/GUI/CalibrationWizardCaliPage.cpp

@@ -104,11 +104,11 @@ void CalibrationCaliPage::set_cali_img()
     }
     else if (m_cali_mode == CalibMode::Calib_Flow_Rate) {
         if (m_page_type == CaliPageType::CALI_PAGE_CALI)
-            m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration", nullptr, 400));
+            m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_coarse", nullptr, 400));
         if (m_page_type == CaliPageType::CALI_PAGE_FINE_CALI)
             m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_fine", nullptr, 400));
         else
-            m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration", nullptr, 400));
+            m_printing_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_coarse", nullptr, 400));
     }
     else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) {
         m_printing_picture->SetBitmap(create_scaled_bitmap("max_volumetric_speed_calibration", nullptr, 400));

src/slic3r/GUI/CalibrationWizardPage.cpp

@@ -24,7 +24,7 @@ CalibrationStyle get_cali_style(MachineObject* obj)
 wxString get_cali_mode_caption_string(CalibMode mode)
 {
     if (mode == CalibMode::Calib_PA_Line)
-        return _L("Dynamic Pressure Control Calibration");
+        return _L("Flow Dynamics Calibration");
     if (mode == CalibMode::Calib_Flow_Rate)
         return _L("Flow Rate Calibration");
     if (mode == CalibMode::Calib_Vol_speed_Tower)

src/slic3r/GUI/CalibrationWizardSavePage.cpp

@@ -119,7 +119,7 @@ void CaliPASaveAutoPanel::create_panel(wxWindow* parent)
     m_complete_text_panel = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
     m_complete_text_panel->Hide();
     wxBoxSizer* complete_text_sizer = new wxBoxSizer(wxVERTICAL);
-    auto complete_text = new wxStaticText(m_complete_text_panel, wxID_ANY, _L("We found the best Dynamic Pressure Control Factor"));
+    auto complete_text = new wxStaticText(m_complete_text_panel, wxID_ANY, _L("We found the best Flow Dynamics Calibration Factor"));
     complete_text->SetFont(Label::Head_14);
     complete_text->Wrap(CALIBRATION_TEXT_MAX_LENGTH);
     complete_text_sizer->Add(complete_text, 0, wxALIGN_CENTER);
@@ -1149,7 +1149,7 @@ void CalibrationFlowCoarseSavePage::create_page(wxWindow* parent)
 }
 
 void CalibrationFlowCoarseSavePage::set_save_img() {
-    m_record_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration", nullptr, 400));
+    m_record_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_coarse_result", nullptr, 400));
 }
 
 void CalibrationFlowCoarseSavePage::set_default_name(const wxString& name) {
@@ -1277,7 +1277,7 @@ void CalibrationFlowFineSavePage::create_page(wxWindow* parent)
 }
 
 void CalibrationFlowFineSavePage::set_save_img() {
-    m_record_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_fine", nullptr, 400));
+    m_record_picture->SetBitmap(create_scaled_bitmap("flow_rate_calibration_fine_result", nullptr, 400));
 }
 
 void CalibrationFlowFineSavePage::set_default_name(const wxString& name) {

src/slic3r/GUI/CalibrationWizardStartPage.cpp

@@ -60,7 +60,7 @@ void CalibrationPAStartPage::create_page(wxWindow* parent)
     m_page_caption->show_prev_btn(false);
     m_top_sizer->Add(m_page_caption, 0, wxEXPAND, 0);
     create_when(parent,
-                _L("When you need Dynamic Pressure Control Calibration"),
+                _L("When you need Flow Dynamics Calibration"),
                 _L("uneven extrusion"));
 
     m_top_sizer->Add(m_when_title);