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

FIX: PrinterFileSystem::FileRemoved 

Change-Id: I891aaa8d58ff379dc1ebd8581064865a33388f74
This commit is contained in:
chunmao.guo 2024-04-30 13:46:59 +08:00 committed by Lane.Wei
parent 2f6c690c4f
commit 2d57111d0b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ PrinterFileSystem::PrinterFileSystem()
wxString path = "D:\\work\\pic\\"; wxString path = "D:\\work\\pic\\";
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
auto name = wxString::Format(L"gcode-%02d.3mf", i + 1); auto name = wxString::Format(L"gcode-%02d.3mf", i + 1);
m_file_list.push_back({name.ToUTF8().data(), "", time.GetTicks(), 26937, i < 5 ? FF_DOWNLOAD : 0, default_thumbnail, i * 34 - 35}); m_file_list.push_back({name.ToUTF8().data(), "", time.GetTicks(), 26937, i < 5 ? FF_DOWNLOAD : 0, default_thumbnail});
std::ifstream ifs((path + name).ToUTF8().data(), std::ios::binary); std::ifstream ifs((path + name).ToUTF8().data(), std::ios::binary);
if (ifs) if (ifs)
ParseThumbnail(m_file_list.back(), ifs); ParseThumbnail(m_file_list.back(), ifs);
@ -84,7 +84,7 @@ PrinterFileSystem::PrinterFileSystem()
for (int i = 0; i < 100; ++i) { for (int i = 0; i < 100; ++i) {
auto name = wxString::Format(L"img-%03d.jpg", i + 1); auto name = wxString::Format(L"img-%03d.jpg", i + 1);
wxImage im(path + name); wxImage im(path + name);
m_file_list.push_back({name.ToUTF8().data(), "", time.GetTicks(), 26937, i < 20 ? FF_DOWNLOAD : 0, i > 3 ? im : default_thumbnail, i * 10 - 40 - 1}); m_file_list.push_back({name.ToUTF8().data(), "", time.GetTicks(), 26937, i < 20 ? FF_DOWNLOAD : 0, i > 3 ? im : default_thumbnail});
time.Add(wxDateSpan::Days(-1)); time.Add(wxDateSpan::Days(-1));
} }
m_file_list[0].thumbnail = default_thumbnail; m_file_list[0].thumbnail = default_thumbnail;
@ -958,13 +958,13 @@ void PrinterFileSystem::FileRemoved(std::pair<FileType, std::string> type, size_
if (file_index.second == size_t(-1)) if (file_index.second == size_t(-1))
return; return;
if (&file_index.first == &m_file_list) { if (&file_index.first == &m_file_list) {
auto removeFromGroup = [](std::vector<size_t> &group, size_t index, int total) { auto removeFromGroup = [](std::vector<size_t> &group, size_t index, size_t total) {
for (auto iter = group.begin(); iter != group.end(); ++iter) { for (auto iter = group.begin(); iter != group.end(); ++iter) {
size_t index2 = -1; size_t index2 = -1;
if (*iter < index) continue; if (*iter < index) continue;
if (*iter == index) { if (*iter == index) {
auto iter2 = iter + 1; auto iter2 = iter + 1;
if (iter2 == group.end() ? index == total - 1 : *iter2 == index + 1) { if (index + 1 == (iter2 == group.end() ? total : *iter2)) {
index2 = std::distance(group.begin(), iter); index2 = std::distance(group.begin(), iter);
} }
++iter; ++iter;
@ -978,11 +978,11 @@ void PrinterFileSystem::FileRemoved(std::pair<FileType, std::string> type, size_
}; };
size_t index2 = removeFromGroup(m_group_month, index, m_file_list.size()); size_t index2 = removeFromGroup(m_group_month, index, m_file_list.size());
if (index2 < m_group_month.size()) { if (index2 < m_group_month.size()) {
int index3 = removeFromGroup(m_group_year, index, m_group_month.size()); int index3 = removeFromGroup(m_group_year, index2, m_group_month.size());
if (index3 < m_group_year.size()) { if (index3 < m_group_year.size()) {
m_group_year.erase(m_group_year.begin() + index3); m_group_year.erase(m_group_year.begin() + index3);
if (m_group_mode == G_YEAR) if (m_group_mode == G_YEAR)
m_group_flags.erase(m_group_flags.begin() + index2); m_group_flags.erase(m_group_flags.begin() + index3);
} }
m_group_month.erase(m_group_month.begin() + index2); m_group_month.erase(m_group_month.begin() + index2);
if (m_group_mode == G_MONTH) if (m_group_mode == G_MONTH)

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

@ -55,6 +55,7 @@ wxMediaCtrl2::wxMediaCtrl2(wxWindow *parent)
void wxMediaCtrl2::Load(wxURI url) void wxMediaCtrl2::Load(wxURI url)
{ {
#ifdef __WIN32__ #ifdef __WIN32__
InvalidateBestSize();
if (m_imp == nullptr) { if (m_imp == nullptr) {
static bool notified = false; static bool notified = false;
if (!notified) CallAfter([] { if (!notified) CallAfter([] {