fix some bug

2026-01-30 15:38:43 +03:00 · 2025-03-24 10:01:22 +08:00
parent 6f9a6b8462
commit 73f7cad391
4 changed files with 72 additions and 72 deletions
--- a/resources/profiles/QIDITechnology.ini
+++ b/resources/profiles/QIDITechnology.ini
@@ -878,7 +878,7 @@ enable_volume_fan = 0
 extrusion_multiplier = 0.95
 filament_colour = #282828
 filament_density = 1.15
-filament_max_volumetric_speed = 17
+filament_max_volumetric_speed = 12
 filament_type = ABS-GF
 first_layer_bed_temperature = 100
 first_layer_temperature = 270
@@ -888,7 +888,7 @@ overhang_fan_speed_0 = 100
 overhang_fan_speed_1 = 100
 slowdown_below_layer_time = 5
 temperature = 270
-chamber_temperature = 55
+chamber_temperature = 0

 # QIDI filament preset
 [filament:*QIDI ASA*]
@@ -928,7 +928,7 @@ extrusion_multiplier = 0.7
 fan_below_layer_time = 40
 filament_colour = #DCDCDC
 filament_density = 1.03
-filament_max_volumetric_speed = 16
+filament_max_volumetric_speed = 12
 filament_retract_before_travel = 0
 filament_retract_layer_change = 0
 filament_retract_length = 0.01
@@ -958,7 +958,7 @@ extrusion_multiplier = 0.96
 fan_below_layer_time = 10
 filament_colour = #696969
 filament_density = 1.09
-filament_max_volumetric_speed = 10
+filament_max_volumetric_speed = 8
 filament_type = PA12-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 290
@@ -982,7 +982,7 @@ extrusion_multiplier = 0.96
 fan_below_layer_time = 10
 filament_colour = #4F4F4F
 filament_density = 1.20
-filament_max_volumetric_speed = 14
+filament_max_volumetric_speed = 8
 filament_type = PAHT-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 310
@@ -1002,7 +1002,7 @@ extrusion_multiplier = 0.96
 fan_below_layer_time = 10
 filament_colour = #4F4F4F
 filament_density = 1.27
-filament_max_volumetric_speed = 14
+filament_max_volumetric_speed = 10
 filament_type = PAHT-GF
 first_layer_bed_temperature = 80
 first_layer_temperature = 310
@@ -1049,7 +1049,7 @@ extrusion_multiplier = 1
 fan_below_layer_time = 10
 filament_colour = #323232
 filament_density = 1.30
-filament_max_volumetric_speed = 12
+filament_max_volumetric_speed = 8
 filament_type = PET-CF
 first_layer_bed_temperature = 80
 first_layer_temperature = 320
@@ -1095,7 +1095,7 @@ extrusion_multiplier = 0.97
 fan_below_layer_time = 10
 filament_colour = #323232
 filament_density = 1.38
-filament_max_volumetric_speed = 12
+filament_max_volumetric_speed = 10
 filament_type = PET-GF
 first_layer_bed_temperature = 80
 first_layer_temperature = 310
@@ -1697,10 +1697,10 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI ABS-GF @X-Plus 4 0.4 nozzle]
 inherits = *QIDI ABS-GF*
 advance_pressure = 0.03
-chamber_minimal_temperature = 55
-filament_max_volumetric_speed = 22
+chamber_minimal_temperature = 0
+filament_max_volumetric_speed = 12
 first_layer_temperature = 260
-temperature = 260
+temperature = 270
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4

 [filament:QIDI ASA @X-Plus 4 0.4 nozzle]
@@ -1719,7 +1719,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PA12-CF @X-Plus 4 0.4 nozzle]
 inherits = *QIDI PA12-CF*
 advance_pressure = 0.035
