Commit Graph
100 Commits
Author SHA1 Message Date
bubnikv 9d9e4a0f7b WIP: Background processing. 2018-09-14 09:28:00 +02:00
bubnikv bb70ad6090 Removed Strings.hpp, replaced with wxString
Fixed UTF8 rendering of status messages.
2018-09-12 13:17:47 +02:00
bubnikv 0235f1a821 Merged with dev 2018-09-12 11:59:02 +02:00
bubnikv 41ce69f327 Improved constness of the Print / PrintObject / Layer ...
Split the wipe tower and time statistics data into separate objects.
Initial work in synchronizing the Model with the Print.
2018-09-11 14:04:47 +02:00
bubnikv 49697ed6aa Replaced this->m_xxx with just m_xxx 2018-09-10 09:11:49 +02:00
bubnikv 453e7e37d3 Bundled newer versions of PrusaResearch profiles. 2018-09-01 09:54:02 +02:00
bubnikv d57725ee18 Bumped up the version number to 1.41.0 release,
bundled updated PrusaResearch configs.
2018-08-30 16:08:25 +02:00
bubnikv 4522811f5b Bumped up the version number to 1.41.0-beta2 2018-08-25 22:11:04 +02:00
bubnikv 78a7104994 Changed the wording of "Purge into this object's ..." to "Wipe ..." 2018-08-25 22:09:55 +02:00
bubnikv fec2545033 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-08-24 16:58:53 +02:00
bubnikv 3c0d81e7d9 Merge remote-tracking branch 'remotes/origin/lm_lay_flat_round_merged_facets' 2018-08-24 16:39:24 +02:00
bubnikv de0f8ec267 Merge remote-tracking branch 'remotes/origin/lm_retraction_fix' 2018-08-24 16:33:57 +02:00
bubnikv 76d60070eb Eigenized the admesh structures
(stl_vertex, stl_normal).
2018-08-22 15:34:03 +02:00
bubnikv 6829704475 d .. 2018-08-22 15:03:35 +02:00
bubnikv ac72cd779f Replaced Point3 with Eigen Vec3crd, removed Point3 from the Perl binding. 2018-08-21 22:14:47 +02:00
bubnikv 0b5b02e002 Eradicated the Pointf class, replaced with Eigen Vector3d 2018-08-21 21:05:24 +02:00
bubnikv cae0806112 Eradicated most of Pointf extras compared to pure Eigen::Vector2d. 2018-08-21 20:34:45 +02:00
bubnikv cb138a20b8 Completely replaced the homebrew Pointf3 class with Eigen Vec3d.
Replaced the unscale macro with a template, implemented templates
for unscaling Eigen vectors.
2018-08-21 17:43:05 +02:00
bubnikv c5256bdd2c Removed the Point::coincides_with_epsilon() method 2018-08-21 09:51:22 +02:00
bubnikv ab60d8adb4 Replaced coincides_with(const Line &line) with operator== 2018-08-17 18:27:07 +02:00
bubnikv 9e7634b6e8 Merged with master 2018-08-17 18:07:45 +02:00
bubnikv 0eba590fc6 Updated the Eigen library to 3.3.5 2018-08-17 17:33:29 +02:00
bubnikv 5b94f53cd7 Removed the Point::wkt() and Point::dump_perl() methods.
Added to_string() for the basis Eigen vector types.
2018-08-17 16:54:07 +02:00
bubnikv 65011f9382 Removed the x(), y(), z() Point/Pointf/Point3/Pointf3 accessors. 2018-08-17 15:53:43 +02:00
bubnikv 1ba64da3fe Removed Point::scale(),translate(),coincides_with(),distance_to(),
distance_to_squared(),perp_distance_to(),negative(),vector_to(),
translate(), distance_to() etc,
replaced with the Eigen equivalents.
2018-08-17 14:14:24 +02:00
bubnikv 3b89717149 Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types:
Changed the Point3 / Pointf3 to derive from the Eigen Vec3crd / Vec3d.
Replaced the Point::concide_with() method calls with == operator.
Reduced some compiler warnings.
2018-08-15 13:51:40 +02:00
bubnikv f34252a27b Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types:
Changed the Point3 / Pointf3 to composite Eigen Vec3crd / Vec3d.
Point3 is no more derived from Point,
Pointf3 is no more derived from Pointf.
Introduced Transform2f/3f/2d/3d types as aliases to Eigen::Transform.
2018-08-14 21:33:41 +02:00
bubnikv 86da661097 Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types, first step 2018-08-14 18:33:26 +02:00
bubnikv 93b8f3147c Fixed inccorect (excessive) time estimates with the MMU 2.0 2018-08-07 14:15:37 +02:00
bubnikv 288cd58ee2 Bumped up version number. 2018-08-06 18:09:52 +02:00
bubnikv c9192e874b Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-08-06 18:04:54 +02:00
bubnikv 1e8d646586 Updated MK3MM2 presets, updated start G-codes of the MK2 printer
as it does not support the new M204 format.
2018-08-06 18:04:35 +02:00
bubnikv 4f52601081 Minor tweaks of UI texts,
optimization of the wipe tower invalidation,
show collisions of the wipe tower with known dimensions.
2018-08-06 16:31:51 +02:00
bubnikv ea163edc41 Deregister the update callback on end of the application.
This fixes a crash on exit.
2018-08-05 23:36:25 +02:00
bubnikv c13cd284e4 Fix of a regression bug: Update the print bed texture when switching
between printer profiles.
2018-08-05 22:52:38 +02:00
bubnikv 71b1e09af9 T1 and M702 C are now evaluated by the time estimator to add the new
"filament_load_time" and "filament_unload_time" values to match
the MK3 MMU2 behavior.

