mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: [STUDIO-3090] export error string to file panel 

Change-Id: Ifabff9646dfcf19da9188edfb2447b33c8c1089e
This commit is contained in:
chunmao.guo 2023-06-09 11:40:39 +08:00 committed by Lane.Wei
parent 75545c65cd
commit 10988f0bae
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/MediaFilePanel.cpp
View File

@ -277,6 +277,7 @@ void MediaFilePanel::SetMachineObject(MachineObject* obj)
case PrinterFileSystem::ListSyncing: icon = m_bmp_loading; msg = _L("Loading file list..."); break; case PrinterFileSystem::ListSyncing: icon = m_bmp_loading; msg = _L("Loading file list..."); break;
case PrinterFileSystem::ListReady: icon = extra == 0 ? m_bmp_empty : m_bmp_failed; msg = extra == 0 ? _L("No files [%d]") : _L("Load failed [%d]"); break; case PrinterFileSystem::ListReady: icon = extra == 0 ? m_bmp_empty : m_bmp_failed; msg = extra == 0 ? _L("No files [%d]") : _L("Load failed [%d]"); break;
} }
if (!e.GetString().IsEmpty()) msg = e.GetString();
if (fs->GetCount() == 0 && !msg.empty()) if (fs->GetCount() == 0 && !msg.empty())
m_image_grid->SetStatus(icon, msg); m_image_grid->SetStatus(icon, msg);
if (e.GetInt() == PrinterFileSystem::Initializing) if (e.GetInt() == PrinterFileSystem::Initializing)

7
src/slic3r/GUI/Printer/PrinterFileSystem.cpp
View File

@ -2,6 +2,7 @@
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "libslic3r/Format/bbs_3mf.hpp" #include "libslic3r/Format/bbs_3mf.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "slic3r/GUI/I18N.hpp"
#include "../../Utils/NetworkAgent.hpp" #include "../../Utils/NetworkAgent.hpp"
#include "../BitmapCache.hpp" #include "../BitmapCache.hpp"
@ -29,6 +30,10 @@ wxDEFINE_EVENT(EVT_FILE_CALLBACK, wxCommandEvent);
static wxBitmap default_thumbnail; static wxBitmap default_thumbnail;
static std::map<int, std::string> error_messages = {
{PrinterFileSystem::FILE_TYPE_ERR, L("Not supported on the current printer version.")}
};
struct StaticBambuLib : BambuLib { struct StaticBambuLib : BambuLib {
static StaticBambuLib & get(); static StaticBambuLib & get();
static int Fake_Bambu_Create(Bambu_Tunnel*, char const*) { return -2; } static int Fake_Bambu_Create(Bambu_Tunnel*, char const*) { return -2; }
@ -973,6 +978,8 @@ void PrinterFileSystem::SendChangedEvent(wxEventType type, size_t index, std::st
event.SetInt(index); event.SetInt(index);
if (!str.empty()) if (!str.empty())
event.SetString(wxString::FromUTF8(str.c_str())); event.SetString(wxString::FromUTF8(str.c_str()));
else if (auto iter = error_messages.find(extra); iter != error_messages.end())
event.SetString(wxString::FromUTF8(iter->second.c_str()));
event.SetExtraLong(extra); event.SetExtraLong(extra);
if (wxThread::IsMain()) if (wxThread::IsMain())
ProcessEventLocally(event); ProcessEventLocally(event);