QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-02-01 16:38:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
QIDI TECH
2025-02-12 14:33:14 +08:00
parent 2c26a369bf
commit 89ea2eb722
9 changed files with 131 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View File

@@ -159,13 +159,16 @@ std::string BackgroundSlicingProcess::output_filepath_for_project(const boost::f
void BackgroundSlicingProcess::process_fff()
{
assert(m_print == m_fff_print);
m_print->process();
wxCommandEvent evt(m_event_slicing_completed_id);
// Post the Slicing Finished message for the G-code viewer to update.
// Passing the timestamp
evt.SetInt((int)(m_fff_print->step_state_with_timestamp(PrintStep::psSlicingFinished).timestamp));
wxQueueEvent(GUI::wxGetApp().mainframe->m_plater, evt.Clone());
m_fff_print->export_gcode(m_temp_output_path, m_gcode_result, [this](const ThumbnailsParams& params) { return this->render_thumbnails(params); });
if (!m_print->finished()) {
m_print->process();
wxCommandEvent evt(m_event_slicing_completed_id);
// Post the Slicing Finished message for the G-code viewer to update.
// Passing the timestamp
evt.SetInt((int)(m_fff_print->step_state_with_timestamp(PrintStep::psSlicingFinished).timestamp));
wxQueueEvent(GUI::wxGetApp().mainframe->m_plater, evt.Clone());
m_fff_print->export_gcode(m_temp_output_path, m_gcode_result, [this](const ThumbnailsParams& params) { return this->render_thumbnails(params); });
}
if (this->set_step_started(bspsGCodeFinalize)) {
if (! m_export_path.empty()) {
wxQueueEvent(GUI::wxGetApp().mainframe->m_plater, new wxCommandEvent(m_event_export_began_id));

4
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -1980,7 +1980,7 @@ float project_overview_table(float scale) {
}
}
ImGui::PushStyleColor(ImGuiCol_Text, ImGuiPureWrap::COL_ORANGE_LIGHT);
ImGui::PushStyleColor(ImGuiCol_Text, ImGuiPureWrap::COL_BLUE_LIGHT);
const StatisticsSum statistics_sum{get_statistics_sum()};
ImGui::TableNextRow();
@@ -2087,7 +2087,7 @@ void extruder_usage_table(const PerExtruderStatistics &extruder_statistics, cons
ImGui::Text("%.2f", statistics.filament_length);
}
ImGui::PushStyleColor(ImGuiCol_Text, ImGuiPureWrap::COL_ORANGE_LIGHT);
ImGui::PushStyleColor(ImGuiCol_Text, ImGuiPureWrap::COL_BLUE_LIGHT);
const ExtruderStatistics extruder_statistics_sum{sum_extruder_statistics(extruder_statistics)};
ImGui::TableNextRow();

2
src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp
View File

@@ -120,7 +120,7 @@ void GLGizmoFuzzySkin::on_render_input_window(float x, float y, float bottom_lim
window_width = std::max(window_width, 2.f * buttons_width + m_imgui->scaled(1.f));
auto draw_text_with_caption = [&caption_max](const std::string &caption, const std::string &text) {
ImGuiPureWrap::text_colored(ImGuiPureWrap::COL_ORANGE_LIGHT, caption);
ImGuiPureWrap::text_colored(ImGuiPureWrap::COL_BLUE_LIGHT, caption);
ImGui::SameLine(caption_max);
ImGuiPureWrap::text(text);
};

2
src/slic3r/GUI/Plater.cpp
View File

@@ -1900,7 +1900,7 @@ void Plater::priv::object_list_changed()
(it != s_multiple_beds.get_inst_map().end()
&& it->second == bed_index
&& instance->printable
&& instance->print_volume_state == ModelInstancePVS_Partly_Outside) || (object->in_exclude)
&& instance->print_volume_state == ModelInstancePVS_Partly_Outside) || (it->second == bed_index && object->in_exclude)
) {
s_print_statuses[bed_index] = PrintStatus::outside;
break;

2
src/slic3r/GUI/PrintHostDialogs.cpp
View File

@@ -969,6 +969,8 @@ void PrintHostQueueDialog::on_progress(Event &evt)
const std::string& nm_str = into_u8(nm.GetString());
const std::string& hst_str = into_u8(hst.GetString());
wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, nm_str, hst_str, evt.progress / 100.f);
//y21
Moonraker::progress_percentage = evt.progress / 100.f;
}
}

10
src/slic3r/GUI/PrinterWebView.cpp
View File

@@ -1152,11 +1152,13 @@ void PrinterWebView::RunScript(const wxString &javascript)
{
wxString m_link_url = from_u8(link_url);
wxString url;
if (!m_link_url.Lower().starts_with("http"))
url = wxString::Format("http://%s", m_link_url);
if (link_url.find(":") == wxString::npos)
url = wxString::Format("%s:10088", link_url);
else
url = link_url;
if (!url.Lower().ends_with("10088"))
url = wxString::Format("%s:10088", url);
if (!m_link_url.Lower().starts_with("http"))
url = wxString::Format("http://%s", url);
load_url(url);
}