Emitting of the remaining times into the output G-code was made optional
through a new "remaining_times" configuration value, so the firmware
flavors and versions, which do not know the M73 code, will not complain.

Configuration changes:

The wipe tower default position was shifted inwards after the wipe tower
coordinate reference point was changed from the center to the left front
corner.

Added the "filament_load_time" and "filament_unload_time" values
to the MK3 MMU filament profiles.

Enabled "remaining_times" for the MK2.5, MK3 and MK3MMU2 printers.
2018-08-04 17:38:25 +02:00
bubnikv ac2b20b54b Merge branch 'master' into time_estimate 2018-08-03 23:04:44 +02:00
bubnikv 73ad49b9ae Merge remote-tracking branch 'origin/lm_minimal_purging_on_wt' 2018-08-03 22:55:08 +02:00
bubnikv 02d6d04185 Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d' 2018-08-03 22:38:44 +02:00
bubnikv 6a9bd540c1 Merge remote-tracking branch 'origin/lm_wipe_tower_block_improvements_merged' 2018-08-03 22:34:53 +02:00
bubnikv 0454adc194 Added support for the upstream Marlin interpretation of the M204 code.
Fix of https://github.com/prusa3d/Slic3r/issues/1089

M204 S.. T..:
T is interpreted by the firmware and Slic3r time estimator the old way
(as acceleration when retracting) only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.

M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.

This change is in sync with the Prusa3D firmware:
https://github.com/prusa3d/Prusa-Firmware/commit/dd4c4b39b4359d61a3329c54bea58df119a731c6

Slic3r will now export
M204 P[machine_max_acceleration_extruding] R[machine_max_acceleration_retracting] T[machine_max_acceleration_extruding]
before the custom start G-code, which will be correctly interpreted
by both the new Prusa3D firmware and the Slic3r's time estimator.

To support our legacy MK2 firmware before we merge the commit above, we may
just insert the following line into the custom start G-code section to override
the block inserted by Slic3r automatically before the custom start G-code:
M204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]
2018-08-03 16:26:28 +02:00
bubnikv f65aadebef Corrected initialization of the SLA presets with their default values. 2018-08-03 14:14:25 +02:00
bubnikv cd919d986a Fixed the *MK3* references in Prusa3D profiles 2018-08-02 13:09:53 +02:00
bubnikv 8fc11c2f14 Configuration improvements:
Bumped up firmware versions for MK2.5/MK3 to 3.3.1, disabled priming areas for MK3MMU2
2018-08-02 09:11:11 +02:00
bubnikv 212ebc5615 Updated the start G-codes for the MK3 MMU2 profiles:
Implemented wiping line for MMU when the priming blocks are disabled,
added initialization of the MMU2 unit with the filament types.
2018-08-01 19:07:49 +02:00
bubnikv a76cb3bd67 Merge remote-tracking branch 'remotes/origin/wipe_tower_no_priming' 2018-08-01 13:16:49 +02:00
bubnikv 3e2aedaaf0 Merge commit '4e901a9db778660d3471a49cd95d66f85b2dbc88' 2018-08-01 13:16:30 +02:00
bubnikv 884f1ff4c0 Merge commit '4e901a9db778660d3471a49cd95d66f85b2dbc88' into SLA 2018-08-01 13:09:05 +02:00
bubnikv 4e193555ae Adding the SLA printer profiles, WIP 2018-08-01 11:09:51 +02:00
bubnikv f0c1c15b62 Integration of SLA parameters, WIP 2018-07-31 15:09:57 +02:00
bubnikv fa6a72ab2d Changed the filament_load_time / filament_unload_time defaults to zero. 2018-07-31 09:46:39 +02:00
bubnikv f49f871992 Added filament_load_time and filament_unload_time parameters
to define the filament load / unload times spent in the MMU2.0 unit
when performing the tool change code (the T code).
2018-07-31 09:44:29 +02:00
bubnikv b6c5fa7f68 Added the alpha4 config to the index. 2018-07-27 23:28:59 +02:00
bubnikv 4778312fa5 Merge branch 'master' into wipe_tower_no_priming 2018-07-27 23:26:10 +02:00
bubnikv 4a88075334 Updated change log for the Prusa3D config index,
bumped up the version to 1.41.0-alpha3
2018-07-27 22:31:24 +02:00
bubnikv db8ba5fb76 New parameter "single_extruder_multi_material_priming" to be able
to suppress the MM priming towers.
The PrusaResearch.ini was modified for the MMU2 printers to
correctly prime the initial extruder when
single_extruder_multi_material_priming is disabled.
2018-07-27 22:19:46 +02:00
bubnikv 78a8acfcf1 New PrusaResearch configuration, renamed and improved the MK3 MMU2 wizard
picture.
2018-07-27 15:57:00 +02:00
bubnikv 987fc4c6df Merge remote-tracking branch 'origin/backspace_to_delete_on_osx' 2018-07-27 09:55:13 +02:00
bubnikv 5c1de9fdd5 Merge remote-tracking branch 'origin/scene_manipulators' 2018-07-27 09:54:39 +02:00
bubnikv c2291e54f4 Fixes crash when loading a config with zero number of default_filament_profile
values. Fixes SPE-427
2018-07-27 09:53:12 +02:00
bubnikv 077680b806 Fix of https://github.com/prusa3d/Slic3r/issues/1068
Fixed reloading of an object, which contains non-ASCII7 characters
in its file name or path.
2018-07-24 09:23:19 +02:00
bubnikv a0096cf563 Renamed the key MK3SMMU to MK3MMU2,
added a generic PLA MMU2 material.
2018-07-23 09:42:02 +02:00
bubnikv 68cd51435f Bumped up the version number. 2018-07-21 17:39:26 +02:00
bubnikv 109b6fb79c Added the MK3 MMU2 printer into the profiles, added an image
of the MK3 MMU2 to the wizard.
2018-07-21 15:46:54 +02:00
bubnikv 88bf7c852c Fixed upgrade of vendor profile from the application resources
after an upgrade of the application.
2018-07-21 09:32:45 +02:00
bubnikv e19a74865b Bumped up the version number. 2018-07-20 17:57:21 +02:00
bubnikv b57418f81d Reordered the fields on the new "Machine limits" page. 2018-07-18 15:08:55 +02:00
bubnikv a46bdb1d81 Reworked the "Sliced info" box on the platter to only show the
"silent mode" print time if it is available.
2018-07-18 14:52:19 +02:00
bubnikv f7390c7ad6 The acceleration G-codes (M204 Sxxx) emited for Marlin are now
clamped by the maximum acceleration when extruding.

