Commit Graph

3836 Commits

Author SHA1 Message Date
Enrico Turri
073ab56d0c Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Enrico Turri
7b49a0b9cd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
5bd0f6ab2b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
c2256b2faa 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
537033462d 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
tamasmeszaros
f2d6cf8a2a Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
Enrico Turri
3d452f07e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri
fcd09ad9e5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
tamasmeszaros
4ee61008ef Comments and refactoring 2018-06-26 17:02:46 +02:00
bubnikv
f4ee973ab7 When running on Windows, Perl $^X returns slic3r.exe or slic3r-console.exe
Do some magic to get the perl interpreter path.
2018-06-26 15:29:23 +02:00
YuSanka
bad87a3965 Fixed post-merge bugs 2018-06-26 13:34:25 +02:00
Enrico Turri
5b32d61a69 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri
bb7c7dac61 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
010e2ecc62 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
Enrico Turri
f1a0aa2ca1 Fixed bed update when changing selected printer 2018-06-26 12:19:19 +02:00
Enrico Turri
5a52f0b773 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
YuSanka
369e9496cc Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
tamasmeszaros
c6d8856ec5 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-25 17:14:29 +02:00
Enrico Turri
90eb01702b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
dd392198f8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
fab492e951 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
tamasmeszaros
996791ca7c 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
1d81186309 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri
afc4bbb680 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
Enrico Turri
c0fde61e64 Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri
13d59bca12 Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
f0e09fc4b4 Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
Enrico Turri
30d38b850a Cleanup of perl code 2018-06-21 12:21:51 +02:00
Enrico Turri
e4087150eb Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Enrico Turri
03719d44de Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +02:00
Enrico Turri
6580dae24e Force update when changing selected printer using the GUI 2018-06-21 10:43:01 +02:00
Enrico Turri
8881f43162 Faster gizmos update 2018-06-21 08:37:04 +02:00
tamasmeszaros
935bd252e2 Slicing in C++ with progress indication. 2018-06-20 14:50:18 +02:00
Enrico Turri
f43ab3d842 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 08:32:27 +02:00
Vojtech Kral
2f21861ad8 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
e51c13841b AppController class created to take the necessary app logic into C++. 2018-06-19 17:45:21 +02:00
bubnikv
c43208ea61 Disabled the UI gizmos, they are not yet ready for the prime time 2018-06-19 16:14:10 +02:00
bubnikv
c6864c29f3 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-06-19 16:08:53 +02:00
bubnikv
3e8a529200 Merge remote-tracking branch 'remotes/origin/fix_model_by_win10' 2018-06-19 10:02:49 +02:00
Enrico Turri
1017bf7355 Object updated by rotate gizmo 2018-06-19 09:46:26 +02:00
Enrico Turri
972fb8e29e Object updated by scale gizmo 2018-06-18 15:07:17 +02:00
tamasmeszaros
05d31d5e5a Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-18 12:17:19 +02:00
YuSanka
062c3c2bde Set correct man/max value for movers 2018-06-16 03:04:59 +02:00
Enrico Turri
76dbed4166 Scale gizmo interaction with mouse 2018-06-15 14:10:28 +02:00
Enrico Turri
9c3a0196fc Partial perl code cleanup 2018-06-14 16:09:36 +02:00
YuSanka
98752cc84f Buttons "Add Part" and "Add Modifier" (in the Object Settings) works now 2018-06-14 15:33:42 +02:00
Enrico Turri
713f1f71db 1st installment of gizmos 2018-06-13 09:12:16 +02:00
YuSanka
f440c086bd Prepared callback from c++ to Perl to inform about a change of object settings 2018-06-12 19:15:03 +02:00
Enrico Turri
f3e6d1d9c1 C++ code cleanup 2018-06-12 12:18:16 +02:00
Enrico Turri
5600f207b3 Attempt to workaround bug in wxWidgets IsShownOnScreen() method 2018-06-12 09:18:25 +02:00