-filament_max_volumetric_speed = 13
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4
@@ -1747,7 +1747,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PET-CF @X-Plus 4 0.4 nozzle]
 inherits = *QIDI PET-CF*
 advance_pressure = 0.032
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4
@@ -1761,7 +1761,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PET-GF @X-Plus 4 0.4 nozzle]
 inherits = *QIDI PET-GF*
 advance_pressure = 0.022
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 10
 first_layer_temperature = 310
 temperature = 310
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4
@@ -1977,10 +1977,10 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]

 [filament:QIDI ABS-GF @X-Plus 4 0.6 nozzle]
 inherits = *QIDI ABS-GF*
-chamber_minimal_temperature = 55
-filament_max_volumetric_speed = 22
+chamber_minimal_temperature = 0
+filament_max_volumetric_speed = 12
 first_layer_temperature = 260
-temperature = 260
+temperature = 270
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6

 [filament:QIDI ASA @X-Plus 4 0.6 nozzle]
@@ -1994,7 +1994,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PA12-CF @X-Plus 4 0.6 nozzle]
 inherits = *QIDI PA12-CF*
 advance_pressure = 0.035
-filament_max_volumetric_speed = 13
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6
@@ -2022,7 +2022,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PET-CF @X-Plus 4 0.6 nozzle]
 inherits = *QIDI PET-CF*
 advance_pressure = 0.025
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6
@@ -2035,7 +2035,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PET-GF @X-Plus 4 0.6 nozzle]
 inherits = *QIDI PET-GF*
 advance_pressure = 0.014
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 10
 first_layer_temperature = 310
 temperature = 310
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6
@@ -2253,10 +2253,10 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]

 [filament:QIDI ABS-GF @X-Plus 4 0.8 nozzle]
 inherits = *QIDI ABS-GF*
-chamber_minimal_temperature = 55
-filament_max_volumetric_speed = 22
+chamber_minimal_temperature = 0
+filament_max_volumetric_speed = 12
 first_layer_temperature = 260
-temperature = 260
+temperature = 270
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8

 [filament:QIDI ASA @X-Plus 4 0.8 nozzle]
@@ -2271,7 +2271,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PA12-CF @X-Plus 4 0.8 nozzle]
 inherits = *QIDI PA12-CF*
 advance_pressure = 0.035
-filament_max_volumetric_speed = 13
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8
@@ -2299,7 +2299,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PET-CF @X-Plus 4 0.8 nozzle]
 inherits = *QIDI PET-CF*
 advance_pressure = 0.025
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8
@@ -2312,7 +2312,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
 [filament:QIDI PET-GF @X-Plus 4 0.8 nozzle]
 inherits = *QIDI PET-GF*
 advance_pressure = 0.01
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 10
 first_layer_temperature = 310
 temperature = 310
 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8
@@ -2690,10 +2690,10 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI ABS-GF @Q1 Pro 0.4 nozzle]
 inherits = *QIDI ABS-GF*
 advance_pressure = 0.035
-chamber_minimal_temperature = 55
-filament_max_volumetric_speed = 22
+chamber_minimal_temperature = 0
+filament_max_volumetric_speed = 12
 first_layer_temperature = 260
-temperature = 260
+temperature = 270
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4

 [filament:QIDI ASA @Q1 Pro 0.4 nozzle]
@@ -2712,7 +2712,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PA12-CF @Q1 Pro 0.4 nozzle]
 inherits = *QIDI PA12-CF*
 advance_pressure = 0.035
-filament_max_volumetric_speed = 13
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4
@@ -2740,7 +2740,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PET-CF @Q1 Pro 0.4 nozzle]
 inherits = *QIDI PET-CF*
 advance_pressure = 0.032
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4
@@ -2754,7 +2754,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PET-GF @Q1 Pro 0.4 nozzle]
 inherits = *QIDI PET-GF*
 advance_pressure = 0.028
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 10
 first_layer_temperature = 310
 temperature = 310
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4
@@ -2966,10 +2966,10 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==

 [filament:QIDI ABS-GF @Q1 Pro 0.6 nozzle]
 inherits = *QIDI ABS-GF*
