From 165664716361cbfc142000f78e7095c8ffa0ba5e Mon Sep 17 00:00:00 2001 From: lltcggie Date: Sun, 10 Jul 2016 20:08:22 +0900 Subject: [PATCH] =?UTF-8?q?GUI=E7=89=88=E3=81=A7=E3=82=B3=E3=83=9E?= =?UTF-8?q?=E3=83=B3=E3=83=89=E3=83=A9=E3=82=A4=E3=83=B3=E3=82=AA=E3=83=97?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=A7=E3=81=AEcrop=E3=81=AE?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=8C=E5=8B=95=E3=81=84=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- waifu2x-caffe-gui/MainDialog.cpp | 8 +++++++- waifu2x-caffe-gui/MainDialog.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/waifu2x-caffe-gui/MainDialog.cpp b/waifu2x-caffe-gui/MainDialog.cpp index 028d16b..3c8a4b1 100644 --- a/waifu2x-caffe-gui/MainDialog.cpp +++ b/waifu2x-caffe-gui/MainDialog.cpp @@ -422,6 +422,9 @@ bool DialogEvent::SyncMember(const bool NotSyncCropSize, const bool silent) void DialogEvent::SetCropSizeList(const boost::filesystem::path & input_path) { + if (isSetInitCrop) + return; + HWND hcrop = GetDlgItem(dh, IDC_COMBO_CROP_SIZE); int gcd = 1; @@ -1223,7 +1226,7 @@ DialogEvent::DialogEvent() : mode(Waifu2x::eWaifu2xModelTypeNoiseScale), modeStr 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), TimeLeftThread(-1), TimeLeftGetTimeThread(0), isCommandLineStart(false), tAutoMode(TEXT("none")), -isArgStartAuto(true), isArgStartSuccessFinish(true), isOutputNoOverwrite(false), isNotSaveParam(false) +isArgStartAuto(true), isArgStartSuccessFinish(true), isOutputNoOverwrite(false), isNotSaveParam(false), isSetInitCrop(false) {} void DialogEvent::Exec(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData) @@ -2246,6 +2249,7 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData) SetWindowText(GetDlgItem(dh, IDC_COMBO_CROP_SIZE), to_tstring(cmdCropSizeFile.getValue()).c_str()); isSetParam = true; + isSetInitCrop = true; } if (cmdBatchSizeFile.isSet()) @@ -2342,6 +2346,8 @@ void DialogEvent::Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData) LocalFree(lplpszArgs); } + + isSetInitCrop = false; } void DialogEvent::Cancel(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData) diff --git a/waifu2x-caffe-gui/MainDialog.h b/waifu2x-caffe-gui/MainDialog.h index a89c60a..a9fca37 100644 --- a/waifu2x-caffe-gui/MainDialog.h +++ b/waifu2x-caffe-gui/MainDialog.h @@ -113,6 +113,8 @@ private: bool isNotSaveParam; + bool isSetInitCrop; + private: tstring AddName() const;