diff --git a/Windows/ViewStep.xaml b/Windows/ViewStep.xaml index 9251874..a7ce84f 100644 --- a/Windows/ViewStep.xaml +++ b/Windows/ViewStep.xaml @@ -95,46 +95,49 @@ FontSize="20" Background="#FFEFEEEE"/> - - - - - - - - - + + + + + + + + diff --git a/Windows/ViewStep.xaml.cs b/Windows/ViewStep.xaml.cs index f83a695..1abb965 100644 --- a/Windows/ViewStep.xaml.cs +++ b/Windows/ViewStep.xaml.cs @@ -158,20 +158,119 @@ namespace DyeingComputer.Windows { try { - dat_D.BeginEdit(); - if (dat_P == 1) + if (dat_P !=0) { - dat_D["Parameter1_S1"] = Convert.ToDouble(P1P.Text); + dat_D.BeginEdit(); + if (dat_P == 1) + { + dat_D["Parameter1_S1"] = Convert.ToDouble(P1P.Text); + } + else if (dat_P == 2) + { + dat_D["Parameter1_S2"] = Convert.ToDouble(P1P.Text); + } + else if (dat_P == 3) + { + dat_D["Parameter1_S3"] = Convert.ToDouble(P1P.Text); + } + dat_D.EndEdit(); } - else if (dat_P == 2) + } + catch (Exception) { } + } + private void P2P_TextChanged(object sender, TextChangedEventArgs e) + { + try + { + if (dat_P != 0) { - dat_D["Parameter1_S2"] = Convert.ToDouble(P1P.Text); + dat_D.BeginEdit(); + if (dat_P == 1) + { + dat_D["Parameter1_S1"] = Convert.ToDouble(P2P.Text); + } + else if (dat_P == 2) + { + dat_D["Parameter1_S2"] = Convert.ToDouble(P2P.Text); + } + else if (dat_P == 3) + { + dat_D["Parameter1_S3"] = Convert.ToDouble(P2P.Text); + } + dat_D.EndEdit(); } - else if (dat_P == 3) + } + catch (Exception) { } + } + private void P3P_TextChanged(object sender, TextChangedEventArgs e) + { + try + { + if (dat_P != 0) + { + dat_D.BeginEdit(); + if (dat_P == 1) + { + dat_D["Parameter1_S1"] = Convert.ToDouble(P3P.Text); + } + else if (dat_P == 2) + { + dat_D["Parameter1_S2"] = Convert.ToDouble(P3P.Text); + } + else if (dat_P == 3) + { + dat_D["Parameter1_S3"] = Convert.ToDouble(P3P.Text); + } + dat_D.EndEdit(); + } + } + catch (Exception) { } + } + private void P4P_TextChanged(object sender, TextChangedEventArgs e) + { + try + { + if (dat_P != 0) { - dat_D["Parameter1_S3"] = Convert.ToDouble(P1P.Text); + dat_D.BeginEdit(); + if (dat_P == 1) + { + dat_D["Parameter1_S1"] = Convert.ToDouble(P4P.Text); + } + else if (dat_P == 2) + { + dat_D["Parameter1_S2"] = Convert.ToDouble(P4P.Text); + } + else if (dat_P == 3) + { + dat_D["Parameter1_S3"] = Convert.ToDouble(P4P.Text); + } + dat_D.EndEdit(); + } + } + catch (Exception) { } + } + private void P5P_TextChanged(object sender, TextChangedEventArgs e) + { + try + { + if (dat_P != 0) + { + dat_D.BeginEdit(); + if (dat_P == 1) + { + dat_D["Parameter1_S1"] = Convert.ToDouble(P5P.Text); + } + else if (dat_P == 2) + { + dat_D["Parameter1_S2"] = Convert.ToDouble(P5P.Text); + } + else if (dat_P == 3) + { + dat_D["Parameter1_S3"] = Convert.ToDouble(P5P.Text); + } + dat_D.EndEdit(); } - dat_D.EndEdit(); } catch (Exception) { } }