Mirror/waifu2x-caffe
1
0
Fork 0
mirror of https://github.com/lltcggie/waifu2x-caffe.git synced 2025-06-26 21:52:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upconvモデルを優先にした

Browse Source
This commit is contained in:
lltcggie 2016-08-03 01:23:15 +09:00
parent 4eb39ad48c
commit b1f81a44c8
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
waifu2x-caffe-gui/MainDialog.cpp
View File

@ -307,25 +307,25 @@ bool DialogEvent::SyncMember(const bool NotSyncCropSize, const bool silent)
switch (cur) switch (cur)
{ {
case 0: case 0:
model_dir = TEXT("models/anime_style_art_rgb");
modelType = eModelTypeRGB;
break;
case 1:
model_dir = TEXT("models/photo");
modelType = eModelTypePhoto;
break;
case 2:
model_dir = TEXT("models/upconv_7_anime_style_art_rgb"); model_dir = TEXT("models/upconv_7_anime_style_art_rgb");
modelType = eModelTypeUpConvRGB; modelType = eModelTypeUpConvRGB;
break; break;
case 3: case 1:
model_dir = TEXT("models/upconv_7_photo"); model_dir = TEXT("models/upconv_7_photo");
modelType = eModelTypeUpConvPhoto; modelType = eModelTypeUpConvPhoto;
break; break;
case 2:
model_dir = TEXT("models/anime_style_art_rgb");
modelType = eModelTypeRGB;
break;
case 3:
model_dir = TEXT("models/photo");
modelType = eModelTypePhoto;
break;
case 4: case 4:
model_dir = TEXT("models/anime_style_art"); model_dir = TEXT("models/anime_style_art");
modelType = eModelTypeY; modelType = eModelTypeY;
@ -1506,10 +1506,10 @@ void DialogEvent::SetWindowTextLang()
SendMessage(hwndCombo, CB_DELETESTRING, 0, 0); SendMessage(hwndCombo, CB_DELETESTRING, 0, 0);
} }
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_RGB").c_str());
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_PHOTO").c_str());
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_UPCONV_RGB").c_str()); SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_UPCONV_RGB").c_str());
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_UPCONV_PHOTO").c_str()); SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_UPCONV_PHOTO").c_str());
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_RGB").c_str());
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_PHOTO").c_str());
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_Y").c_str()); SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_Y").c_str());
SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, cur, 0); SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, cur, 0);
@ -1920,16 +1920,18 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
} }
int index = 0; int index = 0;
if (modelType == eModelTypeRGB) if (modelType == eModelTypeUpConvRGB)
index = 0; index = 0;
else if (modelType == eModelTypePhoto)
index = 1;
else if (modelType == eModelTypeUpConvRGB)
index = 2;
else if (modelType == eModelTypeUpConvPhoto) else if (modelType == eModelTypeUpConvPhoto)
index = 1;
else if (modelType == eModelTypeRGB)
index = 2;
else if (modelType == eModelTypePhoto)
index = 3; index = 3;
else else if (modelType == eModelTypeY)
index = 4; index = 4;
else
index = 0;
SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, index, 0); SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, index, 0);
@ -2081,14 +2083,14 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
false, 0, &cmdNoOverwriteConstraint, cmd); false, 0, &cmdNoOverwriteConstraint, cmd);
std::vector<std::wstring> cmdModelTypeConstraintV; std::vector<std::wstring> cmdModelTypeConstraintV;
cmdModelTypeConstraintV.push_back(L"anime_style_art_rgb");
cmdModelTypeConstraintV.push_back(L"photo");
cmdModelTypeConstraintV.push_back(L"upconv_7_anime_style_art_rgb"); cmdModelTypeConstraintV.push_back(L"upconv_7_anime_style_art_rgb");
cmdModelTypeConstraintV.push_back(L"upconv_7_photo"); cmdModelTypeConstraintV.push_back(L"upconv_7_photo");
cmdModelTypeConstraintV.push_back(L"anime_style_art_rgb");
cmdModelTypeConstraintV.push_back(L"photo");
cmdModelTypeConstraintV.push_back(L"anime_style_art_y"); cmdModelTypeConstraintV.push_back(L"anime_style_art_y");
TCLAP::ValuesConstraint<std::wstring> cmdModelTypeConstraint(cmdModelTypeConstraintV); TCLAP::ValuesConstraint<std::wstring> cmdModelTypeConstraint(cmdModelTypeConstraintV);
TCLAP::ValueArg<std::wstring> cmdModelType(L"y", L"model_type", L"model type", TCLAP::ValueArg<std::wstring> cmdModelType(L"y", L"model_type", L"model type",
false, L"anime_style_art_rgb", &cmdModelTypeConstraint, cmd); false, L"upconv_7_anime_style_art_rgb", &cmdModelTypeConstraint, cmd);
// definition of command line argument : end // definition of command line argument : end
@ -2317,18 +2319,18 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
if (cmdModelType.isSet()) if (cmdModelType.isSet())
{ {
int index = 0; int index = 0;
if (cmdModelType.getValue() == L"anime_style_art_rgb") if (cmdModelType.getValue() == L"upconv_7_anime_style_art_rgb")
index = 0; index = 0;
else if (cmdModelType.getValue() == L"photo")
index = 1;
else if (cmdModelType.getValue() == L"upconv_7_anime_style_art_rgb")
index = 2;
else if (cmdModelType.getValue() == L"upconv_7_photo") else if (cmdModelType.getValue() == L"upconv_7_photo")
index = 1;
else if (cmdModelType.getValue() == L"anime_style_art_rgb")
index = 2;
else if (cmdModelType.getValue() == L"photo")
index = 3; index = 3;
else if (cmdModelType.getValue() == L"anime_style_art_y") else if (cmdModelType.getValue() == L"anime_style_art_y")
index = 4; index = 4;
else else
index = 4; index = 0;
SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, index, 0); SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, index, 0);

2
waifu2x-caffe/Source.cpp
View File

@ -110,7 +110,7 @@ int main(int argc, char** argv)
TCLAP::ValueArg<std::string> cmdModelPath("", "model_dir", TCLAP::ValueArg<std::string> cmdModelPath("", "model_dir",
"path to custom model directory (don't append last / )", false, "path to custom model directory (don't append last / )", false,
"models/anime_style_art_rgb", "string", cmd); "models/upconv_7_anime_style_art_rgb", "string", cmd);
std::vector<std::string> cmdProcessConstraintV; std::vector<std::string> cmdProcessConstraintV;
cmdProcessConstraintV.push_back("cpu"); cmdProcessConstraintV.push_back("cpu");