動作設定を分離し、新しいオプションをつけた(一部オプションの実際の動作はまだ)

bin/lang/Chinese_Simplified.json

@@ -7,7 +7,7 @@
  "IDC_STATIC_OUTPUT_EXT":"输出格式",
  "IDC_STATIC_OUTPUT_QUALITY":"输出图像质量",
  "IDC_STATIC_OUTPUT_DEPTH":"输出色彩深度",
- "IDC_STATIC_AUTO_START":"自动转换设置",
+ "IDC_STATIC_AUTO_START":"",
  "IDC_RADIO_AUTO_START_NONE":"不启用",
  "IDC_RADIO_AUTO_START_ONE":"输入单个文件时启用",
  "IDC_RADIO_AUTO_START_MULTI":"输入文件夹或多个文件时启用",
@@ -31,7 +31,7 @@
  "IDC_RADIO_MODEL_Y":"2D 插图 2 (Y 模型)",
  "IDC_CHECK_TTA":"TTA 模式",
  "IDC_STATIC_PROCESS_SPEED_SETTING":"处理速度设置",
- "IDC_STATIC_PROCESSOR":"处理器",
+ "IDC_STATIC_PROCESSOR":"",
  "IDC_RADIO_MODE_GPU":"CUDA (cuDNN 优先)",
  "IDC_RADIO_MODE_CPU":"CPU",
  "IDC_STATIC_CROP_SIZE":"拆分大小",
@@ -39,6 +39,7 @@
  "IDC_BUTTON_CANCEL":"取消",
  "IDC_BUTTON_EXEC":"开始",
  "IDC_STATIC_LANG_UI":"界面语言",
+ "IDC_BUTTON_OUTPUT_REF":"选择",
  "MessageUseProcessorMode":"使用的处理模式: %s",
  "MessageProcessTime":"处理时间: %02d:%02d:%02d.%03d",
  "MessageInitTime":"初始化时间: %02d:%02d:%02d.%03d",

bin/lang/Chinese_Traditional.json

@@ -7,7 +7,7 @@
  "IDC_STATIC_OUTPUT_EXT":"輸出副檔名",
  "IDC_STATIC_OUTPUT_QUALITY":"輸出質量設置",
  "IDC_STATIC_OUTPUT_DEPTH":"輸出位元深度",
- "IDC_STATIC_AUTO_START":"自動開始設定",
+ "IDC_STATIC_AUTO_START":"",
  "IDC_RADIO_AUTO_START_NONE":"不自動開始",
  "IDC_RADIO_AUTO_START_ONE":"輸入文件",
  "IDC_RADIO_AUTO_START_MULTI":"輸入多個文件或文件夾",
@@ -31,7 +31,7 @@
  "IDC_RADIO_MODEL_Y":"二次元插圖2 ( Y模式 ) ",
  "IDC_CHECK_TTA":"使用TTA模式",
  "IDC_STATIC_PROCESS_SPEED_SETTING":"處理速度設置",
- "IDC_STATIC_PROCESSOR":"處理器",
+ "IDC_STATIC_PROCESSOR":"",
  "IDC_RADIO_MODE_GPU":"CUDA ( cuDNN優先 )",
  "IDC_RADIO_MODE_CPU":"CPU",
  "IDC_STATIC_CROP_SIZE":"拆分大小",
@@ -39,6 +39,7 @@
  "IDC_BUTTON_CANCEL":"取消",
  "IDC_BUTTON_EXEC":"運行",
  "IDC_STATIC_LANG_UI":"界面語言",
+ "IDC_BUTTON_OUTPUT_REF":"瀏覽文件",
  "MessageUseProcessorMode":"使用的處理器模式: %s",
  "MessageProcessTime":"處理時間: %02d:%02d:%02d.%03d",
  "MessageInitTime":"初始化時間: %02d:%02d:%02d.%03d",

bin/lang/english.json

@@ -7,7 +7,7 @@
 "IDC_STATIC_OUTPUT_EXT":"Output extension",
 "IDC_STATIC_OUTPUT_QUALITY":"Output quality",
 "IDC_STATIC_OUTPUT_DEPTH":"Output depth bits",
