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

GUIもupconv_7_anime_style_art_rgbに対応(モデル選択の方法がコンボボックスになった)

Browse Source
This commit is contained in:
lltcggie 2016-05-17 00:44:38 +09:00
parent 0ba9cc962e
commit e9c9651047
11 changed files with 76 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/lang/Chinese_Simplified.json
View File

@ -17,7 +17,7 @@
"IDC_RADIO_MODE_SCALE":"仅放大", "IDC_RADIO_MODE_SCALE":"仅放大",
"IDC_RADIO_MODE_NOISE":"仅降噪", "IDC_RADIO_MODE_NOISE":"仅降噪",
"IDC_RADIO_AUTO_SCALE":"自动降噪和放大", "IDC_RADIO_AUTO_SCALE":"自动降噪和放大",
"IDC_STATIC_JPEG_NOISE_LEVEL":"JPEG 降噪等级", "IDC_STATIC_JPEG_NOISE_LEVEL":"降噪等级",
"IDC_RADIONOISE_LEVEL1":"1 级", "IDC_RADIONOISE_LEVEL1":"1 级",
"IDC_RADIONOISE_LEVEL2":"2 级", "IDC_RADIONOISE_LEVEL2":"2 级",
"IDC_RADIONOISE_LEVEL3":"3 级", "IDC_RADIONOISE_LEVEL3":"3 级",

2
bin/lang/Chinese_Traditional.json
View File

@ -17,7 +17,7 @@
"IDC_RADIO_MODE_SCALE":"放大", "IDC_RADIO_MODE_SCALE":"放大",
"IDC_RADIO_MODE_NOISE":"降噪", "IDC_RADIO_MODE_NOISE":"降噪",
"IDC_RADIO_AUTO_SCALE":"自動降噪和放大", "IDC_RADIO_AUTO_SCALE":"自動降噪和放大",
"IDC_STATIC_JPEG_NOISE_LEVEL":"JPEG降噪水平", "IDC_STATIC_JPEG_NOISE_LEVEL":"降噪水平",
"IDC_RADIONOISE_LEVEL1":"等級1", "IDC_RADIONOISE_LEVEL1":"等級1",
"IDC_RADIONOISE_LEVEL2":"等級2", "IDC_RADIONOISE_LEVEL2":"等級2",
"IDC_RADIONOISE_LEVEL3":"等級3", "IDC_RADIONOISE_LEVEL3":"等級3",

5
bin/lang/english.json
View File

@ -17,7 +17,7 @@
"IDC_RADIO_MODE_SCALE":"Magnify only", "IDC_RADIO_MODE_SCALE":"Magnify only",
"IDC_RADIO_MODE_NOISE":"Denoise only", "IDC_RADIO_MODE_NOISE":"Denoise only",
"IDC_RADIO_AUTO_SCALE":"Magnify && Auto Denoise", "IDC_RADIO_AUTO_SCALE":"Magnify && Auto Denoise",
"IDC_STATIC_JPEG_NOISE_LEVEL":"JPEG denoise level", "IDC_STATIC_JPEG_NOISE_LEVEL":"Denoise level",
"IDC_RADIONOISE_LEVEL1":"Level 1", "IDC_RADIONOISE_LEVEL1":"Level 1",
"IDC_RADIONOISE_LEVEL2":"Level 2", "IDC_RADIONOISE_LEVEL2":"Level 2",
"IDC_RADIONOISE_LEVEL3":"Level 3", "IDC_RADIONOISE_LEVEL3":"Level 3",
@ -90,5 +90,6 @@
"MessageNoOverwrite":"Already file exists in the destination: %s", "MessageNoOverwrite":"Already file exists in the destination: %s",
"MessageCudaOldDeviceError":"Your CUDA device too old.\r\nPlease use Compute Capability 2.0 or more devices", "MessageCudaOldDeviceError":"Your CUDA device too old.\r\nPlease use Compute Capability 2.0 or more devices",
"OK":"OK", "OK":"OK",
"Cancel":"Cancel" "Cancel":"Cancel",
"IDC_RADIO_MODEL_UPCONV_RGB":"2-D illust (UpConvRGB Model)"
} }

7
bin/lang/japanese.json
View File