-chamber_minimal_temperature = 55
-filament_max_volumetric_speed = 22
+chamber_minimal_temperature = 0
+filament_max_volumetric_speed = 12
 first_layer_temperature = 260
-temperature = 260
+temperature = 270
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6

 [filament:QIDI ASA @Q1 Pro 0.6 nozzle]
@@ -2983,7 +2983,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PA12-CF @Q1 Pro 0.6 nozzle]
 inherits = *QIDI PA12-CF*
 advance_pressure = 0.035
-filament_max_volumetric_speed = 13
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6
@@ -3011,7 +3011,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PET-CF @Q1 Pro 0.6 nozzle]
 inherits = *QIDI PET-CF*
 advance_pressure = 0.025
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6
@@ -3025,7 +3025,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PET-GF @Q1 Pro 0.6 nozzle]
 inherits = *QIDI PET-GF*
 advance_pressure = 0.015
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 10
 first_layer_temperature = 310
 temperature = 310
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6
@@ -3240,10 +3240,10 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==

 [filament:QIDI ABS-GF @Q1 Pro 0.8 nozzle]
 inherits = *QIDI ABS-GF*
-chamber_minimal_temperature = 55
-filament_max_volumetric_speed = 22
+chamber_minimal_temperature = 0
+filament_max_volumetric_speed = 12
 first_layer_temperature = 260
-temperature = 260
+temperature = 270
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8

 [filament:QIDI ASA @Q1 Pro 0.8 nozzle]
@@ -3258,7 +3258,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PA12-CF @Q1 Pro 0.8 nozzle]
 inherits = *QIDI PA12-CF*
 advance_pressure = 0.035
-filament_max_volumetric_speed = 13
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8
@@ -3286,7 +3286,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PET-CF @Q1 Pro 0.8 nozzle]
 inherits = *QIDI PET-CF*
 advance_pressure = 0.025
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 8
 first_layer_temperature = 280
 temperature = 280
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8
@@ -3300,7 +3300,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
 [filament:QIDI PET-GF @Q1 Pro 0.8 nozzle]
 inherits = *QIDI PET-GF*
 advance_pressure = 0.01
-filament_max_volumetric_speed = 15
+filament_max_volumetric_speed = 10
 first_layer_temperature = 310
 temperature = 310
 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -280,10 +280,6 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
    //y22
    Bind(wxEVT_ICONIZE, [this](wxIconizeEvent& event) {
        if (event.IsIconized()) {
-            if (m_printer_view->GetHasLoadUrl()) {
-                printer_view_ip = m_printer_view->GetWebIp();
-                printer_view_url = m_printer_view->GetWeburl();
-            }
            wxString url;
            if (m_printer_view->GetNetMode()) {
                url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir()));
@@ -302,7 +298,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
            }
            m_printer_view->Layout();
        }
-        });
+    });

    //FIXME it seems this method is not called on application start-up, at least not on Windows. Why?
    // The same applies to wxEVT_CREATE, it is not being called on startup on Windows.
@@ -775,13 +771,8 @@ void MainFrame::init_tabpanel()
        //y17
        else
            select_tab(size_t(0)); // select Plater
-        //y22
+        //y22 y24
        if (current_selected_tab != 4) {
-            if (m_printer_view->GetHasLoadUrl()) {
-                printer_view_ip = m_printer_view->GetWebIp();
-                printer_view_url = m_printer_view->GetWeburl();
-                is_net_url = m_printer_view->IsNetUrl();
-            }
            wxString url;
            if (m_printer_view->GetNetMode()) {
                url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir()));