-"IDC_STATIC_AUTO_START":"Auto start Settings",
+"IDC_STATIC_AUTO_START":"Auto start When Input files set",
 "IDC_RADIO_AUTO_START_NONE":"No auto start",
 "IDC_RADIO_AUTO_START_ONE":"On input file",
 "IDC_RADIO_AUTO_START_MULTI":"On input many files or folder",
@@ -31,7 +31,7 @@
 "IDC_RADIO_MODEL_Y":"2-D illust (Y Model)",
 "IDC_CHECK_TTA":"Uses TTA Mode",
 "IDC_STATIC_PROCESS_SPEED_SETTING":"Processing speed Settings",
-"IDC_STATIC_PROCESSOR":"Processor",
+"IDC_STATIC_PROCESSOR":"Use Processor",
 "IDC_RADIO_MODE_GPU":"CUDA (Uses cuDNN)",
 "IDC_RADIO_MODE_CPU":"CPU",
 "IDC_STATIC_CROP_SIZE":"Split size",
@@ -39,6 +39,15 @@
 "IDC_BUTTON_CANCEL":"Cancel",
 "IDC_BUTTON_EXEC":"Start",
 "IDC_STATIC_LANG_UI":"UI language",
+"IDC_BUTTON_OUTPUT_REF":"Browse",
+"IDC_BUTTON_APP_SETTING":"App Setting",
+"IDC_BUTTON_CLEAR_OUTPUT_DIR":"Reset output dir",
+"IDC_STATIC_ARG_START":"Boot With Arg",
+"IDC_CHECK_ARG_START_AUTO":"Start when boot",
+"IDC_CHECK_ARG_START_SUCCESS_FINISH":"Exit when successed",
+"IDC_STATIC_INPUT_DIR_FIX":"Input fixed folder",
+"IDC_STATIC_OUTPUT_DIR_FIX":"Output fixed folder",
+"IDC_CHECK_OUTPUT_NO_OVERWIRITE":"Output files No overwrite",
 "MessageUseProcessorMode":"Use Processor: %s",
 "MessageProcessTime":"Processing time: %02d:%02d:%02d.%03d",
 "MessageInitTime":"Initialization time: %02d:%02d:%02d.%03d",

bin/lang/japanese.json

@@ -7,7 +7,7 @@
 "IDC_STATIC_OUTPUT_EXT":"出力拡張子",
 "IDC_STATIC_OUTPUT_QUALITY":"出力画質設定",
 "IDC_STATIC_OUTPUT_DEPTH":"出力深度ビット数",
-"IDC_STATIC_AUTO_START":"自動変換開始設定",
+"IDC_STATIC_AUTO_START":"ファイル入力時自動変換開始設定",
 "IDC_RADIO_AUTO_START_NONE":"自動で開始しない",
 "IDC_RADIO_AUTO_START_ONE":"ファイルを1つでも入力したら開始",
 "IDC_RADIO_AUTO_START_MULTI":"フォルダあるいは複数ファイルを\r\n入力したら開始",
@@ -31,7 +31,7 @@
 "IDC_RADIO_MODEL_Y":"2次元イラスト2 (Yモデル)",
 "IDC_CHECK_TTA":"TTAモードを使う",
 "IDC_STATIC_PROCESS_SPEED_SETTING":"処理速度設定",
-"IDC_STATIC_PROCESSOR":"プロセッサー",
+"IDC_STATIC_PROCESSOR":"使用プロセッサー",
 "IDC_RADIO_MODE_GPU":"CUDA(使えたらcuDNN)",
 "IDC_RADIO_MODE_CPU":"CPU",
 "IDC_STATIC_CROP_SIZE":"分割サイズ",
@@ -39,6 +39,15 @@
 "IDC_BUTTON_CANCEL":"キャンセル",
 "IDC_BUTTON_EXEC":"実行",
 "IDC_STATIC_LANG_UI":"UIの言語",
