Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer
This commit is contained in:
commit
448d92df68
51 changed files with 313 additions and 332 deletions
|
@ -53,6 +53,8 @@
|
||||||
#include "slic3r/GUI/3DScene.hpp"
|
#include "slic3r/GUI/3DScene.hpp"
|
||||||
#include "slic3r/GUI/InstanceCheck.hpp"
|
#include "slic3r/GUI/InstanceCheck.hpp"
|
||||||
#include "slic3r/GUI/AppConfig.hpp"
|
#include "slic3r/GUI/AppConfig.hpp"
|
||||||
|
#include "slic3r/GUI/MainFrame.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
#endif /* SLIC3R_GUI */
|
#endif /* SLIC3R_GUI */
|
||||||
|
|
||||||
using namespace Slic3r;
|
using namespace Slic3r;
|
||||||
|
|
|
@ -11,13 +11,13 @@
|
||||||
|
|
||||||
#include "../libslic3r.h"
|
#include "../libslic3r.h"
|
||||||
#include "../BoundingBox.hpp"
|
#include "../BoundingBox.hpp"
|
||||||
#include "../PrintConfig.hpp"
|
|
||||||
#include "../Utils.hpp"
|
#include "../Utils.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
class ExPolygon;
|
class ExPolygon;
|
||||||
class Surface;
|
class Surface;
|
||||||
|
enum InfillPattern : int;
|
||||||
|
|
||||||
class InfillFailedException : public std::runtime_error {
|
class InfillFailedException : public std::runtime_error {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -455,24 +455,19 @@ bool Model::looks_like_imperial_units() const
|
||||||
if (this->objects.size() == 0)
|
if (this->objects.size() == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
stl_vertex size = this->objects[0]->get_object_stl_stats().size;
|
for (ModelObject* obj : this->objects)
|
||||||
|
if (obj->get_object_stl_stats().volume < 9.0) // 9 = 3*3*3;
|
||||||
|
return true;
|
||||||
|
|
||||||
for (ModelObject* o : this->objects) {
|
return false;
|
||||||
auto sz = o->get_object_stl_stats().size;
|
|
||||||
|
|
||||||
if (size[0] < sz[0]) size[0] = sz[0];
|
|
||||||
if (size[1] < sz[1]) size[1] = sz[1];
|
|
||||||
if (size[2] < sz[2]) size[2] = sz[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
return (size[0] < 3 && size[1] < 3 && size[2] < 3);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Model::convert_from_imperial_units()
|
void Model::convert_from_imperial_units()
|
||||||
{
|
{
|
||||||
double in_to_mm = 25.4;
|
double in_to_mm = 25.4;
|
||||||
for (ModelObject* o : this->objects)
|
for (ModelObject* obj : this->objects)
|
||||||
o->scale_mesh_after_creation(Vec3d(in_to_mm, in_to_mm, in_to_mm));
|
if (obj->get_object_stl_stats().volume < 9.0) // 9 = 3*3*3;
|
||||||
|
obj->scale_mesh_after_creation(Vec3d(in_to_mm, in_to_mm, in_to_mm));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Model::adjust_min_z()
|
void Model::adjust_min_z()
|
||||||
|
@ -1273,6 +1268,27 @@ void ModelObject::split(ModelObjectPtrs* new_objects)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ModelObject::merge()
|
||||||
|
{
|
||||||
|
if (this->volumes.size() == 1) {
|
||||||
|
// We can't merge meshes if there's just one volume
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
TriangleMesh mesh;
|
||||||
|
|
||||||
|
for (ModelVolume* volume : volumes)
|
||||||
|
if (!volume->mesh().empty())
|
||||||
|
mesh.merge(volume->mesh());
|
||||||
|
mesh.repair();
|
||||||
|
|
||||||
|
this->clear_volumes();
|
||||||
|
ModelVolume* vol = this->add_volume(mesh);
|
||||||
|
|
||||||
|
if (!vol)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Support for non-uniform scaling of instances. If an instance is rotated by angles, which are not multiples of ninety degrees,
|
// Support for non-uniform scaling of instances. If an instance is rotated by angles, which are not multiples of ninety degrees,
|
||||||
// then the scaling in world coordinate system is not representable by the Geometry::Transformation structure.
|
// then the scaling in world coordinate system is not representable by the Geometry::Transformation structure.
|
||||||
// This situation is solved by baking in the instance transformation into the mesh vertices.
|
// This situation is solved by baking in the instance transformation into the mesh vertices.
|
||||||
|
|
|
@ -287,6 +287,7 @@ public:
|
||||||
bool needed_repair() const;
|
bool needed_repair() const;
|
||||||
ModelObjectPtrs cut(size_t instance, coordf_t z, bool keep_upper = true, bool keep_lower = true, bool rotate_lower = false); // Note: z is in world coordinates
|
ModelObjectPtrs cut(size_t instance, coordf_t z, bool keep_upper = true, bool keep_lower = true, bool rotate_lower = false); // Note: z is in world coordinates
|
||||||
void split(ModelObjectPtrs* new_objects);
|
void split(ModelObjectPtrs* new_objects);
|
||||||
|
void merge();
|
||||||
// Support for non-uniform scaling of instances. If an instance is rotated by angles, which are not multiples of ninety degrees,
|
// Support for non-uniform scaling of instances. If an instance is rotated by angles, which are not multiples of ninety degrees,
|
||||||
// then the scaling in world coordinate system is not representable by the Geometry::Transformation structure.
|
// then the scaling in world coordinate system is not representable by the Geometry::Transformation structure.
|
||||||
// This situation is solved by baking in the instance transformation into the mesh vertices.
|
// This situation is solved by baking in the instance transformation into the mesh vertices.
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
#include "ModelArrange.hpp"
|
#include "ModelArrange.hpp"
|
||||||
|
|
||||||
|
#include <libslic3r/Model.hpp>
|
||||||
#include "MTUtils.hpp"
|
#include "MTUtils.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
#ifndef MODELARRANGE_HPP
|
#ifndef MODELARRANGE_HPP
|
||||||
#define MODELARRANGE_HPP
|
#define MODELARRANGE_HPP
|
||||||
|
|
||||||
#include <libslic3r/Model.hpp>
|
|
||||||
#include <libslic3r/Arrange.hpp>
|
#include <libslic3r/Arrange.hpp>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
|
class Model;
|
||||||
|
class ModelInstance;
|
||||||
|
using ModelInstancePtrs = std::vector<ModelInstance*>;
|
||||||
|
|
||||||
using arrangement::ArrangePolygon;
|
using arrangement::ArrangePolygon;
|
||||||
using arrangement::ArrangePolygons;
|
using arrangement::ArrangePolygons;
|
||||||
using arrangement::ArrangeParams;
|
using arrangement::ArrangeParams;
|
||||||
|
|
|
@ -33,7 +33,7 @@ enum PrintHostType {
|
||||||
htOctoPrint, htDuet, htFlashAir, htAstroBox
|
htOctoPrint, htDuet, htFlashAir, htAstroBox
|
||||||
};
|
};
|
||||||
|
|
||||||
enum InfillPattern {
|
enum InfillPattern : int {
|
||||||
ipRectilinear, ipMonotonous, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb,
|
ipRectilinear, ipMonotonous, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb,
|
||||||
ipGyroid, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipCount,
|
ipGyroid, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipCount,
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
|
|
||||||
#include "libslic3r.h"
|
#include "libslic3r.h"
|
||||||
#include "Utils.hpp"
|
#include "Utils.hpp"
|
||||||
#include "PrintConfig.hpp"
|
|
||||||
|
|
||||||
namespace Slic3r
|
namespace Slic3r
|
||||||
{
|
{
|
||||||
|
@ -19,6 +18,7 @@ namespace Slic3r
|
||||||
class PrintConfig;
|
class PrintConfig;
|
||||||
class PrintObjectConfig;
|
class PrintObjectConfig;
|
||||||
class ModelObject;
|
class ModelObject;
|
||||||
|
class DynamicPrintConfig;
|
||||||
|
|
||||||
// Parameters to guide object slicing and support generation.
|
// Parameters to guide object slicing and support generation.
|
||||||
// The slicing parameters account for a raft and whether the 1st object layer is printed with a normal or a bridging flow
|
// The slicing parameters account for a raft and whether the 1st object layer is printed with a normal or a bridging flow
|
||||||
|
|
|
@ -95,8 +95,6 @@ set(SLIC3R_GUI_SOURCES
|
||||||
GUI/GUI_ObjectSettings.hpp
|
GUI/GUI_ObjectSettings.hpp
|
||||||
GUI/GUI_ObjectLayers.cpp
|
GUI/GUI_ObjectLayers.cpp
|
||||||
GUI/GUI_ObjectLayers.hpp
|
GUI/GUI_ObjectLayers.hpp
|
||||||
GUI/LambdaObjectDialog.cpp
|
|
||||||
GUI/LambdaObjectDialog.hpp
|
|
||||||
GUI/MeshUtils.cpp
|
GUI/MeshUtils.cpp
|
||||||
GUI/MeshUtils.hpp
|
GUI/MeshUtils.hpp
|
||||||
GUI/Tab.cpp
|
GUI/Tab.cpp
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "BackgroundSlicingProcess.hpp"
|
#include "BackgroundSlicingProcess.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "GUI.hpp"
|
#include "GUI.hpp"
|
||||||
|
#include "MainFrame.hpp"
|
||||||
|
|
||||||
#include <wx/app.h>
|
#include <wx/app.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
|
@ -36,6 +37,7 @@
|
||||||
#include "RemovableDriveManager.hpp"
|
#include "RemovableDriveManager.hpp"
|
||||||
|
|
||||||
#include "slic3r/Utils/Thread.hpp"
|
#include "slic3r/Utils/Thread.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
#include "BedShapeDialog.hpp"
|
#include "BedShapeDialog.hpp"
|
||||||
|
#include "GUI_App.hpp"
|
||||||
|
#include "OptionsGroup.hpp"
|
||||||
|
|
||||||
#include <wx/wx.h>
|
#include <wx/wx.h>
|
||||||
#include <wx/numformatter.h>
|
#include <wx/numformatter.h>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// The bed shape dialog.
|
// The bed shape dialog.
|
||||||
// The dialog opens from Print Settins tab->Bed Shape : Set...
|
// The dialog opens from Print Settins tab->Bed Shape : Set...
|
||||||
|
|
||||||
#include "OptionsGroup.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
#include "2DBed.hpp"
|
#include "2DBed.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
|
||||||
|
@ -13,6 +13,8 @@
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
|
||||||
|
class ConfigOptionsGroup;
|
||||||
|
|
||||||
using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>;
|
using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>;
|
||||||
class BedShapePanel : public wxPanel
|
class BedShapePanel : public wxPanel
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
#include "GUI.hpp"
|
#include "GUI.hpp"
|
||||||
|
#include "GUI_App.hpp"
|
||||||
#include "GUI_Utils.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
#include "slic3r/Config/Snapshot.hpp"
|
#include "slic3r/Config/Snapshot.hpp"
|
||||||
#include "slic3r/Utils/PresetUpdater.hpp"
|
#include "slic3r/Utils/PresetUpdater.hpp"
|
||||||
|
|
|
@ -24,6 +24,9 @@
|
||||||
#include "AppConfig.hpp"
|
#include "AppConfig.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
#include "BedShapeDialog.hpp"
|
#include "BedShapeDialog.hpp"
|
||||||
|
#include "GUI.hpp"
|
||||||
|
#include "wxExtensions.hpp"
|
||||||
|
|
||||||
|
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = boost::filesystem;
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#endif // ENABLE_GCODE_VIEWER
|
#endif // ENABLE_GCODE_VIEWER
|
||||||
#include "GUI.hpp"
|
#include "GUI.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include "ExtruderSequenceDialog.hpp"
|
#include "ExtruderSequenceDialog.hpp"
|
||||||
#include "libslic3r/Print.hpp"
|
#include "libslic3r/Print.hpp"
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include "Field.hpp"
|
#include "Field.hpp"
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
#include "MainFrame.hpp"
|
||||||
|
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
#include "libslic3r/PrintConfig.hpp"
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
#include "slic3r/GUI/OpenGLManager.hpp"
|
#include "slic3r/GUI/OpenGLManager.hpp"
|
||||||
#include "slic3r/GUI/3DBed.hpp"
|
#include "slic3r/GUI/3DBed.hpp"
|
||||||
#include "slic3r/GUI/Camera.hpp"
|
#include "slic3r/GUI/Camera.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
|
#include "slic3r/GUI/MainFrame.hpp"
|
||||||
|
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|
||||||
#include "3DScene.hpp"
|
|
||||||
#include "GLToolbar.hpp"
|
#include "GLToolbar.hpp"
|
||||||
#include "Event.hpp"
|
#include "Event.hpp"
|
||||||
#include "Selection.hpp"
|
#include "Selection.hpp"
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "3DScene.hpp"
|
#include "3DScene.hpp"
|
||||||
#include "GLCanvas3D.hpp"
|
#include "GLCanvas3D.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include "slic3r/GUI/GLCanvas3D.hpp"
|
#include "slic3r/GUI/GLCanvas3D.hpp"
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/GUI/Camera.hpp"
|
#include "slic3r/GUI/Camera.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <wx/bitmap.h>
|
#include <wx/bitmap.h>
|
||||||
|
|
|
@ -37,6 +37,8 @@
|
||||||
#include "AppConfig.hpp"
|
#include "AppConfig.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
#include "3DScene.hpp"
|
#include "3DScene.hpp"
|
||||||
|
#include "MainFrame.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include "../Utils/PresetUpdater.hpp"
|
#include "../Utils/PresetUpdater.hpp"
|
||||||
#include "../Utils/PrintHost.hpp"
|
#include "../Utils/PrintHost.hpp"
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
#include "Preset.hpp"
|
||||||
#include "MainFrame.hpp"
|
|
||||||
#include "ImGuiWrapper.hpp"
|
#include "ImGuiWrapper.hpp"
|
||||||
#include "ConfigWizard.hpp"
|
#include "ConfigWizard.hpp"
|
||||||
#include "OpenGLManager.hpp"
|
#include "OpenGLManager.hpp"
|
||||||
|
@ -30,11 +29,21 @@ class PresetBundle;
|
||||||
class PresetUpdater;
|
class PresetUpdater;
|
||||||
class ModelObject;
|
class ModelObject;
|
||||||
class PrintHostJobQueue;
|
class PrintHostJobQueue;
|
||||||
|
class Model;
|
||||||
|
|
||||||
namespace GUI{
|
namespace GUI{
|
||||||
class RemovableDriveManager;
|
class RemovableDriveManager;
|
||||||
class OtherInstanceMessageHandler;
|
class OtherInstanceMessageHandler;
|
||||||
|
class MainFrame;
|
||||||
|
class Sidebar;
|
||||||
|
class ObjectManipulation;
|
||||||
|
class ObjectSettings;
|
||||||
|
class ObjectList;
|
||||||
|
class ObjectLayers;
|
||||||
|
class Plater;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
enum FileType
|
enum FileType
|
||||||
{
|
{
|
||||||
FT_STL,
|
FT_STL,
|
||||||
|
|
|
@ -2,9 +2,11 @@
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
|
|
||||||
#include "OptionsGroup.hpp"
|
#include "OptionsGroup.hpp"
|
||||||
|
#include "GUI_App.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
#include "GLCanvas3D.hpp"
|
#include "GLCanvas3D.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
#include "GUI_ObjectLayers.hpp"
|
#include "GUI_ObjectLayers.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include "OptionsGroup.hpp"
|
#include "OptionsGroup.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
#include "Tab.hpp"
|
#include "Tab.hpp"
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
#include "LambdaObjectDialog.hpp"
|
|
||||||
#include "GLCanvas3D.hpp"
|
#include "GLCanvas3D.hpp"
|
||||||
#include "Selection.hpp"
|
#include "Selection.hpp"
|
||||||
|
|
||||||
|
@ -1781,6 +1781,22 @@ void ObjectList::append_menu_items_convert_unit(wxMenu* menu)
|
||||||
[](wxCommandEvent&) { wxGetApp().plater()->convert_unit(false); }, "", menu);
|
[](wxCommandEvent&) { wxGetApp().plater()->convert_unit(false); }, "", menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ObjectList::append_menu_item_merge_to_multipart_object(wxMenu* menu)
|
||||||
|
{
|
||||||
|
menu->AppendSeparator();
|
||||||
|
append_menu_item(menu, wxID_ANY, _L("Merge"), _L("Merge objects to the one multipart object"),
|
||||||
|
[this](wxCommandEvent&) { merge(true); }, "", menu,
|
||||||
|
[this]() { return this->can_merge_to_multipart_object(); }, wxGetApp().plater());
|
||||||
|
}
|
||||||
|
|
||||||
|
void ObjectList::append_menu_item_merge_to_single_object(wxMenu* menu)
|
||||||
|
{
|
||||||
|
menu->AppendSeparator();
|
||||||
|
append_menu_item(menu, wxID_ANY, _L("Merge"), _L("Merge objects to the one single object"),
|
||||||
|
[this](wxCommandEvent&) { merge(false); }, "", menu,
|
||||||
|
[this]() { return this->can_merge_to_single_object(); }, wxGetApp().plater());
|
||||||
|
}
|
||||||
|
|
||||||
void ObjectList::create_object_popupmenu(wxMenu *menu)
|
void ObjectList::create_object_popupmenu(wxMenu *menu)
|
||||||
{
|
{
|
||||||
#ifdef __WXOSX__
|
#ifdef __WXOSX__
|
||||||
|
@ -1795,6 +1811,10 @@ void ObjectList::create_object_popupmenu(wxMenu *menu)
|
||||||
|
|
||||||
// Split object to parts
|
// Split object to parts
|
||||||
append_menu_item_split(menu);
|
append_menu_item_split(menu);
|
||||||
|
// menu->AppendSeparator();
|
||||||
|
|
||||||
|
// Merge multipart object to the single object
|
||||||
|
// append_menu_item_merge_to_single_object(menu);
|
||||||
menu->AppendSeparator();
|
menu->AppendSeparator();
|
||||||
|
|
||||||
// Layers Editing for object
|
// Layers Editing for object
|
||||||
|
@ -2365,6 +2385,107 @@ void ObjectList::split()
|
||||||
changed_object(obj_idx);
|
changed_object(obj_idx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ObjectList::merge(bool to_multipart_object)
|
||||||
|
{
|
||||||
|
// merge selected objects to the multipart object
|
||||||
|
if (to_multipart_object)
|
||||||
|
{
|
||||||
|
std::vector<int> obj_idxs;
|
||||||
|
wxDataViewItemArray sels;
|
||||||
|
GetSelections(sels);
|
||||||
|
assert(!sels.IsEmpty());
|
||||||
|
|
||||||
|
for (wxDataViewItem item : sels) {
|
||||||
|
const ItemType type = m_objects_model->GetItemType(item);
|
||||||
|
assert(type & (itObject/* | itInstance*/));
|
||||||
|
obj_idxs.emplace_back(type & itObject ? m_objects_model->GetIdByItem(item) :
|
||||||
|
m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item)));
|
||||||
|
}
|
||||||
|
std::sort(obj_idxs.begin(), obj_idxs.end());
|
||||||
|
obj_idxs.erase(std::unique(obj_idxs.begin(), obj_idxs.end()), obj_idxs.end());
|
||||||
|
|
||||||
|
if (obj_idxs.size() <= 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Merge"));
|
||||||
|
|
||||||
|
Model* model = (*m_objects)[0]->get_model();
|
||||||
|
ModelObject* new_object = model->add_object();
|
||||||
|
new_object->name = _u8L("Merged");
|
||||||
|
DynamicPrintConfig* new_config = &new_object->config;
|
||||||
|
|
||||||
|
const Vec3d& main_offset = (*m_objects)[0]->instances[0]->get_offset();
|
||||||
|
|
||||||
|
for (int obj_idx : obj_idxs)
|
||||||
|
{
|
||||||
|
ModelObject* object = (*m_objects)[obj_idx];
|
||||||
|
Vec3d offset = object->instances[0]->get_offset();
|
||||||
|
|
||||||
|
if (object->id() == (*m_objects)[0]->id())
|
||||||
|
new_object->add_instance(*object->instances[0]);
|
||||||
|
auto new_opt_keys = new_config->keys();
|
||||||
|
|
||||||
|
const DynamicPrintConfig& from_config = object->config;
|
||||||
|
auto opt_keys = from_config.keys();
|
||||||
|
|
||||||
|
// merge settings
|
||||||
|
for (auto& opt_key : opt_keys) {
|
||||||
|
if (find(new_opt_keys.begin(), new_opt_keys.end(), opt_key) == new_opt_keys.end()) {
|
||||||
|
const ConfigOption* option = from_config.option(opt_key);
|
||||||
|
if (!option) {
|
||||||
|
// if current option doesn't exist in prints.get_edited_preset(),
|
||||||
|
// get it from default config values
|
||||||
|
option = DynamicPrintConfig::new_from_defaults_keys({ opt_key })->option(opt_key);
|
||||||
|
}
|
||||||
|
new_config->set_key_value(opt_key, option->clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// merge volumes
|
||||||
|
for (const ModelVolume* volume : object->volumes) {
|
||||||
|
ModelVolume* new_volume = new_object->add_volume(*volume);
|
||||||
|
Vec3d vol_offset = offset - main_offset + new_volume->get_offset();
|
||||||
|
new_volume->set_offset(vol_offset);
|
||||||
|
}
|
||||||
|
// save extruder value if it was set
|
||||||
|
if (object->volumes.size() == 1 && find(opt_keys.begin(), opt_keys.end(), "extruder") != opt_keys.end()) {
|
||||||
|
ModelVolume* volume = new_object->volumes.back();
|
||||||
|
const ConfigOption* option = from_config.option("extruder");
|
||||||
|
if (option)
|
||||||
|
volume->config.set_key_value("extruder", option->clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
// merge layers
|
||||||
|
for (const auto& range : object->layer_config_ranges)
|
||||||
|
new_object->layer_config_ranges.emplace(range);
|
||||||
|
}
|
||||||
|
// remove selected objects
|
||||||
|
remove();
|
||||||
|
// Add new object(merged) to the object_list
|
||||||
|
add_object_to_list(m_objects->size() - 1);
|
||||||
|
}
|
||||||
|
// merge all parts to the one single object
|
||||||
|
// all part's settings will be lost
|
||||||
|
else
|
||||||
|
{
|
||||||
|
wxDataViewItem item = GetSelection();
|
||||||
|
if (!item)
|
||||||
|
return;
|
||||||
|
const int obj_idx = m_objects_model->GetIdByItem(item);
|
||||||
|
if (obj_idx == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Plater::TakeSnapshot snapshot(wxGetApp().plater(), _L("Merge all parts to the one single object"));
|
||||||
|
|
||||||
|
ModelObject* model_object = (*m_objects)[obj_idx];
|
||||||
|
model_object->merge();
|
||||||
|
|
||||||
|
m_objects_model->DeleteVolumeChildren(item);
|
||||||
|
|
||||||
|
changed_object(obj_idx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void ObjectList::layers_editing()
|
void ObjectList::layers_editing()
|
||||||
{
|
{
|
||||||
const Selection& selection = scene_selection();
|
const Selection& selection = scene_selection();
|
||||||
|
@ -2490,6 +2611,31 @@ bool ObjectList::can_split_instances()
|
||||||
return selection.is_multiple_full_instance() || selection.is_single_full_instance();
|
return selection.is_multiple_full_instance() || selection.is_single_full_instance();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ObjectList::can_merge_to_multipart_object() const
|
||||||
|
{
|
||||||
|
wxDataViewItemArray sels;
|
||||||
|
GetSelections(sels);
|
||||||
|
if (sels.IsEmpty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// should be selected just objects
|
||||||
|
for (wxDataViewItem item : sels)
|
||||||
|
if (!(m_objects_model->GetItemType(item) & (itObject/* | itInstance*/)))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ObjectList::can_merge_to_single_object() const
|
||||||
|
{
|
||||||
|
int obj_idx = get_selected_obj_idx();
|
||||||
|
if (obj_idx < 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// selected object should be multipart
|
||||||
|
return (*m_objects)[obj_idx]->volumes.size() > 1;
|
||||||
|
}
|
||||||
|
|
||||||
// NO_PARAMETERS function call means that changed object index will be determine from Selection()
|
// NO_PARAMETERS function call means that changed object index will be determine from Selection()
|
||||||
void ObjectList::changed_object(const int obj_idx/* = -1*/) const
|
void ObjectList::changed_object(const int obj_idx/* = -1*/) const
|
||||||
{
|
{
|
||||||
|
@ -4111,6 +4257,7 @@ void ObjectList::show_multi_selection_menu()
|
||||||
}, wxGetApp().plater());
|
}, wxGetApp().plater());
|
||||||
|
|
||||||
append_menu_items_convert_unit(menu);
|
append_menu_items_convert_unit(menu);
|
||||||
|
append_menu_item_merge_to_multipart_object(menu);
|
||||||
|
|
||||||
wxGetApp().plater()->PopupMenu(menu);
|
wxGetApp().plater()->PopupMenu(menu);
|
||||||
}
|
}
|
||||||
|
|
|
@ -254,6 +254,8 @@ public:
|
||||||
void append_menu_item_delete(wxMenu* menu);
|
void append_menu_item_delete(wxMenu* menu);
|
||||||
void append_menu_item_scale_selection_to_fit_print_volume(wxMenu* menu);
|
void append_menu_item_scale_selection_to_fit_print_volume(wxMenu* menu);
|
||||||
void append_menu_items_convert_unit(wxMenu* menu);
|
void append_menu_items_convert_unit(wxMenu* menu);
|
||||||
|
void append_menu_item_merge_to_multipart_object(wxMenu *menu);
|
||||||
|
void append_menu_item_merge_to_single_object(wxMenu *menu);
|
||||||
void create_object_popupmenu(wxMenu *menu);
|
void create_object_popupmenu(wxMenu *menu);
|
||||||
void create_sla_object_popupmenu(wxMenu*menu);
|
void create_sla_object_popupmenu(wxMenu*menu);
|
||||||
void create_part_popupmenu(wxMenu*menu);
|
void create_part_popupmenu(wxMenu*menu);
|
||||||
|
@ -277,6 +279,7 @@ public:
|
||||||
void del_layers_from_object(const int obj_idx);
|
void del_layers_from_object(const int obj_idx);
|
||||||
bool del_subobject_from_object(const int obj_idx, const int idx, const int type);
|
bool del_subobject_from_object(const int obj_idx, const int idx, const int type);
|
||||||
void split();
|
void split();
|
||||||
|
void merge(bool to_multipart_object);
|
||||||
void layers_editing();
|
void layers_editing();
|
||||||
|
|
||||||
wxDataViewItem add_layer_root_item(const wxDataViewItem obj_item);
|
wxDataViewItem add_layer_root_item(const wxDataViewItem obj_item);
|
||||||
|
@ -287,6 +290,8 @@ public:
|
||||||
bool is_splittable();
|
bool is_splittable();
|
||||||
bool selected_instances_of_same_object();
|
bool selected_instances_of_same_object();
|
||||||
bool can_split_instances();
|
bool can_split_instances();
|
||||||
|
bool can_merge_to_multipart_object() const;
|
||||||
|
bool can_merge_to_single_object() const;
|
||||||
|
|
||||||
wxPoint get_mouse_position_in_control() const { return wxGetMousePosition() - this->GetScreenPosition(); }
|
wxPoint get_mouse_position_in_control() const { return wxGetMousePosition() - this->GetScreenPosition(); }
|
||||||
wxBoxSizer* get_sizer() {return m_sizer;}
|
wxBoxSizer* get_sizer() {return m_sizer;}
|
||||||
|
|
|
@ -4,11 +4,14 @@
|
||||||
|
|
||||||
#include "GLCanvas3D.hpp"
|
#include "GLCanvas3D.hpp"
|
||||||
#include "OptionsGroup.hpp"
|
#include "OptionsGroup.hpp"
|
||||||
|
#include "GUI_App.hpp"
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
#include "libslic3r/Geometry.hpp"
|
#include "libslic3r/Geometry.hpp"
|
||||||
#include "Selection.hpp"
|
#include "Selection.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
#include "MainFrame.hpp"
|
||||||
|
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
#include "slic3r/Utils/FixModelByWin10.hpp"
|
#include "slic3r/Utils/FixModelByWin10.hpp"
|
||||||
|
|
|
@ -2,8 +2,10 @@
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
|
|
||||||
#include "OptionsGroup.hpp"
|
#include "OptionsGroup.hpp"
|
||||||
|
#include "GUI_App.hpp"
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
|
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include "GLCanvas3D.hpp"
|
#include "GLCanvas3D.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
#include "DoubleSlider.hpp"
|
#include "DoubleSlider.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include <wx/notebook.h>
|
#include <wx/notebook.h>
|
||||||
#include <wx/glcanvas.h>
|
#include <wx/glcanvas.h>
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
|
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/GUI/PresetBundle.hpp"
|
#include "slic3r/GUI/PresetBundle.hpp"
|
||||||
#include "slic3r/GUI/Camera.hpp"
|
#include "slic3r/GUI/Camera.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "slic3r/GUI/GLCanvas3D.hpp"
|
#include "slic3r/GUI/GLCanvas3D.hpp"
|
||||||
#include "slic3r/GUI/Camera.hpp"
|
#include "slic3r/GUI/Camera.hpp"
|
||||||
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
|
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
|
||||||
|
#include "slic3r/GUI/MainFrame.hpp"
|
||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include "libslic3r/SLAPrint.hpp"
|
#include "libslic3r/SLAPrint.hpp"
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/GUI/Camera.hpp"
|
#include "slic3r/GUI/Camera.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
|
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
#include "slic3r/GUI/GUI_ObjectManipulation.hpp"
|
#include "slic3r/GUI/GUI_ObjectManipulation.hpp"
|
||||||
#include "slic3r/GUI/PresetBundle.hpp"
|
#include "slic3r/GUI/PresetBundle.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
#include "slic3r/Utils/UndoRedo.hpp"
|
#include "slic3r/Utils/UndoRedo.hpp"
|
||||||
|
|
||||||
#include "slic3r/GUI/Gizmos/GLGizmoMove.hpp"
|
#include "slic3r/GUI/Gizmos/GLGizmoMove.hpp"
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "InstanceCheck.hpp"
|
#include "InstanceCheck.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include "MainFrame.hpp"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
#include "libslic3r/Config.hpp"
|
#include "libslic3r/Config.hpp"
|
||||||
|
|
|
@ -1,200 +0,0 @@
|
||||||
#include "LambdaObjectDialog.hpp"
|
|
||||||
|
|
||||||
#include <wx/window.h>
|
|
||||||
#include <wx/button.h>
|
|
||||||
#include "OptionsGroup.hpp"
|
|
||||||
#include "I18N.hpp"
|
|
||||||
|
|
||||||
namespace Slic3r
|
|
||||||
{
|
|
||||||
namespace GUI
|
|
||||||
{
|
|
||||||
|
|
||||||
LambdaObjectDialog::LambdaObjectDialog(wxWindow* parent,
|
|
||||||
const wxString type_name):
|
|
||||||
m_type_name(type_name)
|
|
||||||
{
|
|
||||||
Create(parent, wxID_ANY, _(L("Lambda Object")),
|
|
||||||
parent->GetScreenPosition(), wxDefaultSize,
|
|
||||||
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
|
|
||||||
|
|
||||||
// instead of double dim[3] = { 1.0, 1.0, 1.0 };
|
|
||||||
object_parameters.dim[0] = 1.0;
|
|
||||||
object_parameters.dim[1] = 1.0;
|
|
||||||
object_parameters.dim[2] = 1.0;
|
|
||||||
|
|
||||||
sizer = new wxBoxSizer(wxVERTICAL);
|
|
||||||
|
|
||||||
// modificator options
|
|
||||||
if (m_type_name == wxEmptyString) {
|
|
||||||
m_modificator_options_book = new wxChoicebook( this, wxID_ANY, wxDefaultPosition,
|
|
||||||
wxDefaultSize, wxCHB_TOP);
|
|
||||||
sizer->Add(m_modificator_options_book, 1, wxEXPAND | wxALL, 10);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
|
|
||||||
sizer->Add(m_panel, 1, wxEXPAND | wxALL, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
ConfigOptionDef def;
|
|
||||||
def.width = 70;
|
|
||||||
auto optgroup = init_modificator_options_page(_(L("Box")));
|
|
||||||
if (optgroup) {
|
|
||||||
optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
|
|
||||||
int opt_id = opt_key == "l" ? 0 :
|
|
||||||
opt_key == "w" ? 1 :
|
|
||||||
opt_key == "h" ? 2 : -1;
|
|
||||||
if (opt_id < 0) return;
|
|
||||||
object_parameters.dim[opt_id] = boost::any_cast<double>(value);
|
|
||||||
};
|
|
||||||
|
|
||||||
def.type = coFloat;
|
|
||||||
def.set_default_value(new ConfigOptionFloat{ 1.0 });
|
|
||||||
def.label = L("Length");
|
|
||||||
Option option(def, "l");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
|
|
||||||
def.label = L("Width");
|
|
||||||
option = Option(def, "w");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
|
|
||||||
def.label = L("Height");
|
|
||||||
option = Option(def, "h");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
}
|
|
||||||
|
|
||||||
optgroup = init_modificator_options_page(_(L("Cylinder")));
|
|
||||||
if (optgroup) {
|
|
||||||
optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
|
|
||||||
int val = boost::any_cast<int>(value);
|
|
||||||
if (opt_key == "cyl_r")
|
|
||||||
object_parameters.cyl_r = val;
|
|
||||||
else if (opt_key == "cyl_h")
|
|
||||||
object_parameters.cyl_h = val;
|
|
||||||
else return;
|
|
||||||
};
|
|
||||||
|
|
||||||
def.type = coInt;
|
|
||||||
def.set_default_value(new ConfigOptionInt{ 1 });
|
|
||||||
def.label = L("Radius");
|
|
||||||
auto option = Option(def, "cyl_r");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
|
|
||||||
def.label = L("Height");
|
|
||||||
option = Option(def, "cyl_h");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
}
|
|
||||||
|
|
||||||
optgroup = init_modificator_options_page(_(L("Sphere")));
|
|
||||||
if (optgroup) {
|
|
||||||
optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
|
|
||||||
if (opt_key == "sph_rho")
|
|
||||||
object_parameters.sph_rho = boost::any_cast<double>(value);
|
|
||||||
else return;
|
|
||||||
};
|
|
||||||
|
|
||||||
def.type = coFloat;
|
|
||||||
def.set_default_value(new ConfigOptionFloat{ 1.0 });
|
|
||||||
def.label = L("Rho");
|
|
||||||
auto option = Option(def, "sph_rho");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
}
|
|
||||||
|
|
||||||
optgroup = init_modificator_options_page(_(L("Slab")));
|
|
||||||
if (optgroup) {
|
|
||||||
optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
|
|
||||||
double val = boost::any_cast<double>(value);
|
|
||||||
if (opt_key == "slab_z")
|
|
||||||
object_parameters.slab_z = val;
|
|
||||||
else if (opt_key == "slab_h")
|
|
||||||
object_parameters.slab_h = val;
|
|
||||||
else return;
|
|
||||||
};
|
|
||||||
|
|
||||||
def.type = coFloat;
|
|
||||||
def.set_default_value(new ConfigOptionFloat{ 1.0 });
|
|
||||||
def.label = L("Height");
|
|
||||||
auto option = Option(def, "slab_h");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
|
|
||||||
def.label = L("Initial Z");
|
|
||||||
option = Option(def, "slab_z");
|
|
||||||
optgroup->append_single_option_line(option);
|
|
||||||
}
|
|
||||||
|
|
||||||
Bind(wxEVT_CHOICEBOOK_PAGE_CHANGED, ([this](wxCommandEvent e)
|
|
||||||
{
|
|
||||||
auto page_idx = m_modificator_options_book->GetSelection();
|
|
||||||
if (page_idx < 0) return;
|
|
||||||
switch (page_idx)
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
object_parameters.type = LambdaTypeBox;
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
object_parameters.type = LambdaTypeCylinder;
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
object_parameters.type = LambdaTypeSphere;
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
object_parameters.type = LambdaTypeSlab;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
const auto button_sizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL);
|
|
||||||
|
|
||||||
wxButton* btn_OK = static_cast<wxButton*>(FindWindowById(wxID_OK, this));
|
|
||||||
btn_OK->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) {
|
|
||||||
// validate user input
|
|
||||||
if (!CanClose())return;
|
|
||||||
EndModal(wxID_OK);
|
|
||||||
Destroy();
|
|
||||||
});
|
|
||||||
|
|
||||||
wxButton* btn_CANCEL = static_cast<wxButton*>(FindWindowById(wxID_CANCEL, this));
|
|
||||||
btn_CANCEL->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) {
|
|
||||||
// validate user input
|
|
||||||
if (!CanClose())return;
|
|
||||||
EndModal(wxID_CANCEL);
|
|
||||||
Destroy();
|
|
||||||
});
|
|
||||||
|
|
||||||
sizer->Add(button_sizer, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM, 10);
|
|
||||||
|
|
||||||
SetSizer(sizer);
|
|
||||||
sizer->Fit(this);
|
|
||||||
sizer->SetSizeHints(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Called from the constructor.
|
|
||||||
// Create a panel for a rectangular / circular / custom bed shape.
|
|
||||||
ConfigOptionsGroupShp LambdaObjectDialog::init_modificator_options_page(const wxString& title)
|
|
||||||
{
|
|
||||||
if (!m_type_name.IsEmpty() && m_type_name != title)
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
auto panel = m_type_name.IsEmpty() ? new wxPanel(m_modificator_options_book) : m_panel;
|
|
||||||
|
|
||||||
ConfigOptionsGroupShp optgroup;
|
|
||||||
optgroup = std::make_shared<ConfigOptionsGroup>(panel, _(L("Add")) + " " +title + " " +dots);
|
|
||||||
optgroup->label_width = 100;
|
|
||||||
|
|
||||||
m_optgroups.push_back(optgroup);
|
|
||||||
|
|
||||||
if (m_type_name.IsEmpty()) {
|
|
||||||
panel->SetSizerAndFit(optgroup->sizer);
|
|
||||||
m_modificator_options_book->AddPage(panel, title);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
panel->SetSizer(optgroup->sizer);
|
|
||||||
|
|
||||||
return optgroup;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
} //namespace GUI
|
|
||||||
} //namespace Slic3r
|
|
|
@ -1,59 +0,0 @@
|
||||||
#ifndef slic3r_LambdaObjectDialog_hpp_
|
|
||||||
#define slic3r_LambdaObjectDialog_hpp_
|
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
#include <wx/dialog.h>
|
|
||||||
#include <wx/sizer.h>
|
|
||||||
#include <wx/choicebk.h>
|
|
||||||
|
|
||||||
class wxPanel;
|
|
||||||
|
|
||||||
namespace Slic3r
|
|
||||||
{
|
|
||||||
namespace GUI
|
|
||||||
{
|
|
||||||
enum LambdaTypeIDs{
|
|
||||||
LambdaTypeBox,
|
|
||||||
LambdaTypeCylinder,
|
|
||||||
LambdaTypeSphere,
|
|
||||||
LambdaTypeSlab
|
|
||||||
};
|
|
||||||
|
|
||||||
struct OBJECT_PARAMETERS
|
|
||||||
{
|
|
||||||
LambdaTypeIDs type = LambdaTypeBox;
|
|
||||||
double dim[3];// = { 1.0, 1.0, 1.0 };
|
|
||||||
int cyl_r = 1;
|
|
||||||
int cyl_h = 1;
|
|
||||||
double sph_rho = 1.0;
|
|
||||||
double slab_h = 1.0;
|
|
||||||
double slab_z = 0.0;
|
|
||||||
};
|
|
||||||
class ConfigOptionsGroup;
|
|
||||||
using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>;
|
|
||||||
class LambdaObjectDialog : public wxDialog
|
|
||||||
{
|
|
||||||
wxChoicebook* m_modificator_options_book = nullptr;
|
|
||||||
std::vector <ConfigOptionsGroupShp> m_optgroups;
|
|
||||||
wxString m_type_name;
|
|
||||||
wxPanel* m_panel = nullptr;
|
|
||||||
public:
|
|
||||||
LambdaObjectDialog(wxWindow* parent,
|
|
||||||
const wxString type_name = wxEmptyString);
|
|
||||||
~LambdaObjectDialog() {}
|
|
||||||
|
|
||||||
bool CanClose() { return true; } // ???
|
|
||||||
OBJECT_PARAMETERS& ObjectParameters() { return object_parameters; }
|
|
||||||
|
|
||||||
ConfigOptionsGroupShp init_modificator_options_page(const wxString& title);
|
|
||||||
|
|
||||||
// Note whether the window was already closed, so a pending update is not executed.
|
|
||||||
bool m_already_closed = false;
|
|
||||||
OBJECT_PARAMETERS object_parameters;
|
|
||||||
wxBoxSizer* sizer = nullptr;
|
|
||||||
};
|
|
||||||
} //namespace GUI
|
|
||||||
} //namespace Slic3r
|
|
||||||
#endif //slic3r_LambdaObjectDialog_hpp_
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include "InstanceCheck.hpp"
|
#include "InstanceCheck.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include "GLCanvas3D.hpp"
|
#include "GLCanvas3D.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
#include "GUI_Utils.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
#include "Plater.hpp"
|
|
||||||
#include "Event.hpp"
|
#include "Event.hpp"
|
||||||
|
|
||||||
class wxNotebook;
|
class wxNotebook;
|
||||||
|
@ -27,6 +26,8 @@ namespace GUI
|
||||||
|
|
||||||
class Tab;
|
class Tab;
|
||||||
class PrintHostQueueDialog;
|
class PrintHostQueueDialog;
|
||||||
|
class Plater;
|
||||||
|
class MainFrame;
|
||||||
|
|
||||||
enum QuickSlice
|
enum QuickSlice
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
#include "AppConfig.hpp"
|
#include "AppConfig.hpp"
|
||||||
#include "GLCanvas3D.hpp"
|
#include "GLCanvas3D.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include <wx/glcanvas.h>
|
#include <wx/glcanvas.h>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#include "OptionsGroup.hpp"
|
#include "OptionsGroup.hpp"
|
||||||
#include "ConfigExceptions.hpp"
|
#include "ConfigExceptions.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
#include "GUI_App.hpp"
|
||||||
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <wx/numformatter.h>
|
#include <wx/numformatter.h>
|
||||||
|
@ -100,6 +102,36 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
|
||||||
return field;
|
return field;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OptionsGroup::OptionsGroup( wxWindow* _parent, const wxString& title,
|
||||||
|
bool is_tab_opt /* = false */,
|
||||||
|
column_t extra_clmn /* = nullptr */) :
|
||||||
|
m_parent(_parent), title(title),
|
||||||
|
m_show_modified_btns(is_tab_opt),
|
||||||
|
staticbox(title!=""), extra_column(extra_clmn)
|
||||||
|
{
|
||||||
|
if (staticbox) {
|
||||||
|
stb = new wxStaticBox(_parent, wxID_ANY, _(title));
|
||||||
|
if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
|
||||||
|
stb->SetFont(wxOSX ? wxGetApp().normal_font() : wxGetApp().bold_font());
|
||||||
|
} else
|
||||||
|
stb = nullptr;
|
||||||
|
sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL));
|
||||||
|
auto num_columns = 1U;
|
||||||
|
if (label_width != 0) num_columns++;
|
||||||
|
if (extra_column != nullptr) num_columns++;
|
||||||
|
m_grid_sizer = new wxFlexGridSizer(0, num_columns, 1,0);
|
||||||
|
static_cast<wxFlexGridSizer*>(m_grid_sizer)->SetFlexibleDirection(wxBOTH/*wxHORIZONTAL*/);
|
||||||
|
static_cast<wxFlexGridSizer*>(m_grid_sizer)->AddGrowableCol(label_width == 0 ? 0 : !extra_column ? 1 : 2 );
|
||||||
|
#if 0//#ifdef __WXGTK__
|
||||||
|
m_panel = new wxPanel( _parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||||
|
sizer->Fit(m_panel);
|
||||||
|
sizer->Add(m_panel, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
|
||||||
|
#else
|
||||||
|
sizer->Add(m_grid_sizer, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
|
||||||
|
#endif /* __WXGTK__ */
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
void OptionsGroup::add_undo_buttuns_to_sizer(wxSizer* sizer, const t_field& field)
|
void OptionsGroup::add_undo_buttuns_to_sizer(wxSizer* sizer, const t_field& field)
|
||||||
{
|
{
|
||||||
if (!m_show_modified_btns) {
|
if (!m_show_modified_btns) {
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
#include "libslic3r/PrintConfig.hpp"
|
||||||
|
|
||||||
#include "Field.hpp"
|
#include "Field.hpp"
|
||||||
#include "GUI_App.hpp"
|
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
|
||||||
// Translate the ifdef
|
// Translate the ifdef
|
||||||
|
@ -171,32 +170,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
OptionsGroup( wxWindow* _parent, const wxString& title, bool is_tab_opt = false,
|
OptionsGroup( wxWindow* _parent, const wxString& title, bool is_tab_opt = false,
|
||||||
column_t extra_clmn = nullptr) :
|
column_t extra_clmn = nullptr);
|
||||||
m_parent(_parent), title(title),
|
|
||||||
m_show_modified_btns(is_tab_opt),
|
|
||||||
staticbox(title!=""), extra_column(extra_clmn) {
|
|
||||||
if (staticbox) {
|
|
||||||
stb = new wxStaticBox(_parent, wxID_ANY, _(title));
|
|
||||||
if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
|
|
||||||
stb->SetFont(wxOSX ? wxGetApp().normal_font() : wxGetApp().bold_font());
|
|
||||||
} else
|
|
||||||
stb = nullptr;
|
|
||||||
sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL));
|
|
||||||
auto num_columns = 1U;
|
|
||||||
if (label_width != 0) num_columns++;
|
|
||||||
if (extra_column != nullptr) num_columns++;
|
|
||||||
m_grid_sizer = new wxFlexGridSizer(0, num_columns, 1,0);
|
|
||||||
static_cast<wxFlexGridSizer*>(m_grid_sizer)->SetFlexibleDirection(wxBOTH/*wxHORIZONTAL*/);
|
|
||||||
static_cast<wxFlexGridSizer*>(m_grid_sizer)->AddGrowableCol(label_width == 0 ? 0 : !extra_column ? 1 : 2 );
|
|
||||||
#if 0//#ifdef __WXGTK__
|
|
||||||
m_panel = new wxPanel( _parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
|
||||||
sizer->Fit(m_panel);
|
|
||||||
sizer->Add(m_panel, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
|
|
||||||
#else
|
|
||||||
sizer->Add(m_grid_sizer, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5);
|
|
||||||
#endif /* __WXGTK__ */
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
wxGridSizer* get_grid_sizer() { return m_grid_sizer; }
|
wxGridSizer* get_grid_sizer() { return m_grid_sizer; }
|
||||||
|
|
||||||
|
|
|
@ -2320,9 +2320,9 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
|
||||||
if (imperial_units)
|
if (imperial_units)
|
||||||
convert_from_imperial_units(model);
|
convert_from_imperial_units(model);
|
||||||
else if (model.looks_like_imperial_units()) {
|
else if (model.looks_like_imperial_units()) {
|
||||||
wxMessageDialog msg_dlg(q, _L(
|
wxMessageDialog msg_dlg(q, format_wxstr(_L(
|
||||||
"This model looks like saved in inches.\n"
|
"Some object(s) in file %s looks like saved in inches.\n"
|
||||||
"Should I consider this model as a saved in inches and convert it?") + "\n",
|
"Should I consider them as a saved in inches and convert them?"), from_path(filename)) + "\n",
|
||||||
_L("Saved in inches object detected"), wxICON_WARNING | wxYES | wxNO);
|
_L("Saved in inches object detected"), wxICON_WARNING | wxYES | wxNO);
|
||||||
if (msg_dlg.ShowModal() == wxID_YES)
|
if (msg_dlg.ShowModal() == wxID_YES)
|
||||||
convert_from_imperial_units(model);
|
convert_from_imperial_units(model);
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "Preferences.hpp"
|
#include "Preferences.hpp"
|
||||||
#include "AppConfig.hpp"
|
#include "AppConfig.hpp"
|
||||||
#include "OptionsGroup.hpp"
|
#include "OptionsGroup.hpp"
|
||||||
|
#include "GUI_App.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
@ -364,4 +365,4 @@ void PreferencesDialog::create_settings_mode_widget()
|
||||||
|
|
||||||
|
|
||||||
} // GUI
|
} // GUI
|
||||||
} // Slic3r
|
} // Slic3r
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
#include "libslic3r/PrintConfig.hpp"
|
#include "libslic3r/PrintConfig.hpp"
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
#include "Tab.hpp"
|
#include "Tab.hpp"
|
||||||
#include "PresetBundle.hpp"
|
#include "PresetBundle.hpp"
|
||||||
|
|
||||||
|
|
|
@ -228,11 +228,11 @@ public:
|
||||||
|
|
||||||
// implementation of base class virtuals to define model
|
// implementation of base class virtuals to define model
|
||||||
|
|
||||||
virtual unsigned int GetColumnCount() const wxOVERRIDE { return colMax; }
|
virtual unsigned int GetColumnCount() const override { return colMax; }
|
||||||
virtual wxString GetColumnType(unsigned int col) const wxOVERRIDE;
|
virtual wxString GetColumnType(unsigned int col) const override;
|
||||||
virtual void GetValueByRow(wxVariant& variant, unsigned int row, unsigned int col) const wxOVERRIDE;
|
virtual void GetValueByRow(wxVariant& variant, unsigned int row, unsigned int col) const override;
|
||||||
virtual bool GetAttrByRow(unsigned int row, unsigned int col, wxDataViewItemAttr& attr) const wxOVERRIDE { return true; }
|
virtual bool GetAttrByRow(unsigned int row, unsigned int col, wxDataViewItemAttr& attr) const override { return true; }
|
||||||
virtual bool SetValueByRow(const wxVariant& variant, unsigned int row, unsigned int col) wxOVERRIDE { return false; }
|
virtual bool SetValueByRow(const wxVariant& variant, unsigned int row, unsigned int col) override { return false; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
#include "Gizmos/GLGizmoBase.hpp"
|
#include "Gizmos/GLGizmoBase.hpp"
|
||||||
#include "Camera.hpp"
|
#include "Camera.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include "libslic3r/Model.hpp"
|
#include "libslic3r/Model.hpp"
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "3DScene.hpp"
|
#include "3DScene.hpp"
|
||||||
#include "GUI.hpp"
|
#include "GUI.hpp"
|
||||||
#include "../Utils/UndoRedo.hpp"
|
#include "../Utils/UndoRedo.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
#include "ConfigWizard.hpp"
|
#include "ConfigWizard.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
|
#include "MainFrame.hpp"
|
||||||
#include "format.hpp"
|
#include "format.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
@ -3582,6 +3584,18 @@ void Tab::set_tooltips_text()
|
||||||
"Click to reset current value to the last saved preset."));
|
"Click to reset current value to the last saved preset."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Page::Page(wxWindow* parent, const wxString& title, const int iconID, const std::vector<ScalableBitmap>& mode_bmp_cache) :
|
||||||
|
m_parent(parent),
|
||||||
|
m_title(title),
|
||||||
|
m_iconID(iconID),
|
||||||
|
m_mode_bitmap_cache(mode_bmp_cache)
|
||||||
|
{
|
||||||
|
Create(m_parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
|
||||||
|
m_vsizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
m_item_color = &wxGetApp().get_label_clr_default();
|
||||||
|
SetSizer(m_vsizer);
|
||||||
|
}
|
||||||
|
|
||||||
void Page::reload_config()
|
void Page::reload_config()
|
||||||
{
|
{
|
||||||
for (auto group : m_optgroups)
|
for (auto group : m_optgroups)
|
||||||
|
|
|
@ -33,11 +33,12 @@
|
||||||
#include "Event.hpp"
|
#include "Event.hpp"
|
||||||
#include "wxExtensions.hpp"
|
#include "wxExtensions.hpp"
|
||||||
#include "ConfigManipulation.hpp"
|
#include "ConfigManipulation.hpp"
|
||||||
|
#include "Preset.hpp"
|
||||||
|
#include "OptionsGroup.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
|
||||||
|
|
||||||
// Single Tab page containing a{ vsizer } of{ optgroups }
|
// Single Tab page containing a{ vsizer } of{ optgroups }
|
||||||
// package Slic3r::GUI::Tab::Page;
|
// package Slic3r::GUI::Tab::Page;
|
||||||
using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>;
|
using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>;
|
||||||
|
@ -49,17 +50,8 @@ class Page : public wxScrolledWindow
|
||||||
wxBoxSizer* m_vsizer;
|
wxBoxSizer* m_vsizer;
|
||||||
bool m_show = true;
|
bool m_show = true;
|
||||||
public:
|
public:
|
||||||
Page(wxWindow* parent, const wxString& title, const int iconID, const std::vector<ScalableBitmap>& mode_bmp_cache) :
|
Page(wxWindow* parent, const wxString& title, const int iconID,
|
||||||
m_parent(parent),
|
const std::vector<ScalableBitmap>& mode_bmp_cache);
|
||||||
m_title(title),
|
|
||||||
m_iconID(iconID),
|
|
||||||
m_mode_bitmap_cache(mode_bmp_cache)
|
|
||||||
{
|
|
||||||
Create(m_parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
|
|
||||||
m_vsizer = new wxBoxSizer(wxVERTICAL);
|
|
||||||
m_item_color = &wxGetApp().get_label_clr_default();
|
|
||||||
SetSizer(m_vsizer);
|
|
||||||
}
|
|
||||||
~Page() {}
|
~Page() {}
|
||||||
|
|
||||||
bool m_is_modified_values{ false };
|
bool m_is_modified_values{ false };
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include "GUI_ObjectList.hpp"
|
#include "GUI_ObjectList.hpp"
|
||||||
#include "I18N.hpp"
|
#include "I18N.hpp"
|
||||||
#include "GUI_Utils.hpp"
|
#include "GUI_Utils.hpp"
|
||||||
|
#include "Plater.hpp"
|
||||||
#include "../Utils/MacDarkMode.hpp"
|
#include "../Utils/MacDarkMode.hpp"
|
||||||
|
|
||||||
#ifndef __WXGTK__// msw_menuitem_bitmaps is used for MSW and OSX
|
#ifndef __WXGTK__// msw_menuitem_bitmaps is used for MSW and OSX
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "slic3r/GUI/UpdateDialogs.hpp"
|
#include "slic3r/GUI/UpdateDialogs.hpp"
|
||||||
#include "slic3r/GUI/ConfigWizard.hpp"
|
#include "slic3r/GUI/ConfigWizard.hpp"
|
||||||
#include "slic3r/GUI/GUI_App.hpp"
|
#include "slic3r/GUI/GUI_App.hpp"
|
||||||
|
#include "slic3r/GUI/Plater.hpp"
|
||||||
#include "slic3r/GUI/format.hpp"
|
#include "slic3r/GUI/format.hpp"
|
||||||
#include "slic3r/Utils/Http.hpp"
|
#include "slic3r/Utils/Http.hpp"
|
||||||
#include "slic3r/Config/Version.hpp"
|
#include "slic3r/Config/Version.hpp"
|
||||||
|
|
Loading…
Add table
Reference in a new issue