@@ -793,12 +784,14 @@ void MainFrame::init_tabpanel()
        }
        else {
            if (!printer_view_ip.empty()) {
-                if (is_net_url)
-                    m_printer_view->load_net_url(printer_view_url, printer_view_ip);
-                else
-                    m_printer_view->load_url(printer_view_url);
+                if(!printer_view_ip.empty()){
+                    if (is_net_url)
+                        m_printer_view->load_net_url(printer_view_url, printer_view_ip);
+                    else
+                        m_printer_view->load_url(printer_view_url);
+                }
+                m_printer_view->Layout();
            }
-            m_printer_view->Layout();
        }

    });
--- a/src/slic3r/GUI/PrinterWebView.cpp
+++ b/src/slic3r/GUI/PrinterWebView.cpp
@@ -473,9 +473,13 @@ void PrinterWebView::SetLoginStatus(bool status) {
        std::vector<Device> devices;
        wxGetApp().set_devices(devices);
 #endif
-        //y3
-        if (webisNetMode == isNetWeb)
-            webisNetMode = isDisconnect;
+        //y3 y24
+        webisNetMode = isDisconnect;
+        if (wxGetApp().mainframe) {
+            wxGetApp().mainframe->is_net_url = false;
+            wxGetApp().mainframe->printer_view_ip = "";
+            wxGetApp().mainframe->printer_view_url = "";
+        }
        m_user_head_name = "";
        SetPresetChanged(true);
        UpdateState();
@@ -999,8 +1003,6 @@ void PrinterWebView::load_disconnect_url(wxString& url)
    webisNetMode = isDisconnect;
    m_web = url;
    m_ip = "";
-    //y22
-    has_load_url = false;
    m_browser->LoadURL(url);
    UpdateState();
 }
@@ -1010,8 +1012,6 @@ void PrinterWebView::load_url(wxString &url)
    if (m_browser == nullptr || m_web == url)
        return;
    m_web = url;
-    //y22
-    has_load_url = true;
    m_browser->LoadURL(url);
    webisNetMode = isLocalWeb;
    // B55
@@ -1030,6 +1030,12 @@ void PrinterWebView::load_url(wxString &url)
        else
            button->SetIsSelected(false);
    }
+    //y24
+    if (wxGetApp().mainframe) {
+        wxGetApp().mainframe->is_net_url = false;
+        wxGetApp().mainframe->printer_view_ip = m_ip;
+        wxGetApp().mainframe->printer_view_url = m_web;
+    }
    UpdateState();
 }
 void PrinterWebView::load_net_url(wxString& url, wxString& ip)
@@ -1037,8 +1043,6 @@ void PrinterWebView::load_net_url(wxString& url, wxString& ip)
    if (m_browser == nullptr || m_web == url)
        return;
    m_web = url;
-    //y22
-    has_load_url = true;
    m_ip = ip;
    webisNetMode = isNetWeb;
    m_browser->LoadURL(url);
@@ -1053,6 +1057,12 @@ void PrinterWebView::load_net_url(wxString& url, wxString& ip)
        else
            button->SetIsSelected(false);
    }
+    //y24
+    if (wxGetApp().mainframe) {
+        wxGetApp().mainframe->is_net_url = true;
+        wxGetApp().mainframe->printer_view_ip = m_ip;
+        wxGetApp().mainframe->printer_view_url = m_web;
+    }
    UpdateState();
 }
 void PrinterWebView::UpdateState()
--- a/src/slic3r/GUI/PrinterWebView.hpp
+++ b/src/slic3r/GUI/PrinterWebView.hpp
@@ -141,7 +141,6 @@ public:
    //y22
    wxString GetWeburl() { return m_web; };
    wxString GetWebIp() { return m_ip; };
-    bool GetHasLoadUrl() { return has_load_url; };
    bool IsNetUrl() { return webisNetMode == isNetWeb; };

 private:
@@ -190,8 +189,6 @@ private:
    std::string           m_user_head_name;
    bool                  m_isfluidd_1;

-    //y22
-    bool has_load_url;
 };

 //y3