+"IDC_BUTTON_OUTPUT_REF":"参照",
+"IDC_BUTTON_APP_SETTING":"動作設定",
+"IDC_BUTTON_CLEAR_OUTPUT_DIR":"出力フォルダ初期化",
+"IDC_STATIC_ARG_START":"引数付き起動時設定",
+"IDC_CHECK_ARG_START_AUTO":"起動時に変換する",
+"IDC_CHECK_ARG_START_SUCCESS_FINISH":"成功時に終了する",
+"IDC_STATIC_INPUT_DIR_FIX":"入力参照時\r\n固定フォルダ",
+"IDC_STATIC_OUTPUT_DIR_FIX":"出力参照時\r\n固定フォルダ",
+"IDC_CHECK_OUTPUT_NO_OVERWIRITE":"出力ファイルを上書きしない",
 "MessageUseProcessorMode":"使用プロセッサーモード: %s",
 "MessageProcessTime":"処理時間: %02d:%02d:%02d.%03d",
 "MessageInitTime":"初期化時間: %02d:%02d:%02d.%03d",

bin/lang/korean.json

@@ -7,7 +7,7 @@
 "IDC_STATIC_OUTPUT_EXT":"출력 확장자",
 "IDC_STATIC_OUTPUT_QUALITY":"출력 화질 설정",
 "IDC_STATIC_OUTPUT_DEPTH":"출력 컬러 비트",
-"IDC_STATIC_AUTO_START":"자동 변환 시작 설정",
+"IDC_STATIC_AUTO_START":"",
 "IDC_RADIO_AUTO_START_NONE":"자동 시작 안 함",
 "IDC_RADIO_AUTO_START_ONE":"파일 입력시 바로 시작",
 "IDC_RADIO_AUTO_START_MULTI":"폴더 또는 여러 파일을\r\n입력하면 시작",
@@ -31,7 +31,7 @@
 "IDC_RADIO_MODEL_Y":"2D 일러스트 (Y 모델)",
 "IDC_CHECK_TTA":"TTA 모드 사용",
 "IDC_STATIC_PROCESS_SPEED_SETTING":"처리 속도 설정",
-"IDC_STATIC_PROCESSOR":"프로세서",
+"IDC_STATIC_PROCESSOR":"",
 "IDC_RADIO_MODE_GPU":"CUDA (cuDNN 사용)",
 "IDC_RADIO_MODE_CPU":"CPU",
 "IDC_STATIC_CROP_SIZE":"분할 크기",
@@ -39,6 +39,7 @@
 "IDC_BUTTON_CANCEL":"취소",
 "IDC_BUTTON_EXEC":"시작",
 "IDC_STATIC_LANG_UI":"UI 언어",
+"IDC_BUTTON_OUTPUT_REF":"찾기",
 "MessageUseProcessorMode":"사용한 프로세서 : %s",
 "MessageProcessTime":"처리 시간: %02d:%02d:%02d.%03d",
 "MessageInitTime":"초기화 시간: %02d:%02d:%02d.%03d",

bin/lang/turkish.json

@@ -7,7 +7,7 @@
 "IDC_STATIC_OUTPUT_EXT":"Çıktı uzantısı",
 "IDC_STATIC_OUTPUT_QUALITY":"Çıktı kalitesi",
 "IDC_STATIC_OUTPUT_DEPTH":"Çıktı bit derinliği",
-"IDC_STATIC_AUTO_START":"Otomatik Başlatma Ayarları",
+"IDC_STATIC_AUTO_START":"",
 "IDC_RADIO_AUTO_START_NONE":"Otomatik başlatma",
 "IDC_RADIO_AUTO_START_ONE":"Dosya girdisi olduğunda",
 "IDC_RADIO_AUTO_START_MULTI":"Birden fazla dosya veya klasör girdisi olduğunda",
@@ -31,7 +31,7 @@
 "IDC_RADIO_MODEL_Y":"2-B çizim (Y Modeli)",
 "IDC_CHECK_TTA":"TTA Modu Kullan",
 "IDC_STATIC_PROCESS_SPEED_SETTING":"İşleme Hızı Ayarları",
-"IDC_STATIC_PROCESSOR":"İşlemci",
+"IDC_STATIC_PROCESSOR":"",
 "IDC_RADIO_MODE_GPU":"CUDA (Varsa cuDNN Kullanır)",
 "IDC_RADIO_MODE_CPU":"CPU",
 "IDC_STATIC_CROP_SIZE":"Parçalama oranı",
@@ -39,6 +39,7 @@
 "IDC_BUTTON_CANCEL":"İptal",
 "IDC_BUTTON_EXEC":"Başlat",
 "IDC_STATIC_LANG_UI":"Arayüz dili",
