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でFatal Errorが発生した時に自分でメッセージを出すようにした

Browse Source
This commit is contained in:
lltcggie 2016-07-06 14:32:38 +09:00
parent c4a8e4d6db
commit 92ca8db404
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/lang/english.json
View File

@ -93,5 +93,6 @@
"Cancel":"Cancel", "Cancel":"Cancel",
"IDC_STATIC_USE_GPU_NO":"Use GPU No", "IDC_STATIC_USE_GPU_NO":"Use GPU No",
"IDC_RADIO_MODEL_UPCONV_RGB":"2-D illust (UpRGB Model)", "IDC_RADIO_MODEL_UPCONV_RGB":"2-D illust (UpRGB Model)",
"IDC_RADIO_MODEL_UPCONV_PHOTO":"Photo (UpPhoto Model)" "IDC_RADIO_MODEL_UPCONV_PHOTO":"Photo (UpPhoto Model)",
"MessageLogFatalError":"The fatal error has occurred.\r\nThere is a possibility the split size is too large"
} }

3
bin/lang/japanese.json
View File

@ -93,5 +93,6 @@
"Cancel":"キャンセル", "Cancel":"キャンセル",
"IDC_STATIC_USE_GPU_NO":"使用GPU No", "IDC_STATIC_USE_GPU_NO":"使用GPU No",
"IDC_RADIO_MODEL_UPCONV_RGB":"2次元イラスト (UpRGBモデル)", "IDC_RADIO_MODEL_UPCONV_RGB":"2次元イラスト (UpRGBモデル)",
"IDC_RADIO_MODEL_UPCONV_PHOTO":"写真・アニメ (UpPhotoモデル)" "IDC_RADIO_MODEL_UPCONV_PHOTO":"写真・アニメ (UpPhotoモデル)",
"MessageLogFatalError":"致命的なエラーが発生しました。\r\n分割サイズが大きすぎる可能性があります"
} }

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

@ -20,6 +20,7 @@
#include "CControl.h" #include "CControl.h"
//#include <boost/program_options.hpp> //#include <boost/program_options.hpp>
#include <tclapw/CmdLine.h> #include <tclapw/CmdLine.h>
#include <glog/logging.h>
const size_t AR_PATH_MAX(1024); const size_t AR_PATH_MAX(1024);
@ -37,6 +38,9 @@ const TCHAR * const MultiFileStr = TEXT("(Multi File)");
const UINT_PTR nIDEventTimeLeft = 1000; const UINT_PTR nIDEventTimeLeft = 1000;
LangStringList DialogEvent::langStringList;
HWND DialogEvent::dh;
namespace namespace
{ {
@ -1192,7 +1196,7 @@ UINT_PTR DialogEvent::OFNHookProcOut(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARA
return 0L; return 0L;
} }
DialogEvent::DialogEvent() : dh(nullptr), mode(Waifu2x::eWaifu2xModelTypeNoiseScale), modeStr("noise_scale"), noise_level(1), scale_ratio(2.0), scale_width(0), scale_height(0), model_dir(TEXT("models/anime_style_art_rgb")), DialogEvent::DialogEvent() : mode(Waifu2x::eWaifu2xModelTypeNoiseScale), modeStr("noise_scale"), noise_level(1), scale_ratio(2.0), scale_width(0), scale_height(0), model_dir(TEXT("models/anime_style_art_rgb")),
process("gpu"), outputExt(TEXT(".png")), inputFileExt(TEXT("png:jpg:jpeg:tif:tiff:bmp:tga")), process("gpu"), outputExt(TEXT(".png")), inputFileExt(TEXT("png:jpg:jpeg:tif:tiff:bmp:tga")),
use_tta(false), output_depth(8), crop_size(128), batch_size(1), gpu_no(0), isLastError(false), scaleType(eScaleTypeEnd), use_tta(false), output_depth(8), crop_size(128), batch_size(1), gpu_no(0), isLastError(false), scaleType(eScaleTypeEnd),
TimeLeftThread(-1), TimeLeftGetTimeThread(0), isCommandLineStart(false), tAutoMode(TEXT("none")), TimeLeftThread(-1), TimeLeftGetTimeThread(0), isCommandLineStart(false), tAutoMode(TEXT("none")),
@ -1626,6 +1630,9 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
SendMessage(hlang, CB_SETCURSEL, defaultListIndex, 0); SendMessage(hlang, CB_SETCURSEL, defaultListIndex, 0);
} }
// 致命的エラーが発生した時にLogFatalFuncを呼び出すようにする
google::InstallFailureFunction(LogFatalFunc);
SetWindowTextLang(); SetWindowTextLang();
{ {
@ -3120,3 +3127,9 @@ void DialogEvent::AppSetting(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpD
} }
} }
} }
void DialogEvent::LogFatalFunc()
{
MessageBox(dh, langStringList.GetString(L"MessageLogFatalError").c_str(), langStringList.GetString(L"MessageTitleError").c_str(), MB_OK | MB_ICONERROR);
abort();
}

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

@ -26,7 +26,9 @@
class DialogEvent class DialogEvent
{ {
private: private:
HWND dh; static HWND dh;
static LangStringList langStringList;
boost::filesystem::path exeDir; boost::filesystem::path exeDir;
std::vector<int> CropSizeList; std::vector<int> CropSizeList;
@ -94,7 +96,6 @@ private:
eModelType modelType; eModelType modelType;
LangStringList langStringList;
std::wstring LangName; std::wstring LangName;
std::atomic<int64_t> TimeLeftThread; std::atomic<int64_t> TimeLeftThread;
@ -153,6 +154,8 @@ private:
_In_ LPARAM lParam _In_ LPARAM lParam
); );
static void LogFatalFunc();
public: public:
DialogEvent(); DialogEvent();