From 35c97ae363c94094a5b64f150c834c19bc707633 Mon Sep 17 00:00:00 2001 From: sunsets <845944018@qq.com> Date: Mon, 18 Sep 2023 10:22:22 +0800 Subject: [PATCH] update win10Sdk and calib --- CMakeLists.txt | 4 +-- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 38 ++++++++----------------- src/slic3r/GUI/Plater.cpp | 32 +-------------------- src/slic3r/GUI/Plater.hpp | 1 - 4 files changed, 15 insertions(+), 60 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34718dc..94239ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,8 +170,8 @@ if(WIN32) endif() endif() if(DEFINED WIN10SDK_PATH) - if (EXISTS "${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h") - set(WIN10SDK_INCLUDE_PATH "${WIN10SDK_PATH}/Include") + if (EXISTS "${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h") + set(WIN10SDK_INCLUDE_PATH "${WIN10SDK_PATH}") else() message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}") message("${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h was not found") diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 56fceae..3a1ae91 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -43,7 +43,6 @@ #include #include // measure enumeration of fonts - // uncomment for easier debug //#define ALLOW_DEBUG_MODE #ifdef ALLOW_DEBUG_MODE @@ -216,8 +215,6 @@ static void find_closest_volume(const Selection &selection, /// Screen coordinat, where to create new object laying on bed static void start_create_object_job(DataBase &emboss_data, const Vec2d &coor); - - // Loaded icons enum // Have to match order of files in function GLGizmoEmboss::init_icons() enum class IconType : unsigned { @@ -264,7 +261,14 @@ static bool apply_camera_dir(const Camera &camera, GLCanvas3D &canvas, bool keep } // namespace priv -<<<<<<< Updated upstream +namespace { +// for existing volume which is selected(could init different(to volume text) lines count when edit text) +void init_text_lines(TextLinesModel &text_lines, const Selection& selection, /* const*/ StyleManager &style_manager, unsigned count_lines=0); +// before text volume is created +void init_new_text_line(TextLinesModel &text_lines, const Transform3d& new_text_tr, const ModelObject& mo, /* const*/ StyleManager &style_manager); +} + + //B34 void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d &mouse_pos, std::string str) { @@ -278,7 +282,9 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d &mous Size s = m_parent.get_canvas_size(); Vec2d screen_center(s.get_width() / 2., s.get_height() / 2.); - DataBase emboss_data = priv::create_emboss_data_base(str, m_style_manager, m_job_cancel); + DataBase emboss_data = priv::create_emboss_data_base(str, m_style_manager, m_text_lines, m_parent.get_selection(), volume_type, + m_job_cancel); + const ModelObjectPtrs &objects = selection.get_model()->objects; bool is_simple_mode = wxGetApp().get_mode() == comSimple; // No selected object so create new object @@ -329,20 +335,6 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d &mous } - - - -void GLGizmoEmboss::change_height(double height) { - set_height(); -======= -namespace { -// for existing volume which is selected(could init different(to volume text) lines count when edit text) -void init_text_lines(TextLinesModel &text_lines, const Selection& selection, /* const*/ StyleManager &style_manager, unsigned count_lines=0); -// before text volume is created -void init_new_text_line(TextLinesModel &text_lines, const Transform3d& new_text_tr, const ModelObject& mo, /* const*/ StyleManager &style_manager); ->>>>>>> Stashed changes -} - void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d& mouse_pos) { if (!init_create(volume_type)) @@ -375,9 +367,6 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type) int object_idx = selection.get_object_idx(); Size s = m_parent.get_canvas_size(); - - - Vec2d screen_center(s.get_width() / 2., s.get_height() / 2.); DataBase emboss_data = priv::create_emboss_data_base(m_text, m_style_manager, m_text_lines, m_parent.get_selection(), volume_type, m_job_cancel); const ModelObjectPtrs &objects = selection.get_model()->objects; @@ -3068,7 +3057,6 @@ bool GLGizmoEmboss::set_height() { return true; } - void GLGizmoEmboss::draw_height(bool use_inch) { float &value = m_style_manager.get_font_prop().size_in_mm; @@ -3077,7 +3065,6 @@ void GLGizmoEmboss::draw_height(bool use_inch) const char *size_format = use_inch ? "%.2f in" : "%.1f mm"; const std::string revert_text_size = _u8L("Revert text size."); const std::string& name = m_gui_cfg->translations.height; - if (rev_input_mm(name, value, stored, revert_text_size, 0.1f, 1.f, size_format, use_inch, m_scale_height)) if (set_height()) process(); @@ -3947,8 +3934,7 @@ bool priv::start_create_volume_on_surface_job(DataBase &emboss_data, return false; // Create result volume transformation - Transform3d surface_trmat = create_transformation_onto_surface(hit->position, hit->normal, - priv::up_limit); + Transform3d surface_trmat = create_transformation_onto_surface(hit->position, hit->normal, priv::up_limit); const FontProp &font_prop = emboss_data.text_configuration.style.prop; apply_transformation(font_prop, surface_trmat); Transform3d instance = gl_volume->get_instance_transformation().get_matrix(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 9f33883..90d318a 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3,13 +3,10 @@ #include #include +#include #include #include #include -//Y -#include -#include -#include #include #include #include @@ -2294,7 +2291,6 @@ Plater::priv::~priv() void Plater::priv::update(unsigned int flags) { - // the following line, when enabled, causes flickering on NVIDIA graphics cards // wxWindowUpdateLocker freeze_guard(q); if (get_config_bool("autocenter")) @@ -5515,7 +5511,6 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep) const double e_step = print_config->get_abs_value("layer_height") * pa_external_perimeter_extrusion_width * 0.4; -<<<<<<< Updated upstream std::string num_str = double_to_str(StartPA + (count-1) * PAStep) ; for (int i = 1; i < count/2; i++) { num_str += "\n" + double_to_str(StartPA + (count - 1 - i * 2) * PAStep) ; @@ -5523,31 +5518,6 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep) add_num_text(num_str, Vec2d(plate_center.x() - 50, plate_center.y())); //add_num_text("2.0"); // add_num_text("1.0", Vec2d(100, 200)); -======= - //B34 Add Text - /*GLCanvas3D * canvas = wxGetApp().plater()->canvas3D(); - GLGizmosManager &mng = canvas->get_gizmos_manager(); - GLGizmoBase * gizmo = mng.get_gizmo(GLGizmosManager::Emboss); - GLGizmoEmboss * emboss = dynamic_cast(gizmo); - assert(emboss != nullptr); - if (emboss == nullptr) - return; - - ModelVolumeType volume_type = ModelVolumeType::MODEL_PART; - // no selected object means create new object - if (volume_type == ModelVolumeType::INVALID) - volume_type = ModelVolumeType::MODEL_PART; -*/ - //emboss->create_volume(volume_type, Vec2d(plate_center.x() - 10, plate_center.y() - count * 2.5), "0.0"); - //dynamic_cast(mng.get_gizmo(GLGizmosManager::Emboss)) - // ->create_volume(volume_type, Vec2d(plate_center.x() - 20, plate_center.y() - count * 2.5), "1.0"); - //dynamic_cast(mng.get_gizmo(GLGizmosManager::Emboss)) - // ->create_volume(volume_type, Vec2d(plate_center.x() - 20, plate_center.y() - count * 2.5), "2.0"); - //dynamic_cast(mng.get_gizmo(GLGizmosManager::Emboss)) - // ->create_volume(volume_type, Vec2d(plate_center.x() - 20, plate_center.y() - count * 2.5), "3.0"); - //model().objects[0]->scale(2); - ->>>>>>> Stashed changes //B34 Generate line gcode std::stringstream gcode; gcode << move_to(Vec2d(start_x + 80, start_y), pa_travel_speed); diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index f81dce3..cd06597 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -206,7 +206,6 @@ public: FORCE_BACKGROUND_PROCESSING_UPDATE = 2, POSTPONE_VALIDATION_ERROR_MESSAGE = 4, }; - void update(unsigned int flags = 0); // Get the worker handling the UI jobs (arrange, fill bed, etc...)