Enrico Turri
a7e9ec5757
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 11:05:07 +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
Lukas Matena
6669357c81
Merge branch 'master' into wipe_tower_improvements
2018-06-21 10:41:01 +02:00
Enrico Turri
80e4155cbc
Bed textures selection using config inheritance
2018-06-21 10:24:57 +02:00
Enrico Turri
b386f52acc
Removed error dialog when texture file does not exist
2018-06-21 09:54:43 +02:00
Enrico Turri
0c24a65039
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 08:39:26 +02:00
Enrico Turri
550f6e307f
Faster gizmos update
2018-06-21 08:37:04 +02:00
bubnikv
8abe1b3633
Yet another fix for the OSX.
2018-06-20 19:26:19 +02:00
bubnikv
3a2b501012
Fixed compilation on OSX
2018-06-20 19:07:55 +02:00
bubnikv
02d4f3e14d
Provide a callback to libslic3r to translate texts.
...
Moved the "translate" functions to namespaces to avoid clashes
between the code in libslic3r and Slic3r GUI projects.
2018-06-20 18:33:46 +02:00
YuSanka
b6ebbdb94a
Updated "Machine limits"(Kinematics) page according to the new config
2018-06-20 16:30:55 +02:00
Enrico Turri
4803e7fc84
Fixed crash at startup on OpenGL 1.1 cards
2018-06-20 14:34:20 +02:00
YuSanka
fd4feb689e
Added prototype for "Kinematics" Page
...
+ Added enum_labels to localizations
+ Added bold font for the name of Options Groups
2018-06-20 14:20:48 +02:00
Vojtech Kral
635bb1e484
Firmware updater: Add support for l10n firmware images
2018-06-19 18:46:37 +02:00
Vojtech Kral
15f943938b
avrdude: add file offset to update operation spec, refactoring
2018-06-19 18:46:37 +02:00
bubnikv
7863412687
Firwmare updater for the Einsy external flash memory,
...
to be used as a storage for localization strings.
Hacked into the avrdude Arduino STK500 (not STK500v2) protocol.
2018-06-19 18:46:37 +02:00
Vojtech Kral
5414f7379d
FirmwareDialog: Fix progress display
2018-06-19 18:46:37 +02:00
Vojtech Kral
2a07f3a0d5
Firmware updater: Fix filename encoding on Windows
2018-06-19 18:46:37 +02:00
Vojtech Kral
478488972c
Updating bugfixes ( #973 )
...
* ConfigWizard: Fix MM legacy profile detect
* Remove Perl BedShapeDialog
* PresetUpdater: Look for updates in resources as well
* ConfigWizard: Startup condition based on printer profiles only rather than all profiles
Previously wizard would not run if there was a leftover filament profile but no printer profiles
* ConfigWizard: Fix button labels
* ConfigWizard: Pick the very first printer variant by default
2018-06-19 18:26:38 +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
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
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
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
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
Enrico Turri
0faaef76e8
C++ code cleanup
2018-06-12 12:18:16 +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
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
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
7b4870d1cb
Fixed selection and rendering in object settings dialog
2018-06-11 11:40:11 +02:00
Enrico Turri
7b1187992c
Added bed texture for Prusa printers
2018-06-11 10:46:32 +02:00
Enrico Turri
96d9879d72
class 3D on_select callback moved to c++
2018-06-08 11:37:07 +02:00
Enrico Turri
bf2fd54578
reload_scene method of 3D class moved to c++
2018-06-08 09:40:00 +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
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
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
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
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
2dee4d1a83
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-06 12:18:52 +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
c6e44509e0
3DScene load_object method moved to c++
2018-06-06 10:16:58 +02:00
Enrico Turri
a8254e0053
Generation of preview paths moved to c++
2018-06-05 14:09:36 +02:00
Enrico Turri
f262ec9094
Modified logic to finalize volumes geometry
2018-06-05 12:24:26 +02:00
Enrico Turri
5392008916
Generation of gcode paths moved to c++
2018-06-05 10:56:55 +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
8911cf6051
OpenGL info moved to c++
2018-06-04 10:14:09 +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
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
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
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
Enrico Turri
30a3b2179b
3DScene timer and _variable_layer_thickness_action method moved to c++
2018-05-30 15:18:45 +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
c3b1eca2c7
Fixed a crash
2018-05-29 14:09:02 +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
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
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
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
Enrico Turri
f31c55ceed
3DScene layer editing overlay textures rendering moved to c++
2018-05-24 13:46:17 +02:00
Lukas Matena
1d1c69f300
Merge branch 'master' into wipe_tower_improvements
2018-05-23 19:34:33 +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
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
Enrico Turri
b36243ba10
Objects rendering moved to c++
2018-05-23 11:14:49 +02:00
Enrico Turri
b4beb7aae9
3DScene plain shader moved to c++
2018-05-23 09:57:44 +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
451c58d58f
3DScene's enable_picking variable moved to c++
2018-05-22 09:02:42 +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
bubnikv
0a328789ef
Fixed compilation on Linux.
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
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
af360d7097
Firmware updater GUI
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
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
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
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
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
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
f34250ea6a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:29:14 +02:00