diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 97145215af..ba08690b2a 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -437,14 +437,21 @@ void GCodeViewer::SequentialView::Marker::render(int canvas_width, int canvas_he } else { sprintf(buf, "%s%.3f", x.c_str(), position.x() - plate->get_origin().x()); + ImGui::PushItemWidth(item_size); 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()); + ImGui::PushItemWidth(item_size); imgui.text(buf); - ImGui::SameLine(); 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); } diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 1cff5846eb..31517ede1d 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1874,7 +1874,6 @@ void TabPrint::build() optgroup->append_single_option_line("outer_wall_acceleration"); optgroup->append_single_option_line("inner_wall_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("travel_acceleration"); @@ -3501,10 +3500,6 @@ void TabPrinter::toggle_options() size_t i = size_t(val - 1); 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 // firmware retraction toggle_option("retraction_minimum_travel", have_retract_length, i); diff --git a/version.inc b/version.inc index 00dbf11f7e..fc77032288 100644 --- a/version.inc +++ b/version.inc @@ -10,5 +10,5 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() -set(SoftFever_VERSION "1.4.0") +set(SoftFever_VERSION "1.4.0 beta1") set(SLIC3R_VERSION "01.04.00.17")