Commit c1b1cd01 authored by tsuji's avatar tsuji

UpDownメニューの初期値(前回記憶値)が表示されない不具合を修正

parent 933feca2
...@@ -11,22 +11,22 @@ ...@@ -11,22 +11,22 @@
<userSettings> <userSettings>
<CSRender.Properties.Settings> <CSRender.Properties.Settings>
<setting name="resolutionSetting" serializeAs="String"> <setting name="resolutionSetting" serializeAs="String">
<value /> <value>75</value>
</setting> </setting>
<setting name="formatSetting" serializeAs="String"> <setting name="formatSetting" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="shiftPixelSetting" serializeAs="String"> <setting name="shiftPixelSetting" serializeAs="String">
<value /> <value>2</value>
</setting> </setting>
<setting name="colorMarginSetting" serializeAs="String"> <setting name="colorMarginSetting" serializeAs="String">
<value /> <value>60</value>
</setting> </setting>
<setting name="removePointSetting" serializeAs="String"> <setting name="removePointSetting" serializeAs="String">
<value /> <value>8</value>
</setting> </setting>
<setting name="shadingOffSetting" serializeAs="String"> <setting name="shadingOffSetting" serializeAs="String">
<value /> <value>5</value>
</setting> </setting>
<setting name="workSpaceSetting" serializeAs="String"> <setting name="workSpaceSetting" serializeAs="String">
<value /> <value />
......
...@@ -51,12 +51,12 @@ namespace CSRender ...@@ -51,12 +51,12 @@ namespace CSRender
FileSelect.ItemsSource = FilePattern; FileSelect.ItemsSource = FilePattern;
//デフォルトに前回の設定値を表示 //デフォルトに前回の設定値を表示
ResolutionBox.Text = Properties.Settings.Default.resolutionSetting; ResolutionBox.Value = Properties.Settings.Default.resolutionSetting;
FileSelect.Text = Properties.Settings.Default.formatSetting; FileSelect.Text = Properties.Settings.Default.formatSetting;
PositionBox.Text = Properties.Settings.Default.shiftPixelSetting; PositionBox.Value = Properties.Settings.Default.shiftPixelSetting;
GradationBox.Text = Properties.Settings.Default.colorMarginSetting; GradationBox.Value = Properties.Settings.Default.colorMarginSetting;
SmallDiffBox.Text = Properties.Settings.Default.removePointSetting; SmallDiffBox.Value = Properties.Settings.Default.removePointSetting;
VisualBox.Text = Properties.Settings.Default.shadingOffSetting; VisualBox.Value = Properties.Settings.Default.shadingOffSetting;
workBox.Text = Properties.Settings.Default.workSpaceSetting; workBox.Text = Properties.Settings.Default.workSpaceSetting;
//ドラッグ&ドロップイベントの追加 //ドラッグ&ドロップイベントの追加
...@@ -223,12 +223,12 @@ namespace CSRender ...@@ -223,12 +223,12 @@ namespace CSRender
ResultConsole.Text += "\r\n"; 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.formatSetting = FileSelect.Text;
Properties.Settings.Default.shiftPixelSetting = PositionBox.Text; Properties.Settings.Default.shiftPixelSetting = PositionBox.Value;
Properties.Settings.Default.colorMarginSetting = GradationBox.Text; Properties.Settings.Default.colorMarginSetting = GradationBox.Value;
Properties.Settings.Default.removePointSetting = SmallDiffBox.Text; Properties.Settings.Default.removePointSetting = SmallDiffBox.Value;
Properties.Settings.Default.shadingOffSetting = VisualBox.Text; Properties.Settings.Default.shadingOffSetting = VisualBox.Value;
Properties.Settings.Default.workSpaceSetting = workBox.Text; Properties.Settings.Default.workSpaceSetting = workBox.Text;
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
} }
...@@ -327,7 +327,7 @@ namespace CSRender ...@@ -327,7 +327,7 @@ namespace CSRender
ResultConsole.ScrollToEnd(); ResultConsole.ScrollToEnd();
//パラメータを次回初期値用に保存 //パラメータを次回初期値用に保存
Properties.Settings.Default.resolutionSetting = ResolutionBox.Text; Properties.Settings.Default.resolutionSetting = ResolutionBox.Value;
Properties.Settings.Default.formatSetting = FileSelect.Text; Properties.Settings.Default.formatSetting = FileSelect.Text;
Properties.Settings.Default.workSpaceSetting = workBox.Text; Properties.Settings.Default.workSpaceSetting = workBox.Text;
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
......
...@@ -25,10 +25,10 @@ namespace CSRender.Properties { ...@@ -25,10 +25,10 @@ namespace CSRender.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("75")]
public string resolutionSetting { public decimal resolutionSetting {
get { get {
return ((string)(this["resolutionSetting"])); return ((decimal)(this["resolutionSetting"]));
} }
set { set {
this["resolutionSetting"] = value; this["resolutionSetting"] = value;
...@@ -49,10 +49,10 @@ namespace CSRender.Properties { ...@@ -49,10 +49,10 @@ namespace CSRender.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("2")]
public string shiftPixelSetting { public decimal shiftPixelSetting {
get { get {
return ((string)(this["shiftPixelSetting"])); return ((decimal)(this["shiftPixelSetting"]));
} }
set { set {
this["shiftPixelSetting"] = value; this["shiftPixelSetting"] = value;
...@@ -61,10 +61,10 @@ namespace CSRender.Properties { ...@@ -61,10 +61,10 @@ namespace CSRender.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("60")]
public string colorMarginSetting { public decimal colorMarginSetting {
get { get {
return ((string)(this["colorMarginSetting"])); return ((decimal)(this["colorMarginSetting"]));
} }
set { set {
this["colorMarginSetting"] = value; this["colorMarginSetting"] = value;
...@@ -73,10 +73,10 @@ namespace CSRender.Properties { ...@@ -73,10 +73,10 @@ namespace CSRender.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("8")]
public string removePointSetting { public decimal removePointSetting {
get { get {
return ((string)(this["removePointSetting"])); return ((decimal)(this["removePointSetting"]));
} }
set { set {
this["removePointSetting"] = value; this["removePointSetting"] = value;
...@@ -85,10 +85,10 @@ namespace CSRender.Properties { ...@@ -85,10 +85,10 @@ namespace CSRender.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("5")]
public string shadingOffSetting { public decimal shadingOffSetting {
get { get {
return ((string)(this["shadingOffSetting"])); return ((decimal)(this["shadingOffSetting"]));
} }
set { set {
this["shadingOffSetting"] = value; this["shadingOffSetting"] = value;
......
...@@ -2,23 +2,23 @@ ...@@ -2,23 +2,23 @@
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="CSRender.Properties" GeneratedClassName="Settings"> <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="CSRender.Properties" GeneratedClassName="Settings">
<Profiles /> <Profiles />
<Settings> <Settings>
<Setting Name="resolutionSetting" Type="System.String" Scope="User"> <Setting Name="resolutionSetting" Type="System.Decimal" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">75</Value>
</Setting> </Setting>
<Setting Name="formatSetting" Type="System.String" Scope="User"> <Setting Name="formatSetting" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="shiftPixelSetting" Type="System.String" Scope="User"> <Setting Name="shiftPixelSetting" Type="System.Decimal" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">2</Value>
</Setting> </Setting>
<Setting Name="colorMarginSetting" Type="System.String" Scope="User"> <Setting Name="colorMarginSetting" Type="System.Decimal" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">60</Value>
</Setting> </Setting>
<Setting Name="removePointSetting" Type="System.String" Scope="User"> <Setting Name="removePointSetting" Type="System.Decimal" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">8</Value>
</Setting> </Setting>
<Setting Name="shadingOffSetting" Type="System.String" Scope="User"> <Setting Name="shadingOffSetting" Type="System.Decimal" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">5</Value>
</Setting> </Setting>
<Setting Name="workSpaceSetting" Type="System.String" Scope="User"> <Setting Name="workSpaceSetting" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment