bubnikv
5a56f08aad
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-06-19 16:08:53 +02:00
YuSanka
a772a19915
"MoveUp" & "MoveDown" work correctly
2018-06-19 12:24:16 +02:00
bubnikv
734273a33a
Merge remote-tracking branch 'remotes/origin/fix_model_by_win10'
2018-06-19 10:02:49 +02:00
Enrico Turri
b9ce19b07c
Object updated by rotate gizmo
2018-06-19 09:46:26 +02:00
YuSanka
12232f1a6d
"Delete part" button works correctly
...
Prepared functions for "Split", "MoveUp" & "MoveDown" buttons (update_model function is missing)
2018-06-18 16:22:15 +02:00
Enrico Turri
a3949b9f01
Object updated by scale gizmo
2018-06-18 15:07:17 +02:00
YuSanka
99082bfe67
Modifiers are moving now
2018-06-18 14:20:29 +02:00
tamasmeszaros
4328ecc287
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-18 12:17:19 +02:00
YuSanka
fb9ba1a55c
Set correct man/max value for movers
2018-06-16 03:04:59 +02:00
YuSanka
54975a4e36
Some changes in GUI-files
...
All functions of object settings are moved to GUI_ObjectParts
2018-06-16 01:21:25 +02:00
YuSanka
a91cb5b267
Upgraded object_control to use icons near the name
...
Renamed some classes
Deleted unused classes
2018-06-15 22:42:51 +02:00
Enrico Turri
53f8706805
Rotate gizmo interaction with mouse
2018-06-15 16:16:55 +02:00
Enrico Turri
6874949556
Scale gizmo interaction with mouse
2018-06-15 14:10:28 +02:00
tamasmeszaros
230c681482
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-06-15 11:06:37 +02:00
YuSanka
942a3340aa
Added a check for the correctness of the entered characters in numerical fields.
2018-06-14 23:56:44 +02:00
YuSanka
a0090fccb5
Button "Load Lambda" (in the Object Settings) works now
2018-06-14 23:31:15 +02:00
YuSanka
3e0ff5e9ef
Added LambdaObjectDialog
2018-06-14 21:48:06 +02:00
YuSanka
9504780ef4
Buttons "Add Part" and "Add Modifier" (in the Object Settings) works now
2018-06-14 15:33:42 +02:00
Enrico Turri
c624d6bb0a
Hover on gizmo grabbers rendering
2018-06-14 15:32:26 +02:00
Enrico Turri
4d405977dd
Keep selection when panning/rotating 3D view
2018-06-14 12:34:19 +02:00
Enrico Turri
7fb6e2aa03
Use mipmaps for bed textures
2018-06-14 10:37:28 +02:00
Enrico Turri
bc5640eef4
Rotate gizmo rendering
2018-06-14 10:00:59 +02:00
YuSanka
8899be8cca
Started porting of the functions for object settings editing
2018-06-13 16:39:33 +02:00
Enrico Turri
3a19b81cef
Scale gizmo rendering
2018-06-13 15:44:04 +02:00
Enrico Turri
099d59ad27
Selection on gizmo overlay
2018-06-13 13:14:17 +02:00
Lukas Matena
29dd305aaa
Wiping into perimeters - bugfix (wrong order of perimeters and infills)
2018-06-13 11:48:43 +02:00
Enrico Turri
c657654c02
Hovering on gizmo overlay
2018-06-13 10:49:59 +02:00
Enrico Turri
6079fed951
Fixed compile on Linux
2018-06-13 09:26:58 +02:00
Enrico Turri
b2cf576bf3
1st installment of gizmos
2018-06-13 09:12:16 +02:00
YuSanka
1c695fd97e
Added object movers to the object settings. Added SliderControl to Field.
2018-06-12 23:42:01 +02:00
YuSanka
f5ef672815
Prepared callback from c++ to Perl to inform about a change of object settings
2018-06-12 19:15:03 +02:00
YuSanka
6b56f99df7
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-12 13:03:40 +02:00
Enrico Turri
0faaef76e8
C++ code cleanup
2018-06-12 12:18:16 +02:00
Enrico Turri
7a08e665bc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-12 11:56:16 +02:00
Enrico Turri
f8664fce71
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:55:57 +02:00
bubnikv
303ed0e6c9
Bumped up the version number to a final.
2018-06-12 11:53:09 +02:00
Enrico Turri
64104c8f1f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-12 11:08:36 +02:00
Enrico Turri
756064810c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:08:16 +02:00
YuSanka
b134fb8c39
Fixed typo bug
2018-06-12 11:01:14 +02:00
Enrico Turri
af3d07bb05
Attempt to workaround bug in wxWidgets IsShownOnScreen() method
2018-06-12 09:18:25 +02:00
Enrico Turri
ac8004f28e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-12 08:32:55 +02:00
Enrico Turri
5f02669d2d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 08:32:34 +02:00
Vojtech Kral
a194d28b14
ConfigWizard: Use scrollbars on smaller screens
2018-06-11 18:52:18 +02:00
Vojtech Kral
7426291e9f
PresetUpdater: Fix of the fix
2018-06-11 18:30:40 +02:00
Vojtech Kral
a54e587751
Fix: PresetUpdater: Set bundle & index file permissions #962 ( #970 )
2018-06-11 17:34:06 +02:00
bubnikv
7b6a0ba9ad
Merge remote-tracking branch 'origin/ys_master_bug_fixes'
2018-06-11 16:58:46 +02:00
bubnikv
49cd06407a
There is a bug related to Ubuntu overlay scrollbars, see https://github.com/prusa3d/Slic3r/issues/898 and https://github.com/prusa3d/Slic3r/issues/952 .
...
The issue apparently manifests when Show()ing a window with overlay scrollbars while the UI is frozen. For this reason,
we will Thaw the UI prematurely on Linux. This means destroing the no_updates object prematurely.
2018-06-11 16:56:35 +02:00
YuSanka
fba1bf7afc
Fixed bug from issue #969
2018-06-11 16:23:10 +02:00
Enrico Turri
44220530cb
Use a single gl context created in c++
2018-06-11 15:49:04 +02:00
Enrico Turri
a02ea39525
GLCanvas3D volumes as a stack variable
2018-06-11 15:13:13 +02:00
Enrico Turri
085110c4d9
Removed 3DScene volumes from perl
2018-06-11 13:48:02 +02:00
Enrico Turri
9a4e250c33
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-11 13:46:55 +02:00
Enrico Turri
efe6a29032
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-11 13:46:35 +02:00
Enrico Turri
7b4870d1cb
Fixed selection and rendering in object settings dialog
2018-06-11 11:40:11 +02:00
bubnikv
6cafc7f121
Fix of a regression issue, which was certainly in 1.34.0, probably
...
even longer. An infill / perimeter overlap was not applied
when defined with absolute coordinates.
Fixes https://github.com/prusa3d/Slic3r/issues/964
2018-06-11 10:59:02 +02:00
Enrico Turri
7b1187992c
Added bed texture for Prusa printers
2018-06-11 10:46:32 +02:00
YuSanka
08ccf85a61
Overrided OnStateChange() function to CollapsiblePane
2018-06-08 12:43:39 +02:00
Enrico Turri
96d9879d72
class 3D on_select callback moved to c++
2018-06-08 11:37:07 +02:00
YuSanka
4215b2b373
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-08 10:10:10 +02:00
YuSanka
da9b0a9b7d
Deleted debugging messages
2018-06-08 09:55:27 +02:00
Enrico Turri
bf2fd54578
reload_scene method of 3D class moved to c++
2018-06-08 09:40:00 +02:00
YuSanka
7ba2093a9b
Try to fix the circular event handling Select() on OSX
2018-06-08 09:03:46 +02:00
Enrico Turri
8867e8ca60
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-08 08:31:21 +02:00
Enrico Turri
f4a687703c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-08 08:30:55 +02:00
bubnikv
95047c1953
Fixed typos from the previous commit.
2018-06-07 22:54:26 +02:00
bubnikv
2b5a1f3e60
Merge remote-tracking branch 'remotes/origin/vk-bugfixes'
2018-06-07 22:10:49 +02:00
bubnikv
7dfe2e2595
Fixed mangling of UTF characters when converted implicitely to
...
wxString on Windows through the + operator.
2018-06-07 22:10:23 +02:00
Lukas Matena
b6455b66bd
Wiping into infill/objects - invalidation of the wipe tower, bugfixes
2018-06-07 16:19:57 +02:00
Enrico Turri
766d1d52a9
Fixed import of model rotated clockwise from 3mf
2018-06-07 16:13:32 +02:00
YuSanka
e2a7bd4a14
Added MessageBoxes for experimenting on OSX
2018-06-07 15:52:35 +02:00
Vojtech Kral
aef0c489e3
Fix: Dialog initialization ordering on OS X
...
Perform update_check after MainFrame is created
2018-06-07 15:41:36 +02:00
Vojtech Kral
2e061994d4
Fix: GCodeSender: Line number resynchronisation
2018-06-07 15:41:34 +02:00
YuSanka
ebe5ee3b1f
Fixed uncorrected Settings sizer showing
2018-06-07 14:57:45 +02:00
YuSanka
49f0a1a824
Fixed OSX compilation bug
...
Changed info_box (more place to the manifold information)
2018-06-07 11:54:42 +02:00
Enrico Turri
a8500d6bae
class 3D callbacks moved to c++
2018-06-07 11:18:28 +02:00
YuSanka
b31e696edc
ListView doesn't used now.
...
(Whole logic of the object list manipulation is on c++ side)
Remove experimental add/del buttons
2018-06-07 11:12:09 +02:00
Enrico Turri
ff86407840
Key down and char event handlers of class 3D moved to c++
2018-06-07 09:22:19 +02:00
YuSanka
9e0d2793cb
CallBack from C++ to Perl to manipulations with object list
2018-06-07 00:55:09 +02:00
Lukas Matena
73452fd79d
More progress on 'wipe into dedicated object' feature (e.g. new value in object settings)
2018-06-06 18:24:42 +02:00
bubnikv
ce6a23ef3b
Repair by the netfabb service: Implemented progress dialog and cancelation.
2018-06-06 15:19:06 +02:00
Enrico Turri
66b4620d9b
Fixed runtime error on Linux when removing canvases
2018-06-06 14:33:04 +02:00
Enrico Turri
8192580b5f
Removed DestroyGL method from 3DScene
2018-06-06 14:19:28 +02:00
Enrico Turri
e79037c44d
3DScene member variables moved to c++
2018-06-06 12:36:52 +02:00
Enrico Turri
71d750c1b8
Remaining time gcode line exported only for Marlin firmware
2018-06-06 12:21:24 +02:00
Enrico Turri
2d34843943
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-06 12:19:12 +02:00
Enrico Turri
2dee4d1a83
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-06 12:18:52 +02:00
Enrico Turri
b2b95d590f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-06 12:17:16 +02:00
bubnikv
92875709e1
Fixed a bug reporting incorrect compatible_printers and
...
compatible_printers_condition inside the Config Bundle.
2018-06-06 12:01:11 +02:00
Enrico Turri
4009fdcc18
Finalized format for gcode line containing remaining printing time
2018-06-06 11:00:36 +02:00
Enrico Turri
c6e44509e0
3DScene load_object method moved to c++
2018-06-06 10:16:58 +02:00
Enrico Turri
40bb0b6f55
Fixed overflow in Polygon::area()
2018-06-05 16:07:09 +02:00
YuSanka
bc6e6492af
Move font initialization to init_fonts
2018-06-05 14:38:22 +02:00
YuSanka
5f82d01f19
Porting object list manipulation from Perl to c++:
...
* Set count and scale to the objects on c++ side
* Select/unselect object
2018-06-05 14:35:38 +02:00
Enrico Turri
a8254e0053
Generation of preview paths moved to c++
2018-06-05 14:09:36 +02:00
Lukas Matena
4830593cac
Started to work on the 'wipe into dedicated object feature'
2018-06-05 12:50:34 +02:00
Enrico Turri
f262ec9094
Modified logic to finalize volumes geometry
2018-06-05 12:24:26 +02:00
tamasmeszaros
34c850fa9d
initial NFP method with convex polygons working.
2018-06-05 12:02:45 +02:00
YuSanka
dcf0b432cb
PrusaCollapsiblePane is used only on MSW
2018-06-05 11:17:37 +02:00
Enrico Turri
5392008916
Generation of gcode paths moved to c++
2018-06-05 10:56:55 +02:00
Enrico Turri
e8b32fa1df
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-05 10:54:35 +02:00
Enrico Turri
1f79713c15
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-05 10:54:15 +02:00
Enrico Turri
489bce5a18
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-05 10:53:20 +02:00
YuSanka
72541ad13e
Next try to fix OSX/Linux compilation bug
2018-06-05 10:41:20 +02:00
YuSanka
bb27d62ba8
Try to fix compilation bug
2018-06-05 09:13:03 +02:00
bubnikv
d05d3cb652
Initial working implementation of the "Fix by Netfabb" function.
2018-06-04 21:22:42 +02:00
bubnikv
e65fac5e84
Added initial implementation of fixing 3MFs through the Netfabb
...
API provided through the Windows 10 Universal Windows Platform API.
2018-06-04 17:27:33 +02:00
YuSanka
04dc50cec4
Add, Delete and DeleteAll are working for new list now
2018-06-04 15:59:55 +02:00
bubnikv
03518d2ff2
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-06-04 15:47:51 +02:00
bubnikv
03fea392d5
Merge remote-tracking branch 'remotes/origin/wipe_tower_gcode_preview'
2018-06-04 15:45:10 +02:00
Enrico Turri
d74b85f3fe
Another set of 3DScene methods moved to c++
2018-06-04 15:42:34 +02:00
Enrico Turri
9729c71691
Fixed opengl initialization on linux
2018-06-04 14:38:41 +02:00
Enrico Turri
af8e869880
3rd attempt to fix opengl initialization on linux
2018-06-04 14:28:59 +02:00
Enrico Turri
fa60917580
Fixed Linux compile
2018-06-04 13:18:04 +02:00
Enrico Turri
ac47ba5864
1st attempt to fix opengl initialization on linux
2018-06-04 13:15:28 +02:00
Enrico Turri
adca3035f9
Fixed Linux compile
2018-06-04 12:32:23 +02:00
Enrico Turri
676210d6f4
Fixed typo
2018-06-04 12:30:40 +02:00
Enrico Turri
95e7d96f52
3DScene paint event handler moved to c++
2018-06-04 12:26:39 +02:00
Enrico Turri
4672a18b49
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-04 12:25:25 +02:00
Enrico Turri
109dde00b2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 12:25:04 +02:00
Enrico Turri
78c32bdf9a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-04 12:24:14 +02:00
Lukas Matena
7c9d594ff6
Fixed behaviour of infill wiping for multiple copies of an object
2018-06-04 12:15:59 +02:00
YuSanka
16a5029d58
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +02:00
Enrico Turri
8911cf6051
OpenGL info moved to c++
2018-06-04 10:14:09 +02:00
Enrico Turri
8dc3a73571
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-04 09:29:16 +02:00
Enrico Turri
7d56b38e40
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 09:28:55 +02:00
Enrico Turri
2e710289eb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-04 09:28:05 +02:00
Enrico Turri
56f0c8fe93
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-06-04 09:25:12 +02:00
Enrico Turri
dab2652cb5
Fixed preference dialog behavior
2018-06-04 09:24:48 +02:00
Vojtech Kral
4df0b94b79
Beta bugfixes ( #931 )
...
* Fix: Function signature in avrdude
* Fix: Remove mockup vendor bundles
* Fix: Make ConfigWizard error handling more friendly
* Fix: Opening the datadir in AppImage-based Slic3r
2018-06-04 09:07:29 +02:00
Enrico Turri
364134515b
Refactoring and cleanup
2018-06-01 15:54:41 +02:00
Lukas Matena
bdaa1cbdfd
Wiping into infill - no infills are now inadvertedly printed twice (hopefully)
2018-06-01 15:43:22 +02:00
Enrico Turri
2bccb43122
Attempt to fix 3DScene key event on Linux
2018-06-01 09:18:10 +02:00
Enrico Turri
94d608c6c1
3DScene mouse event handler move to c++ completed
2018-06-01 09:00:30 +02:00
Lukas Matena
2d24bf5f73
Wipe into infill - copies of one object are properly processed
2018-05-31 16:21:10 +02:00
Enrico Turri
6bf009edee
3DScene mouse event handler partially moved to c++ - part 2
2018-05-31 16:04:59 +02:00
Enrico Turri
276533e236
3DScene mouse event handler partially moved to c++
2018-05-31 13:51:50 +02:00
Enrico Turri
cf8e7475ca
Removed unused methods from 3DScene
2018-05-31 08:44:39 +02:00
YuSanka
c857b68fbe
Functions "Add/Delete" objects to/from list works correct now
2018-05-31 08:43:10 +02:00
Enrico Turri
30a3b2179b
3DScene timer and _variable_layer_thickness_action method moved to c++
2018-05-30 15:18:45 +02:00
Enrico Turri
5a8d1ffdba
Prototype for exporting estimated remaining time into gcode for default and silent mode
2018-05-30 12:08:03 +02:00
Lukas Matena
8bdbe41505
Wiping into infill should respect infill_first setting, marking moved to separate function
2018-05-30 11:56:30 +02:00
Lukas Matena
db22b2f504
Bugfix: first color of the wipe tower preview was incorrect with some models
2018-05-30 11:02:00 +02:00
YuSanka
5c4c912132
Extended "Delete" functions
2018-05-30 00:36:44 +02:00
YuSanka
db7c58009c
Added "Add/Delete" functions to the MyObjectTreeModel
2018-05-29 22:45:35 +02:00
Enrico Turri
2f773a89df
3DScene set_viewport_from_scene method moved to c++
2018-05-29 15:36:09 +02:00
Lukas Matena
b95a6f2626
Fix of previous commit
2018-05-29 15:29:20 +02:00
Enrico Turri
df14a3c399
3DScene update_volumes_colors_by_extruder method moved to c++
2018-05-29 15:07:06 +02:00
Enrico Turri
5ee5465f94
3DScene mark_volumes_for_layer_height method moved to c++
2018-05-29 14:34:45 +02:00
Enrico Turri
c3b1eca2c7
Fixed a crash
2018-05-29 14:09:02 +02:00
Enrico Turri
5c745485e1
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-29 13:56:41 +02:00
Enrico Turri
38d0c964d8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-05-29 13:55:46 +02:00
Enrico Turri
363a964ebb
3DScene render method partially moved to c++
2018-05-29 13:54:34 +02:00
Lukas Matena
cb5f5c65b0
Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width)
2018-05-29 12:41:40 +02:00
Lukas Matena
549351bbb4
Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width)
2018-05-29 12:32:04 +02:00
Lukas Matena
e4aff5b08a
Feedrate on the first layer of the wipe tower properly set (bugfix)
2018-05-29 09:07:23 +02:00
YuSanka
c7d7da452e
Updated Collapsed/Layout for PrusaCollapsiblePane.
...
Cleaned right_panel
2018-05-28 17:08:48 +02:00
Lukas Matena
c72ecb382d
Reduction is now correctly calculated for each region, soluble filament excluded from infill wiping
2018-05-28 15:33:19 +02:00
Enrico Turri
db260a669c
3DScene mouse wheel event moved to c++
2018-05-28 15:23:01 +02:00
Enrico Turri
aacdcd4add
3DScene layers editing mouse containment methods moved to c++
2018-05-28 14:39:59 +02:00
Enrico Turri
994222c317
3DScene _first_selected_object_id_for_variable_layer_height_editing method moved to c++
2018-05-28 14:10:02 +02:00
Enrico Turri
951e8528b4
3DScene layers editing parameters moved to c++
2018-05-28 13:43:29 +02:00
YuSanka
d7d0edf4dc
edit_object_buttons moved to Object/Part Settings
2018-05-28 12:04:39 +02:00
YuSanka
3fb567d286
Final prototype
2018-05-28 11:19:51 +02:00
YuSanka
d93a8aec3d
New concept of the main IU.
...
* only 2 mode - Regular & Expert
* "Export Gcode" moved to bottom of the window (analogue to the PrusaControll)
* Experiments with layout of collapsible_pane [! not successful]
2018-05-27 22:12:01 +02:00
tamasmeszaros
b6f8ea0334
Progress should be displayed with synchronization.
2018-05-25 18:21:06 +02:00
tamasmeszaros
fcef1b107e
Making some meaningful progress feedback.
2018-05-25 16:55:55 +02:00
Enrico Turri
a8311bd1bd
3DScene layer_editing_allowed method moved to c++
2018-05-25 16:28:24 +02:00
Lukas Matena
bfe4350a89
Calculation of wipe tower reduction corrected, new config option (wipe into infill)
2018-05-25 16:11:55 +02:00
Enrico Turri
c51ce63b9b
3DScene layer editing overlay completely moved to c++
2018-05-25 15:56:14 +02:00
tamasmeszaros
5fe83110cb
Fix crashing png export on Linux.
2018-05-25 15:01:57 +02:00
Enrico Turri
455076231b
Layers editing shader moved to c++
2018-05-25 14:05:08 +02:00
Enrico Turri
bdbc86167c
3DScene volume selection methods moved to c++
2018-05-25 09:03:55 +02:00
Lukas Matena
132a67edb2
Wipe tower changes to reduce wiping volumes where appropriate
2018-05-24 17:24:37 +02:00
YuSanka
46f71661b2
Some changes in the concept of the new right column
2018-05-24 16:57:35 +02:00
Enrico Turri
c2e38fc6fe
Fixed compile on Linux
2018-05-24 15:22:53 +02:00
Enrico Turri
70664122af
3DScene layer height profile rendering moved to c++
2018-05-24 15:17:01 +02:00
Lukas Matena
95795f249a
First steps in reorganizing infill order (to use infill instead of the wipe tower)
2018-05-24 14:05:51 +02:00
Enrico Turri
f31c55ceed
3DScene layer editing overlay textures rendering moved to c++
2018-05-24 13:46:17 +02:00
Enrico Turri
157a34bcd9
AMF I/O - Automatic detection if open file is zip archive or xml format
2018-05-24 09:57:12 +02:00
YuSanka
85508fab82
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-24 08:32:24 +02:00
Lukas Matena
1d1c69f300
Merge branch 'master' into wipe_tower_improvements
2018-05-23 19:34:33 +02:00
tamasmeszaros
56db426de7
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-05-23 16:29:02 +02:00
tamasmeszaros
a2eecdfb25
Output directory selection changed to zip file selection with file dialog.
2018-05-23 16:28:18 +02:00
YuSanka
a877846699
Filling object settings (continue)
2018-05-23 16:21:42 +02:00
Enrico Turri
751b41b94b
3DScene picking pass moved to c++
2018-05-23 15:35:11 +02:00
Enrico Turri
486180c422
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 15:33:25 +02:00
tamasmeszaros
3bdb12ada1
Making it compile on GCC 4.9
2018-05-23 14:16:54 +02:00
Enrico Turri
90c50b281a
3DScene mouse variables moved to c++
2018-05-23 13:56:54 +02:00
bubnikv
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
tamasmeszaros
a7298d9d89
Merge with latest master
2018-05-23 12:27:07 +02:00
tamasmeszaros
0c6eb19202
fix zip file error check
2018-05-23 12:24:11 +02:00
Enrico Turri
b36243ba10
Objects rendering moved to c++
2018-05-23 11:14:49 +02:00
tamasmeszaros
7fe9a56ef8
Added some comments and sequential version of png slice export.
2018-05-23 11:02:07 +02:00
Enrico Turri
b4beb7aae9
3DScene plain shader moved to c++
2018-05-23 09:57:44 +02:00
Enrico Turri
37ab7594fc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 08:38:29 +02:00
YuSanka
83cec1a640
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-23 08:30:27 +02:00
tamasmeszaros
835e89f8c1
Delete copy constructor of Raster, we dont want to use that. Getting rid of AGG warnings.
2018-05-22 17:37:39 +02:00
tamasmeszaros
2eddacfb7e
getting rid of strerror problem
2018-05-22 16:39:47 +02:00
YuSanka
ec5b98477d
Filled content_object_settings
2018-05-22 16:14:41 +02:00
bubnikv
076b293fec
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
tamasmeszaros
9c2d9b2ba3
OSX build fixes, again...
2018-05-22 15:13:07 +02:00
Enrico Turri
85b6784dcb
Merge with master
2018-05-22 15:03:40 +02:00
Vojtech Kral
360b34944d
ErrorDialog: Fix size and message encoding
2018-05-22 14:33:37 +02:00
bubnikv
306d77559e
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
2018-05-22 14:32:07 +02:00
bubnikv
e8247c5646
When loading a config bundle, make sure a config value is not accepted
...
if it is placed in a wrong group (for example, max_print_height
does not belong to print settings, but a printer settings, so Slic3r
will now complain about it being in print settings, and it will
remove the value from the print settings).
2018-05-22 14:17:27 +02:00
Enrico Turri
ae394ca97d
Fixed remember output directory default value set to true
2018-05-22 13:57:28 +02:00
Enrico Turri
4e29147756
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 11:48:45 +02:00
tamasmeszaros
73b861287c
Zipped output and tryfixes for linux and mac build.
2018-05-22 11:16:32 +02:00
bubnikv
eef1d500ec
Merge remote-tracking branch 'remotes/origin/brim_width_calculation'
2018-05-22 11:08:37 +02:00
Lukas Matena
e2f44a231e
A fix to use correct spacing with multiloop skirts
2018-05-22 10:50:38 +02:00
tamasmeszaros
e36164c76b
OSX and linux build fixes
2018-05-22 10:15:15 +02:00
YuSanka
2a8391dfbf
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-22 09:05:34 +02:00
Enrico Turri
451c58d58f
3DScene's enable_picking variable moved to c++
2018-05-22 09:02:42 +02:00
YuSanka
6e2d72f35c
Billet for the part of the expert view mode
2018-05-22 08:41:33 +02:00
Enrico Turri
59af3fb866
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 08:33:23 +02:00
bubnikv
b694f1ac89
One day I will fix it!
2018-05-21 23:40:17 +02:00
bubnikv
512b6dfd88
Yet another fix of the previous commit.
2018-05-21 23:24:18 +02:00
bubnikv
6b4fe7975f
Fix of the previous commit: When asking the operating system to open
...
the datadir using the platform specific file explorer, enquote
and escape the path.
2018-05-21 22:10:38 +02:00
bubnikv
7b4aeef40c
Moved the "Flash firmware" menu to "Configuration",
...
removed the "Check for updates" from the "Configuration" menu,
added an "Open file explorer at the datadir" item to the Help menu.
2018-05-21 21:04:03 +02:00
Vojtech Kral
5697754c5e
avrdude: Fix exit hook not being adapted properly
2018-05-21 18:59:15 +02:00
Vojtech Kral
ee5a5df2a7
Serial port friendly name on Linux
2018-05-21 18:59:13 +02:00
bubnikv
3307dbc0fb
Another fix for linux & osx
2018-05-21 18:58:22 +02:00
bubnikv
1e8a0b69b2
Yet another fix for OSX
2018-05-21 18:58:22 +02:00
bubnikv
0a328789ef
Fixed compilation on Linux.
2018-05-21 18:58:22 +02:00
bubnikv
8917f18ef1
Fix of previous commit, fix of compilation on OSX.
2018-05-21 18:58:22 +02:00
bubnikv
d4e939fd04
Serial port fix, get description for serial ports on OSX.
2018-05-21 18:58:22 +02:00
bubnikv
33f21422e6
Added friendly names to serial ports, added automatic selection of Prusa's printers in the firmware updater dialog
2018-05-21 18:58:22 +02:00
Vojtech Kral
7f8265e2be
FirmwareDialog: Fix log clearing
2018-05-21 18:58:22 +02:00
Vojtech Kral
a43e72f696
Firmware updater: rework cancelling
2018-05-21 18:58:22 +02:00
bubnikv
4f4649d046
avrdude: Fix serial I/O timeout on Windows
2018-05-21 18:58:22 +02:00
Vojtech Kral
4723a99b15
FirmwareDialog: Fix dialog sizing
2018-05-21 18:58:22 +02:00
Vojtech Kral
e1930d57f3
Firmware updater: Disable dictionary flashing menu entry for the time being
2018-05-21 18:58:22 +02:00
Vojtech Kral
fd00ea0ca7
Firmware updater: Add cancelation
2018-05-21 18:58:22 +02:00
Vojtech Kral
98ae20c3df
Firmware updater: Perform work in a background thread
2018-05-21 18:58:22 +02:00
Vojtech Kral
a54672fb54
Firmware updater: Make the GUI less scary
2018-05-21 18:58:22 +02:00
Vojtech Kral
c5f1acfbfb
FirmwareUpdater: Disable dialog close while flashing
2018-05-21 18:58:22 +02:00
Vojtech Kral
fe21ca5510
avrdude: Build fixes
2018-05-21 18:58:22 +02:00
Vojtech Kral
404fdbcfdf
avrdude: Fixes in error handling
2018-05-21 18:58:22 +02:00
Vojtech Kral
97b3c38148
avrdude: Fix h_addr
2018-05-21 18:58:22 +02:00
Vojtech Kral
839c0451f7
avrdude: Fix PATH_MAX
2018-05-21 18:58:22 +02:00
Vojtech Kral
4ac17daad2
avrdude: Use C99, fix alloca include in stk500
2018-05-21 18:58:22 +02:00
Vojtech Kral
af360d7097
Firmware updater GUI
2018-05-21 18:58:22 +02:00
Vojtech Kral
3d09f2a980
avrdude: bugfixes
2018-05-21 18:58:22 +02:00
Vojtech Kral
07817c8ee5
avrdude: Compilation on Windows/MSVC
2018-05-21 18:58:22 +02:00
Vojtech Kral
11a00b025f
avrdude integration basics (WIP)
2018-05-21 18:58:20 +02:00
Vojtech Kral
1caeab913b
avrdude base
2018-05-21 18:55:03 +02:00
tamasmeszaros
b3c49cbbe6
Fixing zlib and libpng build on Linux
2018-05-21 17:42:46 +02:00
tamasmeszaros
6cc4e99632
Logging file system error and formatting png output filename for equal leading zeros.
2018-05-21 16:28:00 +02:00
tamasmeszaros
e6e078cbf7
Unneccessary AGG sources removed. Added libpng and zlib sources and static build in cmake.
2018-05-21 15:58:52 +02:00
Enrico Turri
ae53c7cb2e
Volumes rendering moved to c++
2018-05-21 15:57:03 +02:00
Enrico Turri
0f035d0bae
Background rendering moved to c++
2018-05-21 15:24:52 +02:00
Enrico Turri
bf7b9eb3e7
Legend texture moved to c++
2018-05-21 14:57:43 +02:00
YuSanka
622c613b41
Update of the view mode works correctly
2018-05-21 14:49:31 +02:00
Enrico Turri
3fdc5e20a7
Warning texture moved to c++
2018-05-21 14:40:09 +02:00
YuSanka
c4478ccffa
Fixed wrong updating of the options group tree
2018-05-21 14:36:09 +02:00
tamasmeszaros
6b5c0073a7
Model centered when exporting to png. Added some comments to the rasterization.
2018-05-21 13:46:41 +02:00
Enrico Turri
7cff6ef6db
Shaders loaded from files
2018-05-21 13:08:02 +02:00
Enrico Turri
3fb96ff636
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-21 13:06:16 +02:00
Enrico Turri
308a0b5709
Remember output directory default value set to true
2018-05-21 11:50:48 +02:00
Enrico Turri
3291cbfdad
Fix of #889
2018-05-21 11:19:03 +02:00
Enrico Turri
01b6bc1dc8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-21 08:38:05 +02:00
Enrico Turri
05dcda8ef7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-21 08:37:53 +02:00
YuSanka
deabeaaa7f
Aligned frequently changing parameters according to presets settings on the Plater tab.
...
Fixed missing adding of the Filaments preset settings(for multy material case) to the right_panel
2018-05-20 23:58:09 +02:00
tamasmeszaros
0f552832da
PNG conversion and parallel execution working.
2018-05-18 18:11:29 +02:00
tamasmeszaros
d97939c012
Holes now printed correctly. export changed to pgm which is grayscale.
2018-05-18 15:08:18 +02:00
Vojtech Kral
fd43e53aeb
PresetUpdater: Add some more logging
2018-05-18 14:59:24 +02:00
Enrico Turri
a7fc57a176
3DScene reset_object method moved to c++
2018-05-18 14:08:59 +02:00
Enrico Turri
5fc8fdee11
3DScene axes moved to c++
2018-05-18 13:02:47 +02:00
Lukas Matena
99293011e6
Corrected brim generation (width), enabling continuity with skirt
2018-05-18 12:19:54 +02:00
YuSanka
876cf9aa8b
Show/hide warning icon according to the view mode
2018-05-18 11:39:49 +02:00
Enrico Turri
1e0a8de5b1
3DScene cutting plane moved to c++
2018-05-18 11:05:48 +02:00
Enrico Turri
0584990b65
Fixed z layers indices under 3D preview sliders
2018-05-18 10:14:47 +02:00
Enrico Turri
5224acad59
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:55:30 +02:00
Enrico Turri
6c6b8ccc42
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:55:21 +02:00
bubnikv
3f08ef70f1
Fix of extraneous infill over thin walls.
...
Fixes https://github.com/prusa3d/Slic3r/issues/670
and some of https://github.com/prusa3d/Slic3r/issues/895
PerimeterGenerator was using an unsafe clipper offset function,
which performed offset for both a contour and its holes together.
With this commit the offsets were replaced with their safe counterparts,
though these safe counterparts may be somehow slower
(performing offset on ExPolygon or ExPolygons, piece by piece).
Also there was a bug, where if the infill & gap fill consumed
everything of the polygon, a polygon one onion shell above was still
used for infill.
2018-05-18 09:52:09 +02:00
Enrico Turri
f34250ea6a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:29:14 +02:00
Enrico Turri
255bec7432
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:29:05 +02:00
bubnikv
651c4ab0ae
Fixed a typo in AppConfig
2018-05-18 08:46:33 +02:00
Enrico Turri
d56b543ff8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 08:32:19 +02:00
Enrico Turri
d85fd5501c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 08:32:09 +02:00
bubnikv
19221b749c
Fix of https://github.com/prusa3d/Slic3r/issues/869
2018-05-18 08:21:24 +02:00
tamasmeszaros
c3a944ef97
Can rasterize polygons with holes using AGG. Export is raw ppm for now.
2018-05-17 18:17:15 +02:00
Vojtech Kral
5fd2164612
ConfigWizard: Fix incorrent wizard run after a language change
2018-05-17 17:19:33 +02:00
Vojtech Kral
e783e00578
AppConfig: Remember previous Slic3r version
2018-05-17 16:19:58 +02:00
YuSanka
4e47f4973c
Updating of the right column according selected view mode
2018-05-17 16:03:18 +02:00
Enrico Turri
7ca9f46b9c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 14:43:27 +02:00
Enrico Turri
f26bce2538
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 14:43:18 +02:00
bubnikv
37c498d6dc
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-17 14:09:08 +02:00
bubnikv
35bf4aee7d
Fixed loading of configuraton values octoprint_host, support_material_threshold
...
They were incorrectly handled by the handle_legacy() function, which has been
ported from the upstream Slic3r without inspecting its content.
2018-05-17 14:08:50 +02:00
Vojtech Kral
96c7c4a58b
PresetUpdater: Remove obsolete presets
2018-05-17 13:48:11 +02:00
Enrico Turri
15f35a9e9e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 12:12:27 +02:00
Enrico Turri
74b0ed4b23
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 12:12:18 +02:00
Lukas Matena
d98dec3a7c
Merge branch 'gcode_preview_dropdown_ui'
2018-05-17 11:22:38 +02:00
YuSanka
d310668462
Added Regular view mode to the menu.
...
Right column objects send fron Perl to C++
2018-05-17 10:46:32 +02:00
tamasmeszaros
cee965f5ac
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-05-17 10:44:17 +02:00
tamasmeszaros
fd829580e9
Working arrange_objects with DJD selection heuristic and a bottom-left placement strategy.
2018-05-17 10:37:26 +02:00
bubnikv
c5dc47c647
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-17 10:30:24 +02:00
bubnikv
e3d84407e0
Fix of https://github.com/prusa3d/Slic3r/issues/896
...
Fixed a bug in parsering a Point from a config file.
2018-05-17 10:30:20 +02:00
Lukas Matena
6f792b7ffb
Horrible workaround to make the gcode preview dropdown (show feature types) work on all platforms
2018-05-17 10:23:02 +02:00
Enrico Turri
24b5d61eb3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 09:53:46 +02:00
Enrico Turri
4a4f4db6a5
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 09:53:36 +02:00
Enrico Turri
e13564cb19
Fixed shell visualization in g-code preview
2018-05-17 09:50:40 +02:00
Enrico Turri
7a6d83e7eb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 08:33:32 +02:00
Enrico Turri
853ebf6ad2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 08:33:16 +02:00
tamasmeszaros
e1b9c13024
Rasterizer skeleton
2018-05-16 18:51:28 +02:00
bubnikv
e329f6f5f2
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-16 16:34:19 +02:00
bubnikv
687c91d6e9
Parsing of obsolete presets from Config Bundle to remove them
...
from user's profile when upgrading to a new configuration structure.
2018-05-16 16:34:07 +02:00
YuSanka
146a02a300
Added view mode selection to the config_menu
2018-05-16 14:38:37 +02:00
YuSanka
b8fe48c563
Modification of the AboutDialog to be correct showing on dark theme of Linux
2018-05-16 13:56:03 +02:00
Vojtech Kral
a97226ae54
PresetUpdater: Fix: Don't offer updates on legacy datadir
2018-05-16 10:15:05 +02:00
bubnikv
5c44453ced
Fixed loading of configuration files after reverting to a snapshot
...
storing the old configuration format.
2018-05-16 10:11:00 +02:00
tamasmeszaros
d9ff63c022
Basic svg export ported from perl to the point where actual svg is assembled. Empty PNG files are genereted for each sliced layer.
2018-05-15 18:01:47 +02:00
Enrico Turri
41c51d7614
3DScene's char event handler moved to c++
2018-05-15 16:09:04 +02:00
Enrico Turri
2b4829a4b9
3DScene bed variables moved to c++
2018-05-15 15:38:25 +02:00
bubnikv
4b87f71bbc
Fix of the previous commmit. gcc and clang rightfully complained about a typo.
2018-05-15 14:20:32 +02:00
bubnikv
868b400120
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-15 14:04:49 +02:00
bubnikv
7645e9cb7a
Added layer_num, layer_z variables to the end_gcode, end_filament_gcode,
...
added min(.,.), max(.,.) functions to the placeholder parser syntax.
2018-05-15 14:04:29 +02:00
Enrico Turri
c60bf694ef
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-15 12:22:44 +02:00
Enrico Turri
43784f3409
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-15 12:22:35 +02:00
Enrico Turri
a612b5b648
Replacement of xml escape characters when exporting to amf
2018-05-15 12:19:43 +02:00
YuSanka
75a0dea93f
PrusaCollapsiblePanel works correct on MSW now
2018-05-15 12:01:33 +02:00
Enrico Turri
f0d1888ca9
3DScene select_view() function moved to c++
2018-05-15 11:30:11 +02:00
Lukas Matena
1f62978251
Merge branch 'master' into wipe_tower_improvements
2018-05-15 11:22:58 +02:00
Enrico Turri
75f1f832aa
3DScene bed origin moved to c++
2018-05-15 11:07:32 +02:00
Enrico Turri
7519e34507
3DScene zoom functions moved to c++
2018-05-15 10:32:38 +02:00
Enrico Turri
f4303ebdb8
1st attempt of perl callback from c++ for 3DScene
2018-05-15 09:50:01 +02:00
YuSanka
e78a885247
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-15 09:44:11 +02:00
Enrico Turri
0155f4a7f7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-15 08:41:59 +02:00
Enrico Turri
986630c2dc
3DScene's idle even handler moved to c++
2018-05-14 14:47:13 +02:00
Enrico Turri
a12e3c1cc9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-14 14:15:31 +02:00
Enrico Turri
0c1655b884
3DScene::Resize() method moved to c++
2018-05-14 14:14:19 +02:00
YuSanka
3bc8d7517a
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-05-14 13:57:08 +02:00
YuSanka
b51197b52c
Updated POT-file, added Spanish and Polish, fixed bug with Ctrl+U,O,L in Italian
2018-05-14 13:56:40 +02:00
Enrico Turri
a73cb45792
Camera angle clamping moved to c++
2018-05-14 12:08:23 +02:00
Enrico Turri
1fd59144c7
Camera data moved to c++ - WIP
2018-05-14 11:31:58 +02:00
Enrico Turri
32063cbe23
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-14 10:02:28 +02:00
Enrico Turri
1edd2d01f0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-14 10:01:27 +02:00
Enrico Turri
e90bc3fcab
Fix in _3DScene::_load_gcode_extrusion_paths::Helper::path_color()
2018-05-14 09:00:19 +02:00
Lukas Matena
b6db3767a2
Bugfix: extruder temperature only changes when the temperature differs from the one last set (wipe tower)
2018-05-11 17:35:42 +02:00
YuSanka
d53127fa44
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-11 14:42:19 +02:00
YuSanka
8c4c392cb8
Fixed enable/disable of the tooltips on GTK
2018-05-11 14:41:21 +02:00
Lukas Matena
03c6efe0d6
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-05-11 12:29:34 +02:00
Lukas Matena
d89f8128cd
Fixed a GCode preview crash on Linux due to returning a reference to temporary (issue #872 )
2018-05-11 12:28:31 +02:00
YuSanka
27769edab2
Fixed compilation bag on GTK and OSX
2018-05-11 11:25:28 +02:00
YuSanka
e91ebddeea
Added possibility of select all TextCtrl context using Ctrl+A
2018-05-11 09:53:35 +02:00
bubnikv
d620961c34
Fixed the version number. We have an alpha state as of today.
2018-05-10 18:37:57 +02:00
YuSanka
2e7d623ee4
Created PrusaCollapsiblePane for CollapsiblePane view with disclosure triangles
2018-05-10 16:36:12 +02:00
YuSanka
98d9ce31de
Corrected error message to last commit
2018-05-10 12:54:02 +02:00
YuSanka
754bfd926b
Auto-correction of the input values according to the admissible range
2018-05-10 11:10:44 +02:00
YuSanka
c07f347ff6
CollapsiblePanes are putted to ScrolledWindow
2018-05-09 14:36:20 +02:00
Enrico Turri
5024fc4be7
OpenGL to c++ 1st installment - WIP
2018-05-09 10:47:04 +02:00
Enrico Turri
86155ae4c0
Fixed conflict in previous merge
2018-05-09 10:28:26 +02:00
Enrico Turri
bd4061c3b0
Merge with master branch
2018-05-09 10:16:28 +02:00
Enrico Turri
8eb9ddc2eb
Max count of auto assigned extruders when splitting object set as dependent of current printer
2018-05-07 16:13:58 +02:00
Enrico Turri
c579ec7f5f
Fixed wrong extrusion paths detection with multimaterial objects
2018-05-07 14:23:07 +02:00
YuSanka
db549e8609
First experiments with ObjectsTreeList
2018-05-04 18:32:20 +02:00
Enrico Turri
678cbd9d47
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-04 08:56:16 +02:00
bubnikv
19977edae2
Removed the "Broken croak" support, which was useful on broken
...
64bit Strawberry perl only. We don't use Strawberry perl anymore,
so this has been removed for clarity.
Added a PerlCallback wrapper to call a Perl subroutine from a C++ code.
2018-05-03 21:45:43 +02:00
Enrico Turri
471f90659f
Fixed typo preventing to build on Win
2018-05-03 16:28:41 +02:00
Enrico Turri
6d88d0d39b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-03 16:13:22 +02:00
YuSanka
af4e0308ae
Fixed visibility of the contents of the GCode fields
2018-05-03 13:49:37 +02:00
YuSanka
993294579d
Button's border and background aren't use on MSW.
2018-05-03 13:27:20 +02:00
Enrico Turri
717fbc1196
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-03 11:11:48 +02:00
Enrico Turri
d19b1162b3
Fixed normals on wipe tower box
2018-05-03 11:09:13 +02:00
YuSanka
6abfee65ce
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-03 09:30:02 +02:00
YuSanka
20d9bda87e
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-05-03 09:22:10 +02:00
YuSanka
20b83c5b53
Save the Canonical Language Name instead of the Enumerator to the Slic3r.ini
2018-05-03 09:21:01 +02:00
Enrico Turri
e8d5c939b0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-03 08:29:08 +02:00
Vojtech Kral
8ad6053544
PresetUpdater: More logging
2018-05-02 17:14:09 +02:00
YuSanka
4131a92cec
Merge remote-tracking branch 'origin/master' into updating
2018-05-02 16:13:00 +02:00
YuSanka
16d5faac20
Preparations to the localization update & new Slic3rPE.pot
2018-05-02 16:06:35 +02:00
Enrico Turri
65f3b52cad
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-02 15:17:32 +02:00
Enrico Turri
cb486522a8
Fixed crash when pressing 'A' with empty print bed
2018-05-02 14:55:17 +02:00
Enrico Turri
81636abaa9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-02 14:45:42 +02:00
Vojtech Kral
e9b83a20d0
ConfigWizard: Add additional logging
2018-05-02 12:44:53 +02:00
Lukas Matena
de0d1f34f3
Label in filament settings changed
2018-05-02 10:57:25 +02:00
Lukas Matena
b4e63d47cb
Yet another attempt to fix the layer height profile validation
2018-05-02 10:56:06 +02:00
Lukas Matena
71b4337036
Label in filament settings changed
2018-05-02 10:52:17 +02:00
YuSanka
2cab573a02
Merge remote-tracking branch 'origin/updating' into new_main_page_ui
2018-05-02 08:42:30 +02:00
Vojtech Kral
4758b68e55
Fix: Turn two Preset & PresetUpdater exceptions into error logs
2018-05-01 11:20:44 +02:00
Vojtech Kral
28effac0f1
Fix bitmap loading in new dialogs
2018-05-01 10:35:30 +02:00
YuSanka
6d34db352d
Merge branch 'updating' of https://github.com/prusa3d/Slic3r into updating
2018-04-30 16:30:23 +02:00
YuSanka
2d4cac0018
Added ability to change color of the labels of the system or modified values
2018-04-30 16:29:13 +02:00
Enrico Turri
3c13c4f103
Added versioning to 3mf file
2018-04-30 15:27:01 +02:00
Vojtech Kral
5624b8afd2
Add a new error dialog
2018-04-30 14:34:47 +02:00
Enrico Turri
4344eaebca
Added versioning to amf file
2018-04-30 12:03:06 +02:00
YuSanka
43d2027b76
ToolTips are showing on GTK
2018-04-30 11:11:48 +02:00
Vojtech Kral
bb4c4d9ecf
Legacy data update dialog: Add link to wiki
2018-04-27 15:45:04 +02:00
Enrico Turri
ad54210c3e
3mf I/O - Added import/export of layer heights profile
2018-04-27 12:56:35 +02:00
Vojtech Kral
6d38943222
Fix & refactor legacy datadir dialog
2018-04-27 12:29:18 +02:00
Vojtech Kral
a3d5251b8e
Merge branch 'cpp_ui_optimization' into updating
2018-04-27 12:04:43 +02:00
Enrico Turri
4811abfa99
Apply gradient to colors in GCode Preview
2018-04-27 09:54:21 +02:00
bubnikv
86e4c7b6ad
Merge branch 'new_cooling_logic' into updating
2018-04-26 19:03:21 +02:00
bubnikv
25d47c1da8
Fix of the new cooling logic.
2018-04-26 18:56:16 +02:00
YuSanka
19f8e0bc63
Changed background color in AboutDialog from wxWHITE to wxSYS_COLOUR_WINDOW,
...
AboutDialogLogo is replaced to wxStaticBitmap.
2018-04-26 17:46:24 +02:00
YuSanka
6467513f60
Set default bitmap (white_bullet) when creating Field's reset buttons
2018-04-26 16:33:37 +02:00
YuSanka
7698ba168e
Merge branch 'updating' of https://github.com/prusa3d/Slic3r into updating
2018-04-26 15:11:48 +02:00
YuSanka
9548593b57
Forbid tabstop on resert buttons
2018-04-26 15:11:02 +02:00
Enrico Turri
a223655973
Inverted order of range items in legend texture
2018-04-26 13:40:29 +02:00
Enrico Turri
ad9dca2bd9
Fixed update of ranges for GCode paths colors selection
2018-04-26 13:03:54 +02:00
YuSanka
4d07b63b5a
Merge remote-tracking branch 'origin/profile_changes_reset' into updating
2018-04-26 12:47:32 +02:00
YuSanka
b3859c49c1
Updated description preset line for each type of presets...
...
Disabled m_btn_delete_preset for default and system presets.
Enabled update of the current preset if it was modified and selected again.
2018-04-26 12:40:17 +02:00
Lukas Matena
24dc4c0f23
Yet another attempt to fix the layer height profile validation
2018-04-26 11:19:51 +02:00
bubnikv
cbaf0ccc51
Refactored cooling logic for readibility and maintainability.
2018-04-25 22:54:52 +02:00
bubnikv
269770bbbc
Fix of a new cooling logic.
2018-04-25 22:06:44 +02:00
Vojtech Kral
dce0aa6771
Updating: Start using proper URLs
2018-04-25 17:43:01 +02:00
Enrico Turri
166ee4c2c8
Export of print config enabled as default in save file dialog when exporting to amf and 3mf files
2018-04-25 15:31:37 +02:00
Vojtech Kral
f23f86d91c
PresetUpdate: Fix UpdateConfig dialog
2018-04-25 15:21:38 +02:00
Vojtech Kral
933c0eb650
Fixes in SemVer and MsgUpdateConfig
2018-04-25 15:14:01 +02:00
Enrico Turri
1a4827ba33
Fixed incorrect z values set into GCode Preview sliders
2018-04-25 14:38:44 +02:00
Vojtech Kral
bbc3c890ea
Snapshots: Disable activation of incompatible snapshots
2018-04-25 14:00:29 +02:00
YuSanka
91db0a6e05
Merge remote-tracking branch 'origin/profile_changes_reset' into updating
2018-04-25 13:53:22 +02:00
YuSanka
0572a3299a
First experiment with the wxCollapsiblePane
2018-04-25 13:25:34 +02:00
YuSanka
cfac6c0ebb
Aligned printer settings on Plater tab
2018-04-25 11:10:34 +02:00
bubnikv
6c627be4c1
New cooling logic to equalize extrusion velocity. The old behavior caused bad outer surface print quality on Prusa i3 MK3
2018-04-25 10:37:31 +02:00
Vojtech Kral
0feb4d823f
PresetUpdater: Fix string type
2018-04-25 10:17:43 +02:00
Vojtech Kral
60f62a6463
Fix text in UpdateDialogs
2018-04-24 18:29:36 +02:00
Vojtech Kral
62d67d35ec
Merge branch 'profile_changes_reset' into updating
2018-04-24 18:15:23 +02:00
Vojtech Kral
a50bde4267
Merge branch 'master' into updating
2018-04-24 18:11:34 +02:00
Vojtech Kral
fea5603409
PresetUpdater: Bundle incompatibility / Slic3r downgrade scnario
2018-04-24 18:06:42 +02:00
YuSanka
7c7c37a4f4
Added tooltips for reset buttons near each option
2018-04-24 14:11:23 +02:00
Lukas Matena
650489dd8a
New parameters actually connected to the wipe tower generator
2018-04-24 13:43:39 +02:00
Lukas Matena
ec2d37451b
Merge branch 'master' into wipe_tower_improvements
2018-04-24 13:10:33 +02:00
Lukas Matena
8c77b9645c
Loading, unloading and cooling reworked, new filament parameters regarding cooling were added
2018-04-24 13:02:08 +02:00
YuSanka
92b67fb62e
Change reset buttons tooltips according to its state
2018-04-24 12:12:15 +02:00
YuSanka
1e8d302fd4
Fixed wrong updating of "Top/Bottom fill pattern"
2018-04-24 10:33:11 +02:00
Enrico Turri
71d9500b2e
More robust fix for 3D view and GUI buttons not in synch when object's size is almost identical to print volume's size
2018-04-24 09:00:33 +02:00
YuSanka
e31f5fc4b6
Modified text for tooltips and ButtonsDescription
2018-04-24 08:49:37 +02:00
YuSanka
b0841f78f4
Experiment failed
2018-04-23 15:39:55 +02:00
YuSanka
6432ec8a9b
Experiment with extruders count change
2018-04-23 15:09:01 +02:00
Enrico Turri
cd3be74e3b
Workaround for 3D view and GUI buttons not in synch when object's size is almost identical to print volume's size
2018-04-23 15:03:38 +02:00
Vojtech Kral
a7a8030fea
PresetUpdater: Don't install updates that are already present in a snapshot
2018-04-23 13:58:50 +02:00
YuSanka
ec7e10e068
Fixed wrong behavior of options group Tree after extruders count change
2018-04-23 11:52:03 +02:00
Vojtech Kral
33c0d1dca3
PresetUpdater: Add/fix logging, comments
2018-04-23 11:16:47 +02:00
YuSanka
9a1dbfa6cf
Updated action_undo.png icon and added sys_unlock_grey.png & action_undo_grey.png for dark themes of OS
2018-04-23 10:27:42 +02:00
YuSanka
b8cb936973
Added effective update of ComboBoxes on Plater
2018-04-20 17:32:08 +02:00
YuSanka
27f77c7680
Added little more information to ButtonsDescription dialog
2018-04-20 15:40:43 +02:00
YuSanka
48bbd2d22a
Added new files to MackList
2018-04-20 15:02:54 +02:00
Vojtech Kral
e0421a3ba6
PresetUpdater: Don't display new Slic3r version notifications multiple times for the same version
2018-04-20 14:53:11 +02:00
YuSanka
669b0b68ab
Added missed files to commit
2018-04-20 13:27:25 +02:00
YuSanka
1e1bf03f61
Added reset buttons description
2018-04-20 12:58:07 +02:00
Vojtech Kral
134a083662
Merge branch 'config_snapshots' into updating
2018-04-20 11:08:23 +02:00
Vojtech Kral
9b5480b7ba
PresetUpdater: Use PID in cache tmp filenames
2018-04-20 11:05:00 +02:00
bubnikv
ab397e5ce1
Added SnapshotDB::snapshot_with_vendor_preset() utility function
...
to find out whether there has ever been a snapshot taken with a given
configuration version.
Implemented an "on snapshot" flag, which indicates, whether the current
state equals to some snapshot. If so, a new snapshot is not taken
in upgrade / downgrade case.
2018-04-20 10:26:23 +02:00
Vojtech Kral
d671e06c32
Fix alpha legacy dir detection, Fix SemVer value ctor
2018-04-19 18:29:19 +02:00
Vojtech Kral
bdaf1b01be
ConfigWizard: Fix reset checkbox
2018-04-19 16:49:22 +02:00
YuSanka
88dadcec78
Added tooltips for reverse buttons
...
* Corrected default size of undo buttons for GTK
* Experiment with rich tooltips
2018-04-19 16:20:30 +02:00
YuSanka
7083f58326
Added lock icons to system presets in ComboBoxes.
...
Added right event handling if informative string is selected in ComboBoxes
2018-04-19 12:08:59 +02:00
bubnikv
8ab62d702c
Fixed memory leak of TabIface.
...
Added documentation of the XS interface on how the Ref<> and Clone<>
wrappers work.
2018-04-18 18:06:07 +02:00
YuSanka
f38f0edaaf
Cleaned code from commented code
2018-04-18 14:15:13 +02:00
bubnikv
fa97a86751
Implemented merging of system profiles from various vendors.
2018-04-18 13:35:51 +02:00
YuSanka
3ca2dfbc1d
Added some performance changes
2018-04-18 13:32:21 +02:00
Vojtech Kral
0711f84ea0
Add version check & preset update options to Preferences
2018-04-18 12:33:07 +02:00
Vojtech Kral
81c6ad3ab7
ConfigWizard: Add reset option, fixes
...
Fix mock vendors
2018-04-18 11:40:43 +02:00
Vojtech Kral
c884f3b213
Display app update notification with the main frame
2018-04-17 17:11:56 +02:00
Vojtech Kral
df03b8e4e8
PresetUpdater: Notify about Slic3r updates
2018-04-17 16:59:53 +02:00
Enrico Turri
3bedcf4413
Tweaks in generation of rendering geometry for preview toolpaths. Fixes #240 and #348
2018-04-17 15:04:14 +02:00
Vojtech Kral
6286c9ee7c
ConfigWizard & updating: Fixes & cleanups
2018-04-17 11:54:59 +02:00
bubnikv
98785e47b1
Removed the
...
"The Wipe Tower currently supports only:\n"
"- first layer height 0.2mm\n"
"- layer height from 0.15mm to 0.35mm\n"
message as the new wipe tower is more generic.
2018-04-17 10:55:58 +02:00
bubnikv
3b0eb6b786
Merge remote-tracking branch 'origin/updating' into cpp_ui_optimization
2018-04-17 10:38:02 +02:00
Vojtech Kral
b506aa11fa
PresetUpdater: Fix: Compare versions when installing indices
2018-04-17 10:28:32 +02:00
YuSanka
d254c39a77
Added "smart" setting of label color
2018-04-17 10:15:48 +02:00
Lukas Matena
d7dc04eb57
Removed parameter filament_cooling_time (fixed value of 14s for now)
2018-04-17 08:18:12 +02:00
Vojtech Kral
37cf839b27
ConfigWizard: Fix regression
2018-04-16 18:33:33 +02:00
Vojtech Kral
d26c8e5336
Fix: Avoid the infamous major
& minor
macros on GCC
2018-04-16 17:43:23 +02:00
Vojtech Kral
214ad2925b
Merge branch 'master' into updating
2018-04-16 17:32:58 +02:00
Vojtech Kral
7710b541da
Merge branch 'config_snapshots' into updating
2018-04-16 17:00:31 +02:00
Vojtech Kral
c733e3151b
Updating: Detect legacy datadir, remove conflicting presets
2018-04-16 16:55:24 +02:00
YuSanka
6e870e8466
Merge remote-tracking branch 'origin/cpp_ui_optimization' into profile_changes_reset
2018-04-16 14:30:10 +02:00
Lukas Matena
a154fd34ee
Added parameter extra_loading_move, prevented high feedrate moves during loading
2018-04-16 14:26:57 +02:00
YuSanka
5d39126989
Changes to performance.
2018-04-16 13:43:01 +02:00
Lukas Matena
2726267748
Bugfix: validation of equal layering rejected even some valid configurations
2018-04-16 11:47:35 +02:00
bubnikv
c18b28e27c
Implemented caching of often rendered bitmaps on the Tab UI.
2018-04-16 11:03:08 +02:00
bubnikv
eb58e29245
Merge remote-tracking branch 'origin/profile_changes_reset'
2018-04-13 18:31:19 +02:00
YuSanka
215c2082d3
Decorated "bed_shape" and "compatible_printers" labels
2018-04-13 18:22:06 +02:00
bubnikv
5d363c1bb9
Removed printf debugging output
2018-04-13 17:25:36 +02:00
bubnikv
913cdef297
Merge remote-tracking branch 'origin/scene_manipulators'
2018-04-13 16:54:22 +02:00
bubnikv
56f19f01dd
Merge remote-tracking branch 'origin/3mf_io'
2018-04-13 16:50:33 +02:00
bubnikv
b79692c35e
Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements'
2018-04-13 16:43:35 +02:00
bubnikv
c5af8bfe78
Merged with Vojtech's branch
2018-04-13 16:19:27 +02:00
bubnikv
6d25ed2b00
Version's compatibility with Slic3r extended with pre-release
...
compatibility check:
A release Slic3r is not compatible with alpha and beta configs,
a beta Slic3r is not compatible with alpha configs, but is compatible
with beta configs etc.
2018-04-13 16:15:30 +02:00
Vojtech Kral
7dbb2ed6a3
Configuration updates downloading
2018-04-13 15:24:55 +02:00
bubnikv
82890ec815
Removed some obsolete Perl binding.
...
Added Version Index "version" method.
Implemented automatic selection of default_print_profile and
default_filament_profile, when the print / filament profiles are
not compatible with the selected printer profile.
Fixed selection of a printer profile, if the currently selected
printer profile becomes invisible.
2018-04-13 14:49:33 +02:00
Lukas Matena
68c3749696
Gyroid infill - automatic discretization steps and refactoring
2018-04-13 13:46:31 +02:00
Lukas Matena
abe6e8a783
Bugfix: legacy config options were not properly processed
2018-04-13 13:43:53 +02:00
YuSanka
64976c249d
Added @bubnikv's changes to BitmapCache
2018-04-13 12:49:12 +02:00
YuSanka
120c1978ae
Cleaned code
2018-04-13 12:35:04 +02:00
Vojtech Kral
b49b59cbb2
Configuration update application at startup
2018-04-13 11:04:39 +02:00
Enrico Turri
acd8d2df98
Fixed layer height profile editing for multipart objects
2018-04-13 09:01:48 +02:00
YuSanka
d82505984a
Rollback changes in BitmapCache
2018-04-12 16:46:17 +02:00
Lukas Matena
52a3f4a2bb
Default purging volumes set to more appropriate values
2018-04-12 16:13:59 +02:00
YuSanka
3bc7580e8c
Merge remote-tracking branch 'origin/master' into profile_changes_reset
2018-04-12 15:58:46 +02:00
Lukas Matena
adbaa42b2b
Bugfix: cooling tubes parameters change invalidates generated wipe tower
2018-04-12 15:38:05 +02:00
Enrico Turri
b062cddeea
Fixed object cutting
2018-04-12 12:56:42 +02:00
bubnikv
0f6fc689aa
Merge remote-tracking branch 'remotes/origin/updating' into config_snapshots
2018-04-12 11:24:48 +02:00
bubnikv
9ab38f416d
Improvement of the snapshot dialog, fixed storing of the snapshot "reason"
...
field.
2018-04-12 11:24:03 +02:00
Enrico Turri
1a274a253a
Fixed object/instance transformation after import from 3mf files
2018-04-12 10:10:15 +02:00
Vojtech Kral
b030791384
Semver fixes, misc fixes
2018-04-12 09:33:17 +02:00
Vojtech Kral
12b3132b1a
Perform init_vendors at startup
2018-04-11 18:05:21 +02:00
Vojtech Kral
31ea03feb0
ConfigWizard: Make bundle installation more intelligent, fixes
2018-04-11 18:05:12 +02:00
YuSanka
723bd22b96
Changed icons for lock/unlock filament_presets on Plater tab
...
Experiment with filament_presets transparency on GTK
2018-04-11 15:35:04 +02:00
bubnikv
aaa8f133c0
Fixed parsing of the config index.
2018-04-11 15:17:41 +02:00
YuSanka
762306d985
Added preset grouping to all presets ComboBoxes
...
Changed icons for action_undo, sys_lock and sys_unlock.
There are used same icons for all OS now.
Deleted/Commented temporarily used wxDataViewTreeCtrl
2018-04-11 13:56:37 +02:00
bubnikv
da2878958b
Wizard runs from the new Config menu,
...
snapshots could be rolled back / forward.
2018-04-11 12:21:15 +02:00
bubnikv
4275b15dcd
Merge remote-tracking branch 'origin/updating' into config_snapshots
2018-04-10 16:46:15 +02:00
bubnikv
0694fad016
Initial implementation of the config snapshot dialog.
2018-04-10 16:27:42 +02:00
YuSanka
e7520c3d18
Don't use select_preset on OS X
2018-04-10 14:52:03 +02:00
YuSanka
c1d25ba259
Experiments with wxDataViewTreeCtrl
2018-04-10 14:00:48 +02:00
Enrico Turri
9993f2215d
Auto assignement of extruder, after object's splitting to parts
2018-04-10 12:17:55 +02:00
Enrico Turri
e92cf311db
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-04-10 11:46:51 +02:00
Vojtech Kral
a541f5dfe1
Fix of the fix
2018-04-10 11:43:04 +02:00
Lukas Matena
f49a7be90c
An attempt to get RammingChart background colour consistent with its parent(s) on all platforms
2018-04-10 10:50:18 +02:00
YuSanka
fa4462514b
Added preset grouping to PresetCollection::update_tab_ui
2018-04-10 10:31:58 +02:00
Enrico Turri
30a1fea8a0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-04-10 08:52:12 +02:00
YuSanka
0cca7bb5e7
Dont use select_preset from preset_tree...
2018-04-09 17:09:00 +02:00
bubnikv
32c4cddb91
Ported the AboutDialog to C++, thanks @alexrj for the work.
...
New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 17:03:37 +02:00
YuSanka
674ddcd73a
Show preset_tree according to preset inheritance
2018-04-09 16:50:17 +02:00
Vojtech Kral
26511deec0
Add '-alpha' suffix to data directory for now
2018-04-09 16:39:50 +02:00
Vojtech Kral
b8a06d728a
Fixes in 2DBed
2018-04-09 16:24:34 +02:00
Enrico Turri
df32817992
Auto assign multi-part extruders
2018-04-09 14:57:23 +02:00
Lukas Matena
bbbb5c9a93
Ramming chart is now drawn with double-buffering
2018-04-09 14:49:32 +02:00
Vojtech Kral
388deb71ab
Adapt settings label colors to light vs dark UI themes
2018-04-09 14:46:19 +02:00
Lukas Matena
9ebff9ce00
Bugfix: a sign mistake was causing unnecessary travel moves
2018-04-09 13:35:39 +02:00
YuSanka
affaeef2ab
Default presets are visible only if it's selected from Preferences
2018-04-09 12:41:25 +02:00
Vojtech Kral
57f6601c9d
ConfigWizard: Fix logo rendering
2018-04-09 11:07:15 +02:00
YuSanka
e33db203d8
Next try to use wxDataViewTreeCtrlComboPopup on macOS and Linux:
...
Added: m_cc_presets_choice->UseAltPopupWindow();
m_cc_presets_choice->EnablePopupAnimation(false);
like for wxCheckListBoxComboPopup
2018-04-09 09:55:24 +02:00
bubnikv
601185f113
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-04-06 16:49:59 +02:00
bubnikv
670061ac33
Initial implementation of configuration snapshotting.
2018-04-06 16:49:33 +02:00
YuSanka
004f9ba1e5
Added update_tab_presets functions to m_cc_preset_choise filling
2018-04-06 15:42:52 +02:00
Vojtech Kral
90a8ef8e9f
Cleanup
2018-04-06 15:17:02 +02:00
YuSanka
e4b767e840
Experiment with own ComboCtrl for preset_choice.
2018-04-06 13:37:00 +02:00
Lukas Matena
abe94706f6
Gyroid infill bug fix: abs vs std::abs
2018-04-06 13:27:51 +02:00
Vojtech Kral
9dcec6662e
ConfigWizard: Other vendor sample data, minor fixes
2018-04-06 13:24:02 +02:00
Vojtech Kral
d1c1dcbe8f
ConfigWizard: Factor out a PrinterPicker widget, finalize other vendors page
2018-04-06 13:24:02 +02:00
Vojtech Kral
8422cf93c0
ConfigWizard: Finalize custom setup
2018-04-06 13:24:02 +02:00
Vojtech Kral
e53949f2c8
Apply printer model / variant preferences when loading presets
2018-04-06 13:24:02 +02:00
Vojtech Kral
57e47a3296
AppConfig: Support for vendor / model / variant enable state
2018-04-06 13:24:02 +02:00
Vojtech Kral
3fcf194e39
ConfigWizard: Basic structure / WIP
2018-04-06 13:23:49 +02:00
Lukas Matena
7253028d79
Merge branch 'master' into wipe_tower_improvements
2018-04-06 12:33:12 +02:00
Lukas Matena
cb9937cde4
Corrected wipe tower comments in GCode
2018-04-06 12:02:52 +02:00
Enrico Turri
b4efff1d95
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-04-06 08:40:38 +02:00
bubnikv
e37cbdfcfc
Merge remote-tracking branch 'remotes/origin/profile_changes_reset'
2018-04-05 19:53:53 +02:00
Vojtech Kral
2b8da333ef
Semver: Semantic version parsing and arithmetics
2018-04-05 14:22:11 +02:00
YuSanka
6053c8f54d
Try to fix bug with CheckBox selection if cursor is in TextCtrl.
2018-04-05 13:52:30 +02:00
Enrico Turri
76beaa6421
Objects colored by extruder color
2018-04-05 12:52:29 +02:00
YuSanka
28b6d222f2
Next try to fix bug with CheckBox selection if cursor is in SpinCtrl.
2018-04-05 12:12:35 +02:00
Lukas Matena
6af45362ce
Purging volumes button is only shown when the wipe tower is enabled and we have single extruder MM printer with more than one extruder
2018-04-05 10:44:31 +02:00
bubnikv
a866011574
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-04-05 10:32:26 +02:00
bubnikv
4611b5094e
Fixed regression of the gyroid infill.
2018-04-05 10:31:53 +02:00
YuSanka
2eee3a64b7
First try to fix bug with CheckBox selection if cursor is in SpinCtrl.
2018-04-04 20:37:37 +02:00
Lukas Matena
706dd7020f
New extruder temperature is only set when it differs from the old one
2018-04-04 14:59:31 +02:00
Lukas Matena
290e3e66c0
Merge correction
2018-04-04 14:41:23 +02:00
Lukas Matena
eb9917536c
Merge branch 'master' into wipe_tower_improvements
2018-04-04 13:06:46 +02:00
Lukas Matena
597e8650a6
Fixed incorrect redraw of Purging volumes button in certain cases
2018-04-04 12:49:16 +02:00
Lukas Matena
1afe0af343
Merge branch 'wipe_tower_ui' into wipe_tower_improvements
2018-04-04 12:28:46 +02:00
Vojtech Kral
b0840065ed
Octoprint ( #804 )
...
* Octoprint progress dialog
* Fix curl version on Windows
2018-04-04 11:18:22 +02:00
YuSanka
1b08bc94f0
Added g_wiping_dialog_button status update to update_frequently_changed_parameters()
2018-04-04 11:13:28 +02:00
bubnikv
00324a14b8
Merge remote-tracking branch 'origin/scene_manipulators'
2018-04-04 11:06:45 +02:00
bubnikv
261f391ee3
Merge remote-tracking branch 'origin/3mf_io'
2018-04-04 11:05:29 +02:00
bubnikv
40bbabb6d0
Merge remote-tracking branch 'origin/time_estimate'
2018-04-04 11:04:31 +02:00
bubnikv
2f6fbfb338
Fix of SPE-183: Incorrect z values set into GCode Preview sliders.
...
Rework to replace layer top heights with averages of EPSILON intervals.
2018-04-04 11:00:25 +02:00
Lukas Matena
91d6deee03
Merge branch 'wipe_tower_config' into wipe_tower_improvements
2018-04-04 10:37:18 +02:00
bubnikv
be8acc5ac4
Moved "wiping_volumes_extruders", "wiping_volumes_matrix" from
...
print settings to project settings.
2018-04-04 10:18:26 +02:00
Lukas Matena
719adfbaf3
The layer height check for multiple objects is now only enabled when variable layer height is enabled
2018-04-04 09:59:41 +02:00
Lukas Matena
42baeee0ed
Fixed a bug regarding the sparse infill
2018-04-04 09:44:05 +02:00
YuSanka
d54425a901
Added show/hide of "Purging volumes" button depending on a state of "wipe_tower"
2018-04-03 22:07:59 +02:00
Lukas Matena
e5f23bc11d
Fixed bug - negative feedrate was issued during loading of a new filament
2018-04-03 14:35:54 +02:00
Lukas Matena
89686b808d
Added a check that all objects have the same layer height profile
2018-04-03 13:51:12 +02:00
Lukas Matena
281732ca38
Variable layer height enabled, nozzle diameters properly passed to the wipe tower generator
2018-03-29 15:32:09 +02:00
Enrico Turri
bf295b9039
Time Estimator and GCode Analyzer - Fixed handling of commands G90, G91, M82 and M83 - Fixes #812
2018-03-29 14:46:11 +02:00
Lukas Matena
6fd3f38717
Warning to show before ramming adjustements, vertical text in wiping dialog positioned better
2018-03-29 14:23:45 +02:00
Lukas Matena
572008546d
Vertical label in wiping matrix dialog
2018-03-29 12:04:09 +02:00
Lukas Matena
c73d564004
Merge branch 'wipe_tower_ui' into wipe_tower_improvements
2018-03-29 09:47:12 +02:00
YuSanka
c61ffe9f6b
Corrected UI for RammingDialog
2018-03-28 20:31:36 +02:00
bubnikv
fca7c8abfe
Fixed compilation and test cases.
2018-03-28 19:47:26 +02:00
bubnikv
33e1108f65
Background processing in C++, WIP.
2018-03-28 17:05:31 +02:00
Lukas Matena
1b4dc685f4
Connected filament_ramming_parameters to respective dialog, other minor changes
2018-03-28 15:37:10 +02:00
YuSanka
4da6085ef8
Corrected UI for WipingDialog
2018-03-28 02:17:51 +02:00
Lukas Matena
56fef5302c
Added axis-labels to RammingChart
2018-03-27 14:42:47 +02:00
Lukas Matena
7d9e892edc
Added a button to open purging volumes dialog directly from Plater
2018-03-27 13:44:18 +02:00
Enrico Turri
c166af5cce
GCode Preview - Fixed z values set on sliders
2018-03-27 11:35:48 +02:00
bubnikv
8639df1cfd
Removed an incorrectly placed status line update, causing stack
...
overflow in unit tests.
2018-03-26 11:21:53 +02:00
Enrico Turri
903a90f37a
AMF I/O - Forces .zip.amf extension on export
2018-03-26 08:58:44 +02:00
bubnikv
eed15c459b
Use asynchronous wxWidgets messages when posting between threads.
2018-03-23 17:39:19 +01:00
YuSanka
e7edb512b8
Saved bed_shape changes.
...
*code review
2018-03-23 17:27:43 +01:00
bubnikv
5063c15442
Fixed automatic tests.
2018-03-23 16:00:00 +01:00
YuSanka
77f5ed6851
Fixed bugs from SPE-180
2018-03-23 12:52:37 +01:00
bubnikv
e931f75010
Work in progress: Good bye, Perl Threads!
2018-03-23 11:41:20 +01:00
YuSanka
53e100b890
Changed PrusaResearch.ini.
...
*(Uncommented "printer_model","printer_vendor", "printer_variant", "default_filament_profile")
* Added msg "It's system preset" to Dependencies
2018-03-23 09:41:52 +01:00
Lukas Matena
3fdd182f0c
Parameters describing cooling tubes position etc moved to separate page in Printer Settings
2018-03-22 16:13:41 +01:00
YuSanka
08a8fe84a4
Merge remote-tracking branch 'origin/master' into profile_changes_reset
2018-03-22 14:18:48 +01:00
YuSanka
57b61470a3
"Advanced" options alignment
2018-03-22 14:12:29 +01:00
Enrico Turri
4b8bd48663
AMF and 3MF export - Export of print config customizable by user in the select file dialog
2018-03-22 13:49:48 +01:00
Lukas Matena
985b414c64
Removed parameter 'wipe_tower_per_color_wipe' from UI and configuration layer
2018-03-22 13:37:01 +01:00
Lukas Matena
036e41ae69
Wiping dialog - first experiments with sizers
2018-03-22 13:07:45 +01:00
YuSanka
44b711953f
Added preset parent description line to Dependencies
2018-03-22 11:46:15 +01:00
YuSanka
d7e2305686
"Undo"-buttons work
2018-03-22 10:56:57 +01:00
YuSanka
78208620c0
Correct updating of "Undo"-buttons according to the option changes
2018-03-22 09:37:42 +01:00
YuSanka
82f4e16a27
"Decorated" UI for options groups.
...
* Added prototype of undo-buttons for options groups;
* Fixed bugs with "decoration" updating after preset changing;
* Fixed wrong Ukrainian translation.
2018-03-21 22:21:37 +01:00
Lukas Matena
e7a5bc1afe
Added a check that no object uses extruder the printer doesn't have
2018-03-21 16:01:31 +01:00
Lukas Matena
9519fae490
Partial refactoring of wipe tower code (got rid of global constants, etc)
2018-03-21 15:57:17 +01:00
Lukas Matena
e30405d672
Merge branch 'master' into wipe_tower_improvements
2018-03-21 11:33:37 +01:00
Lukas Matena
1a1be94c99
Purging volume parameters normalization - minor changes
2018-03-21 10:20:36 +01:00
Enrico Turri
4a179c81d2
GCode Preview - Added visualization of volumetric flow rate
2018-03-21 10:03:10 +01:00
Lukas Matena
ac9db81820
Normalization of purging volume parameters when number of extruders is changed
2018-03-21 09:36:27 +01:00
Lukas Matena
0fc2da5a32
Wipe tower generator should now work for more than 4 extruders (actual number extracted from wiping_volumes_matrix)
2018-03-20 15:45:11 +01:00
Lukas Matena
a782424d5f
Wipe tower generator connected to purging volumes from the configuration layer
2018-03-20 15:07:18 +01:00
Lukas Matena
a923062167
Purging volume dialog improved and connected to configuration layer
2018-03-20 13:50:51 +01:00
Enrico Turri
f99aaa1191
Out of bed detection - New colors for out of bed state
2018-03-20 13:01:50 +01:00
Enrico Turri
1f3f109263
Out of bed detection - Fixed false detection due to float precision
2018-03-20 09:31:42 +01:00
Enrico Turri
99f7bd90db
Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview
2018-03-20 08:33:53 +01:00
YuSanka
f72bb89521
Reset to system value works for Extruders too
2018-03-19 17:21:37 +01:00
bubnikv
abbfac0404
Modified the Triangles / Stars / Cubic infill types to lessen overfill
...
along the perimeters:
Only the two first hatching lines (0 and 60 degrees) will be connected
along the perimeter lines. The 3rd hatching direction will not.
Inspired by a fix done by @alexrj.
2018-03-19 16:51:43 +01:00
bubnikv
ebf0ef48f1
Extended the Cooling Buffer G-code filter to remove repeated
...
G1 Fxx entries to reduce the G-code size and printer stutter.
Fixes https://github.com/prusa3d/Slic3r/issues/448
2018-03-19 16:38:32 +01:00
Lukas Matena
76b280c64c
Removed parameter 'wipe_tower_adhesion', it will always be true
2018-03-19 15:53:49 +01:00
Lukas Matena
349a8a88ae
Bug fix: speed for finish_layer was not properly set
2018-03-19 15:35:31 +01:00
Lukas Matena
e41eff9186
Wiping volumes options temporarily added to Print Settings
2018-03-19 15:30:54 +01:00
bubnikv
bfc9678839
why is strlen() defined by different include on different systems?
2018-03-16 19:26:13 +01:00
bubnikv
f353b098e5
Missing include on Linux/GCC
2018-03-16 19:11:08 +01:00
bubnikv
34a0f87395
Fixed the previous commit on Linux: The older GCC we are using
...
on our Debian build server does not support C++11 <codecvt>,
so the utf8 to utf16 conversion was replaced with Boost counterparts.
2018-03-16 18:56:01 +01:00
bubnikv
0bd9918643
Implements SPE-159 "substitute accented letters with non-accented ones"
2018-03-16 18:20:47 +01:00
YuSanka
7e6887cca8
Completed UI for system value changes
2018-03-16 17:25:11 +01:00
Lukas Matena
3d6f6530c0
Merge branch 'master' into wipe_tower_improvements
2018-03-16 14:06:23 +01:00
Lukas Matena
b556cec42d
Got rid of wipe_tower_advanced option
2018-03-16 13:58:58 +01:00
YuSanka
7f5bfe3ddc
First visualization of system value changes
2018-03-16 12:56:03 +01:00
bubnikv
63a98269bb
Merge branch 'master' into mesh_repair
2018-03-16 12:33:53 +01:00
bubnikv
1b23f9cd6e
Fixing compilation errors: A non-const reference does not accept
...
a temporary variable.
2018-03-16 10:04:42 +01:00
Vojtech Kral
c88d2780ce
Octoprint ( #796 )
...
* Octoprint: GUI for CA file, improvements
* Octoprint: Add GUI for Bonjour lookup, bugfixes
* Octoprint: Bonjour browser: Cleanup Perl interaction
* Octoprint: Bonjour: Perform several broadcast, UI fixes
* Octoprint: Add files to localization list
* Http: Disable CA File setting on SSL backends that don't support it
2018-03-15 18:06:26 +01:00
bubnikv
4f0c6dd879
Reworked the fix of #784 for efficiency and robustness:
...
First, the same direction segments are chained as before, but this time
the remaining open polylines are collected to be processed in the 2nd step.
Second, the remaining open polylines are connected by a greedy algorithm
disregarding their original orientation. As the orientation of loops
created by the 2nd step is mixed, the orientation of these loops is
unknown, therfore a CCW orientation is enforced. The CCW heuristics
may fill holes and cavities, but no outer geometry will be lost.
2018-03-15 17:14:13 +01:00
Lukas Matena
e864238609
Merge branch 'project_specific_config' into wipe_tower_improvements
2018-03-15 14:05:45 +01:00
Lukas Matena
67009d80fd
Ramming parameters reduced to one and connected to the wipe tower generator again
2018-03-15 14:04:12 +01:00
YuSanka
d97a8f5740
Merge remote-tracking branch 'origin/master' into profile_changes_reset
2018-03-15 10:24:54 +01:00
YuSanka
c3ec40c3cc
Added prototype of an "Undo to system" button
2018-03-15 09:55:31 +01:00
bubnikv
61ae78432c
Removed the unsupported "pillars" support pattern.
2018-03-14 20:08:34 +01:00
bubnikv
4351187ce5
Fixed Print::validate() to allow for objects protruding below the print bed.
...
The part of the object below the print bed will simply not be sliced.
This fix also fixes integration tests, which often work with boxes
centered around (0,0,0).
2018-03-14 18:16:17 +01:00
YuSanka
a41e55a773
Merge remote-tracking branch 'origin/profile_inheritance' into profile_changes_reset
2018-03-14 16:34:51 +01:00
bubnikv
757b0788ae
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-03-14 16:16:18 +01:00
bubnikv
ab654f6319
Merge branch 'scene_manipulators'
2018-03-14 16:15:26 +01:00
bubnikv
b43a21d1be
Extended Print::validate() to check, whether the objects
...
are inside the print volume.
2018-03-14 16:11:57 +01:00
Lukas Matena
9f18b639a8
Added filament_ramming_parameters and filament_ramming_buttons into configuration layer
2018-03-14 15:48:37 +01:00
YuSanka
639f2bc2f3
Update m_initial_extruders_count after preset changing
2018-03-14 15:38:54 +01:00
YuSanka
15b2522ed9
Update "fill_density" to initial preset value instead of to 40%
2018-03-14 15:10:16 +01:00
bubnikv
08bea91197
Merge remote-tracking branch 'remotes/origin/3mf_io'
2018-03-14 13:35:51 +01:00
bubnikv
56c2267d19
Merge branch 'gui_improvements'
2018-03-14 13:33:53 +01:00
bubnikv
e680658cf5
Fixed selection of sensible active print / filament / printer profile
...
after the initial wizard run.
2018-03-14 13:29:50 +01:00
bubnikv
1969a8b2c1
Fixed crash on start of the application in case there is no
...
profile available.
2018-03-14 13:12:17 +01:00
bubnikv
5f28b89ae0
Added a project specific config to the PresetBundle class.
...
This project specific config will be stored into the config.ini,
into .3mf and .amf and .gcode,
and recover it from the same files.
2018-03-14 11:54:11 +01:00
YuSanka
6d5d38eb6a
Fixed bug_2 with update infill parameters
2018-03-14 11:45:31 +01:00
YuSanka
d9e2e37da7
Fixed bug with update infill parameters
2018-03-14 10:14:48 +01:00
YuSanka
30f6e33656
Completed update of frequently changed parameters
2018-03-13 16:14:36 +01:00
Lukas Matena
cf5dfb9673
Started to move ramming dialog into filament settings
2018-03-13 15:54:29 +01:00
Enrico Turri
1ae8684af1
Modified TriangleMeshSlicer::make_loops() to fix #784
2018-03-13 13:32:50 +01:00
bubnikv
729d879b0e
Added the Prusa's vendor specific Config Bundle.
...
Added the "unlocked lock" icon when the system profile gets modified.
2018-03-13 09:45:04 +01:00
YuSanka
5bb736daf2
Infill(Plater) updates with Infill (Print Settings).
...
*Updated some fuctions
2018-03-12 16:52:21 +01:00
bubnikv
30c859ac7f
Added a lock icon to the list of filaments, added some
...
helper methods to PresetBundle.
2018-03-12 16:04:32 +01:00
Lukas Matena
27ab8ff4e1
Configuration layer changes (cooling_time, bridging, adhesion moved from dedicated dialog to filament/print settings)
2018-03-12 15:41:25 +01:00
Lukas Matena
b5fd4ddb8c
Removed an unnecessary wait
2018-03-12 08:35:35 +01:00
YuSanka
e8adbd7303
First prototype of adding of UI for frequently changed parameters
2018-03-09 18:34:30 +01:00
YuSanka
d5e136a6d5
Fixed bug with updating of the value of "Wipe while retracting" CheckBox.
2018-03-09 17:17:51 +01:00
bubnikv
f55becd43c
Introduced the system profiles.
...
The Config Wizard now just copies the Vendor's Config Bundle
into user_dir/vendor/ directory and Slic3r uses the configs
from the bundles found in user_dir/vendor directly.
2018-03-09 16:37:33 +01:00
Enrico Turri
d68804772a
GCode Preview - Added handling of G10 and G11 commands
2018-03-09 15:27:38 +01:00
Lukas Matena
1c6fa6660e
Merge branch 'master' into wipe_tower_improvements
2018-03-09 15:10:15 +01:00
Enrico Turri
50d74dfd20
Out of bed detection - Fixed compile on MacOS
2018-03-09 14:50:25 +01:00
Enrico Turri
7a2df9f54f
Out of bed detection - Volumes' layer texture rendering moved to cpp
2018-03-09 14:33:44 +01:00
Lukas Matena
6e39f61198
Priming extrusions, nozzle-wipes when leaving tower, removed few unnecessary moves
2018-03-09 12:40:39 +01:00
Enrico Turri
bdd2d725c8
Out of bed detection - 1st installment
2018-03-09 10:40:42 +01:00
YuSanka
419721ce22
Fixed bug with highlighting of modified parameters after changing the profile
2018-03-09 08:34:32 +01:00
Lukas Matena
8340a71f88
Lots of unnecessary code removed, minor refactoring changes
2018-03-08 16:44:52 +01:00
YuSanka
9ebb0f27c1
Fixed bugs with spiral_vase and standby_temperature_delta
2018-03-08 16:33:38 +01:00
YuSanka
418e083781
Fixed Linux build
2018-03-08 14:01:14 +01:00
YuSanka
986ee50437
Completed UI to visualize changes and to reset to initial value
2018-03-08 11:58:06 +01:00
Enrico Turri
124c37641d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview
2018-03-08 08:36:55 +01:00
bubnikv
f0fde26295
Implemented inheritance of profiles inside a config bundle.
...
Updated the Prusa's presets to match the initial flat config bundle.
2018-03-07 16:48:28 +01:00
Lukas Matena
f5cf181372
Sparse infill repositioned always to the same side
2018-03-07 15:34:12 +01:00
YuSanka
38dca8396f
Updated back_to_initial_value and fixed some bugs for Extruders
2018-03-07 15:25:24 +01:00
Lukas Matena
76aa134f66
Ramming lines that would end unsupported are made longer to reach to the edge
2018-03-07 11:44:47 +01:00
Enrico Turri
fe59958ea8
GCode Preview - Unified preview data ranges to ensure proper paths colors
2018-03-07 09:17:59 +01:00
Lukas Matena
e1922cb2c5
Supressed preview on unloadingmoves
2018-03-07 08:55:53 +01:00
Lukas Matena
af281e13db
Last wipe on layer accounts of border and sparse infill (ugly, yet working)
2018-03-06 19:14:12 +01:00
YuSanka
dd7712d4d3
Fixed bug with case-sensitive name of icon (for Linux build)
2018-03-06 14:58:51 +01:00
YuSanka
254e311593
Delete background color changing (except of MSW)
2018-03-06 13:34:39 +01:00
YuSanka
d0d83526b4
Merge remote-tracking branch 'origin/master' into gui_improvements
2018-03-06 12:47:20 +01:00
YuSanka
3caf54c359
Undo buttons work
2018-03-06 12:34:20 +01:00
Enrico Turri
d91f59379b
GCode Preview - Fixed values in range labels of legend texture
2018-03-06 12:12:00 +01:00
bubnikv
4a90ab1f6a
Merge branch 'octoprint'
2018-03-06 11:39:44 +01:00
Enrico Turri
9f7607c064
3mf I/O - Fixed object sinking into bed after import
2018-03-06 10:26:39 +01:00
bubnikv
51da42734a
Merge remote-tracking branch 'origin/http+build'
2018-03-06 10:15:17 +01:00
YuSanka
4547755221
Update UI for visualize changes:
...
* Added changing of text color and inserted undo_button when some option is modified.
* Call wxSetlocale(LC_NUMERIC, "C") when do language changing.
2018-03-06 09:46:26 +01:00
Enrico Turri
7320a87183
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-03-06 08:35:28 +01:00
Vojtech Kral
ca0f6131a1
WIP: Bonjour: TXT + improvements
2018-03-05 18:33:15 +01:00
Vojtech Kral
fc05eb898d
WIP: Bonjour
2018-03-05 18:33:15 +01:00
Vojtech Kral
7cfc5204c8
WIP: OctoPrint
2018-03-05 18:33:15 +01:00
Lukas Matena
6c223c2f84
Fixed cooling time calculation, removed unnecessary diagonal moves, fixed 'stringing' on start and end of narrower wipe tower layers
2018-03-05 16:51:31 +01:00
Vojtech Kral
751e86cd4d
libcurl linking and cmake usage improvements
2018-03-05 16:31:24 +01:00
Vojtech Kral
14929e9d15
Http client via libcurl
2018-03-05 15:52:17 +01:00
bubnikv
3c64eb9215
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-03-05 15:31:32 +01:00
Lukas Matena
4058f00275
Added print head moves after ramming and removed one unnecessary diagonal move
2018-03-05 13:53:49 +01:00
bubnikv
5ea584280c
Merge remote-tracking branch 'remotes/origin/gui_improvements'
2018-03-05 12:12:40 +01:00
Enrico Turri
352d5d0baa
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-03-05 11:53:15 +01:00
Enrico Turri
802579ad20
Fixed crash while exporting to .amf and .gcode files ( #753 ) - (improves previous fix: d4f1ed0036
)
2018-03-05 10:53:18 +01:00
Lukas Matena
5aca3045b9
(Un)loading speed and delay introduced into wipe tower generator
2018-03-05 10:45:35 +01:00
YuSanka
f750abb9db
Refactor load_config() function
2018-03-04 15:21:01 +01:00
Lukas Matena
b3e9b82280
(Un)loading speed and time delay parameters introduced into GUI and conf. layer (not yet into wipe tower generator)
2018-03-02 15:52:16 +01:00
YuSanka
2a378f6590
Fixed problem with changing extruders color
2018-03-02 13:41:37 +01:00
Lukas Matena
e1421da5e8
Integrating cooling tube parameters into wipe tower generator
2018-03-02 13:26:16 +01:00
YuSanka
222368f7e8
Start of realization UI to visualize changes
2018-03-02 09:08:11 +01:00
Lukas Matena
d2006c8d8e
Cooling tubes parameters added into GUI and configuration layer (not yet into wipe tower generator)
2018-03-01 16:15:00 +01:00
Lukas Matena
1d787a15a0
Fix for win builds
2018-03-01 09:57:51 +01:00
Lukas Matena
c76c075569
Yet another attempt to fix Win builds
2018-03-01 09:19:34 +01:00
Lukas Matena
b1b16359d9
Changes in includes in order to fix Win builds
2018-03-01 08:43:43 +01:00
Lukas Matena
9ea803b000
Attempts to fix OSX and Win builds
2018-02-28 19:53:32 +01:00
Lukas Matena
a62ad3323f
First naive implementation of wipe tower settings dialog
2018-02-28 16:04:56 +01:00
YuSanka
751c97c503
Localize the Plater tab
...
* Marking and translation of Plater tab are complited
* GUI.pm is marked to l10n
* Fix small bug with Extruder adding at Printer Settings tab
2018-02-28 15:41:35 +01:00
Enrico Turri
0e896e48e4
3mf I/O - Added import and export of modifiers
2018-02-28 12:11:41 +01:00
Enrico Turri
8cd42966d6
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-02-28 11:45:23 +01:00
Enrico Turri
0ec68eb35b
Fix for issue #661 (ExPolygons generation)
2018-02-28 11:41:04 +01:00
Enrico Turri
ecac4ab175
3mf I/O - Added import and export of object's and volume's name
2018-02-27 15:46:54 +01:00
Enrico Turri
2a2bdaa0e0
3mf I/O - Added import and export of object's and volume's config data
2018-02-27 10:49:51 +01:00
YuSanka
0596660dda
Fix bug with not displaying flags for incompatible presets
2018-02-27 09:51:14 +01:00
Lukas Matena
3099c32d08
GUI - reenabling rotation angle settings for the wipe tower (was disabled by the merge with master)
2018-02-27 08:56:11 +01:00
YuSanka
7047f4365a
Update localization:
...
* 2D.pm, 3DPreview.pm, PreviewData.cpp are marked by L()
* use translating function in 3DScene.cpp
2018-02-26 16:23:44 +01:00
YuSanka
e05493bd90
Fixed wrong printing of recommended_thin_wall_thickness_description_line
2018-02-26 13:57:36 +01:00
YuSanka
f3f78ebc5a
Fix #742
2018-02-26 09:57:08 +01:00
bubnikv
edb756c084
Refactored the gyroid infill.
2018-02-23 18:32:35 +01:00
bubnikv
69fc99edbb
Merge remote-tracking branch 'remotes/origin/gui_translate_to_cpp'
2018-02-23 15:32:13 +01:00
YuSanka
d61295eb10
Added Preferences files
2018-02-23 14:55:27 +01:00
bubnikv
68c51be130
Merge remote-tracking branch 'remotes/origin/mesh_repair'
2018-02-23 14:38:37 +01:00
bubnikv
d0df673c82
Merge remote-tracking branch 'remotes/origin/time_estimate'
2018-02-23 14:34:01 +01:00
bubnikv
8fb443522b
Merge remote-tracking branch 'remotes/origin/gcode_preview'
2018-02-23 14:33:16 +01:00
YuSanka
baa5726532
All project is ready to localization.
...
* Macro _LC is changed to _CHB. [to put translated string into std::string correctly]
* Macro _LS is changed to L. [to mark string to translation]
* Standard wxWidgets macro _() is used for translation now.
* Updated POfile for EN
2018-02-23 14:25:49 +01:00
bubnikv
c3d7be5994
Merge remote-tracking branch 'remotes/origin/3mf_io'
2018-02-22 18:57:07 +01:00
Enrico Turri
52eb6f6bcf
Remove .zip from file extension on import to avoid having it added again and again when exporting
2018-02-22 15:27:32 +01:00
YuSanka
bc97184c63
Fixed #735 & PresetHints.cpp is marked to localization
...
* Macro _LC is created to put translated string into std::string correctly.
* Macro _LU8 is changed to function L_str.
* Created function from_u8
2018-02-22 14:19:41 +01:00
Lukas Matena
d17229efd5
Gyroid infill - minor correction for standard-conforming compilers
2018-02-22 12:00:24 +01:00
YuSanka
3d805a0f43
PreferencesDialog moved to C++ part
2018-02-22 11:12:29 +01:00
Lukas Matena
5f5a59328b
Minor refactoring, actualized comments, etc.
2018-02-22 11:03:29 +01:00
Merill
d59bb027eb
Gyroid infill type ( #733 )
...
Gyroid infill type.
2018-02-22 09:56:05 +01:00
Lukas Matena
5a02bde170
Fix of merge conflict and uninitialized variables in writer class
2018-02-22 09:28:31 +01:00
Enrico Turri
81eff20ad1
GCode Preview - Added Custom extrusion role + extended layers range for GCode preview
2018-02-22 08:59:47 +01:00
Lukas Matena
de92f45eaf
Merge with master
2018-02-21 13:22:51 +01:00
Lukas Matena
5ca0a2f37d
Parametrized toolchanges, experiments with sparse wipe tower, etc
2018-02-21 13:07:32 +01:00
Enrico Turri
36601723a2
4th attempt to fix JIRA SPE-26 (Feature types on MAC)
2018-02-20 15:22:30 +01:00
Enrico Turri
23b1c8f1d2
3rd attempt to fix JIRA SPE-26 (Feature types on MAC)
2018-02-20 14:44:00 +01:00
Enrico Turri
26409cbade
2nd attempt to fix JIRA SPE-26 (Feature types on MAC)
2018-02-20 14:25:40 +01:00
YuSanka
23f96e30c3
Fixed wrong saving of "percent or millimeters" parameters
2018-02-20 12:30:13 +01:00
Enrico Turri
a569de44b6
1st attempt to fix JIRA SPE-26 (Feature types on MAC)
2018-02-20 11:40:15 +01:00
YuSanka
6ad38f80fb
Language configuration is saved now in AppConfig instead of wxConfig.
2018-02-20 08:58:46 +01:00
Enrico Turri
eeada56c1f
1st attempt to fix JIRA SPE-22 (wrong file export on MAC)
2018-02-19 15:33:01 +01:00
YuSanka
f5ae470e5e
Completed translation to Ukrainian.
...
* Signs of degree are returned to UTF-8 in PrintConfig.
* Changed _LU8 macro. It's translated now like string explicitly specified as a string is already in UTF-8 encoding.
2018-02-19 15:32:22 +01:00
Enrico Turri
d4f1ed0036
Fixed crash while exporting MultiMaterial
2018-02-19 13:46:36 +01:00
Enrico Turri
7375f6a6f5
Fixed camera shifting after generating gcode
2018-02-19 11:28:56 +01:00
YuSanka
c6ff5ccbf4
Updated TextCtrl::BUILD()
2018-02-19 09:15:15 +01:00
YuSanka
867e867cdd
Merge remote-tracking branch 'origin/master' into gui_translate_to_cpp
2018-02-19 08:41:41 +01:00
YuSanka
f330eb9567
Fixed set_value() bug. Fixed Infill density.
...
* Got rid of try/catch at PointCtrl::set_value().
* Optimized localization: got rid of redundant macro _LU8(s).
2018-02-19 00:01:11 +01:00
fsantini
ac904b2731
Error messages in parsing variables ( #722 )
...
Making error messages more clear when a vector or scalar is found in macro parsing, and the other type is expected.
2018-02-16 17:27:50 +01:00
YuSanka
4d9eac0750
Fix porting Tab.title() from cpp to Perl
2018-02-16 15:49:18 +01:00
YuSanka
12b9a513c1
Escape from try/catch in Tab and OptionsGroup
...
* Deleted macro _LU8 from GUI.hpp. It's used only in Option class now.
* Added macro _LS to mark string used at localization (It returns same string)
2018-02-16 15:41:33 +01:00
bubnikv
f876946358
Merge remote-tracking branch 'origin/gui_translate_to_cpp'
2018-02-15 18:32:51 +01:00
bubnikv
39100068c1
Removed the Perl Tab & BedDialog as they were replaced by their C++
...
counterparts.
2018-02-15 18:16:19 +01:00
bubnikv
f1840a52db
Merged the C++ port of the GUI Tabs / OptionGroup / Option classes
...
by @YuSanka, thanks @lordofhyphens for the initial port
of the OptionGroup / Option.
2018-02-15 18:13:37 +01:00
YuSanka
59cee4a3aa
Thanks @stelgenhof Corrected units of measure that had exponents displayed with caret.
2018-02-15 18:06:37 +01:00
YuSanka
e0933786e3
Marked string used at localization.
...
* Correct save changed color
2018-02-15 17:30:33 +01:00
bubnikv
b695089bc4
Merge remote-tracking branch 'remotes/origin/3mf_io'
2018-02-15 17:02:47 +01:00
Enrico Turri
1489b9901b
Added workaround into admesh stl_fix_normal_directions() function to prevent meshes to be broken by the repairing process ( fixes #716 , #574 , #413 , #269 , #262 , #259 , #230 , #228 , #206 )
2018-02-15 16:10:47 +01:00
bubnikv
f9cdda7bfd
Delayed loading of the opengl texture for the G-code preview legend,
...
as the opengl context may not be ready on some platforms (Linux)
at the time the window gets its focus for the first time.
Changed the G-code preview invalidation to trigger when the print
gets invalidated. At that time the 3D path preview switches to the old
preview, if there is anything valid left.
2018-02-15 14:37:53 +01:00
bubnikv
b5bdb46268
Added logging of the G-code export.
2018-02-14 22:25:09 +01:00
bubnikv
ff3ae40aeb
Fixed compilation issues caused by the previous commits
2018-02-14 21:57:46 +01:00
bubnikv
2caba92623
GCode/PreviewData.cpp,hpp has been split from GCode/Analyzer.cpp,hpp
2018-02-14 20:38:03 +01:00
bubnikv
b1f5e7e8fa
Removed the GCodePreviewData from the Print class, it does not belong here,
...
as the GCode is generated outside of the Print class.
Exported the GCodePreviewData as GCode::PreviewData to Perl.
When exporting the G-code with a command line Slic3r,
the GCodeAnalyzer is now supressed for performance reasons.
Removed obsolete Perl module Slic3r::GUI::Plater::3DToolpaths.
2018-02-14 20:35:59 +01:00
bubnikv
3a6436f6f0
Split the GCodePreviewData from the GCodeAnalyzer,
...
as in the next step the GCodePreviewData will be exported to Perl.
2018-02-14 18:42:09 +01:00
Enrico Turri
dcc667cdc7
AMF I/O - Fixed error messages
2018-02-14 15:52:39 +01:00
Enrico Turri
f5f27859e0
AMF I/O - Embedded config data + zip formatting
2018-02-14 14:30:03 +01:00
bubnikv
6cf8264362
Re-enabled $combochecklist_features->UseAltPopupWindow(), without this
...
line the combo box popup was not reacting to mouse events on Windows 10.
2018-02-13 17:46:23 +01:00
YuSanka
39fae3777c
Marked all informative strings by macros _L and _LU8.
2018-02-13 16:05:53 +01:00
Enrico Turri
bacb36eb10
3mf - Fixed include for Linux build
2018-02-13 15:33:45 +01:00
Enrico Turri
8885f5e344
3mf import/export of config data
2018-02-13 15:19:55 +01:00
bubnikv
030fc9c320
Merge branch 'master' into gcode_preview
2018-02-13 14:55:54 +01:00
YuSanka
752d089814
Fixed Issue #478
2018-02-13 13:39:20 +01:00
Enrico Turri
f4522cd2fc
GCode Preview - Customizable extrusion role colors by editing 3DPreview.pm
2018-02-13 13:16:23 +01:00
bubnikv
a5e48cdf4d
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-02-13 11:19:34 +01:00
bubnikv
e7f05f8516
Fix of "Crash while trying to slice with a raft" #686
...
This was an issue specific to multi-material print with raft
and no support.
2018-02-13 11:18:58 +01:00
Enrico Turri
e77111bf98
Fixed crash when importing .prusa files
2018-02-13 10:25:55 +01:00
bubnikv
81a80ebd61
Synchronized the GCodeSender with the upstream Slic3r, thanks @alexrj.
...
Fixes https://github.com/prusa3d/Slic3r/issues/654
2018-02-12 20:44:06 +01:00
bubnikv
6f92424bab
Fix of https://github.com/prusa3d/Slic3r/issues/709
...
A regression error has been introduced into Slic3r 1.38.xx series
for the float/percent config value, where the value was considered
unchanged if the percent sign has been added or removed.
2018-02-12 19:06:05 +01:00
bubnikv
47d904a628
Changed the Slic3r coordinate type from long to int32 to match
...
the point type on Windows / Linux / OSX
to achieve the same behavior on all the 32 / 64bit systems.
(Windows always treats the long as 32bit int, while Linux treats
long as a 64bit int).
2018-02-12 18:16:10 +01:00
bubnikv
adc9e749c4
Clipper should always throw clipperExceptions, not strings.
2018-02-12 16:34:39 +01:00
bubnikv
0571d22d5f
Fix of https://github.com/prusa3d/Slic3r/issues/707
...
This is a crash due to the recommended thin wall thickness hint.
2018-02-12 15:37:42 +01:00
YuSanka
77bac4c17a
Fixed wrong filling of TextControl, when value is double.
2018-02-12 15:29:21 +01:00
Enrico Turri
3f006dc11a
GCode Preview - Added objects and wipe tower transparent shells
2018-02-12 09:04:05 +01:00
YuSanka
badeb2f64c
Save language preset.
...
* Added global variable g_local_dir to get "localization" directory.
* Chage/Set language works correctly now.
* Probably, fixed work on Linux
2018-02-12 08:57:32 +01:00
YuSanka
d18a200b0f
Fix biuld on Linux a OSX
2018-02-09 12:07:59 +01:00
YuSanka
abcfd5bad9
Implemented Application recreate after changing of language.
...
* Implementation of C++ to Perl callbacks from menu item Localization.
* Added global variable g_tabs_list to control existing Tabs.
2018-02-09 11:04:34 +01:00
Enrico Turri
33553e1c50
3mf Exporter - 1st installment
2018-02-08 13:26:50 +01:00
YuSanka
43aa1680cb
Added menu item for selection of application language from the list of installed languages.
...
* m_Local and its functions moved to GUI.cpp.
* Strings in some files(GUI.cpp, Tab.cpp, Tab.hpp & Field.cpp) marked by _L() macro.
* Updated mo-files for En and Uk languages.
2018-02-08 10:58:13 +01:00
YuSanka
28115a847c
First steps for implementing localization
...
* Created mo-files for Ukrainian and English languages
* For this moment it works only on BedShapeDialog.
2018-02-07 17:13:52 +01:00
Enrico Turri
0d6a013658
GCode Preview - Coloring by tool
2018-02-07 09:07:37 +01:00
YuSanka
407f50a66f
Deleted on more EVT_NOTEBOOK_PAGE_CHANGE hangling of TabPanel
2018-02-06 14:53:38 +01:00
Enrico Turri
6ff9021e04
GCode Preview - Legend texture shown only when gcode is available
2018-02-06 12:43:25 +01:00
YuSanka
6bff67a865
First experiments with wxLocale
2018-02-05 16:12:16 +01:00
Enrico Turri
593d794655
Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview
2018-02-05 13:28:10 +01:00
Enrico Turri
6e14e6ef17
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-02-05 13:18:56 +01:00
Enrico Turri
f9dd251276
GCode Preview - Added feature type for wipe tower
2018-02-05 13:16:08 +01:00
YuSanka
a72184684c
Fix compilation on Linux and OSX
2018-02-05 12:49:23 +01:00
YuSanka
2d3c2dc595
Fix of #696 in cpp's Tabs,
...
using changes from commit 36bbd6a
2018-02-05 11:03:13 +01:00
bubnikv
ea9920e5d6
Fix of Negative Feedrates: G1 F-3.84007e+006 stops smoothie
...
The problem was caused by the gap fill algorithm, which worked
with square extrusion width values as with rounded extrusion widths,
which sometimes lead to negative extrusion cross sections
for high height to width ratios.
The extrusion width logic has been changed to consider the input width
to be the extrusion spacing, not the extrusion width. The change certainly
removed the negative feed rates, but it also certainly increased the gap
fill width to some exent. It needs to be verified now, whether the gap fill
does not extrude too much.
https://github.com/prusa3d/Slic3r/issues/677
2018-02-02 19:48:16 +01:00
Enrico Turri
fe8dfb9c9b
GCode Preview - fixed Linux build (include in GUI.cpp) 2nd attempt
2018-02-02 13:56:25 +01:00
Enrico Turri
556c9c236f
GCode Preview - fixed Linux build (include in GUI.cpp)
2018-02-02 13:28:37 +01:00
Enrico Turri
a5c4751718
GCode Preview - void wxCheckListBoxComboPopup::OnListBoxSelection(wxCommandEvent& evt) fixed for OsX and Linux
2018-02-02 12:58:31 +01:00
Enrico Turri
787a5f1715
GCode Preview - New Layout
2018-02-02 12:38:35 +01:00
bubnikv
b4483fdcbd
Fix of "Conditional gcode with "<=" condition fails"
...
https://github.com/prusa3d/Slic3r/issues/683
2018-02-02 11:49:09 +01:00
bubnikv
8932055ed5
Fixed spelling of Elephant foot compensation from Elefant to Elephant.
...
Unfortunately the settings is out in the wild, so we did not fix
the spelling of the config value name.
2018-02-02 11:38:30 +01:00
YuSanka
d9521fe733
One more try to fix compilation on OSX
2018-02-01 12:09:09 +01:00
YuSanka
e375a0d5ac
Try fix compilation on OSX
2018-02-01 10:39:27 +01:00
YuSanka
46c39d6ef7
Try fix compilation on OSX
2018-02-01 10:24:12 +01:00
YuSanka
33280b7069
Next try fix compilation on OSX
2018-02-01 10:01:05 +01:00
YuSanka
d414c6e118
Fix compilation on OSX & Linux
2018-02-01 09:29:07 +01:00
YuSanka
733c85936b
Eliminated the g-code pop up text description
...
(switch Enable of Tooltip to false,
when clicking mouse left button inside the control).
2018-01-31 16:46:17 +01:00
YuSanka
54dbc916a8
Fixed strange behavior of Text- and Spin- control on KillFocus event
2018-01-31 14:59:44 +01:00
Enrico Turri
c550ad2268
GCode Preview - Travel moves colored by speed
2018-01-31 11:35:35 +01:00
Enrico Turri
d2d2a3fa8e
speed in mm/s
2018-01-31 10:34:00 +01:00
Enrico Turri
29853a3a45
GCodeTimeEstimator - Added move statistics log (for debug purpose)
2018-01-30 13:18:21 +01:00
YuSanka
667ffa6101
Added changes missing from the previous commit.
2018-01-30 12:13:55 +01:00
YuSanka
7d29a7b45a
BedShapeDialog and Bed_2D (as a part of it) are completed.
...
Added new_scale function to Polyline.
Fixed small bug in PointCtrl.
Extended change_opt_value for coPoints case.
2018-01-30 12:10:12 +01:00
Enrico Turri
475f892413
3mf Importer - 1st installment
2018-01-30 09:27:10 +01:00
Enrico Turri
893201d3d9
3mf Importer - Added miniz library
2018-01-30 08:48:58 +01:00
YuSanka
f90ea5060d
Fixed performance of preset switching.
2018-01-27 17:39:00 +01:00
YuSanka
8c7a56d4ea
Eliminated the g-code pop up text description.
...
Fixed correct writing of TextCtrl values.
2018-01-27 14:21:16 +01:00
YuSanka
6ef5e6bd3d
Deleted Perl's Tabs,
...
but still printer preset switching work very slowly.
2018-01-26 03:24:01 +01:00
YuSanka
4056978731
Implementation of C++ to Perl callbacks from Browse & Test buttons.
2018-01-26 01:44:34 +01:00
YuSanka
4d234e90ae
Some modifications:
...
- Added no_controller to create_preset_tab().
- Small changes in Tab"Setting" constructor.
2018-01-25 21:45:39 +01:00
YuSanka
fced9a85ec
Merge remote-tracking branch 'origin/master' into gui_translate_to_cpp
2018-01-25 13:59:15 +01:00
YuSanka
f0b035059a
Merge with bibnikv.
...
Added some functions to TabIface.
Added BedShapeDialog & Bed2D classes.
Added new_scale to Polygon.
In class Field: Point renamed to PointCtrl and added set_value for PointCtrl, extended get_value for Choice.
2018-01-25 13:46:04 +01:00
bubnikv
a1705c093b
Renamed Tab.h to Tab.hpp
2018-01-23 11:42:04 +01:00
bubnikv
91c7bc43d3
Added new files missing from the previous commit.
2018-01-23 11:37:45 +01:00
bubnikv
09c9f6bdc3
Added TabIface C++ wrapper for GUI::Tab C++ class,
...
exported the TabIface to Perl.
2018-01-23 11:37:19 +01:00
bubnikv
1d10a2293a
Example implementation of C++ to Perl callbacks using wxWidgets command events.
2018-01-21 23:35:00 +01:00
bubnikv
ea8b3a5dc0
Will clang & gcc eat it now?
2018-01-21 22:23:59 +01:00
bubnikv
f529269f62
GCC requires explicit conversion from wxString to std::string.
2018-01-21 22:04:57 +01:00
bubnikv
a78fa58b51
Fix compilation on OSX
2018-01-21 21:56:20 +01:00
bubnikv
28c929f14d
Replaced UTF8 characters in string literals with \uxxxx.
...
Replaced std::make_unique with Slic3r::make_unique to support old C++11
compilers.
2018-01-21 21:42:06 +01:00
Enrico Turri
be63cb7d12
Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview
2018-01-19 08:49:11 +01:00
YuSanka
bd113ea882
Extended load_config and deleted call of CallAfter,
...
because of in some cases it causes undate() function to be recalled again.
2018-01-18 16:36:26 +01:00
YuSanka
5162cddd5e
Added SavePresetWindow dialog.
2018-01-18 11:45:25 +01:00
Enrico Turri
6591620200
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-01-18 09:16:37 +01:00
Enrico Turri
d34f3ffc83
Fix for #574 , #413 , #269 , #262 , #259 , #230 , #228 , #206
2018-01-18 09:15:04 +01:00
Enrico Turri
a417cf955d
GCode Preview - Code cleanup
2018-01-17 10:39:05 +01:00
YuSanka
d6568f9ce7
To Tab added functions to save/delete/upload presets...
...
Changed m_options OptionsGroup from const t_optiondef_map& to std::map<t_config_option_key, Option>.
2018-01-16 16:28:01 +01:00
Enrico Turri
c63e6b74fa
GCode Preview - Added legend texture
2018-01-16 14:59:06 +01:00
YuSanka
636af8933c
Added class ogStaticText to the static text shown among the options.
...
Fixed bugs in Tab.
2018-01-15 12:13:05 +01:00
YuSanka
8e0cd35c23
Merge remote-tracking branch 'origin/master' into gui_translate_to_cpp
2018-01-14 21:58:21 +01:00