+"IDC_BUTTON_OUTPUT_REF":"Gözat",
 "MessageUseProcessorMode":"Kullanılan İşlemci: %s",
 "MessageProcessTime":"İşlem süresi: %02d:%02d:%02d.%03d",
 "MessageInitTime":"Başlangıç süresi: %02d:%02d:%02d.%03d",

waifu2x-caffe-gui/CDialogBase.cpp

@@ -3,9 +3,9 @@
 
 
 // ダイアログを作成する
-INT_PTR CDialogBase::DoModal(HINSTANCE hInstance, int iDialogId) 
+INT_PTR CDialogBase::DoModal(HINSTANCE hInstance, int iDialogId, HWND hWndParent)
 { 
-	return DialogBoxParam(hInstance, MAKEINTRESOURCE(iDialogId), NULL, &DispatchDialogProc, (LPARAM)this); 
+	return DialogBoxParam(hInstance, MAKEINTRESOURCE(iDialogId), hWndParent, &DispatchDialogProc, (LPARAM)this);
 }
 
 HWND CDialogBase::GetDialogHWND(void)

waifu2x-caffe-gui/CDialogBase.h

@@ -16,7 +16,7 @@ public:
 	virtual ~CDialogBase(){};
 
 	// ダイアログを作成する 
-	INT_PTR DoModal(HINSTANCE hInstance, int iDialogId);
+	INT_PTR DoModal(HINSTANCE hInstance, int iDialogId, HWND hWndParent = NULL);
 
 	HWND GetDialogHWND(void);
 

waifu2x-caffe-gui/LangStringList.h

@@ -139,6 +139,7 @@ private:
 				auto name = Utf8ToUtf16(it->name.GetString(), it->name.GetStringLength());
 				auto val = Utf8ToUtf16(it->value.GetString(), it->value.GetStringLength());
 
+				if(val.length() > 0)
 					langStringMap.emplace(name, val);
 			}
 		}

waifu2x-caffe-gui/MainDialog.h

