Commit Graph

2686 Commits

Author SHA1 Message Date
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
bubnikv
fa86d776cb Bumped up the version number to final. 2018-07-05 15:27:48 +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
tamasmeszaros
b26d1ef5bf Some comments 2018-07-04 14:36:14 +02:00
tamasmeszaros
0b914c5ea3 Customized object function for arrange algorithm to arrange into a circle.
Now we optimize for smallest diameter of the circle around the arranged pile of items. This implies that we can forget about pack efficiency but the result will be better for the heat characteristics of the print bed.
2018-07-04 14:11:21 +02:00
YuSanka
38768a7bda Replaced Object list before Object(Part) Settings 2018-07-04 12:38:34 +02:00
tamasmeszaros
4b9a504c04 Solution for SPE-347 (scale is not fed into the arrange alg) 2018-07-04 11:19:11 +02:00
tamasmeszaros
fa7ca09e57 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-04 10:22:49 +02:00
tamasmeszaros
d337fec8af Proper fix for SPE-324 2018-07-04 10:21:44 +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
bdc9b9dadd Bumped up the version number. 2018-07-03 16:46:52 +02:00
tamasmeszaros
f3591d2a85 Libnest2D test fix 2018-07-03 16:39:13 +02:00
tamasmeszaros
b4666e8174 Tryfix for Mac build... 2018-07-03 16:18:35 +02:00
tamasmeszaros
16ec625483 Eliminating signed comp warning 2018-07-03 15:09:12 +02:00
tamasmeszaros
c73f702922 Filtering invalid geometries as per: SPE-337 2018-07-03 14:58:49 +02:00
tamasmeszaros
99f2d40b53 Remove progress indicators for individual threads. 2018-07-03 13:58:35 +02:00
bubnikv
e61b25de7c Merge branch 'master' into amf_activate_existing_presets 2018-07-03 13:04:11 +02:00
YuSanka
b682fb1829 Enabled "delete preset" button after current profile saving 2018-07-03 12:19:34 +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
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
86726b15b4 Pull build fixes from libnest2d and allow reverse order checks in DJD placement for better quality results. 2018-07-02 10:45:06 +02:00
tamasmeszaros
6ffdea1457 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-06-29 17:46:55 +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
Lukas Matena
5bf795ec6f Overriddable infills that were not overridden are now printed according to infill_first 2018-06-29 12:26:22 +02:00
YuSanka
16e42b0226 Added tooltips for selected Preset 2018-06-29 11:29:23 +02:00
bubnikv
d4b0d1b773 bumped up the version number 2018-06-29 10:59:58 +02:00
bubnikv
6b3c24359b Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
bubnikv
082f88ad5f gcc / clang did not like backslashes inside comments 2018-06-28 21:46:23 +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
tamasmeszaros
5446b9f1e5 Incorporating performance optimizations from libnest2d 2018-06-28 16:14:17 +02:00
YuSanka
0b1833a2af Try to fix tooltips on OSX 2018-06-28 16:01:06 +02:00
bubnikv
aae6cfc696 Merge remote-tracking branch 'remotes/origin/lm_ultimate_wipe_tower_rotation_fix' 2018-06-28 13:59:19 +02:00
Enrico Turri
dc25df7b32 Faster remaining times export 2018-06-28 13:57:28 +02:00
bubnikv
acd712cdbc Merge remote-tracking branch 'remotes/origin/vk-octoprint' 2018-06-28 13:53:27 +02:00
YuSanka
5605835ba9 Use silent_mode only with MK3 printer 2018-06-28 12:40:27 +02:00
Lukas Matena
19f5863d75 Wipe tower fix - incorrect start/end position reported to the GCode generator when the tower was rotated 2018-06-28 10:22:04 +02:00
Enrico Turri
7d61b2076f Faster remaining time calculation 2018-06-28 09:24:07 +02:00
Enrico Turri
9725966f38 Time estimate uses G1 lines containing E parameter for remaining time calculations 2018-06-28 08:52:07 +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
Lukas Matena
bb288f2a1b Fixed a crash when complete_objects was turned on 2018-06-27 15:49:02 +02:00
Enrico Turri
7ff22b9413 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +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
Lukas Matena
54bd0af905 Infill wiping turned off by default and in some automatic tests 2018-06-27 15:07:37 +02:00
Lukas Matena
c11a163e08 Correct extruder is used for dontcare extrusions 2018-06-27 14:08:46 +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
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
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
bubnikv
68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +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
Lukas Matena
f8388abe17 'Dontcare' extrusions now don't force a toolchange + code reorganization 2018-06-26 14:12:25 +02:00
YuSanka
c1724f45c9 Fixed post-merge bugs 2018-06-26 13:34:25 +02:00
bubnikv
22463343a7 Fixed integration tests. 2018-06-26 13:22:24 +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
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
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
a754de4c32 Fixed panning in Layers view 2018-06-26 11:17:30 +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
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
Enrico Turri
581ed7764c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 13:21:52 +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
Lukas Matena
e2126c2dd6 Dedicated objects are now not ignored 2018-06-22 14:03:34 +02:00
Enrico Turri
f420ced581 Time estimators use initial data from config 2018-06-22 14:01:27 +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
e89083090f Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 16:08:40 +02:00
Enrico Turri
e0db2a925d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 16:08:20 +02:00
Enrico Turri
75cd436ae5 2nd Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-21 15:43:34 +02:00
Lukas Matena
e622401599 Wipe tower bugfix - the tower was printed incorrectly when the rotation angle was close to 90 degrees 2018-06-21 14:05:07 +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
8194d7713b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 12:21:11 +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
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
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
Lukas Matena
bc5bd1b42b Assigning of wiping extrusions improved 2018-06-21 10:16:52 +02:00
Enrico Turri
b386f52acc Removed error dialog when texture file does not exist 2018-06-21 09:54:43 +02:00
Enrico Turri
a3d21b6b0e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 08:39:51 +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