@ -17,7 +17,7 @@
"IDC_RADIO_MODE_SCALE":"拡大", "IDC_RADIO_MODE_SCALE":"拡大",
"IDC_RADIO_MODE_NOISE":"ノイズ除去", "IDC_RADIO_MODE_NOISE":"ノイズ除去",
"IDC_RADIO_AUTO_SCALE":"ノイズ除去(自動判別)と拡大", "IDC_RADIO_AUTO_SCALE":"ノイズ除去(自動判別)と拡大",
"IDC_STATIC_JPEG_NOISE_LEVEL":"JPEGノイズ除去レベル", "IDC_STATIC_JPEG_NOISE_LEVEL":"ノイズ除去レベル",
"IDC_RADIONOISE_LEVEL1":"レベル1", "IDC_RADIONOISE_LEVEL1":"レベル1",
"IDC_RADIONOISE_LEVEL2":"レベル2", "IDC_RADIONOISE_LEVEL2":"レベル2",
"IDC_RADIONOISE_LEVEL3":"レベル3", "IDC_RADIONOISE_LEVEL3":"レベル3",
@ -28,7 +28,7 @@
"IDC_STATIC_MODEL":"モデル", "IDC_STATIC_MODEL":"モデル",
"IDC_RADIO_MODEL_RGB":"2次元イラスト (RGBモデル)", "IDC_RADIO_MODEL_RGB":"2次元イラスト (RGBモデル)",
"IDC_RADIO_MODEL_PHOTO":"写真・アニメ (Photoモデル)", "IDC_RADIO_MODEL_PHOTO":"写真・アニメ (Photoモデル)",
"IDC_RADIO_MODEL_Y":"2次元イラスト2 (Yモデル)", "IDC_RADIO_MODEL_Y":"2次元イラスト (Yモデル)",
"IDC_CHECK_TTA":"TTAモードを使う", "IDC_CHECK_TTA":"TTAモードを使う",
"IDC_STATIC_PROCESS_SPEED_SETTING":"処理速度設定", "IDC_STATIC_PROCESS_SPEED_SETTING":"処理速度設定",
"IDC_STATIC_PROCESSOR":"使用プロセッサー", "IDC_STATIC_PROCESSOR":"使用プロセッサー",
@ -90,5 +90,6 @@
"MessageNoOverwrite":"出力先に既にファイルが存在します: %s", "MessageNoOverwrite":"出力先に既にファイルが存在します: %s",
"MessageCudaOldDeviceError":"CUDAデバイスが古いです。\r\nCompute Capability 2.0以上のデバイスを使用してください", "MessageCudaOldDeviceError":"CUDAデバイスが古いです。\r\nCompute Capability 2.0以上のデバイスを使用してください",
"OK":"OK", "OK":"OK",
"Cancel":"キャンセル" "Cancel":"キャンセル",
"IDC_RADIO_MODEL_UPCONV_RGB":"2次元イラスト (UpConvRGBモデル)"
} }

2
bin/lang/korean.json
View File

@ -17,7 +17,7 @@
"IDC_RADIO_MODE_SCALE":"확대", "IDC_RADIO_MODE_SCALE":"확대",
"IDC_RADIO_MODE_NOISE":"노이즈 제거", "IDC_RADIO_MODE_NOISE":"노이즈 제거",
"IDC_RADIO_AUTO_SCALE":"자동 노이즈 제거 && 확대", "IDC_RADIO_AUTO_SCALE":"자동 노이즈 제거 && 확대",
"IDC_STATIC_JPEG_NOISE_LEVEL":"JPEG 노이즈 제거 단계", "IDC_STATIC_JPEG_NOISE_LEVEL":"노이즈 제거 단계",
"IDC_RADIONOISE_LEVEL1":"1단계", "IDC_RADIONOISE_LEVEL1":"1단계",
"IDC_RADIONOISE_LEVEL2":"2단계", "IDC_RADIONOISE_LEVEL2":"2단계",
"IDC_RADIONOISE_LEVEL3":"3단계", "IDC_RADIONOISE_LEVEL3":"3단계",

2
bin/lang/turkish.json
View File

@ -17,7 +17,7 @@
"IDC_RADIO_MODE_SCALE":"Sadece büyüt", "IDC_RADIO_MODE_SCALE":"Sadece büyüt",
"IDC_RADIO_MODE_NOISE":"Sadece gürültüsüzleştir", "IDC_RADIO_MODE_NOISE":"Sadece gürültüsüzleştir",
"IDC_RADIO_AUTO_SCALE":"Büyüt ve Oto-Gürültüsüzleştir", "IDC_RADIO_AUTO_SCALE":"Büyüt ve Oto-Gürültüsüzleştir",
"IDC_STATIC_JPEG_NOISE_LEVEL":"JPEG gürültüsüzleştirme düzeyi", "IDC_STATIC_JPEG_NOISE_LEVEL":"gürültüsüzleştirme düzeyi",
"IDC_RADIONOISE_LEVEL1":"Seviye 1", "IDC_RADIONOISE_LEVEL1":"Seviye 1",
"IDC_RADIONOISE_LEVEL2":"Seviye 2", "IDC_RADIONOISE_LEVEL2":"Seviye 2",
"IDC_RADIONOISE_LEVEL3":"Seviye 3", "IDC_RADIONOISE_LEVEL3":"Seviye 3",

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

