Enrico Turri
4579b71a66
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 15:07:56 +02:00
Enrico Turri
3fac0d92cd
Unified opengl textures
2018-07-18 15:07:52 +02:00
Enrico Turri
d805c8ac3b
Disable slicing when one object crosses the print volume boundary
2018-07-18 14:26:42 +02:00
tamasmeszaros
9559ad77e5
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-18 10:14:28 +02:00
Enrico Turri
5c90746914
Merge with master + resolved conflicts
2018-07-17 10:44:23 +02:00
bubnikv
83f9813f56
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-07-17 09:37:38 +02:00
Enrico Turri
8175c9d306
Merge with master
2018-07-17 08:54:17 +02:00
bubnikv
210eeff160
Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets'
2018-07-16 19:52:17 +02:00
YuSanka
54298c8e61
First right-panel reorganization:
...
* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list
2018-07-04 09:03:43 +02:00
bubnikv
6b3c24359b
Merge branch 'master' into amf_activate_existing_presets
2018-06-28 22:00:10 +02:00
tamasmeszaros
85474e5803
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
...
# Conflicts:
# CMakeLists.txt
# lib/Slic3r/GUI/MainFrame.pm
2018-06-28 18:50:39 +02:00
tamasmeszaros
ad4d95f60c
AppController integration
2018-06-28 18:47:18 +02:00
tamasmeszaros
d337b69407
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-27 17:44:33 +02:00
tamasmeszaros
ac9d81cfa0
Refactor and extensions to png export dialog.
2018-06-27 17:43:54 +02:00
Enrico Turri
7ff22b9413
Time estimate emitted to gcode at requested interval
2018-06-27 15:35:47 +02:00
Enrico Turri
3dba0be81e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 15:32:31 +02:00
Enrico Turri
d02c90d5d0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 13:54:39 +02:00
Chow Loong Jin
8eb8a8b1f6
Fix format-security violation with croak
...
Missed one in https://github.com/prusa3d/slic3r/pull/802 .
2018-06-27 13:54:07 +02:00
Enrico Turri
48915a65fd
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 13:52:57 +02:00
Enrico Turri
8db4fdc24c
3rd attempt to fix opengl on ubuntu
2018-06-27 12:36:49 +02:00
Enrico Turri
5c32347449
1st attempt to fix opengl on ubuntu
2018-06-27 11:31:11 +02:00
bubnikv
68e82a7348
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
tamasmeszaros
c28b602465
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-27 09:36:05 +02:00
tamasmeszaros
d2c6190cc5
Comments and refactoring
2018-06-26 17:02:46 +02:00
Enrico Turri
ab587babb9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-26 12:20:41 +02:00
Enrico Turri
9b2f760679
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-26 12:20:23 +02:00
Enrico Turri
a754de4c32
Fixed panning in Layers view
2018-06-26 11:17:30 +02:00
YuSanka
0371f368a4
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-06-26 09:26:27 +02:00
tamasmeszaros
3efe6675cb
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-25 17:14:29 +02:00
Enrico Turri
714204b227
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 15:27:06 +02:00
Enrico Turri
7b0ba7a9d4
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-25 15:24:58 +02:00
Enrico Turri
40b327eb11
Fix of interaction between opengl contexts and main page notebook
2018-06-25 15:17:13 +02:00
tamasmeszaros
f26cb9ebd6
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
...
# Conflicts:
# lib/Slic3r/GUI/MainFrame.pm
2018-06-25 13:24:37 +02:00
Enrico Turri
f9e6bcf872
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:26:14 +02:00
Enrico Turri
ac0f3a6ef7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-22 16:13:51 +02:00
Enrico Turri
2a03b90d2b
Forced render of 3D scene when changing tab in plater's notebook
2018-06-22 16:06:37 +02:00
Enrico Turri
00ef0610a5
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-22 12:57:16 +02:00
Enrico Turri
f8982c0ca1
Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-22 12:30:15 +02:00
YuSanka
c10e9a6840
Fixed crash-bug when close application after language changing
2018-06-22 12:27:56 +02:00
Enrico Turri
ac7d21b50a
Geometry info updated while using gizmos
2018-06-22 11:19:38 +02:00
YuSanka
9ba1af5834
Merge remote-tracking branch 'origin/master' into add_kinematics
2018-06-22 09:22:29 +02:00
Enrico Turri
a7e9ec5757
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 11:05:07 +02:00
Enrico Turri
4ee365194a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-21 11:03:38 +02:00
Vojtech Kral
1ba81655e2
Octoprint: Add a dialog for setting the filename/path
...
and a "print now" option
cf. #880 , #245 , #55 , #87
2018-06-21 10:44:29 +02:00
Enrico Turri
550f6e307f
Faster gizmos update
2018-06-21 08:37:04 +02:00
tamasmeszaros
8dcf789d4b
Slicing in C++ with progress indication.
2018-06-20 14:50:18 +02:00
bubnikv
6b2b970b9a
Added machine evelope configuration parameters
...
(the MachineEnvelopeConfig class).
Added localization support for libslic3r through a callback
(the callback is not registered yet, so the localization does nothing).
Localized the Print::validate() error messages.
2018-06-20 13:57:37 +02:00
Enrico Turri
fa9014fc8e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-20 08:32:27 +02:00
tamasmeszaros
5f310e1520
AppController class created to take the necessary app logic into C++.
2018-06-19 17:45:21 +02:00
bubnikv
6fef5a07ab
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
...
Disabled the gizmos.
2018-06-19 16:12:36 +02:00
bubnikv
5a56f08aad
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-06-19 16:08:53 +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
Enrico Turri
a3949b9f01
Object updated by scale gizmo
2018-06-18 15:07:17 +02:00
tamasmeszaros
4328ecc287
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-18 12:17:19 +02:00
Enrico Turri
52a7d7ed09
Partial perl code cleanup
2018-06-14 16:09:36 +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
b2cf576bf3
1st installment of gizmos
2018-06-13 09:12:16 +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
Enrico Turri
af3d07bb05
Attempt to workaround bug in wxWidgets IsShownOnScreen() method
2018-06-12 09:18:25 +02:00
Enrico Turri
44220530cb
Use a single gl context created in c++
2018-06-11 15:49:04 +02:00
Enrico Turri
085110c4d9
Removed 3DScene volumes from perl
2018-06-11 13:48:02 +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
Enrico Turri
bf2fd54578
reload_scene method of 3D class moved to c++
2018-06-08 09:40:00 +02:00
Enrico Turri
a8500d6bae
class 3D callbacks moved to c++
2018-06-07 11:18:28 +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
Enrico Turri
e79037c44d
3DScene member variables moved to c++
2018-06-06 12:36:52 +02:00
Enrico Turri
c6e44509e0
3DScene load_object method moved to c++
2018-06-06 10:16:58 +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
Enrico Turri
5392008916
Generation of gcode paths moved to c++
2018-06-05 10:56:55 +02:00
bubnikv
d05d3cb652
Initial working implementation of the "Fix by Netfabb" function.
2018-06-04 21:22:42 +02:00
YuSanka
04dc50cec4
Add, Delete and DeleteAll are working for new list now
2018-06-04 15:59:55 +02:00
Enrico Turri
d74b85f3fe
Another set of 3DScene methods moved to c++
2018-06-04 15:42:34 +02:00
Enrico Turri
af8e869880
3rd attempt to fix opengl initialization on linux
2018-06-04 14:28:59 +02:00
Enrico Turri
ac47ba5864
1st attempt to fix opengl initialization on linux
2018-06-04 13:15:28 +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
ac3408a4ab
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-06-04 09:29:07 +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
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
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
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
Enrico Turri
2f773a89df
3DScene set_viewport_from_scene method moved to c++
2018-05-29 15:36:09 +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
363a964ebb
3DScene render method partially moved to c++
2018-05-29 13:54:34 +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
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
Enrico Turri
a8311bd1bd
3DScene layer_editing_allowed method moved to c++
2018-05-25 16:28:24 +02:00
Enrico Turri
c51ce63b9b
3DScene layer editing overlay completely moved to c++
2018-05-25 15:56:14 +02:00