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
waifu2x-caffe/waifu2x-caffe-gui/Source.cpp

112 lines
6.0 KiB
C++
Raw Permalink Normal View History

first
2015-05-29 01:47:26 +09:00
#define _CRT_SECURE_NO_WARNINGS
動作設定を分離し、新しいオプションをつけた(一部オプションの実際の動作はまだ)
2016-05-05 18:49:54 +09:00
#include "MainDialog.h"
GUIでエラーログを保存するようにした
2015-12-07 13:36:49 +09:00
#include <glog/logging.h>
first
2015-05-29 01:47:26 +09:00
#include "CDialog.h"
#include "CControl.h"
動作設定を分離し、新しいオプションをつけた(一部オプションの実際の動作はまだ)
2016-05-05 18:49:54 +09:00
#include "../common/waifu2x.h"
first
2015-05-29 01:47:26 +09:00
GUIで残り時間が表示されるようにした
2016-03-19 19:28:33 +09:00
#pragma comment(lib, "winmm.lib")
first
2015-05-29 01:47:26 +09:00
int WINAPI WinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPSTR lpCmdLine,
int nCmdShow)
{
設計が破綻していたので全面的に書きなおした
2016-07-03 13:37:26 +09:00
Waifu2x::init_liblary(__argc, __argv);
Caffeをcaffe-builderでビルドした最新版に変更
2015-12-04 00:48:55 +09:00
GUIで管理者権限で起動してもファイルのドロップを受け付けるようにした
2015-12-18 00:20:17 +09:00
// <20>Ǘ<EFBFBD><C797>Ҍ<EFBFBD><D28C><EFBFBD><EFBFBD>ŋN<C58B><4E><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̃h<CC83><68><EFBFBD>b<EFBFBD>v<EFBFBD><76><EFBFBD>󂯕t<F382AF95><74><EFBFBD><EFBFBD><EFBFBD>悤<EFBFBD>ɂ<EFBFBD><C982><EFBFBD>
ChangeWindowMessageFilter(WM_DROPFILES, MSGFLT_ADD);
ChangeWindowMessageFilter(WM_COPYDATA, MSGFLT_ADD);
ChangeWindowMessageFilter(0x0049, MSGFLT_ADD);
GUIでエラーログの設定を行うタイミングを変更
2015-12-07 16:59:42 +09:00
// Caffe<66>̃G<CC83><47><EFBFBD>[<5B>łȂ<C582><C882><EFBFBD><EFBFBD>O<EFBFBD><4F><EFBFBD>ۑ<EFBFBD><DB91><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>悤<EFBFBD>ɂ<EFBFBD><C982><EFBFBD>
google::SetLogDestination(google::INFO, "");
google::SetLogDestination(google::WARNING, "");
// Caffe<66>̃G<CC83><47><EFBFBD>[<5B><><EFBFBD>O<EFBFBD><4F><EFBFBD>uerror_log_<67>`<60>v<EFBFBD>ɏo<C98F><6F>
google::SetLogDestination(google::ERROR, "error_log_");
google::SetLogDestination(google::FATAL, "error_log_");
first
2015-05-29 01:47:26 +09:00
// CDialog<6F>N<EFBFBD><4E><EFBFBD>X<EFBFBD>Ń_<C583>C<EFBFBD>A<EFBFBD><41><EFBFBD>O<EFBFBD><4F><EFBFBD>쐬<EFBFBD><EC90AC><EFBFBD><EFBFBD>
CDialog cDialog;
CDialog cDialog2;
// IDC_EDIT<49>̃T<CC83>u<EFBFBD>N<EFBFBD><4E><EFBFBD>X
CControl cControlInput(IDC_EDIT_INPUT);
CControl cControlOutput(IDC_EDIT_OUTPUT);
UI完成
2016-03-19 17:51:38 +09:00
CControl cControlScaleRatio(IDC_EDIT_SCALE_RATIO);
CControl cControlScaleWidth(IDC_EDIT_SCALE_WIDTH);
CControl cControlScaleHeight(IDC_EDIT_SCALE_HEIGHT);
GUIで縦横サイズ指定追加
2017-03-20 21:44:57 +09:00
CControl cControlScaleWidthHeight(IDC_EDIT_SCALE_WIDTH_HEIGHT);
first
2015-05-29 01:47:26 +09:00
// <20>o<EFBFBD>^<5E><><EFBFBD><EFBFBD><EFBFBD>֐<EFBFBD><D690><EFBFBD><EFBFBD>܂Ƃ߂<C682><DF82>ꂽ<EFBFBD>N<EFBFBD><4E><EFBFBD>X
// <20>O<EFBFBD><4F><EFBFBD>[<5B>o<EFBFBD><6F><EFBFBD>֐<EFBFBD><D690><EFBFBD><EFBFBD>g<EFBFBD><67><EFBFBD>΃N<CE83><4E><EFBFBD>X<EFBFBD>ɂ܂Ƃ߂<C682><DF82>K<EFBFBD>v<EFBFBD>͂Ȃ<CD82><C882><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̕<EFBFBD><CC95>@<40><><EFBFBD>𗧂‚<F097A782><C282>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD>
DialogEvent cDialogEvent;
// <20>N<EFBFBD><4E><EFBFBD>X<EFBFBD>̊֐<CC8A><D690><EFBFBD><EFBFBD>o<EFBFBD>^<5E><><EFBFBD><EFBFBD><EFBFBD>ꍇ
// IDC_EDIT<49><54>WM_DROPFILES<45><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>Ɏ<EFBFBD><C98E>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>֐<EFBFBD><D690>̓o<CC93>^
cControlInput.SetEventCallBack(SetClassCustomFunc(DialogEvent::DropInput, &cDialogEvent), NULL, WM_DROPFILES);
cControlOutput.SetEventCallBack(SetClassCustomFunc(DialogEvent::DropOutput, &cDialogEvent), NULL, WM_DROPFILES);
UI完成
2016-03-19 17:51:38 +09:00
cControlScaleRatio.SetEventCallBack(SetClassCustomFunc(DialogEvent::TextInput, &cDialogEvent), NULL, WM_CHAR);
cControlScaleWidth.SetEventCallBack(SetClassCustomFunc(DialogEvent::TextInput, &cDialogEvent), NULL, WM_CHAR);
cControlScaleHeight.SetEventCallBack(SetClassCustomFunc(DialogEvent::TextInput, &cDialogEvent), NULL, WM_CHAR);
GUIで縦横サイズ指定追加
2017-03-20 21:44:57 +09:00
cControlScaleWidthHeight.SetEventCallBack(SetClassCustomFunc(DialogEvent::TextInput, &cDialogEvent), NULL, WM_CHAR);
first
2015-05-29 01:47:26 +09:00
// <20>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><><EFBFBD>̃T<CC83>u<EFBFBD>N<EFBFBD><4E><EFBFBD>X<EFBFBD><58><EFBFBD>o<EFBFBD>^
cDialog.AddControl(&cControlInput);
cDialog.AddControl(&cControlOutput);
UI完成
2016-03-19 17:51:38 +09:00
cDialog.AddControl(&cControlScaleRatio);
cDialog.AddControl(&cControlScaleWidth);
cDialog.AddControl(&cControlScaleHeight);
GUIで縦横サイズ指定追加
2017-03-20 21:44:57 +09:00
cDialog.AddControl(&cControlScaleWidthHeight);
first
2015-05-29 01:47:26 +09:00
// <20>e<EFBFBD>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><><EFBFBD>̃C<CC83>x<EFBFBD><78><EFBFBD>g<EFBFBD>Ŏ<EFBFBD><C58E>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>֐<EFBFBD><D690>̓o<CC93>^
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::Exec, &cDialogEvent), NULL, IDC_BUTTON_EXEC);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::Cancel, &cDialogEvent), NULL, IDC_BUTTON_CANCEL);
入力パスと出力パスをダイアログで設定するボタンをつけた
2015-12-17 16:28:53 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::InputRef, &cDialogEvent), NULL, IDC_BUTTON_INPUT_REF);
動作設定を分離し、新しいオプションをつけた(一部オプションの実際の動作はまだ)
2016-05-05 18:49:54 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OutputRef, &cDialogEvent), NULL, IDC_BUTTON_OUTPUT_REF);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::ClearOutputDir, &cDialogEvent), NULL, IDC_BUTTON_CLEAR_OUTPUT_DIR);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::AppSetting, &cDialogEvent), NULL, IDC_BUTTON_APP_SETTING);
first
2015-05-29 01:47:26 +09:00
GUIでモードを切り替えると拡大率、ノイズ除去率の指定が有効、無効になるようにした
2016-05-07 07:51:09 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OnModeChange, &cDialogEvent), NULL, IDC_RADIO_MODE_NOISE);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OnModeChange, &cDialogEvent), NULL, IDC_RADIO_MODE_SCALE);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OnModeChange, &cDialogEvent), NULL, IDC_RADIO_MODE_NOISE_SCALE);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OnModeChange, &cDialogEvent), NULL, IDC_RADIO_AUTO_SCALE);
GUIで縦横サイズ指定追加
2017-03-20 21:44:57 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OnModeChange, &cDialogEvent), NULL, IDC_RADIO_SCALE_WIDTH_HEIGHT);
GUIでモードを切り替えると拡大率、ノイズ除去率の指定が有効、無効になるようにした
2016-05-07 07:51:09 +09:00
GUIでノイズ除去レベルを0を変えても出力ファイル名が変化しないバグを修正
2016-08-03 00:57:02 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL0);
出力画質設定に対応
2015-12-27 06:39:13 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL1);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL2);
ノイズ除去レベル3を追加
2016-04-20 19:11:53 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_RADIONOISE_LEVEL3);
GUIもupconv_7_anime_style_art_rgbに対応(モデル選択の方法がコンボボックスになった)
2016-05-17 00:44:38 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_COMBO_MODEL);
出力画質設定に対応
2015-12-27 06:39:13 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_CHECK_TTA);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::UpdateAddString, &cDialogEvent), NULL, IDC_COMBO_OUTPUT_DEPTH);
GUIでTTAモードの有無で出力ファイル名が変化するようにした
2015-11-19 02:22:49 +09:00
UI完成
2016-03-19 17:51:38 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::ScaleRadio, &cDialogEvent), NULL, IDC_RADIO_SCALE_RATIO);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::ScaleRadio, &cDialogEvent), NULL, IDC_RADIO_SCALE_WIDTH);
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::ScaleRadio, &cDialogEvent), NULL, IDC_RADIO_SCALE_HEIGHT);
first
2015-05-29 01:47:26 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::CheckCUDNN, &cDialogEvent), NULL, IDC_BUTTON_CHECK_CUDNN);
GUIでUIの言語切替に対応した
2015-12-27 02:46:42 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::LangChange, &cDialogEvent), NULL, IDC_COMBO_LANG);
出力画質設定に対応
2015-12-27 06:39:13 +09:00
cDialog.SetCommandCallBack(SetClassFunc(DialogEvent::OutExtChange, &cDialogEvent), NULL, IDC_COMBO_OUT_EXT);
GUIでUIの言語切替に対応した
2015-12-27 02:46:42 +09:00
first
2015-05-29 01:47:26 +09:00
// <20>_<EFBFBD>C<EFBFBD>A<EFBFBD><41><EFBFBD>O<EFBFBD>̃C<CC83>x<EFBFBD><78><EFBFBD>g<EFBFBD>Ŏ<EFBFBD><C58E>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>֐<EFBFBD><D690>̓o<CC93>^
cDialog.SetEventCallBack(SetClassFunc(DialogEvent::Create, &cDialogEvent), NULL, WM_INITDIALOG);
cDialog.SetEventCallBack(SetClassFunc(DialogEvent::OnDialogEnd, &cDialogEvent), NULL, WM_CLOSE);
cDialog.SetEventCallBack(SetClassFunc(DialogEvent::OnFaildCreateDir, &cDialogEvent), NULL, WM_FAILD_CREATE_DIR);
全体の設計を変更
2015-06-03 03:01:56 +09:00
cDialog.SetEventCallBack(SetClassFunc(DialogEvent::OnWaifu2xError, &cDialogEvent), NULL, WM_ON_WAIFU2X_ERROR);
ファイルの上書き禁止に対応
2016-05-07 06:10:23 +09:00
cDialog.SetEventCallBack(SetClassFunc(DialogEvent::OnWaifu2xNoOverwrite, &cDialogEvent), NULL, WM_ON_WAIFU2X_NO_OVERWRITE);
first
2015-05-29 01:47:26 +09:00
cDialog.SetEventCallBack(SetClassFunc(DialogEvent::WaitThreadExit, &cDialogEvent), NULL, WM_END_THREAD);
GUIで残り時間が表示されるようにした
2016-03-19 19:28:33 +09:00
cDialog.SetEventCallBack(SetClassFunc(DialogEvent::Timer, &cDialogEvent), NULL, WM_TIMER);
first
2015-05-29 01:47:26 +09:00
// <20>_<EFBFBD>C<EFBFBD>A<EFBFBD><41><EFBFBD>O<EFBFBD><4F><EFBFBD>\<5C><>
cDialog.DoModal(hInstance, IDD_DIALOG);
Caffeをcaffe-builderでビルドした最新版に変更
2015-12-04 00:48:55 +09:00
Waifu2x::quit_liblary();
first
2015-05-29 01:47:26 +09:00
return 0;
}
Reference in New Issue Copy Permalink