fix some bug

QIDITECH · Feb 13, 2025 · 0eb6845 · 0eb6845
1 parent 89ea2eb
commit 0eb6845
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/resources/profiles/QIDITechnology.ini b/resources/profiles/QIDITechnology.ini
@@ -6002,7 +6002,7 @@ autoemit_temperature_commands = 0
 auxiliary_fan = 1
 bed_exclude_area = 0x0,0x0,0x302,0x305,35x302,35x302,0x302,0x0,0x0,293x0,293x20,305x20,305x0,293x0,0x0
 bed_shape = 0x0,305x0,305x305,0x305
-before_layer_gcode = ;TIMELAPSE_TAKE_FRAME
+before_layer_gcode = TIMELAPSE_TAKE_FRAME
 chamber_temperature_control = 1
 end_gcode = M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 Y290 F12000\nG0 X90 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}
 layer_gcode = G92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}
@@ -6058,7 +6058,7 @@ autoemit_temperature_commands = 0
 auxiliary_fan = 1
 bed_exclude_area = 0x0,0x0,25x240,25x245,115x245,115x240,25x240,0x0,0x0,208x240,208x245,245x245,245x240,208x240,0x0
 bed_shape = 0x0,245x0,245x245,0x245
-before_layer_gcode = ;TIMELAPSE_TAKE_FRAME
+before_layer_gcode = TIMELAPSE_TAKE_FRAME
 chamber_temperature_control = 1
 max_print_height = 240
 retract_lift_below = 239

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1552,14 +1552,17 @@ bool GLCanvas3D::check_volumes_outside_state(GLVolumeCollection& volumes, ModelI
                         int obj_idx = volume->object_idx();
                         ModelObjectPtrs model_parts = wxGetApp().model().objects;
                         ModelObject* model_obj = model_parts[obj_idx];
-                        ModelInstance* instance = model_obj->instances[0];
-                        Polygon        hull = instance->convex_hull_2d();
-                        state = build_volume.check_outside(hull);
-                        if (state != BuildVolume::ObjectState::Inside) {
-                            model_obj->in_exclude = true;
+                        for (size_t i = 0; i < model_obj->instances.size(); ++i) {
+                            ModelInstance* instance = model_obj->instances[i];
+                            Polygon        hull = instance->convex_hull_2d();
+                            state = build_volume.check_outside(hull);
+                            if (state != BuildVolume::ObjectState::Inside) {
+                                model_obj->in_exclude = true;
+                                break;
+                            }
+                            else
+                                model_obj->in_exclude = false;
                         }
-                        else
-                            model_obj->in_exclude = false;
                     }
                     break;
                 case BuildVolume::Type::Circle:

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
@@ -3457,8 +3457,11 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage
     }
     //y14
     std::string new_token = wxGetApp().app_config->get("user_token");
-    if(old_token != new_token)
+    if(new_token.empty())
+        wxGetApp().SetOnlineLogin(false);
+    else if(old_token != new_token)
         wxGetApp().SetOnlineLogin(true);
+
     return res;
 }
 

diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp
@@ -55,10 +55,6 @@ ZUserLogin::ZUserLogin() : wxDialog((wxWindow *) (wxGetApp().mainframe), wxID_AN
     TargetUrl = m_qidinetwork.get_qidi_host();
 #endif
 
-
-    BOOST_LOG_TRIVIAL(error) << "login url = " << TargetUrl.ToStdString();
-
-
     m_qdt_user_agent = wxString::Format("QDT-Slicer/v%s", SLIC3R_VERSION);
 
     // set the frame icon

diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
@@ -108,7 +108,7 @@ struct Http::priv
 	enum {
 		DEFAULT_TIMEOUT_CONNECT = 10,
 		//y21
-        DEFAULT_TIMEOUT_MAX = 10,
+        DEFAULT_TIMEOUT_MAX = 0,
 		DEFAULT_SIZE_LIMIT = 5 * 1024 * 1024,
 	};