diff --git a/Code/CSRender/CSRender/App.config b/Code/CSRender/CSRender/App.config index 41822101066d0df330b0c58a6846b6cdeb44d31a..0ae79156946201b415beccdfc9a695d3e1083385 100644 --- a/Code/CSRender/CSRender/App.config +++ b/Code/CSRender/CSRender/App.config @@ -11,22 +11,22 @@ - + 75 - + 2 - + 60 - + 8 - + 5 diff --git a/Code/CSRender/CSRender/MainWindow.xaml.cs b/Code/CSRender/CSRender/MainWindow.xaml.cs index c4e4185195dc11cd630a84eb187ceef73dc999a4..dfe81c6fadd7eb12a0044e1c6a6bc7124d42ecf6 100644 --- a/Code/CSRender/CSRender/MainWindow.xaml.cs +++ b/Code/CSRender/CSRender/MainWindow.xaml.cs @@ -51,12 +51,12 @@ namespace CSRender FileSelect.ItemsSource = FilePattern; //デフォルトに前回の設定値を表示 - ResolutionBox.Text = Properties.Settings.Default.resolutionSetting; + ResolutionBox.Value = 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; + PositionBox.Value = Properties.Settings.Default.shiftPixelSetting; + GradationBox.Value = Properties.Settings.Default.colorMarginSetting; + SmallDiffBox.Value = Properties.Settings.Default.removePointSetting; + VisualBox.Value = Properties.Settings.Default.shadingOffSetting; workBox.Text = Properties.Settings.Default.workSpaceSetting; //ドラッグ&ドロップイベントの追加 @@ -221,14 +221,14 @@ namespace CSRender ResultConsole.Text += " 検版レポートのパス:"; ResultConsole.Text += System.IO.Path.Combine(workBox.Text, "report", PDFName); ResultConsole.Text += "\r\n"; - + //パラメータを次回初期値用に保存 - Properties.Settings.Default.resolutionSetting = ResolutionBox.Text; + Properties.Settings.Default.resolutionSetting = ResolutionBox.Value; 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.shiftPixelSetting = PositionBox.Value; + Properties.Settings.Default.colorMarginSetting = GradationBox.Value; + Properties.Settings.Default.removePointSetting = SmallDiffBox.Value; + Properties.Settings.Default.shadingOffSetting = VisualBox.Value; Properties.Settings.Default.workSpaceSetting = workBox.Text; Properties.Settings.Default.Save(); } @@ -327,7 +327,7 @@ namespace CSRender ResultConsole.ScrollToEnd(); //パラメータを次回初期値用に保存 - Properties.Settings.Default.resolutionSetting = ResolutionBox.Text; + Properties.Settings.Default.resolutionSetting = ResolutionBox.Value; Properties.Settings.Default.formatSetting = FileSelect.Text; Properties.Settings.Default.workSpaceSetting = workBox.Text; Properties.Settings.Default.Save(); diff --git a/Code/CSRender/CSRender/Properties/Settings.Designer.cs b/Code/CSRender/CSRender/Properties/Settings.Designer.cs index 5a237130c0cb6a761d5245d9c4f055f3c8f67397..fe85426c598d5999882ac3edd6e1f215ab7ea506 100644 --- a/Code/CSRender/CSRender/Properties/Settings.Designer.cs +++ b/Code/CSRender/CSRender/Properties/Settings.Designer.cs @@ -25,10 +25,10 @@ namespace CSRender.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string resolutionSetting { + [global::System.Configuration.DefaultSettingValueAttribute("75")] + public decimal resolutionSetting { get { - return ((string)(this["resolutionSetting"])); + return ((decimal)(this["resolutionSetting"])); } set { this["resolutionSetting"] = value; @@ -49,10 +49,10 @@ namespace CSRender.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string shiftPixelSetting { + [global::System.Configuration.DefaultSettingValueAttribute("2")] + public decimal shiftPixelSetting { get { - return ((string)(this["shiftPixelSetting"])); + return ((decimal)(this["shiftPixelSetting"])); } set { this["shiftPixelSetting"] = value; @@ -61,10 +61,10 @@ namespace CSRender.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string colorMarginSetting { + [global::System.Configuration.DefaultSettingValueAttribute("60")] + public decimal colorMarginSetting { get { - return ((string)(this["colorMarginSetting"])); + return ((decimal)(this["colorMarginSetting"])); } set { this["colorMarginSetting"] = value; @@ -73,10 +73,10 @@ namespace CSRender.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string removePointSetting { + [global::System.Configuration.DefaultSettingValueAttribute("8")] + public decimal removePointSetting { get { - return ((string)(this["removePointSetting"])); + return ((decimal)(this["removePointSetting"])); } set { this["removePointSetting"] = value; @@ -85,10 +85,10 @@ namespace CSRender.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string shadingOffSetting { + [global::System.Configuration.DefaultSettingValueAttribute("5")] + public decimal shadingOffSetting { get { - return ((string)(this["shadingOffSetting"])); + return ((decimal)(this["shadingOffSetting"])); } set { this["shadingOffSetting"] = value; diff --git a/Code/CSRender/CSRender/Properties/Settings.settings b/Code/CSRender/CSRender/Properties/Settings.settings index 8c054fd158b3a1a2575e49a0f233a206f0a3dbe5..9124af5fe673b252fea29d4b132fbb756b7c78ad 100644 --- a/Code/CSRender/CSRender/Properties/Settings.settings +++ b/Code/CSRender/CSRender/Properties/Settings.settings @@ -2,23 +2,23 @@ - - + + 75 - - + + 2 - - + + 60 - - + + 8 - - + + 5