fix some bug

This commit is contained in:
QIDI TECH
2025-02-13 16:55:32 +08:00
parent 89ea2eb722
commit 0eb68458ad
5 changed files with 17 additions and 15 deletions

View File

@@ -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:

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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,
};