GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 00:16:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cut WIP: Fix compilation warnings and errors

Browse Source
This commit is contained in:
YuSanka 2022-05-09 16:52:02 +02:00
parent 51e77fd81b
commit 279b116533
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@ -255,8 +255,6 @@ bool GLGizmoCut3D::render_combo(const std::string& label, const std::vector<std:
if (ImGui::BeginCombo(("##"+label).c_str(), "")) { if (ImGui::BeginCombo(("##"+label).c_str(), "")) {
for (size_t line_idx = 0; line_idx < lines.size(); ++line_idx) { for (size_t line_idx = 0; line_idx < lines.size(); ++line_idx) {
ImGui::PushID(int(line_idx)); ImGui::PushID(int(line_idx));
ImVec2 start_position = ImGui::GetCursorScreenPos();
if (ImGui::Selectable("", line_idx == selection_idx)) if (ImGui::Selectable("", line_idx == selection_idx))
selection_out = line_idx; selection_out = line_idx;
@ -966,11 +964,10 @@ void GLGizmoCut3D::on_render_input_window(float x, float y, float bottom_limit)
double koef = m_imperial_units ? ObjectManipulation::mm_to_in : 1.0; double koef = m_imperial_units ? ObjectManipulation::mm_to_in : 1.0;
wxString unit_str = " " + (m_imperial_units ? _L("in") : _L("mm")); wxString unit_str = " " + (m_imperial_units ? _L("in") : _L("mm"));
const BoundingBoxf3 tbb = transformed_bounding_box(); Vec3d tbb_sz = transformed_bounding_box().size();
Vec3d tbb_sz = tbb.size(); wxString size = "X: " + double_to_string(tbb_sz.x() * koef, 2) + unit_str +
wxString size = "X: " + double_to_string(tbb.size().x() * koef, 2) + unit_str + ", Y: " + double_to_string(tbb_sz.y() * koef, 2) + unit_str +
", Y: " + double_to_string(tbb.size().y() * koef, 2) + unit_str + ", Z: " + double_to_string(tbb_sz.z() * koef, 2) + unit_str;
", Z: " + double_to_string(tbb.size().z() * koef, 2) + unit_str;
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
m_imgui->text(_L("Build size")); m_imgui->text(_L("Build size"));
@ -1158,7 +1155,7 @@ void GLGizmoCut3D::render_connectors(bool picking)
for (size_t i = 0; i < connectors.size(); ++i) { for (size_t i = 0; i < connectors.size(); ++i) {
const CutConnector& connector = connectors[i]; const CutConnector& connector = connectors[i];
const bool& point_selected = m_selected[i]; // const bool& point_selected = m_selected[i];
double height = connector.height; double height = connector.height;
// recalculate connector position to world position // recalculate connector position to world position
@ -1449,14 +1446,11 @@ bool GLGizmoCut3D::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_posi
if (is_dragging() || m_connector_mode == CutConnectorMode::Auto || (!m_keep_upper || !m_keep_lower)) if (is_dragging() || m_connector_mode == CutConnectorMode::Auto || (!m_keep_upper || !m_keep_lower))
return false; return false;
CutConnectors& connectors = m_c->selection_info()->model_object()->cut_connectors;
const Camera& camera = wxGetApp().plater()->get_camera();
if ( m_hover_id < 0 && shift_down && if ( m_hover_id < 0 && shift_down &&
(action == SLAGizmoEventType::LeftDown || action == SLAGizmoEventType::Moving) ) (action == SLAGizmoEventType::LeftDown || action == SLAGizmoEventType::Moving) )
return process_cut_line(action, mouse_position); return process_cut_line(action, mouse_position);
int mesh_id = -1; CutConnectors& connectors = m_c->selection_info()->model_object()->cut_connectors;
// left down without selection rectangle - place connector on the cut plane: // left down without selection rectangle - place connector on the cut plane:
if (action == SLAGizmoEventType::LeftDown && /*!m_selection_rectangle.is_dragging() && */!shift_down) { if (action == SLAGizmoEventType::LeftDown && /*!m_selection_rectangle.is_dragging() && */!shift_down) {
@ -1469,7 +1463,6 @@ bool GLGizmoCut3D::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_posi
std::pair<Vec3d, Vec3d> pos_and_normal; std::pair<Vec3d, Vec3d> pos_and_normal;
if (unproject_on_cut_plane(mouse_position.cast<double>(), pos_and_normal)) { if (unproject_on_cut_plane(mouse_position.cast<double>(), pos_and_normal)) {
const Vec3d& hit = pos_and_normal.first; const Vec3d& hit = pos_and_normal.first;
const Vec3d& normal = pos_and_normal.second;
// The clipping plane was clicked, hit containts coordinates of the hit in world coords. // The clipping plane was clicked, hit containts coordinates of the hit in world coords.
std::cout << hit.x() << "\t" << hit.y() << "\t" << hit.z() << std::endl; std::cout << hit.x() << "\t" << hit.y() << "\t" << hit.z() << std::endl;
Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Add connector"), UndoRedo::SnapshotType::GizmoAction); Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Add connector"), UndoRedo::SnapshotType::GizmoAction);

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

@ -2977,10 +2977,11 @@ bool Plater::priv::delete_object_from_model(size_t obj_idx)
// show warning message that "cut consistancy" will not be supported any more // show warning message that "cut consistancy" will not be supported any more
ModelObject* obj = model.objects[obj_idx]; ModelObject* obj = model.objects[obj_idx];
if (obj->is_cut()) { if (obj->is_cut()) {
MessageDialog dialog(q, _L("You try to delete an object which is a part of a cut object.\n" InfoDialog dialog(q, _L("Delete object which is a part of cut object"),
_L("You try to delete an object which is a part of a cut object.\n"
"This action will break a cut correspondence.\n" "This action will break a cut correspondence.\n"
"After that PrusaSlicer can't garantie model consistency"), "After that PrusaSlicer can't garantie model consistency"),
_L("Delete object which is a part of cut object"), wxYES | wxCANCEL | wxCANCEL_DEFAULT); false, wxYES | wxCANCEL | wxCANCEL_DEFAULT | wxICON_WARNING);
dialog.SetButtonLabel(wxID_YES, _L("Delete object")); dialog.SetButtonLabel(wxID_YES, _L("Delete object"));
if (dialog.ShowModal() == wxID_CANCEL) if (dialog.ShowModal() == wxID_CANCEL)
return false; return false;