@ -119,6 +119,10 @@ tstring DialogEvent::AddName() const
case eModelTypeY: case eModelTypeY:
addstr += TEXT("Y"); addstr += TEXT("Y");
break; break;
case eModelTypeUpConvRGB:
addstr += TEXT("UpConvRGB");
break;
} }
addstr += TEXT(")"); addstr += TEXT(")");
@ -261,20 +265,33 @@ bool DialogEvent::SyncMember(const bool NotSyncCropSize, const bool silent)
scale_height = l; scale_height = l;
} }
if (SendMessage(GetDlgItem(dh, IDC_RADIO_MODEL_RGB), BM_GETCHECK, 0, 0))
{ {
const int cur = SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_GETCURSEL, 0, 0);
switch (cur)
{
case 0:
model_dir = TEXT("models/anime_style_art_rgb"); model_dir = TEXT("models/anime_style_art_rgb");
modelType = eModelTypeRGB; modelType = eModelTypeRGB;
} break;
else if (SendMessage(GetDlgItem(dh, IDC_RADIO_MODEL_Y), BM_GETCHECK, 0, 0))
{ case 1:
model_dir = TEXT("models/anime_style_art"); model_dir = TEXT("models/anime_style_art");
modelType = eModelTypeY; modelType = eModelTypeY;
} break;
else
{ case 2:
model_dir = TEXT("models/photo"); model_dir = TEXT("models/photo");
modelType = eModelTypePhoto; modelType = eModelTypePhoto;
break;
case 3:
model_dir = TEXT("models/upconv_7_anime_style_art_rgb");
modelType = eModelTypeUpConvRGB;
break;
default:
break;
}
} }
{ {
@ -1383,9 +1400,6 @@ void DialogEvent::SetWindowTextLang()
SET_WINDOW_TEXT(IDC_RADIO_SCALE_WIDTH); SET_WINDOW_TEXT(IDC_RADIO_SCALE_WIDTH);
SET_WINDOW_TEXT(IDC_RADIO_SCALE_HEIGHT); SET_WINDOW_TEXT(IDC_RADIO_SCALE_HEIGHT);
SET_WINDOW_TEXT(IDC_STATIC_MODEL); SET_WINDOW_TEXT(IDC_STATIC_MODEL);
SET_WINDOW_TEXT(IDC_RADIO_MODEL_RGB);
SET_WINDOW_TEXT(IDC_RADIO_MODEL_PHOTO);
SET_WINDOW_TEXT(IDC_RADIO_MODEL_Y);
SET_WINDOW_TEXT(IDC_CHECK_TTA); SET_WINDOW_TEXT(IDC_CHECK_TTA);
SET_WINDOW_TEXT(IDC_STATIC_PROCESS_SPEED_SETTING); SET_WINDOW_TEXT(IDC_STATIC_PROCESS_SPEED_SETTING);
SET_WINDOW_TEXT(IDC_STATIC_CROP_SIZE); SET_WINDOW_TEXT(IDC_STATIC_CROP_SIZE);
@ -1401,6 +1415,21 @@ void DialogEvent::SetWindowTextLang()
SET_WINDOW_TEXT(IDC_BUTTON_CLEAR_OUTPUT_DIR); SET_WINDOW_TEXT(IDC_BUTTON_CLEAR_OUTPUT_DIR);
#undef SET_WINDOW_TEXT #undef SET_WINDOW_TEXT
const int cur = SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_GETCURSEL, 0, 0);
HWND hwndCombo = GetDlgItem(dh, IDC_COMBO_MODEL);
while (SendMessage(hwndCombo, CB_GETCOUNT, 0, 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_Y").c_str());
SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)langStringList.GetString(L"IDC_RADIO_MODEL_UPCONV_RGB").c_str());
SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, cur, 0);
} }
void DialogEvent::SetDepthAndQuality(const bool SetDefaultQuality) void DialogEvent::SetDepthAndQuality(const bool SetDefaultQuality)
@ -1780,24 +1809,18 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
SendMessage(GetDlgItem(hWnd, IDC_RADIONOISE_LEVEL3), BM_SETCHECK, BST_CHECKED, 0); SendMessage(GetDlgItem(hWnd, IDC_RADIONOISE_LEVEL3), BM_SETCHECK, BST_CHECKED, 0);
} }
int index = 0;
if (modelType == eModelTypeRGB) if (modelType == eModelTypeRGB)
{ index = 0;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_RGB), BM_SETCHECK, BST_CHECKED, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_PHOTO), BM_SETCHECK, BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_Y), BM_SETCHECK, BST_UNCHECKED, 0);
}
else if (modelType == eModelTypePhoto) else if (modelType == eModelTypePhoto)
{ index = 1;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_RGB), BM_SETCHECK, BST_UNCHECKED, 0); else if (modelType == eModelTypeY)
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_PHOTO), BM_SETCHECK, BST_CHECKED, 0); index = 2;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_Y), BM_SETCHECK, BST_UNCHECKED, 0);
}
else else
{ index = 3;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_RGB), BM_SETCHECK, BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_PHOTO), BM_SETCHECK, BST_UNCHECKED, 0); SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, index, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_Y), BM_SETCHECK, BST_CHECKED, 0);
}
if (use_tta) if (use_tta)
SendMessage(GetDlgItem(hWnd, IDC_CHECK_TTA), BM_SETCHECK, BST_CHECKED, 0); SendMessage(GetDlgItem(hWnd, IDC_CHECK_TTA), BM_SETCHECK, BST_CHECKED, 0);
@ -1945,6 +1968,7 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
cmdModelTypeConstraintV.push_back(L"anime_style_art_rgb"); cmdModelTypeConstraintV.push_back(L"anime_style_art_rgb");
cmdModelTypeConstraintV.push_back(L"photo"); cmdModelTypeConstraintV.push_back(L"photo");
cmdModelTypeConstraintV.push_back(L"anime_style_art_y"); cmdModelTypeConstraintV.push_back(L"anime_style_art_y");
cmdModelTypeConstraintV.push_back(L"upconv_7_anime_style_art_rgb");
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"anime_style_art_rgb", &cmdModelTypeConstraint, cmd);
@ -2157,24 +2181,17 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
if (cmdModelType.isSet()) if (cmdModelType.isSet())
{ {
int index = 0;
if (cmdModelType.getValue() == L"anime_style_art_rgb") if (cmdModelType.getValue() == L"anime_style_art_rgb")
{ index = 0;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_RGB), BM_SETCHECK, BST_CHECKED, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_PHOTO), BM_SETCHECK, BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_Y), BM_SETCHECK, BST_UNCHECKED, 0);
}
else if (cmdModelType.getValue() == L"photo") else if (cmdModelType.getValue() == L"photo")
{ index = 1;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_RGB), BM_SETCHECK, BST_UNCHECKED, 0); else if (cmdModelType.getValue() == L"anime_style_art_y")
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_PHOTO), BM_SETCHECK, BST_CHECKED, 0); index = 2;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_Y), BM_SETCHECK, BST_UNCHECKED, 0);
}
else else
{ index = 3;
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_RGB), BM_SETCHECK, BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_PHOTO), BM_SETCHECK, BST_UNCHECKED, 0); SendMessage(GetDlgItem(dh, IDC_COMBO_MODEL), CB_SETCURSEL, index, 0);
SendMessage(GetDlgItem(hWnd, IDC_RADIO_MODEL_Y), BM_SETCHECK, BST_CHECKED, 0);
}
isSetParam = true; isSetParam = true;
} }

1
waifu2x-caffe-gui/MainDialog.h
View File

@ -83,6 +83,7 @@ private:
eModelTypeRGB, eModelTypeRGB,
eModelTypePhoto, eModelTypePhoto,
eModelTypeY, eModelTypeY,
eModelTypeUpConvRGB,
eModelTypeEnd, eModelTypeEnd,
}; };

BIN
waifu2x-caffe-gui/Resource.rc
View File

Binary file not shown.

4
waifu2x-caffe-gui/Source.cpp
View File

@ -75,9 +75,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL1); cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL1);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL2); cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL2);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL3); cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL3);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIO_MODEL_RGB); cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_COMBO_MODEL);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIO_MODEL_PHOTO);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIO_MODEL_Y);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_CHECK_TTA); cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_CHECK_TTA);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_COMBO_OUTPUT_DEPTH); cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_COMBO_OUTPUT_DEPTH);

BIN
waifu2x-caffe-gui/resource.h
View File

Binary file not shown.