3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix issues caused by merging

Browse source
This commit is contained in:
SoftFever 2022-12-16 17:04:19 +08:00
parent bf8a9fee1f
commit 5d141ee214
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -437,14 +437,21 @@ void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_he
} }
else { else {
sprintf(buf, "%s%.3f", x.c_str(), position.x() - plate->get_origin().x()); sprintf(buf, "%s%.3f", x.c_str(), position.x() - plate->get_origin().x());
ImGui::PushItemWidth(item_size);
imgui.text(buf); imgui.text(buf);
ImGui::SameLine(); ImGui::SameLine(window_padding + item_size + item_spacing);
sprintf(buf, "%s%.3f", y.c_str(), position.y() - plate->get_origin().y()); sprintf(buf, "%s%.3f", y.c_str(), position.y() - plate->get_origin().y());
ImGui::PushItemWidth(item_size);
imgui.text(buf); imgui.text(buf);
ImGui::SameLine();
sprintf(buf, "%s%.3f", z.c_str(), position.z()); sprintf(buf, "%s%.3f", z.c_str(), position.z());
ImGui::PushItemWidth(item_size);
imgui.text(buf);
ImGui::SameLine(window_padding + item_size + item_spacing);
sprintf(buf, "%s%.0f", speed.c_str(), it->feedrate);
ImGui::PushItemWidth(item_size);
imgui.text(buf); imgui.text(buf);
} }

5
src/slic3r/GUI/Tab.cpp
View file

@ -1874,7 +1874,6 @@ void TabPrint::build()
optgroup->append_single_option_line("outer_wall_acceleration"); optgroup->append_single_option_line("outer_wall_acceleration");
optgroup->append_single_option_line("inner_wall_acceleration"); optgroup->append_single_option_line("inner_wall_acceleration");
optgroup->append_single_option_line("initial_layer_acceleration"); optgroup->append_single_option_line("initial_layer_acceleration");
optgroup->append_single_option_line("outer_wall_acceleration");
optgroup->append_single_option_line("top_surface_acceleration"); optgroup->append_single_option_line("top_surface_acceleration");
optgroup->append_single_option_line("travel_acceleration"); optgroup->append_single_option_line("travel_acceleration");
@ -3501,10 +3500,6 @@ void TabPrinter::toggle_options()
size_t i = size_t(val - 1); size_t i = size_t(val - 1);
bool have_retract_length = m_config->opt_float("retraction_length", i) > 0; bool have_retract_length = m_config->opt_float("retraction_length", i) > 0;
//BBS
for (auto el : { "nozzle_diameter", "extruder_offset"})
toggle_option(el, !is_BBL_printer, i);
// user can customize travel length if we have retraction length or we"re using // user can customize travel length if we have retraction length or we"re using
// firmware retraction // firmware retraction
toggle_option("retraction_minimum_travel", have_retract_length, i); toggle_option("retraction_minimum_travel", have_retract_length, i);

2
version.inc
View file

@ -10,5 +10,5 @@ endif()
if(NOT DEFINED BBL_INTERNAL_TESTING) if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1") set(BBL_INTERNAL_TESTING "1")
endif() endif()
set(SoftFever_VERSION "1.4.0") set(SoftFever_VERSION "1.4.0 beta1")
set(SLIC3R_VERSION "01.04.00.17") set(SLIC3R_VERSION "01.04.00.17")