The machine envelope values are only set at the time estimator
from the Printer parameters for the Marlin firmware.
2018-07-18 14:00:42 +02:00
bubnikv 17df029c9d Fixed a previous commit. 2018-07-18 12:04:56 +02:00
bubnikv b6fe90cbdc Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-07-18 11:58:19 +02:00
bubnikv 9d027a558e Implemented clamping of the acceleration when extruding for the Marlin
firmware, both for the G-code export and the time estimator.
2018-07-18 11:58:02 +02:00
bubnikv 3bebe9f954 Restored the "Fix STL through Netfabb" functionality, which has been
lost during some merge process.
2018-07-17 21:31:54 +02:00
bubnikv c596c05765 With the Marlin flavor, a "machine envelope limits" G-code section
is emitted, which breaks some of the automatic tests.

Changed the default firmware flavor to RepRap,
so that the automatic tests will run.
2018-07-17 20:37:15 +02:00
bubnikv 36c1483ec5 Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d' 2018-07-17 19:42:02 +02:00
bubnikv 0660862058 For the Marlin firmware, the machine envelope G-code is emitted
based on the Slic3r printer profile.

Also the bundled config has been updated, so that the machine envelope
G-code values were removed and the new Slic3r printer profile values
were updated with the former G-code values.

Slic3r version has been bumped up to 1.41.0-alpha for the configuration
files to work.
2018-07-17 19:37:24 +02:00
bubnikv c34a713c8c Simplification of
1.40.1-rc2 fails to save the modified AMF settings #1035
2018-07-17 10:41:17 +02:00
bubnikv 161a2bc6f8 Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf' 2018-07-17 09:47:49 +02:00
bubnikv 3339623db6 Merge remote-tracking branch 'remotes/origin/ys_tooltips_osx' 2018-07-17 09:40:19 +02:00
bubnikv 83f9813f56 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
bubnikv c7f59aca7d Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-07-17 09:20:19 +02:00
bubnikv 210eeff160 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +02:00
bubnikv fa86d776cb Bumped up the version number to final. 2018-07-05 15:27:48 +02:00
bubnikv bdc9b9dadd Bumped up the version number. 2018-07-03 16:46:52 +02:00
bubnikv e61b25de7c Merge branch 'master' into amf_activate_existing_presets 2018-07-03 13:04:11 +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
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
bubnikv c4a3e4eca7 Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
bubnikv aae6cfc696 Merge remote-tracking branch 'remotes/origin/lm_ultimate_wipe_tower_rotation_fix' 2018-06-28 13:59:19 +02:00
bubnikv acd712cdbc Merge remote-tracking branch 'remotes/origin/vk-octoprint' 2018-06-28 13:53:27 +02:00
bubnikv 67de1a462f Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2018-06-28 13:53:22 +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
bubnikv 68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
bubnikv 645cc65d2b 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
bubnikv 22463343a7 Fixed integration tests. 2018-06-26 13:22:24 +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
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