diff --git a/Code/CSRender/CSRender/CSRender.csproj b/Code/CSRender/CSRender/CSRender.csproj
index dc51068fa3019f897d3db8f066cd5ce5b9ad4200..1ca9ec2527dea66e1e8c43a919514e4e1184a46a 100644
--- a/Code/CSRender/CSRender/CSRender.csproj
+++ b/Code/CSRender/CSRender/CSRender.csproj
@@ -46,6 +46,7 @@
+
@@ -58,6 +59,7 @@
+
diff --git a/Code/CSRender/CSRender/MainWindow.xaml b/Code/CSRender/CSRender/MainWindow.xaml
index 18d5bd10f06a7514b30e94fe45ae04c0caf10e87..f2128f28f63194f34beba29710788e090a28c6d9 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml
+++ b/Code/CSRender/CSRender/MainWindow.xaml
@@ -3,11 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:wfc="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:local="clr-namespace:CSRender"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d"
Title="CSRender" Height="475" Width="600" Background="#FFF3F4F4" MinWidth="600" MinHeight="330">
-
+
@@ -35,29 +36,24 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
@@ -69,7 +65,7 @@
-
+
@@ -80,58 +76,44 @@
-
+ InputMethod.IsInputMethodSuspended="True" PreviewKeyDown="PageBox_PreviewKeyDown" PreviewTextInput="PageBox_PreviewTextInput" LostFocus="PageBox_LostFocus" CommandManager.PreviewExecuted="PageBox_PreviewExecuted" BorderBrush="#FF595959"/>
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Code/CSRender/CSRender/MainWindow.xaml.cs b/Code/CSRender/CSRender/MainWindow.xaml.cs
index 39c4455ba7c30c2a1b21400e1b7838101465c31b..c4e4185195dc11cd630a84eb187ceef73dc999a4 100644
--- a/Code/CSRender/CSRender/MainWindow.xaml.cs
+++ b/Code/CSRender/CSRender/MainWindow.xaml.cs
@@ -32,46 +32,6 @@ namespace CSRender
public MainWindow()
{
InitializeComponent();
-
- //解像度選択UpDownバーの設定
- this.Title = this.ToString();
- ResolutionBox.MouseWheel += NumericTextBox_MouseWheel;
- ResolutionBox.GotFocus += NumericTextBox_GotFocusSelectAll;
- ResolutionBox.TextChanged += NumericTextBox_TextChanged;
- ResolutionBox.TextChanged += NumericTextBox_NumChanged;
- NumericScroll1.MouseWheel += NumericScroll1_MouseWheel;
-
- //位置ズレ許容量選択UpDownバーの設定
- this.Title = this.ToString();
- PositionBox.MouseWheel += NumericTextBox_MouseWheel;
- PositionBox.GotFocus += NumericTextBox_GotFocusSelectAll;
- PositionBox.TextChanged += NumericTextBox_TextChanged;
- PositionBox.TextChanged += PosiTextBox_NumChanged;
- PosiScroll1.MouseWheel += PosiScroll1_MouseWheel;
-
- //諧調差許容量選択UpDownバーの設定
- this.Title = this.ToString();
- GradationBox.MouseWheel += NumericTextBox_MouseWheel;
- GradationBox.GotFocus += NumericTextBox_GotFocusSelectAll;
- GradationBox.TextChanged += NumericTextBox_TextChanged;
- GradationBox.TextChanged += GradTextBox_NumChanged;
- GradScroll.MouseWheel += GradScroll_MouseWheel;
-
- //微小誤差許容量選択UpDownバーの設定
- this.Title = this.ToString();
- SmallDiffBox.MouseWheel += NumericTextBox_MouseWheel;
- SmallDiffBox.GotFocus += NumericTextBox_GotFocusSelectAll;
- SmallDiffBox.TextChanged += NumericTextBox_TextChanged;
- SmallDiffBox.TextChanged += SmallDiffTextBox_NumChanged;
- SmallDiffScroll.MouseWheel += SmallDiffScroll_MouseWheel;
-
- //視覚的あいまい量選択UpDownバーの設定
- this.Title = this.ToString();
- VisualBox.MouseWheel += NumericTextBox_MouseWheel;
- VisualBox.GotFocus += NumericTextBox_GotFocusSelectAll;
- VisualBox.TextChanged += NumericTextBox_TextChanged;
- VisualBox.TextChanged += VisualTextBox_NumChanged;
- VisualScroll.MouseWheel += VisualScroll_MouseWheel;
//ページ入力メニューの設定
PagePattern.Add((new ComboBoxSet { Id = 1, Item = "全ページ"}));
diff --git a/Code/CSRender/CSRender/NumericUpDown.cs b/Code/CSRender/CSRender/NumericUpDown.cs
index 96ed82948aa9b2f275f177f3a8b7c8e3e784daaa..203c887e56e80fd9c33a3a60b8bdb20fe69eed36 100644
--- a/Code/CSRender/CSRender/NumericUpDown.cs
+++ b/Code/CSRender/CSRender/NumericUpDown.cs
@@ -20,181 +20,5 @@ namespace CSRender
public partial class MainWindow : Window
{
- ////////////////////////////////////////////////////////////////////////////
- // 解像度のUpDownメニュー機能の記述
- ////////////////////////////////////////////////////////////////////////////
-
- //TextBoxフォーカス時にテキスト全選択
- private void NumericTextBox_GotFocusSelectAll(object sender, RoutedEventArgs e)
- {
- TextBox ResolutionBox = (TextBox)sender;
- //box.SelectAll();
- this.Dispatcher.InvokeAsync(() => { Task.Delay(10); ResolutionBox.SelectAll(); });
- }
-
- //正規表現で数値以外は削除using System.Text.RegularExpressions;
- private void NumericTextBox_TextChanged(object sender, TextChangedEventArgs e)
- {
- TextBox ResolutionBox = (TextBox)sender;
- double d;
- if (!double.TryParse(ResolutionBox.Text, out d))
- {
- ResolutionBox.Text = Regex.Replace(ResolutionBox.Text, "[^0-9-]", "");
- }
- }
-
- //数字の下限;
- private void NumericTextBox_NumChanged(object sender, TextChangedEventArgs e)
- {
- TextBox ResolutionBox = (TextBox)sender;
- if (ResolutionBox.Text == "")
- {
- ResolutionBox.Text = "72";
- }
- NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
- }
-
- //TextBox上でマウスホイールを回転させた時にスクロールバーの値を上下させる
- private void NumericTextBox_MouseWheel(object sender, MouseWheelEventArgs e)
- {
- TextBox ResolutionBox = (TextBox)sender;
- Binding binding = BindingOperations.GetBinding(ResolutionBox, TextBox.TextProperty);
- ScrollBar NumericScroll1 = (ScrollBar)this.FindName(binding.ElementName);//名前から取得
- NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
- if (e.Delta > 0)
- {
- NumericScroll1.Value++;
- }
- else
- {
- NumericScroll1.Value--;
- }
- }
- //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
- private void NumericScroll1_MouseWheel(object sender, MouseWheelEventArgs e)
- {
- ScrollBar NumericScroll1 = (ScrollBar)sender;
- NumericScroll1.Value = Int32.Parse(ResolutionBox.Text);
- if (e.Delta > 0)
- {
- NumericScroll1.Value++;
- }
- else
- {
- NumericScroll1.Value--;
- }
- }
-
- ////////////////////////////////////////////////////////////////////////////
- // 位置ズレ許容量のUpDownメニュー機能の記述
- ////////////////////////////////////////////////////////////////////////////
- //数字の下限;
- private void PosiTextBox_NumChanged(object sender, TextChangedEventArgs e)
- {
- TextBox PositionBox = (TextBox)sender;
- if (PositionBox.Text == "")
- {
- PositionBox.Text = "2";
- }
- PosiScroll1.Value = Int32.Parse(PositionBox.Text);
- }
- //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
- private void PosiScroll1_MouseWheel(object sender, MouseWheelEventArgs e)
- {
- ScrollBar PosiScroll1 = (ScrollBar)sender;
- PosiScroll1.Value = Int32.Parse(PositionBox.Text);
- if (e.Delta > 0)
- {
- PosiScroll1.Value++;
- }
- else
- {
- PosiScroll1.Value--;
- }
- }
-
- ////////////////////////////////////////////////////////////////////////////
- // 諧調差許容量のUpDownメニュー機能の記述
- ////////////////////////////////////////////////////////////////////////////
- //数字の下限;
- private void GradTextBox_NumChanged(object sender, TextChangedEventArgs e)
- {
- TextBox GradationBox = (TextBox)sender;
- if (GradationBox.Text == "")
- {
- GradationBox.Text = "60";
- }
- GradScroll.Value = Int32.Parse(GradationBox.Text);
- }
- //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
- private void GradScroll_MouseWheel(object sender, MouseWheelEventArgs e)
- {
- ScrollBar GradScroll = (ScrollBar)sender;
- GradScroll.Value = Int32.Parse(GradationBox.Text);
- if (e.Delta > 0)
- {
- GradScroll.Value++;
- }
- else
- {
- GradScroll.Value--;
- }
- }
-
- ////////////////////////////////////////////////////////////////////////////
- // 微小差異許容量のUpDownメニュー機能の記述
- ////////////////////////////////////////////////////////////////////////////
- //数字の下限;
- private void SmallDiffTextBox_NumChanged(object sender, TextChangedEventArgs e)
- {
- TextBox SmallDiffBox = (TextBox)sender;
- if (SmallDiffBox.Text == "")
- {
- SmallDiffBox.Text = "60";
- }
- SmallDiffScroll.Value = Int32.Parse(SmallDiffBox.Text);
- }
- //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
- private void SmallDiffScroll_MouseWheel(object sender, MouseWheelEventArgs e)
- {
- ScrollBar SmallDiffScroll = (ScrollBar)sender;
- SmallDiffScroll.Value = Int32.Parse(SmallDiffBox.Text);
- if (e.Delta > 0)
- {
- SmallDiffScroll.Value++;
- }
- else
- {
- SmallDiffScroll.Value--;
- }
- }
-
- ////////////////////////////////////////////////////////////////////////////
- // 視覚的あいまい量のUpDownメニュー機能の記述
- ////////////////////////////////////////////////////////////////////////////
- //数字の下限;
- private void VisualTextBox_NumChanged(object sender, TextChangedEventArgs e)
- {
- TextBox VisualBox = (TextBox)sender;
- if (VisualBox.Text == "")
- {
- VisualBox.Text = "60";
- }
- VisualScroll.Value = Int32.Parse(VisualBox.Text);
- }
- //ScrollBar上でマウスホイールを回転させた時にScrollBarの値を上下させる
- private void VisualScroll_MouseWheel(object sender, MouseWheelEventArgs e)
- {
- ScrollBar VisualScroll = (ScrollBar)sender;
- VisualScroll.Value = Int32.Parse(VisualBox.Text);
- if (e.Delta > 0)
- {
- VisualScroll.Value++;
- }
- else
- {
- VisualScroll.Value--;
- }
- }
}
}