GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 11:26:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cout -> BOOST_LOG_TRIVIAL(info)

Browse Source
This commit is contained in:
supermerill 2021-09-05 15:17:32 +02:00
parent d0459d60ce
commit dfab9c5b18
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libslic3r/Print.cpp
View File

@ -2835,28 +2835,28 @@ void Print::_make_wipe_tower()
float pigmentAft = m_config.filament_wipe_advanced_pigment.get_at(extruder_id); float pigmentAft = m_config.filament_wipe_advanced_pigment.get_at(extruder_id);
if (m_config.wipe_advanced_algo.value == waLinear) { if (m_config.wipe_advanced_algo.value == waLinear) {
volume_to_wipe += m_config.wipe_advanced_multiplier.value * (pigmentBef - pigmentAft); volume_to_wipe += m_config.wipe_advanced_multiplier.value * (pigmentBef - pigmentAft);
std::cout << "advanced wiping (lin) "; BOOST_LOG_TRIVIAL(info) << "advanced wiping (lin) ";
std::cout << current_extruder_id << " -> " << extruder_id << " will use " << volume_to_wipe << " mm3\n"; BOOST_LOG_TRIVIAL(info) << current_extruder_id << " -> " << extruder_id << " will use " << volume_to_wipe << " mm3\n";
std::cout << " calculus : " << m_config.wipe_advanced_nozzle_melted_volume << " + " << m_config.wipe_advanced_multiplier.value BOOST_LOG_TRIVIAL(info) << " calculus : " << m_config.wipe_advanced_nozzle_melted_volume << " + " << m_config.wipe_advanced_multiplier.value
<< " * ( " << pigmentBef << " - " << pigmentAft << " )\n"; << " * ( " << pigmentBef << " - " << pigmentAft << " )\n";
std::cout << " = " << m_config.wipe_advanced_nozzle_melted_volume << " + " << (m_config.wipe_advanced_multiplier.value* (pigmentBef - pigmentAft)) << "\n"; BOOST_LOG_TRIVIAL(info) << " = " << m_config.wipe_advanced_nozzle_melted_volume << " + " << (m_config.wipe_advanced_multiplier.value* (pigmentBef - pigmentAft)) << "\n";
} else if (m_config.wipe_advanced_algo.value == waQuadra) { } else if (m_config.wipe_advanced_algo.value == waQuadra) {
volume_to_wipe += m_config.wipe_advanced_multiplier.value * (pigmentBef - pigmentAft) volume_to_wipe += m_config.wipe_advanced_multiplier.value * (pigmentBef - pigmentAft)
+ m_config.wipe_advanced_multiplier.value * (pigmentBef - pigmentAft) * (pigmentBef - pigmentAft) * (pigmentBef - pigmentAft); + m_config.wipe_advanced_multiplier.value * (pigmentBef - pigmentAft) * (pigmentBef - pigmentAft) * (pigmentBef - pigmentAft);
std::cout << "advanced wiping (quadra) "; BOOST_LOG_TRIVIAL(info) << "advanced wiping (quadra) ";
std::cout << current_extruder_id << " -> " << extruder_id << " will use " << volume_to_wipe << " mm3\n"; BOOST_LOG_TRIVIAL(info) << current_extruder_id << " -> " << extruder_id << " will use " << volume_to_wipe << " mm3\n";
std::cout << " calculus : " << m_config.wipe_advanced_nozzle_melted_volume << " + " << m_config.wipe_advanced_multiplier.value BOOST_LOG_TRIVIAL(info) << " calculus : " << m_config.wipe_advanced_nozzle_melted_volume << " + " << m_config.wipe_advanced_multiplier.value
<< " * ( " << pigmentBef << " - " << pigmentAft << " ) + " << m_config.wipe_advanced_multiplier.value << " * ( " << pigmentBef << " - " << pigmentAft << " ) + " << m_config.wipe_advanced_multiplier.value
<< " * ( " << pigmentBef << " - " << pigmentAft << " ) ^3 \n"; << " * ( " << pigmentBef << " - " << pigmentAft << " ) ^3 \n";
std::cout << " = " << m_config.wipe_advanced_nozzle_melted_volume << " + " << (m_config.wipe_advanced_multiplier.value* (pigmentBef - pigmentAft)) BOOST_LOG_TRIVIAL(info) << " = " << m_config.wipe_advanced_nozzle_melted_volume << " + " << (m_config.wipe_advanced_multiplier.value* (pigmentBef - pigmentAft))
<< " + " << (m_config.wipe_advanced_multiplier.value*(pigmentBef - pigmentAft)*(pigmentBef - pigmentAft)*(pigmentBef - pigmentAft))<<"\n"; << " + " << (m_config.wipe_advanced_multiplier.value*(pigmentBef - pigmentAft)*(pigmentBef - pigmentAft)*(pigmentBef - pigmentAft))<<"\n";
} else if (m_config.wipe_advanced_algo.value == waHyper) { } else if (m_config.wipe_advanced_algo.value == waHyper) {
volume_to_wipe += m_config.wipe_advanced_multiplier.value * (0.5 + pigmentBef) / (0.5 + pigmentAft); volume_to_wipe += m_config.wipe_advanced_multiplier.value * (0.5 + pigmentBef) / (0.5 + pigmentAft);
std::cout << "advanced wiping (hyper) "; BOOST_LOG_TRIVIAL(info) << "advanced wiping (hyper) ";
std::cout << current_extruder_id << " -> " << extruder_id << " will use " << volume_to_wipe << " mm3\n"; BOOST_LOG_TRIVIAL(info) << current_extruder_id << " -> " << extruder_id << " will use " << volume_to_wipe << " mm3\n";
std::cout << " calculus : " << m_config.wipe_advanced_nozzle_melted_volume << " + " << m_config.wipe_advanced_multiplier.value BOOST_LOG_TRIVIAL(info) << " calculus : " << m_config.wipe_advanced_nozzle_melted_volume << " + " << m_config.wipe_advanced_multiplier.value
<< " * ( 0.5 + " << pigmentBef << " ) / ( 0.5 + " << pigmentAft << " )\n"; << " * ( 0.5 + " << pigmentBef << " ) / ( 0.5 + " << pigmentAft << " )\n";
std::cout << " = " << m_config.wipe_advanced_nozzle_melted_volume << " + " << (m_config.wipe_advanced_multiplier.value * (0.5 + pigmentBef) / (0.5 + pigmentAft)) << "\n"; BOOST_LOG_TRIVIAL(info) << " = " << m_config.wipe_advanced_nozzle_melted_volume << " + " << (m_config.wipe_advanced_multiplier.value * (0.5 + pigmentBef) / (0.5 + pigmentAft)) << "\n";
} }
} }
//filament_wipe_advanced_pigment //filament_wipe_advanced_pigment