Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync codes to github master #3759

Merged
merged 185 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
185 commits
Select commit Hold shift + click to select a range
8741796
ENH: revert time lapse gcode in A1 mini
XunZhangBambu Dec 14, 2023
2ae7ba0
ENH: revert "c80ad56f5e386687b7975918cec"
XunZhangBambu Dec 14, 2023
66f8138
FIX: do not touch the plate with different printing sequence
ArthurBambulab Dec 1, 2023
debf0bb
FIX: global arrange setting is wrong
ArthurBambulab Dec 1, 2023
05e054c
ENH: remove unnecessary translation labels
ArthurBambulab Nov 6, 2023
a697ddb
FIX: temperature symbols not shown correctly
ArthurBambulab Dec 15, 2023
ce092a6
FIX:Repair calculation process of plate_box
Haidiye00 Dec 7, 2023
058cc4b
ENH:when plate name has illegal filename character,it is invalid
Haidiye00 Dec 6, 2023
85ba562
FIX:frequent calls to _update_imgui_select_plate_toolbar
Haidiye00 Dec 6, 2023
1bb2884
FIX:Compressing textures causes black when switching textures
Haidiye00 Dec 13, 2023
14dbcf6
FIX: & is not displayed on the sending print page
BambooBugFixer Dec 11, 2023
3195695
FIX: AMS info is not fully displayed with Ukraine
BambooBugFixer Dec 7, 2023
64baf67
FIX: file name is not fully displayed if it is too long
BambooBugFixer Dec 11, 2023
ea56d5b
FIX: The warning box still exits when the temperature has reset.
BambooBugFixer Dec 13, 2023
0d5b4d2
FIX: White circle is not clear on auto refill page
BambooBugFixer Dec 13, 2023
b60f734
FIX: Groove text ctrl is not wide engough
BambooBugFixer Dec 8, 2023
ff03bdb
FIX: values are not saved when clicking on an empty space
BambooBugFixer Nov 29, 2023
1739e12
FIX: Temperature warning is not fully displayed
BambooBugFixer Dec 1, 2023
d81f240
NEW: display bitmap when calibrating
BambooBugFixer Dec 4, 2023
dcc9d57
FIX: remember the flow ratio calibration type
BambooBugFixer Dec 7, 2023
abf2cd8
FIX: File panel crash on scroll
bambu123 Dec 6, 2023
f1af457
ci: update build version to 01.08.02.57
Dec 18, 2023
df4927b
FIX: cali: custom created filament from AMS displayed as incompatible
LiZ-Li-BBL Dec 18, 2023
a2e50ea
FIX: Commas should be used to indicate decimal points in German
BambooBugFixer Dec 18, 2023
261c1ad
FIX: duplicated items in comboBox at calibration completed page
LiZ-Li-BBL Dec 18, 2023
2b63590
FIX: auto arranging skip unprintable high items
ArthurBambulab Dec 19, 2023
886d64a
ENH:update support for P1S plus
walterwongbbl Dec 14, 2023
aa95fd3
ENH: CLI: add mk information support
lanewei120 Dec 19, 2023
e6ee14b
ENH:calibration support p1p plus
walterwongbbl Dec 20, 2023
5dcd1b1
FIX: add dialog of 3mf version newer cloud version
DanBao-Bambu Dec 11, 2023
3e0e812
FIX: add log for base_id and filament_id
DanBao-Bambu Dec 19, 2023
2f3d820
FIX: MediaFilePanel error state
bambu123 Dec 19, 2023
ad0f796
NEW: Load Printer-Image First System Second Profiles
Dec 8, 2023
2a9436a
FIX: sync whole preset vendor directory
bambu123 Dec 8, 2023
ca7c39f
ENH: support turn off liveview auto retry
bambu123 Nov 14, 2023
5315f79
FIX: SwitchButton auto scale font
bambu123 Dec 4, 2023
c322004
FIX: set WEBKIT_DISABLE_COMPOSITING_MODE=1 for linux gtk
bambu123 Dec 20, 2023
e48260b
FIX: use t_utc for debug only
bambu123 Dec 18, 2023
da3c903
FIX: Prefer old selection when sync AMS not compatible
bambu123 Dec 1, 2023
bf26770
ENH: show liveview stat
bambu123 Nov 21, 2023
f00878d
FIX: register bambusource dll path
bambu123 Dec 20, 2023
623e78e
FIX: update model mall on switch env
bambu123 Dec 20, 2023
285da52
FIX:make sort_volumes right
Haidiye00 Dec 19, 2023
d198e8f
NEW:remember custom color
Haidiye00 Dec 18, 2023
f6c0ebf
FIX: mistake in compatible printers
XunZhangBambu Dec 21, 2023
3cf8f92
ENH:keep an unload logic
walterwongbbl Dec 20, 2023
9fa397e
FIX: copy live555 dll
bambu123 Dec 22, 2023
04d3250
FIX: show video size in stat
bambu123 Dec 1, 2023
b9c558f
FIX: optimize batch update object list on macOS
bambu123 Dec 21, 2023
6e88d7a
FIX: network plugins tip disappear on dark mode
bambu123 Dec 21, 2023
9d37fa0
FIX: several problems with mesh boolean
ArthurBambulab Dec 21, 2023
00ee04d
ENH: update some filament settings
XunZhangBambu Dec 19, 2023
97cc3e7
FIX: prevent slicing with adaptive layer height and organic support
ArthurBambulab Dec 19, 2023
3066d04
FIX: Display inconsistence in parameter table
BambooBugFixer Nov 23, 2023
b4a5c8a
FIX: Incomplete copy display in Transfer or discard dialog
DanBao-Bambu Dec 14, 2023
fc69475
FIX: Blank page appears when editing presets
DanBao-Bambu Dec 13, 2023
8951696
FIX: Filament issue generated when creating a printer
DanBao-Bambu Dec 5, 2023
727fed6
FIX: Limit the max length of k when calibrating
BambooBugFixer Dec 15, 2023
ff514a6
FIX: do not show the background bitmap when model is white.
BambooBugFixer Dec 20, 2023
ba773d4
FIX: add link for fuzzy skin, elefant, layer_height, retraction
DanBao-Bambu Nov 29, 2023
bca5e4d
ENH: add support for Troodon 2.0
YGK3D Dec 25, 2023
dfabf8c
FIX:arrow direction in scaling tool is incorrect
Haidiye00 Dec 25, 2023
8b7697c
FIX:cut connector can't be valid in gizmoMove and so on
YuSanka Dec 25, 2023
cb635d1
NEW:limit the length of project name
walterwongbbl Dec 22, 2023
09b0064
FIX: check recommended nozzle temperature
DanBao-Bambu Nov 27, 2023
60813e9
ENH: add PETG Translucent
XunZhangBambu Dec 25, 2023
79aa876
ENH:adjusting the warning level of timelpase
walterwongbbl Dec 22, 2023
17ef586
ENH:set lifecycle to production
walterwongbbl Dec 25, 2023
e118714
NEW: Add buried point information
MklBambu Dec 14, 2023
242e43f
FIX: boolmesh new volume's transform issue
MklBambu Dec 22, 2023
e0cf134
FIX: 3mf specification: change namespace form slic3rpe to BambuStudio
DanBao-Bambu Dec 26, 2023
de39161
FIX: Add flush_length for change_filament_gcode
zhimin-zeng-bambulab Dec 21, 2023
8d7752d
NEW: Open MakerWorld With BambuStudio GetParam
Dec 26, 2023
6505f52
FIX: context menu didn't update UI
LiZ-Li-BBL Dec 26, 2023
4ffb9bd
ENH: modify some profiles
XunZhangBambu Dec 26, 2023
138b907
FIX: crash of "filling bed"
ArthurBambulab Dec 26, 2023
3e6533e
FIX: boolean hangs in the middle of color painting
ArthurBambulab Dec 26, 2023
2f3570f
NEW: add nozzle height preset to machines
BambooBugFixer Dec 26, 2023
4777156
ENH: linux: set openssl back to 1.1.1k
lanewei120 Dec 20, 2023
befa37f
ENH: updater: use the current plugin version for compare
lanewei120 Nov 8, 2023
6b19237
FIX: An error of inconsistent layer height is reported.
zhimin-zeng-bambulab Dec 6, 2023
172a804
FIX:gcode.3mf file needs to open the plate_toolbar
Haidiye00 Dec 27, 2023
cf26dbe
FIX: plane_normal is not right after undo
Haidiye00 Dec 27, 2023
e49da29
FIX: the initial_non_support_extruder_id is not correct
zhimin-zeng-bambulab Nov 30, 2023
b158b78
FIX: macOS crash when undo object deleting
bambu123 Dec 27, 2023
1246cde
FIX: keep unsave config category order
bambu123 Dec 26, 2023
2417e1a
NEW: add buried point at the open method
MklBambu Dec 26, 2023
23ed6e1
NEW: Improvement of user experience plan
MklBambu Dec 26, 2023
ab63ff7
ENH: update A1 series start gcode
XunZhangBambu Dec 27, 2023
653217c
ENH: set elefant_foot_compenstation
XunZhangBambu Dec 27, 2023
b42d4c8
FIX: crach when send print and reslice
MklBambu Dec 28, 2023
5d6bc3f
ENH:remember filament custom color
Haidiye00 Dec 27, 2023
bfaea14
NEW:add "paint along straight line" function
SoftFever Dec 26, 2023
e257999
FIX:default bed use dark color in dark mode
Haidiye00 Dec 25, 2023
4409e55
FIX: edit preset dialog can't close on mac
DanBao-Bambu Dec 27, 2023
e37e51c
ENH: add dev_ota_version in ssdp
StoneLiBambulab Dec 28, 2023
35a94f4
NEW:Adapt to multicolour and gradient colour
bam-winterfell Dec 26, 2023
0c926c9
ENH: add alias for custom Filament preset
DanBao-Bambu Dec 23, 2023
85b7feb
NEW:Adaptation of semi transparent materials
bam-winterfell Dec 29, 2023
f8f1bfc
ENH: update A1 series end gcode
XunZhangBambu Dec 29, 2023
84bbaf4
ENH: modify 3rd party filament profiles
XunZhangBambu Dec 29, 2023
9b61ede
FIX:crash when intersection result is empty
Haidiye00 Dec 29, 2023
f24a17b
ENH: support preset description(tooltip)
bambu123 Dec 29, 2023
dd8dd5a
FIX: check sdcard exists for file connect
bambu123 Dec 29, 2023
86b60a2
FIX: MediaPlay not retry on end of stream
bambu123 Dec 29, 2023
c882f34
ENH: update version to 1.8.3
QingZhangBambu Jan 2, 2024
ccfbe31
FIX: disable flush options if prime tower is unchecked
LiZ-Li-BBL Jan 2, 2024
8f0a586
ENH: translation
ArthurBambulab Jan 2, 2024
3fda95b
ENH: refine GetVersion for HMS query
StoneLiBambulab Jan 3, 2024
6ecec6f
ENH: update translations
StoneLiBambulab Jan 3, 2024
4032a7f
FIX: The flushing was not auto-calc when sync ams list
MklBambu Dec 14, 2023
53400e8
ENH:enhance warning text of boolean operation
Haidiye00 Jan 2, 2024
6b01dad
ENH:paint along line function auto enter front view perspective
Haidiye00 Jan 2, 2024
911f1d4
ENH:translate three texts
Haidiye00 Jan 3, 2024
64fe32f
ENH: add high quality process profiles
XunZhangBambu Jan 3, 2024
8d92c71
NEW: add nozzle_height to machine profile and do not detect conflict
ArthurBambulab Dec 19, 2023
75a923e
FIX: auto arranging short objects gives overlapping results
ArthurBambulab Jan 3, 2024
ec425b9
NEW: New Policy UI
Dec 23, 2023
5e5dc4c
ENH: Refresh Staffpick every 6 hours
Jan 3, 2024
7f1f74a
FIX: privacyuse should be false when skip
MklBambu Jan 3, 2024
740ce25
FIX:fixed invalid links
walterwongbbl Jan 3, 2024
02c352c
FIX: update translations
MklBambu Jan 4, 2024
1d937a1
FIX:do not render plate pick when open gizmo
Haidiye00 Jan 4, 2024
0c5c5b4
FIX:fix export stl function with cut connector
Haidiye00 Jan 4, 2024
eb92f01
ENH: update A1 series GCode
XunZhangBambu Jan 4, 2024
85f9970
ENH: refine some words with air filtration
XunZhangBambu Jan 5, 2024
8934483
FIX: translate "support generation" and so on
ArthurBambulab Jan 5, 2024
a0fa72c
ENH: Optimize buried point information
MklBambu Jan 2, 2024
86b5e4d
FIX: The problem caused by Euler angle calculation
MklBambu Dec 13, 2023
8d5d11c
FIX: Prompt to delete problematic presets
DanBao-Bambu Jan 4, 2024
11cf266
ENH: modify elefant foot compensation
XunZhangBambu Jan 5, 2024
50c57be
FIX:adapt to multicolour and semi transparent materials
bam-winterfell Jan 5, 2024
230d4f5
FIX: crash when open newer 3mf on mac
DanBao-Bambu Jan 5, 2024
355866a
FIX:fixed incorrect HMS content
walterwongbbl Jan 5, 2024
6d83f99
ENH: update PETG nozzle_temperature_range
XunZhangBambu Jan 8, 2024
75cb903
FIX:allow height-range paint at upper and lower limit
Haidiye00 Jan 8, 2024
ca5a129
FIX:don't use clipping plane in text gizmo
Haidiye00 Jan 5, 2024
7a29101
ENH:add "reset function" in cutTongueAndGroove mode
Haidiye00 Jan 5, 2024
657049b
FIX: [5846] Custom Filament Page show System Filament
DanBao-Bambu Jan 8, 2024
323b396
FIX:A1 and p1 series do not support custom materials
bam-winterfell Jan 9, 2024
7da61b0
FIX: hide_id_middle_string
bambu123 Jan 8, 2024
9c84e92
FIX: start ping test on leave tunnel mqtt
bambu123 Dec 27, 2023
1db36e6
FIX: Copywriting updates
MklBambu Jan 4, 2024
fff197b
ENH: restrict the scope of multiplier
MklBambu Jan 8, 2024
2ed5c81
ENH: improve auto arranging with multi colors
ArthurBambulab Jan 8, 2024
5176681
ENH: avoid duplicating meshes in boolean
ArthurBambulab Dec 27, 2023
5ce41b2
FIX: several support bugs
ArthurBambulab Dec 20, 2023
1079fa5
ENH: use a better cone model
ArthurBambulab Dec 28, 2023
78f11ca
FIX: exception when comparing profiles
XunZhangBambu Jan 11, 2024
14be41e
ENH: add some missing params in profiles
XunZhangBambu Jan 12, 2024
1c4ac70
ENH: modify some logs level
StoneLiBambulab Jan 12, 2024
2ce2b37
ENH: improve auto-arranging
ArthurBambulab Jan 13, 2024
9e2666c
NEW:build plate marker detect
bam-winterfell Jan 12, 2024
e8a7bd0
ENH: separate objects by 1mm when duplicating
ArthurBambulab Jan 11, 2024
962553a
FIX: Studio UI Freeze when saving user preset
DanBao-Bambu Jan 12, 2024
b235cce
FIX: hide_id_middle_string 2
bambu123 Jan 15, 2024
95a4835
ENH::modify some logs level
walterwongbbl Jan 15, 2024
ca0fdc2
ENH: CLI: add logic to support skip pick images
lanewei120 Jan 15, 2024
70622db
ENH: bumped version to 1.8.4
lanewei120 Jan 16, 2024
3001e9a
FIX: first layer print sequence is incorrect when print by object
zhimin-zeng-bambulab Jan 15, 2024
d19f57e
FIX: user can accept nozzle wear to continue sending calibration
zhimin-zeng-bambulab Jan 15, 2024
ac8d4e0
ENH: QoL: improve PA Line method
SoftFever Jan 16, 2024
2f8109e
FIX:not render Separator line in dark mode
Haidiye00 Jan 15, 2024
5131bbc
FIX:Right click is invalid on blank space in the assembly view
Haidiye00 Jan 15, 2024
e990d32
FIX:not consider export stl from file menu
Haidiye00 Jan 15, 2024
29e4f77
ENH: skip_object: set enable_skip to false when only one object in plate
lanewei120 Jan 16, 2024
1ab50a0
FIX:not render plate pick when open paint gizmo
Haidiye00 Jan 16, 2024
b0374f0
FIX: [#3375] Force .gcode.3mf file extension
DanBao-Bambu Jan 16, 2024
1c63952
ENH: Support global part selection relationships
MklBambu Jan 15, 2024
9a69937
FIX:hide ip address
bam-winterfell Jan 17, 2024
f426868
FIX: low-level NFP bug with auto-arranging
ArthurBambulab Jan 13, 2024
e84c648
ENH: export stl with proper translation
ArthurBambulab Jan 17, 2024
8bb1c70
FIX: the logic of buried points that were not buried
MklBambu Jan 17, 2024
8dc4381
FIX: delete sdcard file crash
bambu123 Jan 16, 2024
fece9a0
FIX: hide local liveview ip
bambu123 Jan 17, 2024
f53acc2
FIX: Yield when join media thread
bambu123 Jan 17, 2024
3a66e17
ENH: restore single instance
bambu123 Dec 26, 2023
7a4f190
ENH: adjust connect error string
bambu123 Jan 10, 2024
19e91eb
FIX: 3mf with some Chinese puncs are not readable to 3D viewer
ArthurBambulab Jan 5, 2024
2adc69e
FIX: Guide page can't show in screen with mainframe
DanBao-Bambu Dec 27, 2023
221bab5
FIX: filament combox has blank line
DanBao-Bambu Dec 29, 2023
90a6143
FIX: load 3mf crash when studio has no base filament
DanBao-Bambu Jan 18, 2024
a47d629
FIX: the wipe tower of other PartPlate is generated incorrectly
zhimin-zeng-bambulab Jan 17, 2024
f050858
FIX: fix issues in the third phase of buried point
MklBambu Jan 19, 2024
9d723be
NEW:add plugin download address
walterwongbbl Jan 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ENH: modify some logs level
JIRA: STUDIO-5958

Change-Id: I5a8592dfb8ffa9a81952535cb30944f867aa0e22
Signed-off-by: Stone Li <stone.li@bambulab.com>
  • Loading branch information
StoneLiBambulab authored and lanewei120 committed Mar 25, 2024
commit 1c4ac707c6db82ef6882e0e3988d5b756a3e99c9
3 changes: 1 addition & 2 deletions src/slic3r/GUI/DeviceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4110,8 +4110,7 @@ int MachineObject::parse_json(std::string payload)
} else if (jj["command"].get<std::string>() == "project_file") {
//ack of project file
BOOST_LOG_TRIVIAL(debug) << "parse_json, ack of project_file = " << j.dump(4);

if (m_agent && is_studio_cmd(sequence_id)) {
if (m_agent) {
json t;
t["dev_id"] = this->dev_id;
t["signal"] = this->wifi_signal;
Expand Down
4 changes: 2 additions & 2 deletions src/slic3r/GUI/GUI_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5846,7 +5846,7 @@ void GUI_App::OSXStoreOpenFiles(const wxArrayString &fileNames)

void GUI_App::MacOpenURL(const wxString& url)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "get mac url " << url;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << "get mac url " << url;

if (!url.empty() && boost::starts_with(url, "bambustudioopen://")) {
auto input_str_arr = split_str(url.ToStdString(), "bambustudioopen://");
Expand All @@ -5857,7 +5857,7 @@ void GUI_App::MacOpenURL(const wxString& url)
}

std::string download_file_url = url_decode(download_origin_url);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << download_file_url;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << download_file_url;
if (!download_file_url.empty() && (boost::starts_with(download_file_url, "http://") || boost::starts_with(download_file_url, "https://"))) {

if (m_post_initialized) {
Expand Down
23 changes: 14 additions & 9 deletions src/slic3r/GUI/Plater.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3432,7 +3432,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
int progress_percent = static_cast<int>(100.0f * static_cast<float>(i) / static_cast<float>(input_files.size()));
const auto real_filename = (strategy & LoadStrategy::Restore) ? input_files[++i].filename() : filename;
const auto dlg_info = _L("Loading file") + ": " + from_path(real_filename);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": load file %1%") % filename;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << boost::format(": load file %1%") % filename;
dlg_cont = dlg.Update(progress_percent, dlg_info);
if (!dlg_cont) return empty_result;

Expand Down Expand Up @@ -5101,7 +5101,7 @@ void Plater::priv::export_gcode(fs::path output_path, bool output_path_on_remova
{
wxCHECK_RET(!(output_path.empty()), "export_gcode: output_path and upload_job empty");

BOOST_LOG_TRIVIAL(info) << boost::format("export_gcode: output_path %1%")%output_path.string();
BOOST_LOG_TRIVIAL(trace) << boost::format("export_gcode: output_path %1%")%output_path.string();
if (model.objects.empty())
return;

Expand Down Expand Up @@ -7260,7 +7260,7 @@ wxString Plater::priv::get_project_name()
//BBS
void Plater::priv::set_project_name(const wxString& project_name)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " project is:" << project_name;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << __LINE__ << " project is:" << project_name;
m_project_name = project_name;
//update topbar title
wxGetApp().mainframe->SetTitle(m_project_name);
Expand Down Expand Up @@ -7290,7 +7290,7 @@ void Plater::priv::set_project_filename(const wxString& filename)
full_path.replace_extension("");

m_project_folder = full_path.parent_path();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " project folder is:" << m_project_folder.string();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << __LINE__ << " project folder is:" << m_project_folder.string();

//BBS
wxString project_name = from_u8(full_path.filename().string());
Expand Down Expand Up @@ -8494,6 +8494,7 @@ void Plater::load_project(wxString const& filename2,
wxString const& originfile)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "filename is: " << filename2 << "and originfile is: " << originfile;
BOOST_LOG_TRIVIAL(info) << __FUNCTION__;
auto filename = filename2;
auto check = [&filename, this] (bool yes_or_no) {
if (!yes_or_no && !wxGetApp().check_and_save_current_preset_changes(_L("Load project"),
Expand Down Expand Up @@ -8635,7 +8636,7 @@ int Plater::save_project(bool saveAs)
Slic3r::remove_backup(model(), false);

p->set_project_filename(filename);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " call set_project_filename: " << filename;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << __LINE__ << " call set_project_filename: " << filename;

up_to_date(true, false);
up_to_date(true, true);
Expand All @@ -8659,7 +8660,7 @@ int Plater::save_project(bool saveAs)
//BBS import model by model id
void Plater::import_model_id(wxString download_info)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " download info: " << download_info;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << __LINE__ << " download info: " << download_info;

wxString download_origin_url = download_info;
wxString download_url;
Expand Down Expand Up @@ -9423,7 +9424,8 @@ void Plater::load_gcode()
//BBS: remove GCodeViewer as seperate APP logic
void Plater::load_gcode(const wxString& filename)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " entry and filename: " << filename;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << __LINE__ << " entry and filename: " << filename;
BOOST_LOG_TRIVIAL(info) << __FUNCTION__;
if (! is_gcode_file(into_u8(filename))
|| (m_last_loaded_gcode == filename && m_only_gcode)
)
Expand Down Expand Up @@ -11134,9 +11136,12 @@ int Plater::export_3mf(const boost::filesystem::path& output_path, SaveStrategy
const std::string path_u8 = into_u8(path);
wxBusyCursor wait;

BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": path=%1%, backup=%2%, export_plate_idx=%3%, SaveStrategy=%4%")
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << boost::format(": path=%1%, backup=%2%, export_plate_idx=%3%, SaveStrategy=%4%")
%output_path.string()%(strategy & SaveStrategy::Backup)%export_plate_idx %(unsigned int)strategy;

BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": path=%1%, backup=%2%, export_plate_idx=%3%, SaveStrategy=%4%")
% std::string("") % (strategy & SaveStrategy::Backup) % export_plate_idx % (unsigned int)strategy;

//BBS: add plate logic for thumbnail generate
std::vector<ThumbnailData*> thumbnails;
std::vector<ThumbnailData*> calibration_thumbnails;
Expand Down Expand Up @@ -11290,7 +11295,7 @@ int Plater::export_3mf(const boost::filesystem::path& output_path, SaveStrategy
if (!(store_params.strategy & SaveStrategy::Silence)) {
// Success
p->set_project_filename(path);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " call set_project_filename: " << path;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << __LINE__ << " call set_project_filename: " << path;
}
}
else {
Expand Down
6 changes: 3 additions & 3 deletions src/slic3r/GUI/WebGuideDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ GuideFrame::~GuideFrame()

void GuideFrame::load_url(wxString &url)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< " enter, url=" << url.ToStdString();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__<< " enter, url=" << url.ToStdString();
WebView::LoadUrl(m_browser, url);
m_browser->SetFocus();
UpdateState();
Expand Down Expand Up @@ -552,7 +552,7 @@ void GuideFrame::OnError(wxWebViewEvent &evt)
// Show the info bar with an error
// m_info->ShowMessage(_L("An error occurred loading ") + evt.GetURL() +
// "\n" + "'" + category + "'", wxICON_ERROR);
BOOST_LOG_TRIVIAL(info) << "GuideFrame::OnError: An error occurred loading " << evt.GetURL() << category;
BOOST_LOG_TRIVIAL(trace) << "GuideFrame::OnError: An error occurred loading " << evt.GetURL() << category;

UpdateState();
}
Expand Down Expand Up @@ -1605,7 +1605,7 @@ bool GuideFrame::LoadFile(std::string jPath, std::string &sContent)
std::stringstream buffer;
buffer << t.rdbuf();
sContent=buffer.str();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", load %1% into buffer")% jPath;
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << boost::format(", load %1% into buffer")% jPath;
}
catch (std::exception &e)
{
Expand Down
18 changes: 9 additions & 9 deletions src/slic3r/GUI/WebViewDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ WebViewPanel::WebViewPanel(wxWindow *parent)

WebViewPanel::~WebViewPanel()
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Start";
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << " Start";
SetEvtHandlerEnabled(false);

delete m_tools_menu;
Expand All @@ -233,7 +233,7 @@ WebViewPanel::~WebViewPanel()
delete m_LoginUpdateTimer;
m_LoginUpdateTimer = NULL;
}
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " End";
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << " End";
}


Expand Down Expand Up @@ -539,7 +539,7 @@ void WebViewPanel::update_mode()
*/
void WebViewPanel::OnNavigationRequest(wxWebViewEvent& evt)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
const wxString &url = evt.GetURL();
if (url.StartsWith("File://") || url.StartsWith("file://")) {
if (!url.Contains("/web/homepage/index.html")) {
Expand Down Expand Up @@ -583,7 +583,7 @@ void WebViewPanel::OnNavigationComplete(wxWebViewEvent& evt)
{
m_browser->Show();
Layout();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
if (wxGetApp().get_mode() == comDevelop)
wxLogMessage("%s", "Navigation complete; url='" + evt.GetURL() + "'");
UpdateState();
Expand All @@ -595,7 +595,7 @@ void WebViewPanel::OnNavigationComplete(wxWebViewEvent& evt)
*/
void WebViewPanel::OnDocumentLoaded(wxWebViewEvent& evt)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetTarget().ToUTF8().data();
// Only notify if the document is the main frame, not a subframe
if (evt.GetURL() == m_browser->GetCurrentURL())
{
Expand All @@ -607,7 +607,7 @@ void WebViewPanel::OnDocumentLoaded(wxWebViewEvent& evt)

void WebViewPanel::OnTitleChanged(wxWebViewEvent &evt)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetString().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetString().ToUTF8().data();
// wxGetApp().CallAfter([this] { SendRecentList(); });
}

Expand All @@ -616,7 +616,7 @@ void WebViewPanel::OnTitleChanged(wxWebViewEvent &evt)
*/
void WebViewPanel::OnNewWindow(wxWebViewEvent& evt)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetURL().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetURL().ToUTF8().data();
wxString flag = " (other)";

if (evt.GetNavigationAction() == wxWEBVIEW_NAV_ACTION_USER)
Expand All @@ -637,7 +637,7 @@ void WebViewPanel::OnNewWindow(wxWebViewEvent& evt)

void WebViewPanel::OnScriptMessage(wxWebViewEvent& evt)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << evt.GetString().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << evt.GetString().ToUTF8().data();
// update login status
if (m_LoginUpdateTimer == nullptr) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " Create Timer";
Expand Down Expand Up @@ -883,7 +883,7 @@ void WebViewPanel::OnError(wxWebViewEvent& evt)
WX_ERROR_CASE(wxWEBVIEW_NAV_ERR_OTHER);
}

BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": [" << category << "] " << evt.GetString().ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": [" << category << "] " << evt.GetString().ToUTF8().data();

if (wxGetApp().get_mode() == comDevelop)
wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'");
Expand Down
4 changes: 2 additions & 2 deletions src/slic3r/GUI/Widgets/WebView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
url2.Replace("\\", "/");
#endif
if (!url2.empty()) { url2 = wxURI(url2).BuildURI(); }
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << url2.ToUTF8();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << ": " << url2.ToUTF8();

#ifdef __WIN32__
wxWebView* webView = new WebViewEdge;
Expand Down Expand Up @@ -270,7 +270,7 @@ void WebView::LoadUrl(wxWebView * webView, wxString const &url)
url2.Replace("\\", "/");
#endif
if (!url2.empty()) { url2 = wxURI(url2).BuildURI(); }
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << url2.ToUTF8();
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << url2.ToUTF8();
webView->LoadURL(url2);
}

Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/wxMediaCtrl2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ WXLRESULT wxMediaCtrl2::MSWWindowProc(WXUINT nMsg,
wxPostEvent(this, evt);
}
}
BOOST_LOG_TRIVIAL(info) << msg.ToUTF8().data();
BOOST_LOG_TRIVIAL(trace) << msg.ToUTF8().data();
return 0;
}
return wxMediaCtrl::MSWWindowProc(nMsg, wParam, lParam);
Expand Down