diff --git a/Code/CSRender/CSRender/App.config b/Code/CSRender/CSRender/App.config
index 00bfd114afa09381b01f0115be71b65a8ba9284e..6061b33ae2bbb0dfb5d679fc0fecf70da606d6b2 100644
--- a/Code/CSRender/CSRender/App.config
+++ b/Code/CSRender/CSRender/App.config
@@ -1,6 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Code/CSRender/CSRender/MainWindow.xaml.cs b/Code/CSRender/CSRender/MainWindow.xaml.cs
index b99c6aab7778680e6ba66cf32200796dbe411b5f..0a6b56ed5334c51664004c3f5ad8bb9b14be16b2 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml.cs
+++ b/Code/CSRender/CSRender/MainWindow.xaml.cs
@@ -89,6 +89,14 @@ namespace CSRender
FilePattern.Add((new ComboBoxSet { Id = 7, Item = "BMP" }));
FileSelect.ItemsSource = FilePattern;
+ //デフォルトに前回の設定値を表示
+ ResolutionBox.Text = Properties.Settings.Default.resolutionSetting;
+ FileSelect.Text = Properties.Settings.Default.formatSetting;
+ PositionBox.Text = Properties.Settings.Default.shiftPixelSetting;
+ GradationBox.Text = Properties.Settings.Default.colorMarginSetting;
+ SmallDiffBox.Text = Properties.Settings.Default.removePointSetting;
+ VisualBox.Text = Properties.Settings.Default.shadingOffSetting;
+
//ドラッグ&ドロップイベントの追加
targetBox.AddHandler(TextBox.DragOverEvent, new DragEventHandler(textBox_PreviewDragOver), true);
targetBox.AddHandler(TextBox.DropEvent, new DragEventHandler(TargetBox_Drop), true);
@@ -185,6 +193,14 @@ namespace CSRender
//指定先にレポートを移動
CompareTIFF.moveReport(workBox.Text, workDir);
+ //パラメータを次回初期値用に保存
+ Properties.Settings.Default.resolutionSetting = ResolutionBox.Text;
+ Properties.Settings.Default.formatSetting = FileSelect.Text;
+ Properties.Settings.Default.shiftPixelSetting = PositionBox.Text;
+ Properties.Settings.Default.colorMarginSetting = GradationBox.Text;
+ Properties.Settings.Default.removePointSetting = SmallDiffBox.Text;
+ Properties.Settings.Default.shadingOffSetting = VisualBox.Text;
+ Properties.Settings.Default.Save();
}
//UIに検版結果を出力
@@ -254,6 +270,11 @@ namespace CSRender
ResultConsole.Text += TIFFresult;
ResultConsole.Text += "\r\n<変換終了>\r\n";
ResultConsole.ScrollToEnd();
+
+ //パラメータを次回初期値用に保存
+ Properties.Settings.Default.resolutionSetting = ResolutionBox.Text;
+ Properties.Settings.Default.formatSetting = FileSelect.Text;
+ Properties.Settings.Default.Save();
}
}
diff --git a/Code/CSRender/CSRender/Properties/Settings.Designer.cs b/Code/CSRender/CSRender/Properties/Settings.Designer.cs
index 20d4e8608d25a299c478d1a0c894e14ca3568de7..a78a07fb296bba8d4533d5c262a037e9d01dda41 100644
--- a/Code/CSRender/CSRender/Properties/Settings.Designer.cs
+++ b/Code/CSRender/CSRender/Properties/Settings.Designer.cs
@@ -1,30 +1,98 @@
//------------------------------------------------------------------------------
//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
+// このコードはツールによって生成されました。
+// ランタイム バージョン:4.0.30319.42000
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
+// コードが再生成されるときに損失したりします。
//
//------------------------------------------------------------------------------
-namespace CSRender.Properties
-{
-
-
+namespace CSRender.Properties {
+
+
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
+
+ public static Settings Default {
+ get {
return defaultInstance;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string resolutionSetting {
+ get {
+ return ((string)(this["resolutionSetting"]));
+ }
+ set {
+ this["resolutionSetting"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string formatSetting {
+ get {
+ return ((string)(this["formatSetting"]));
+ }
+ set {
+ this["formatSetting"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string shiftPixelSetting {
+ get {
+ return ((string)(this["shiftPixelSetting"]));
+ }
+ set {
+ this["shiftPixelSetting"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string colorMarginSetting {
+ get {
+ return ((string)(this["colorMarginSetting"]));
+ }
+ set {
+ this["colorMarginSetting"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string removePointSetting {
+ get {
+ return ((string)(this["removePointSetting"]));
+ }
+ set {
+ this["removePointSetting"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string shadingOffSetting {
+ get {
+ return ((string)(this["shadingOffSetting"]));
+ }
+ set {
+ this["shadingOffSetting"] = value;
+ }
+ }
}
}
diff --git a/Code/CSRender/CSRender/Properties/Settings.settings b/Code/CSRender/CSRender/Properties/Settings.settings
index 8f2fd95d626cc8451ccec1b2bcd6419e91491c31..f2945763880a883c328c22039c0440a2ef54f2b1 100644
--- a/Code/CSRender/CSRender/Properties/Settings.settings
+++ b/Code/CSRender/CSRender/Properties/Settings.settings
@@ -1,7 +1,24 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file