supermerill
86d73b9a2a
Merge branch 'master_slic3rPE_PR' into masterPE
2018-12-19 18:22:51 +01:00
supermerill
a658ae653e
Merge branch 'master' into masterPE (renaming)
2018-12-19 18:18:18 +01:00
supermerill
2e2fee79ec
Merge branch 'masterPE' into master_slic3rPE_PR
...
# "resolved" Conflicts:
# lib/Slic3r/GUI/Plater.pm
# slic3r.pl
# src/libslic3r/EdgeGrid.cpp
# src/libslic3r/EdgeGrid.hpp
# src/libslic3r/Fill/Fill.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/PreviewData.cpp
# src/libslic3r/GCode/PreviewData.hpp
# src/libslic3r/GCode/WipeTowerPrusaMM.cpp
# src/libslic3r/Geometry.hpp
# src/libslic3r/LayerRegion.cpp
# src/libslic3r/Model.cpp
# src/libslic3r/MultiPoint.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/libslic3r/SupportMaterial.cpp
# src/libslic3r/TriangleMesh.cpp
# src/slic3r/AppController.hpp
# src/slic3r/AppControllerWx.cpp
# src/slic3r/GUI/3DScene.cpp
# src/slic3r/GUI/Field.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI.hpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/Preset.cpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Tab.hpp
# xs/CMakeLists.txt
# xs/xsp/AppController.xsp
# xs/xsp/GUI.xsp
# xs/xsp/Print.xsp
2018-12-17 15:58:41 +01:00
supermerill
a11db7a227
Merge tag 'mass_rename' into master_slic3rPE_PR
...
# "resolved" Conflicts:
# lib/Slic3r/GUI/Plater.pm
# lib/Slic3r/GUI/Plater/2DToolpaths.pm
# lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
# lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
# lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
# lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
# src/libslic3r/EdgeGrid.cpp
# src/libslic3r/EdgeGrid.hpp
# src/libslic3r/ExPolygon.cpp
# src/libslic3r/ExtrusionEntity.hpp
# src/libslic3r/ExtrusionEntityCollection.hpp
# src/libslic3r/Fill/Fill.cpp
# src/libslic3r/Fill/FillBase.cpp
# src/libslic3r/Flow.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/ToolOrdering.cpp
# src/libslic3r/GCode/WipeTowerPrusaMM.cpp
# src/libslic3r/Geometry.cpp
# src/libslic3r/LayerRegion.cpp
# src/libslic3r/Model.cpp
# src/libslic3r/MultiPoint.cpp
# src/libslic3r/MultiPoint.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/PerimeterGenerator.hpp
# src/libslic3r/Polyline.cpp
# src/libslic3r/Polyline.hpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/libslic3r/SupportMaterial.cpp
# src/libslic3r/TriangleMesh.cpp
# src/libslic3r/TriangleMesh.hpp
# src/libslic3r/Utils.hpp
# src/libslic3r/utils.cpp
# src/slic3r/AppController.hpp
# src/slic3r/AppControllerWx.cpp
# src/slic3r/GUI/3DScene.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI.hpp
# src/slic3r/GUI/Preset.cpp
# src/slic3r/GUI/ProgressIndicator.hpp
# src/slic3r/GUI/Tab.hpp
# xs/CMakeLists.txt
# xs/src/libslic3r/Layer.hpp
# xs/src/libslic3r/Line.cpp
# xs/src/libslic3r/Line.hpp
# xs/src/libslic3r/Point.hpp
# xs/src/libslic3r/Print.hpp
# xs/src/libslic3r/PrintRegion.cpp
# xs/src/slic3r/AppController.cpp
# xs/xsp/AppController.xsp
# xs/xsp/GUI.xsp
# xs/xsp/Print.xsp
2018-12-17 15:42:50 +01:00
Vojtech Kral
0c7c9d5754
Plater: single object STL export and reloading
...
Based on Plater.pm`export_object_stl() and reload_from_disk()
2018-12-07 13:58:44 +01:00
supermerill
e7cfb20838
Merge branch 'master_slic3rPE_PR'
2018-10-31 14:54:11 +01:00
supermerill
af0ef31b20
Merge remote-tracking branch 'remotes/prusa/master' into master_slic3rPE_PR
...
(needd to verify supports doesn't break something)
2018-10-29 14:11:04 +01:00
Vojtech Kral
8337d4675f
Plater: increase, decrease, set_number_of_copies, arrange
2018-10-11 12:48:35 +02:00
Vojtech Kral
322e0a433c
Plater: Add missing skeletons (un-typed for now)
2018-10-09 10:47:42 +02:00
Vojtech Kral
928c146aef
WIP: Plater: Event handling boilerplate / skeletons
2018-10-08 19:56:59 +02:00
Vojtech Kral
ceb295944a
WIP: Plater, tracking in Plater.pm
2018-10-08 19:14:55 +02:00
Vojtech Kral
342b584399
WIP: Plater
2018-10-01 09:28:40 +02:00
Enrico Turri
3835a1cacf
Fixed #1244 - perl part
2018-09-26 11:22:01 +02:00
Enrico Turri
197600d452
Test.pm modified to use ModelInstance full 3D transform
2018-09-25 09:21:38 +02:00
Enrico Turri
0e1843a871
1st installment of ModelInstance 3D scale components
2018-09-24 15:54:09 +02:00
Enrico Turri
e3d44b07fe
Fixed arrange for objects with 3D rotations
2018-09-24 15:21:18 +02:00
Enrico Turri
cce5f3203b
Enhanced fix of #1229 - perl part
2018-09-21 12:39:15 +02:00
Enrico Turri
07274589a3
1st installment of ModelInstance 3D rotation components
2018-09-20 15:00:40 +02:00
Enrico Turri
e79b0a2f25
Code cleanup
2018-09-19 08:59:11 +02:00
Enrico Turri
9daae9413a
Perl version of preview removed from Slic3r
2018-09-18 16:13:18 +02:00
Enrico Turri
abdaaf6ede
Method Preview::load_print() ported to c++
2018-09-18 15:50:52 +02:00
Enrico Turri
e3e5948982
1st installment of preview ported in c++
2018-09-18 13:35:05 +02:00
bubnikv
fe3b92870f
Merged with dev
2018-09-17 15:12:13 +02:00
bubnikv
d934b63424
Removed Print.pm,
...
ported execution of post processing scripts into C++ (WIP, waits for
update of boost::system module on our build server)
Removed other mention of the "Controller".
2018-09-17 12:01:02 +02:00
bubnikv
4ec4c9364e
Merge remote-tracking branch 'origin/support_improvements'
2018-09-14 15:12:20 +02:00
Vojtech Kral
7258c597b9
Fix window size persistence
...
Fixes #1116
Fixes #1175
2018-09-14 15:10:50 +02:00
bubnikv
bd659663f8
Merge remote-tracking branch 'origin/lm_wipe_tower_consumption'
2018-09-14 14:55:43 +02:00
Enrico Turri
578792be31
Fixed #1229
2018-09-14 11:37:26 +02:00
bubnikv
bb7f504296
Removed "Slice to SVG" and "Quick Slice"
2018-09-14 11:16:54 +02:00
bubnikv
2c9dc4dbbf
Finished porting of the status bar to C++.
2018-09-14 10:59:50 +02:00
bubnikv
36faa090fc
Removed the Controller, Layer View, System Info, ObjectCutDialog,
...
removed unused Perl modules.
2018-09-14 10:25:20 +02:00
bubnikv
9d9e4a0f7b
WIP: Background processing.
2018-09-14 09:28:00 +02:00
bubnikv
bb70ad6090
Removed Strings.hpp, replaced with wxString
...
Fixed UTF8 rendering of status messages.
2018-09-12 13:17:47 +02:00
bubnikv
0235f1a821
Merged with dev
2018-09-12 11:59:02 +02:00
Lukas Matena
712fef0669
Added number of toolchanges into 'Sliced info' statistics
2018-09-12 09:28:26 +02:00
Enrico Turri
781df150a1
Added perl callback for gizmo flatten
2018-09-10 14:10:08 +02:00
Enrico Turri
333bc1523a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-09-10 13:19:53 +02:00
Enrico Turri
be508b003a
Fixed #1211
2018-09-10 13:15:12 +02:00
Enrico Turri
e9d5cd726e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
2018-09-07 10:32:39 +02:00
YuSanka
125ece0aad
Fixed #1204
2018-09-07 09:33:18 +02:00
Enrico Turri
0ea18d57d0
Fixed wipe tower selection
2018-09-07 09:21:12 +02:00
Lukas Matena
961d894218
Added a Layout call for 'Sliced Info' box to show sliders when needed
2018-09-07 08:43:21 +02:00
Enrico Turri
8460926d36
Added select by part tool to toolbar
2018-09-06 16:10:31 +02:00
bubnikv
2a81408e8b
Implemented support enforcers / blockers.
...
Reduced amount of full support interfaces similar to S3D.
2018-09-06 14:19:20 +02:00
supermerill
6b6fe8c868
Merge branch 'master_slic3rPE_PR'
2018-09-05 17:33:53 +02:00
supermerill
75e79189a2
Merge remote-tracking branch 'remotes/prusa/master' into master_slic3rPE_PR
...
cleaning some tabs & wrong indentation at the same time.
2018-09-05 17:27:30 +02:00
Enrico Turri
677dad0669
Object's properties updated while manipulating gizmos
2018-09-05 16:22:48 +02:00
Lukas Matena
c83a5474f6
Wipe tower extrusions are now accounted for in the filament consumption statistics
2018-09-05 15:35:35 +02:00
Enrico Turri
15b1340514
Added ModelInstance::world_matrix() method and stl_transform using eigen transform
2018-09-04 14:42:14 +02:00
tamasmeszaros
4f53fc2a5f
Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
...
# Conflicts:
# lib/Slic3r/GUI/MainFrame.pm
# xs/src/slic3r/AppController.cpp
# xs/src/slic3r/AppControllerWx.cpp
# xs/src/slic3r/GUI/GUI.hpp
2018-08-30 17:35:49 +02:00
