3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 23:17:35 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: just load json profile

Browse source 
Change-Id: I15c54f67a7680e643b9d21a4facb9365ef08fe72
(cherry picked from commit e2f862b462445d0eeb69c99525a07db9d67d0a6f)
This commit is contained in:
zorro.zhang 2023-07-05 18:52:04 +08:00 • committed by Lane.Wei
parent d08e5f6531
commit b7a11fb768
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/WebGuideDialog.cpp
View file

@ -1006,11 +1006,13 @@ int GuideFrame::LoadProfile()
} else { } else {
//cout << "is a file" << endl; //cout << "is a file" << endl;
//cout << iter->path().string() << endl; //cout << iter->path().string() << endl;
wxString strVendor = from_u8(iter->path().string()).BeforeLast('.'); wxString strVendor = from_u8(iter->path().string()).BeforeLast('.');
strVendor = strVendor.AfterLast( '\\'); strVendor = strVendor.AfterLast( '\\');
strVendor = strVendor.AfterLast('\/'); strVendor = strVendor.AfterLast('\/');
wxString strExtension = from_u8(iter->path().string()).AfterLast('.').Lower();
if (w2s(strVendor) == PresetBundle::BBL_BUNDLE) if (w2s(strVendor) == PresetBundle::BBL_BUNDLE && strExtension.CmpNoCase("json") == 0)
LoadProfileFamily(w2s(strVendor), iter->path().string()); LoadProfileFamily(w2s(strVendor), iter->path().string());
} }
} }
@ -1027,8 +1029,9 @@ int GuideFrame::LoadProfile()
wxString strVendor = from_u8(iter->path().string()).BeforeLast('.'); wxString strVendor = from_u8(iter->path().string()).BeforeLast('.');
strVendor = strVendor.AfterLast( '\\'); strVendor = strVendor.AfterLast( '\\');
strVendor = strVendor.AfterLast('\/'); strVendor = strVendor.AfterLast('\/');
wxString strExtension = from_u8(iter->path().string()).AfterLast('.').Lower();
if (w2s(strVendor) != PresetBundle::BBL_BUNDLE) if (w2s(strVendor) != PresetBundle::BBL_BUNDLE && strExtension.CmpNoCase("json")==0)
LoadProfileFamily(w2s(strVendor), iter->path().string()); LoadProfileFamily(w2s(strVendor), iter->path().string());
} }
} }