tamasmeszaros
eefa1678db
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-13 11:28:02 +02:00
Enrico Turri
0f5ce827a1
Rotate gizmo radius changed only when moving one of multiple instances
2018-07-12 15:19:43 +02:00
Enrico Turri
3839d26e9b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-12 15:17:08 +02:00
Enrico Turri
b2d9877cd5
Fixed crash on MAC when selecting system info
2018-07-12 13:34:39 +02:00
Enrico Turri
76d4b9dbb8
Attempt to fix SPE-352
2018-07-12 13:10:18 +02:00
Enrico Turri
63ab713585
Added debug output to investigate SPE-352
2018-07-12 12:15:30 +02:00
Enrico Turri
0e9ac1679f
Keep fixed radius of rotate gizmo
2018-07-12 11:26:13 +02:00
Enrico Turri
b6e55a521e
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-12 08:42:08 +02:00
Enrico Turri
a8691bc083
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-12 08:32:42 +02:00
Enrico Turri
1356a9977e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-12 08:32:18 +02:00
YuSanka
a6b1e8466d
Added popupmenu for add_settings
2018-07-09 16:42:31 +02:00
Lukas Matena
4c823b840f
Fix of previous commit
2018-07-09 14:43:32 +02:00
Lukas Matena
bb80774e74
Infill purging - added fifth extruder into default setttings, cosmetic changes
2018-07-09 13:44:41 +02:00
YuSanka
fcc781195b
Added updating of the is_external value for edited_preset after loading preset from (.ini, .gcode, .amf, .3mf etc)
2018-07-09 12:10:57 +02:00
Lukas Matena
92d36df903
Merge branch 'master' into wipe_tower_improvements
2018-07-09 09:28:26 +02:00
YuSanka
182e4232b2
Added error icon before object if errors auto-repaire was detected
...
+ Added size object updating (in the object setting panel)
2018-07-04 16:32:01 +02:00
YuSanka
60f703e7c7
Added function for the sidetext changing
...
+ some code reorganization
2018-07-04 14:52:36 +02:00
YuSanka
38768a7bda
Replaced Object list before Object(Part) Settings
2018-07-04 12:38:34 +02:00
tamasmeszaros
a5d6064ad6
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-04 10:26:04 +02:00
tamasmeszaros
fa7ca09e57
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-04 10:22:49 +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
tamasmeszaros
28bc54e5b7
Patch from Lubomír for CLI parameters
2018-07-03 17:59:49 +02:00
tamasmeszaros
16ec625483
Eliminating signed comp warning
2018-07-03 15:09:12 +02:00
tamasmeszaros
99f2d40b53
Remove progress indicators for individual threads.
2018-07-03 13:58:35 +02:00
tamasmeszaros
797c812f31
Stop the ongoing slicing process when attempting to export.
2018-07-03 13:12:15 +02:00
bubnikv
e61b25de7c
Merge branch 'master' into amf_activate_existing_presets
2018-07-03 13:04:11 +02:00
tamasmeszaros
033b7eb8ad
Removing progress indicators for individual threads.
2018-07-03 12:43:17 +02:00
YuSanka
b682fb1829
Enabled "delete preset" button after current profile saving
2018-07-03 12:19:34 +02:00
tamasmeszaros
f00c17b959
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-03 11:40:35 +02:00
tamasmeszaros
10b19c8604
fix for progressindicator not being destroyed after export to png
2018-07-03 11:40:02 +02:00
tamasmeszaros
9beb767830
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-03 10:23:33 +02:00
tamasmeszaros
27b0926c19
Localization for app controller.
2018-07-03 10:22:55 +02:00
bubnikv
c7f3014d26
Fix of
...
"Slic3r 1.40.1-rc fails to retain the filament list on"
https://github.com/prusa3d/Slic3r/issues/1020
2018-07-02 20:25:37 +02:00
Vojtech Kral
617b5158bd
Fix: Leak in Tab.cpp in serial port test
2018-07-02 19:00:36 +02:00
tamasmeszaros
ec571aec44
Scale correction revert in case of exception.
2018-07-02 16:36:30 +02:00
tamasmeszaros
478dd2a93f
Proper localization of AppController
2018-07-02 16:15:21 +02:00
tamasmeszaros
4f27f6c6dc
Fixing crash on linux. Exporting png in the UI thread.
2018-07-02 14:50:54 +02:00
YuSanka
07b28b2a8c
Bug-fixes of the OSX crashing
2018-07-02 13:51:50 +02:00
tamasmeszaros
ddb4945586
Fix crash on Linux when arranging
2018-07-02 11:22:47 +02:00
tamasmeszaros
952068f282
Autocenter finally disabled. Progress indication works.
2018-06-29 17:46:21 +02:00
YuSanka
678498bed6
Typo fixed
2018-06-29 14:00:22 +02:00
YuSanka
f8ab8b43de
Experiment with Toolpits of selected preset on OSX
2018-06-29 13:07:58 +02:00
YuSanka
16e42b0226
Added tooltips for selected Preset
2018-06-29 11:29:23 +02:00
bubnikv
6b3c24359b
Merge branch 'master' into amf_activate_existing_presets
2018-06-28 22:00:10 +02:00
bubnikv
26b003073b
Renamed the "compatible_printers_condition" and "inherits" vectors
...
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.
Improved escaping of strings stored / loaded from config files.
2018-06-28 20:13:01 +02:00
tamasmeszaros
d3b19382fe
AppController reachable trough Plater.pm
2018-06-28 19:16:36 +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
YuSanka
2cbf5b75db
Final Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 18:30:22 +02:00
YuSanka
9e4bea8cce
Code cleaning
2018-06-28 18:14:34 +02:00
YuSanka
896d898124
Resizing panel to 1 px
2018-06-28 17:52:20 +02:00
bubnikv
c4a3e4eca7
Merge branch 'for_merging'
2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed
Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 17:34:55 +02:00
YuSanka
0171f49ad0
And last try..
2018-06-28 17:14:45 +02:00
YuSanka
75bda8cfd8
Addition to last commit
2018-06-28 16:50:06 +02:00
YuSanka
0b1833a2af
Try to fix tooltips on OSX
2018-06-28 16:01:06 +02:00
bubnikv
acd712cdbc
Merge remote-tracking branch 'remotes/origin/vk-octoprint'
2018-06-28 13:53:27 +02:00
tamasmeszaros
18bfe4f2dc
ExpTime incorporated. Some refactor as welll.
2018-06-28 13:21:24 +02:00
YuSanka
5605835ba9
Use silent_mode only with MK3 printer
2018-06-28 12:40:27 +02:00
tamasmeszaros
8497289650
Execution abstraction and build fix for linux and mac
2018-06-27 18:23:53 +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
Vojtech Kral
5787c495d6
Octoprint: Improve error reporting
2018-06-27 17:00:20 +02:00
bubnikv
80b430ad94
Simplified handling of the "compatible_printers_condition" and
...
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
2018-06-27 16:57:42 +02:00
Enrico Turri
de28d4edeb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 15:32: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
Vojtech Kral
930a2f1d12
Fix: Http: Body size limit not properly initialized
2018-06-27 13:57:21 +02:00
Vojtech Kral
6706c3b71f
ConfigWizard: Mark the first variant of each printer as default in the GUI
2018-06-27 13:57:21 +02:00
Vojtech Kral
e00125d866
PresetUpdater: Fix double update detection (had_config_update)
2018-06-27 13:57:21 +02:00
Vojtech Kral
3229574a39
ConfigWizard: Fix default printer selection
2018-06-27 13:57:21 +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
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
06f44a9e4b
Code cleanup
2018-06-27 12:49:38 +02:00
Enrico Turri
8db4fdc24c
3rd attempt to fix opengl on ubuntu
2018-06-27 12:36:49 +02:00
Enrico Turri
23d10fdadc
2nd attempt to fix opengl on ubuntu
2018-06-27 12:05:23 +02:00
Enrico Turri
5c32347449
1st attempt to fix opengl on ubuntu
2018-06-27 11:31:11 +02:00
tamasmeszaros
30e177d986
PngExportDialog fix on Windows
2018-06-27 11:21:14 +02:00
tamasmeszaros
a9e2950ad0
PngExportDialog size fix on Linux
2018-06-27 11:13:40 +02:00
bubnikv
68e82a7348
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
tamasmeszaros
8eb8d4f0c5
Patch from Lubomír Bláha applied. Polished comments and PngExportDialog.
2018-06-27 10:28:44 +02:00
tamasmeszaros
c28b602465
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-06-27 09:36:05 +02:00
Lukas Matena
fe0f0fe6af
Merge branch 'master' into wipe_tower_improvements
2018-06-27 08:56:08 +02:00
Enrico Turri
dc223066d3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 08:26:55 +02:00
Enrico Turri
db95460154
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 08:26:33 +02:00
tamasmeszaros
d2c6190cc5
Comments and refactoring
2018-06-26 17:02:46 +02:00
tamasmeszaros
df625a0c4b
File saving to new file fixed.
2018-06-26 16:08:58 +02:00
tamasmeszaros
ae682b9cd3
Export dialog ready
2018-06-26 15:53:43 +02:00
YuSanka
c1724f45c9
Fixed post-merge bugs
2018-06-26 13:34:25 +02:00
Lukas Matena
4dae6cbf60
Merge branch 'master' into wipe_tower_improvements
2018-06-26 12:58:04 +02:00
Enrico Turri
bd1d70d8d3
Fixed crash when slicing from Layers tab
2018-06-26 12:50:04 +02:00
bubnikv
59510c42d1
When loading an archive (AMF/3MF/Config), the original name
...
of the profile is show in braces next to the file name.
2018-06-26 11:31:01 +02:00
Enrico Turri
90b0cd5cae
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-26 11:16:00 +02:00
Enrico Turri
69ff60b557
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-26 11:15:33 +02:00
bubnikv
1175dc95f6
Storing and recovering the "compatible_printers_condition"
...
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
2018-06-26 10:50:50 +02:00
YuSanka
2fae893af2
Fixed #998
...
Added detection of gtk2/gtk3 GUI libraries required by Alien::wxWidgets.
Added gtk2/gtk3 include paths, so we may call gtk2/3 API directly if needed for some workaround.
2018-06-26 10:37:36 +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
tamasmeszaros
99f6866a1d
Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png
...
# Conflicts:
# xs/src/slic3r/AppController.cpp
# xs/src/slic3r/AppController.hpp
2018-06-25 17:13:36 +02:00
Enrico Turri
ecda2a6140
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 16:09:27 +02:00
YuSanka
f9b85b6700
Correct updating of "Machine limits" and "Single extruder MM setup" pages
2018-06-25 16:03:43 +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
b6b14ef819
Fixed conflicts after merge with master branch
2018-06-25 15:26:37 +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
YuSanka
515502e685
Fixed #994 .
...
Print double-type values according to "full" value instead of 2 digits after point
2018-06-25 13:32:28 +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
581ed7764c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-25 13:21:52 +02:00
Tamás Mészáros
6737506b14
Separating wx and the app controller.
2018-06-25 12:40:01 +02:00
YuSanka
318212f475
Fixed crashing-bug after language changing (detected under Debug)
2018-06-25 12:27:42 +02:00
YuSanka
362a9d8eda
Fixed bug #995
2018-06-25 11:40:40 +02:00
Enrico Turri
789a760fbd
Fixed conflict after merge with master
2018-06-25 10:49:30 +02:00
Enrico Turri
8a4a5e487e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:51:47 +02:00
Enrico Turri
7d15a15e14
Fix of #999
2018-06-25 08:48:36 +02:00
Enrico Turri
3da21a4ce8
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:27:09 +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
bubnikv
b5f97baa28
Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics
2018-06-22 17:44:12 +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
YuSanka
54c90ee948
Updated PrintConfig default values for machine limits
...
+ fixed incorrect default value setting for the TextCtrl
2018-06-22 16:13:34 +02:00
Enrico Turri
c948ca647c
Code cleanup
2018-06-22 16:11:00 +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
de540de9aa
5th Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 15:11:04 +02:00
bubnikv
082ed95a94
Activate existing projects after loading AMF/3MF/Config: Initial implementation.
2018-06-22 14:17:03 +02:00
YuSanka
3fdefbfbea
Added updatin of the "Machine limits" page according to "use silent mode"
2018-06-22 13:01:41 +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
15c69a90ec
Changed use of GL_LIGHTING logic and code cleanup
2018-06-22 12:21:43 +02:00
Enrico Turri
ac7d21b50a
Geometry info updated while using gizmos
2018-06-22 11:19:38 +02:00
YuSanka
bfe7896709
Try to fix uncorrect setup on Linux
2018-06-22 10:59:54 +02:00
Enrico Turri
266a4413bd
4th Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 09:42:56 +02:00
YuSanka
9ba1af5834
Merge remote-tracking branch 'origin/master' into add_kinematics
2018-06-22 09:22:29 +02:00
Enrico Turri
be52647440
Smaller gizmos icons
2018-06-22 09:00:01 +02:00
Enrico Turri
4ba3cef496
3rd Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-22 08:38:13 +02:00
YuSanka
4454c3437f
"Machine limits" page is completed
2018-06-21 16:15:56 +02:00
Enrico Turri
75cd436ae5
2nd Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-21 15:43:34 +02:00
Enrico Turri
b139f38784
Attempt to fix texture rendering on OpenGL 1.1 cards
2018-06-21 13:03:53 +02:00
Enrico Turri
21e7d379b1
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 12:20:52 +02:00
Vojtech Kral
7cf3922707
Http: Fix nowide fstream usage
2018-06-21 12:06:55 +02:00
Enrico Turri
8c40a962fb
Shift key to move selected instances together
2018-06-21 11:14:17 +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
Vojtech Kral
9ee10a8779
Octoprint: Fix unicode support
2018-06-21 10:44:29 +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
tamasmeszaros
8dcf789d4b
Slicing in C++ with progress indication.
2018-06-20 14:50:18 +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
tamasmeszaros
5f310e1520
AppController class created to take the necessary app logic into C++.
2018-06-19 17:45:21 +02:00
YuSanka
8a3cf3f71d
Correct selection update on MSW
2018-06-19 16:24:49 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
Enrico Turri
f262ec9094
Modified logic to finalize volumes geometry
2018-06-05 12:24:26 +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
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
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
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
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
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
YuSanka
c7d7da452e
Updated Collapsed/Layout for PrusaCollapsiblePane.
...
Cleaned right_panel
2018-05-28 17:08:48 +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
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
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
Enrico Turri
f31c55ceed
3DScene layer editing overlay textures rendering moved to c++
2018-05-24 13:46:17 +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
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
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
YuSanka
83cec1a640
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-23 08:30:27 +02:00
YuSanka
ec5b98477d
Filled content_object_settings
2018-05-22 16:14:41 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
YuSanka
d53127fa44
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-11 14:42:19 +02:00