@@ -0,0 +1,212 @@
+#pragma once
+
+#define _CRT_SECURE_NO_WARNINGS
+#include <windows.h>
+#include <tchar.h>
+#include <stdio.h>
+#include <string>
+#include <thread>
+#include <atomic>
+#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
+#include "resource.h"
+#include "tstring.h"
+#include "LangStringList.h"
+
+#undef ERROR
+
+#define WM_FAILD_CREATE_DIR (WM_APP + 5)
+#define WM_ON_WAIFU2X_ERROR (WM_APP + 6)
+#define WM_END_THREAD (WM_APP + 7)
+
+
+// ダイアログ用
+class DialogEvent
+{
+private:
+	HWND dh;
+
+	boost::filesystem::path exeDir;
+	std::vector<int> CropSizeList;
+
+	tstring input_str;
+	std::vector<tstring> input_str_multi;
+	tstring output_str;
+	std::string mode;
+	int noise_level;
+	double scale_ratio;
+	int scale_width;
+	int scale_height;
+	tstring model_dir;
+	std::string process;
+	tstring outputExt;
+	tstring inputFileExt;
+
+	bool use_tta;
+
+	boost::optional<int> output_quality;
+	int output_depth;
+
+	int crop_size;
+	int batch_size;
+
+	std::vector<tstring> extList;
+
+	std::thread processThread;
+	std::atomic_bool cancelFlag;
+
+	tstring autoSetAddName;
+	bool isLastError;
+
+	tstring logMessage;
+
+	tstring output_dir;
+
+	std::string usedProcess;
+	std::chrono::system_clock::duration cuDNNCheckTime;
+	std::chrono::system_clock::duration InitTime;
+	std::chrono::system_clock::duration ProcessTime;
+
+	enum eScaleType
+	{
+		eScaleTypeRatio,
+		eScaleTypeWidth,
+		eScaleTypeHeight,
+		eScaleTypeEnd,
+	};
+
+	eScaleType scaleType;
+
+	enum eModelType
+	{
+		eModelTypeRGB,
+		eModelTypePhoto,
+		eModelTypeY,
+		eModelTypeEnd,
+	};
+
+	eModelType modelType;
+
+	LangStringList langStringList;
+	std::wstring LangName;
+
+	std::atomic<int64_t> TimeLeftThread;
+	std::atomic<DWORD> TimeLeftGetTimeThread;
+
+	bool isCommandLineStart;
+
+	tstring tAutoMode;
+
+	bool isArgStartAuto;
+	bool isArgStartSuccessFinish;
+	bool isOutputNoOverwrite;
+	tstring tInputDirFix;
+	tstring tOutputDirFix;
+
+private:
+	template<typename T>
+	static tstring to_tstring(T val)
+	{
+#ifdef UNICODE
+		return std::to_wstring(val);
+#else
+		return std::to_string(val);
+#endif
+	}
+
+	tstring AddName() const;
+
+	bool SyncMember(const bool NotSyncCropSize, const bool silent = false);
+
+	void SetCropSizeList(const boost::filesystem::path &input_path);
+
+	static boost::filesystem::path GetFileName(const boost::filesystem::path &input_path)
+	{
+		if (boost::filesystem::is_directory(input_path))
+			return input_path.stem();
+		else
+			return input_path.filename();
+	}
+
+	void ProcessWaifu2x();
+
+	void ReplaceAddString();
+
+	void AddLogMessage(const TCHAR *msg);
+
+	void Waifu2xTime();
+
+	void SaveIni(const bool isSyncMember = true);
+
+	// 入力パスを選択する
+	static UINT_PTR CALLBACK OFNHookProcIn(
+		_In_  HWND hdlg,
+		_In_  UINT uiMsg,
+		_In_  WPARAM wParam,
+		_In_  LPARAM lParam
+	);
+
+	// 出力パスを選択する
+	static UINT_PTR CALLBACK OFNHookProcOut(
+		_In_  HWND hdlg,
+		_In_  UINT uiMsg,
+		_In_  WPARAM wParam,
+		_In_  LPARAM lParam
+	);
+
+public:
+	DialogEvent();
+
+	void Exec(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void WaitThreadExit(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void Timer(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void OnDialogEnd(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void OnFaildCreateDir(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void OnWaifu2xError(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void SetWindowTextLang();
+
+	void SetDepthAndQuality(const bool SetDefaultQuality = true);
+
+	void Create(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void Cancel(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void UpdateAddString(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void ScaleRadio(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void CheckCUDNN(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	LRESULT OnSetInputFilePath(const TCHAR *tPath);
+
+	LRESULT OnSetInputFilePath();
+
+	LRESULT OnSetOutputFilePath(const TCHAR *tPath);
+
+	// ここで渡されるhWndはIDC_EDITのHWND(コントロールのイベントだから)
+	LRESULT DropInput(HWND hWnd, WPARAM wParam, LPARAM lParam, WNDPROC OrgSubWnd, LPVOID lpData);
+
+	// ここで渡されるhWndはIDC_EDITのHWND(コントロールのイベントだから)
+	LRESULT DropOutput(HWND hWnd, WPARAM wParam, LPARAM lParam, WNDPROC OrgSubWnd, LPVOID lpData);
+
+	LRESULT TextInput(HWND hWnd, WPARAM wParam, LPARAM lParam, WNDPROC OrgSubWnd, LPVOID lpData);
+
+	void InputRef(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void OutputRef(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void LangChange(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void OutExtChange(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void ClearOutputDir(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+
+	void AppSetting(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData);
+};
+

waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj

@@ -99,6 +99,7 @@
     <ClCompile Include="CControl.cpp" />
     <ClCompile Include="CDialog.cpp" />
     <ClCompile Include="CDialogBase.cpp" />
+    <ClCompile Include="MainDialog.cpp" />
     <ClCompile Include="Source.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -110,7 +111,9 @@
     <ClInclude Include="CWindowBase.h" />
     <ClInclude Include="GUICommon.h" />
     <ClInclude Include="LangStringList.h" />
+    <ClInclude Include="MainDialog.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="Source.h" />
     <ClInclude Include="tstring.h" />
   </ItemGroup>
   <ItemGroup>

waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj.filters

@@ -30,6 +30,9 @@
     <ClCompile Include="CDialogBase.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="MainDialog.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\waifu2x.h">
@@ -62,6 +65,12 @@
     <ClInclude Include="LangStringList.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="Source.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
+    <ClInclude Include="MainDialog.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">