diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj index b3279de9..e30da392 100644 --- a/Crystallography.Controls/Crystallography.Controls.csproj +++ b/Crystallography.Controls/Crystallography.Controls.csproj @@ -4,8 +4,8 @@ Library net5.0-windows true - 2021.9.2.0051 - 2021.9.2.0051 + 2021.9.2.0350 + 2021.9.2.0350 diff --git a/Crystallography.Controls/ScalablePictureBoxAdvanced.Designer.cs b/Crystallography.Controls/ScalablePictureBoxAdvanced.Designer.cs index aa902d54..6fe198ab 100644 --- a/Crystallography.Controls/ScalablePictureBoxAdvanced.Designer.cs +++ b/Crystallography.Controls/ScalablePictureBoxAdvanced.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScalablePictureBoxAdvanced)); this.panelTrackBar = new System.Windows.Forms.Panel(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -48,7 +49,7 @@ private void InitializeComponent() this.numericBoxDustScratchesThreshold = new Crystallography.Controls.NumericBox(); this.flowLayoutPanelGaussianBlur2 = new System.Windows.Forms.FlowLayoutPanel(); this.checkBoxGaussianBlur = new System.Windows.Forms.CheckBox(); - this.numericBoxGaussianRadius = new Crystallography.Controls.NumericBox(); + this.numericBoxGaussianFWHM = new Crystallography.Controls.NumericBox(); this.panelUpper = new System.Windows.Forms.Panel(); this.buttonCopyToClipBoard = new System.Windows.Forms.Button(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); @@ -67,63 +68,35 @@ private void InitializeComponent() // // panelTrackBar // - this.panelTrackBar.AutoSize = true; + resources.ApplyResources(this.panelTrackBar, "panelTrackBar"); this.panelTrackBar.Controls.Add(this.label2); this.panelTrackBar.Controls.Add(this.label3); this.panelTrackBar.Controls.Add(this.trackBarAdvancedMinimum); this.panelTrackBar.Controls.Add(this.trackBarAdvancedMaximum); - this.panelTrackBar.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelTrackBar.Location = new System.Drawing.Point(0, 354); - this.panelTrackBar.Margin = new System.Windows.Forms.Padding(2); this.panelTrackBar.Name = "panelTrackBar"; - this.panelTrackBar.Size = new System.Drawing.Size(397, 54); - this.panelTrackBar.TabIndex = 7; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(2, 6); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(31, 15); - this.label2.TabIndex = 5; - this.label2.Text = "Min."; // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(2, 30); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(33, 15); - this.label3.TabIndex = 5; - this.label3.Text = "Max."; // // trackBarAdvancedMinimum // - this.trackBarAdvancedMinimum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.trackBarAdvancedMinimum.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.trackBarAdvancedMinimum, "trackBarAdvancedMinimum"); this.trackBarAdvancedMinimum.ControlHeight = 22; this.trackBarAdvancedMinimum.DecimalPlaces = 0; - this.trackBarAdvancedMinimum.Font = new System.Drawing.Font("メイリオ", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); - this.trackBarAdvancedMinimum.FooterFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); - this.trackBarAdvancedMinimum.FooterText = ""; - this.trackBarAdvancedMinimum.HeaderFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); - this.trackBarAdvancedMinimum.HeaderText = ""; - this.trackBarAdvancedMinimum.Location = new System.Drawing.Point(42, 3); this.trackBarAdvancedMinimum.LogScrollBar = false; - this.trackBarAdvancedMinimum.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.trackBarAdvancedMinimum.Maximum = 65D; - this.trackBarAdvancedMinimum.MaximumSize = new System.Drawing.Size(1000, 25); this.trackBarAdvancedMinimum.Minimum = 0D; - this.trackBarAdvancedMinimum.MinimumSize = new System.Drawing.Size(1, 22); this.trackBarAdvancedMinimum.Name = "trackBarAdvancedMinimum"; this.trackBarAdvancedMinimum.NumericBoxSize = 84; this.trackBarAdvancedMinimum.Orientation = System.Windows.Forms.Orientation.Vertical; - this.trackBarAdvancedMinimum.Size = new System.Drawing.Size(352, 22); this.trackBarAdvancedMinimum.Smart_Increment = true; - this.trackBarAdvancedMinimum.TabIndex = 4; this.trackBarAdvancedMinimum.TickStyle = System.Windows.Forms.TickStyle.BottomRight; this.trackBarAdvancedMinimum.UpDown_Increment = 1D; this.trackBarAdvancedMinimum.Value = 0D; @@ -131,29 +104,16 @@ private void InitializeComponent() // // trackBarAdvancedMaximum // - this.trackBarAdvancedMaximum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.trackBarAdvancedMaximum.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.trackBarAdvancedMaximum, "trackBarAdvancedMaximum"); this.trackBarAdvancedMaximum.ControlHeight = 22; this.trackBarAdvancedMaximum.DecimalPlaces = 0; - this.trackBarAdvancedMaximum.Font = new System.Drawing.Font("メイリオ", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); - this.trackBarAdvancedMaximum.FooterFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); - this.trackBarAdvancedMaximum.FooterText = ""; - this.trackBarAdvancedMaximum.HeaderFont = new System.Drawing.Font("Segoe UI Symbol", 9.75F); - this.trackBarAdvancedMaximum.HeaderText = ""; - this.trackBarAdvancedMaximum.Location = new System.Drawing.Point(42, 29); this.trackBarAdvancedMaximum.LogScrollBar = false; - this.trackBarAdvancedMaximum.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.trackBarAdvancedMaximum.Maximum = 65535D; - this.trackBarAdvancedMaximum.MaximumSize = new System.Drawing.Size(1000, 25); this.trackBarAdvancedMaximum.Minimum = 0D; - this.trackBarAdvancedMaximum.MinimumSize = new System.Drawing.Size(1, 22); this.trackBarAdvancedMaximum.Name = "trackBarAdvancedMaximum"; this.trackBarAdvancedMaximum.NumericBoxSize = 84; this.trackBarAdvancedMaximum.Orientation = System.Windows.Forms.Orientation.Vertical; - this.trackBarAdvancedMaximum.Size = new System.Drawing.Size(352, 22); this.trackBarAdvancedMaximum.Smart_Increment = true; - this.trackBarAdvancedMaximum.TabIndex = 4; this.trackBarAdvancedMaximum.TickStyle = System.Windows.Forms.TickStyle.BottomRight; this.trackBarAdvancedMaximum.UpDown_Increment = 1D; this.trackBarAdvancedMaximum.Value = 0D; @@ -161,27 +121,18 @@ private void InitializeComponent() // // label // - this.label.AutoSize = true; - this.label.Dock = System.Windows.Forms.DockStyle.Left; - this.label.Location = new System.Drawing.Point(0, 2); - this.label.Margin = new System.Windows.Forms.Padding(2, 2, 2, 0); + resources.ApplyResources(this.label, "label"); this.label.Name = "label"; - this.label.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); - this.label.Size = new System.Drawing.Size(0, 17); - this.label.TabIndex = 9; // // comboBoxScale2 // this.comboBoxScale2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxScale2.FormattingEnabled = true; this.comboBoxScale2.Items.AddRange(new object[] { - "Gray scale", - "Cold-Warm scale"}); - this.comboBoxScale2.Location = new System.Drawing.Point(282, 2); - this.comboBoxScale2.Margin = new System.Windows.Forms.Padding(0); + resources.GetString("comboBoxScale2.Items"), + resources.GetString("comboBoxScale2.Items1")}); + resources.ApplyResources(this.comboBoxScale2, "comboBoxScale2"); this.comboBoxScale2.Name = "comboBoxScale2"; - this.comboBoxScale2.Size = new System.Drawing.Size(97, 23); - this.comboBoxScale2.TabIndex = 36; this.comboBoxScale2.SelectedIndexChanged += new System.EventHandler(this.comboBoxScale_SelectedIndexChanged); // // comboBoxScale1 @@ -189,13 +140,10 @@ private void InitializeComponent() this.comboBoxScale1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxScale1.FormattingEnabled = true; this.comboBoxScale1.Items.AddRange(new object[] { - "Log Scale", - "Liner Scale"}); - this.comboBoxScale1.Location = new System.Drawing.Point(164, 2); - this.comboBoxScale1.Margin = new System.Windows.Forms.Padding(0); + resources.GetString("comboBoxScale1.Items"), + resources.GetString("comboBoxScale1.Items1")}); + resources.ApplyResources(this.comboBoxScale1, "comboBoxScale1"); this.comboBoxScale1.Name = "comboBoxScale1"; - this.comboBoxScale1.Size = new System.Drawing.Size(80, 23); - this.comboBoxScale1.TabIndex = 35; this.comboBoxScale1.SelectedIndexChanged += new System.EventHandler(this.comboBoxScale_SelectedIndexChanged); // // comboBoxGradient @@ -203,253 +151,145 @@ private void InitializeComponent() this.comboBoxGradient.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxGradient.FormattingEnabled = true; this.comboBoxGradient.Items.AddRange(new object[] { - "Positive ", - "Negative"}); - this.comboBoxGradient.Location = new System.Drawing.Point(54, 2); - this.comboBoxGradient.Margin = new System.Windows.Forms.Padding(0); + resources.GetString("comboBoxGradient.Items"), + resources.GetString("comboBoxGradient.Items1")}); + resources.ApplyResources(this.comboBoxGradient, "comboBoxGradient"); this.comboBoxGradient.Name = "comboBoxGradient"; - this.comboBoxGradient.Size = new System.Drawing.Size(74, 23); - this.comboBoxGradient.TabIndex = 34; this.comboBoxGradient.SelectedIndexChanged += new System.EventHandler(this.comboBoxScale_SelectedIndexChanged); // // label7 // - this.label7.AutoSize = true; - this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label7.Location = new System.Drawing.Point(130, 4); - this.label7.Margin = new System.Windows.Forms.Padding(2, 2, 0, 0); + resources.ApplyResources(this.label7, "label7"); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(34, 15); - this.label7.TabIndex = 37; - this.label7.Text = "Scale"; // // label9 // - this.label9.AutoSize = true; - this.label9.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label9.Location = new System.Drawing.Point(246, 4); - this.label9.Margin = new System.Windows.Forms.Padding(2, 2, 0, 0); + resources.ApplyResources(this.label9, "label9"); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(36, 15); - this.label9.TabIndex = 38; - this.label9.Text = "Color"; // // label5 // - this.label5.AutoSize = true; - this.label5.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label5.Location = new System.Drawing.Point(2, 4); - this.label5.Margin = new System.Windows.Forms.Padding(2, 2, 0, 0); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(52, 15); - this.label5.TabIndex = 39; - this.label5.Text = "Gradient"; // // flowLayoutPanelGradient // - this.flowLayoutPanelGradient.AutoSize = true; - this.flowLayoutPanelGradient.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.flowLayoutPanelGradient, "flowLayoutPanelGradient"); this.flowLayoutPanelGradient.Controls.Add(this.label5); this.flowLayoutPanelGradient.Controls.Add(this.comboBoxGradient); this.flowLayoutPanelGradient.Controls.Add(this.label7); this.flowLayoutPanelGradient.Controls.Add(this.comboBoxScale1); this.flowLayoutPanelGradient.Controls.Add(this.label9); this.flowLayoutPanelGradient.Controls.Add(this.comboBoxScale2); - this.flowLayoutPanelGradient.Dock = System.Windows.Forms.DockStyle.Bottom; - this.flowLayoutPanelGradient.Location = new System.Drawing.Point(0, 478); - this.flowLayoutPanelGradient.Margin = new System.Windows.Forms.Padding(2); this.flowLayoutPanelGradient.Name = "flowLayoutPanelGradient"; - this.flowLayoutPanelGradient.Padding = new System.Windows.Forms.Padding(0, 2, 0, 4); - this.flowLayoutPanelGradient.Size = new System.Drawing.Size(397, 29); - this.flowLayoutPanelGradient.TabIndex = 11; // // flowLayoutPanelImageFilter // - this.flowLayoutPanelImageFilter.AutoSize = true; - this.flowLayoutPanelImageFilter.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.flowLayoutPanelImageFilter, "flowLayoutPanelImageFilter"); this.flowLayoutPanelImageFilter.Controls.Add(this.flowLayoutPanelDustScratches); this.flowLayoutPanelImageFilter.Controls.Add(this.flowLayoutPanelGaussianBlur2); - this.flowLayoutPanelImageFilter.Dock = System.Windows.Forms.DockStyle.Bottom; - this.flowLayoutPanelImageFilter.Location = new System.Drawing.Point(0, 507); - this.flowLayoutPanelImageFilter.Margin = new System.Windows.Forms.Padding(2); this.flowLayoutPanelImageFilter.Name = "flowLayoutPanelImageFilter"; - this.flowLayoutPanelImageFilter.Padding = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.flowLayoutPanelImageFilter.Size = new System.Drawing.Size(397, 54); - this.flowLayoutPanelImageFilter.TabIndex = 12; // // flowLayoutPanelDustScratches // - this.flowLayoutPanelDustScratches.AutoSize = true; - this.flowLayoutPanelDustScratches.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.flowLayoutPanelDustScratches, "flowLayoutPanelDustScratches"); this.flowLayoutPanelDustScratches.Controls.Add(this.checkBoxDustScratches); this.flowLayoutPanelDustScratches.Controls.Add(this.numericBoxDustScratchesRadius); this.flowLayoutPanelDustScratches.Controls.Add(this.numericBoxDustScratchesThreshold); - this.flowLayoutPanelDustScratches.Location = new System.Drawing.Point(0, 2); - this.flowLayoutPanelDustScratches.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanelDustScratches.Name = "flowLayoutPanelDustScratches"; - this.flowLayoutPanelDustScratches.Size = new System.Drawing.Size(353, 25); - this.flowLayoutPanelDustScratches.TabIndex = 42; // // checkBoxDustScratches // - this.checkBoxDustScratches.AutoSize = true; - this.checkBoxDustScratches.Location = new System.Drawing.Point(2, 2); - this.checkBoxDustScratches.Margin = new System.Windows.Forms.Padding(2); + resources.ApplyResources(this.checkBoxDustScratches, "checkBoxDustScratches"); this.checkBoxDustScratches.Name = "checkBoxDustScratches"; - this.checkBoxDustScratches.Size = new System.Drawing.Size(110, 19); - this.checkBoxDustScratches.TabIndex = 40; - this.checkBoxDustScratches.Text = "Dust&&Scratches"; this.checkBoxDustScratches.UseVisualStyleBackColor = true; this.checkBoxDustScratches.CheckedChanged += new System.EventHandler(this.imageFilterProperty_Changed); // // numericBoxDustScratchesRadius // - this.numericBoxDustScratchesRadius.BackColor = System.Drawing.SystemColors.Control; + this.numericBoxDustScratchesRadius.BackColor = System.Drawing.SystemColors.Control; this.numericBoxDustScratchesRadius.DecimalPlaces = 1; - this.numericBoxDustScratchesRadius.Font = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxDustScratchesRadius.FooterFont = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxDustScratchesRadius.FooterText = "pix."; - this.numericBoxDustScratchesRadius.HeaderFont = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxDustScratchesRadius.HeaderText = "Radius"; - this.numericBoxDustScratchesRadius.Location = new System.Drawing.Point(114, 0); - this.numericBoxDustScratchesRadius.Margin = new System.Windows.Forms.Padding(0); + resources.ApplyResources(this.numericBoxDustScratchesRadius, "numericBoxDustScratchesRadius"); + this.numericBoxDustScratchesRadius.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxDustScratchesRadius.HeaderBackColor = System.Drawing.SystemColors.Control; this.numericBoxDustScratchesRadius.Maximum = 5D; - this.numericBoxDustScratchesRadius.MaximumSize = new System.Drawing.Size(1000, 25); this.numericBoxDustScratchesRadius.Minimum = 0D; - this.numericBoxDustScratchesRadius.MinimumSize = new System.Drawing.Size(1, 25); - this.numericBoxDustScratchesRadius.Name = "numericBoxDustScratchesRadius"; - this.numericBoxDustScratchesRadius.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.numericBoxDustScratchesRadius.Name = "numericBoxDustScratchesRadius"; this.numericBoxDustScratchesRadius.RadianValue = 0.017453292519943295D; - this.numericBoxDustScratchesRadius.RestrictLimitValue = true; - this.numericBoxDustScratchesRadius.ShowFraction = false; - this.numericBoxDustScratchesRadius.ShowPositiveSign = false; + this.numericBoxDustScratchesRadius.RoundErrorAccuracy = -1; this.numericBoxDustScratchesRadius.ShowUpDown = true; - this.numericBoxDustScratchesRadius.Size = new System.Drawing.Size(123, 25); this.numericBoxDustScratchesRadius.SkipEventDuringInput = false; - this.numericBoxDustScratchesRadius.SmartIncrement = false; - this.numericBoxDustScratchesRadius.TabIndex = 43; - this.numericBoxDustScratchesRadius.TextBoxForeColor = System.Drawing.SystemColors.WindowText; - this.numericBoxDustScratchesRadius.ThonsandsSeparator = true; - this.numericBoxDustScratchesRadius.ToolTip = ""; + this.numericBoxDustScratchesRadius.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.numericBoxDustScratchesRadius.ThonsandsSeparator = true; this.numericBoxDustScratchesRadius.UpDown_Increment = 0.5D; this.numericBoxDustScratchesRadius.Value = 1D; - this.numericBoxDustScratchesRadius.Visible = false; - this.numericBoxDustScratchesRadius.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.imageFilterProperty_Changed); + this.numericBoxDustScratchesRadius.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.imageFilterProperty_Changed); // // numericBoxDustScratchesThreshold // - this.numericBoxDustScratchesThreshold.BackColor = System.Drawing.SystemColors.Control; + this.numericBoxDustScratchesThreshold.BackColor = System.Drawing.SystemColors.Control; this.numericBoxDustScratchesThreshold.DecimalPlaces = 0; - this.numericBoxDustScratchesThreshold.Font = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxDustScratchesThreshold.FooterFont = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxDustScratchesThreshold.HeaderFont = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxDustScratchesThreshold.HeaderText = "Threshold"; - this.numericBoxDustScratchesThreshold.Location = new System.Drawing.Point(237, 0); - this.numericBoxDustScratchesThreshold.Margin = new System.Windows.Forms.Padding(0); + resources.ApplyResources(this.numericBoxDustScratchesThreshold, "numericBoxDustScratchesThreshold"); + this.numericBoxDustScratchesThreshold.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxDustScratchesThreshold.HeaderBackColor = System.Drawing.SystemColors.Control; this.numericBoxDustScratchesThreshold.Maximum = 10D; - this.numericBoxDustScratchesThreshold.MaximumSize = new System.Drawing.Size(1000, 25); this.numericBoxDustScratchesThreshold.Minimum = 0D; - this.numericBoxDustScratchesThreshold.MinimumSize = new System.Drawing.Size(1, 25); - this.numericBoxDustScratchesThreshold.Name = "numericBoxDustScratchesThreshold"; - this.numericBoxDustScratchesThreshold.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.numericBoxDustScratchesThreshold.Name = "numericBoxDustScratchesThreshold"; this.numericBoxDustScratchesThreshold.RadianValue = 0.052359877559829883D; - this.numericBoxDustScratchesThreshold.RestrictLimitValue = true; - this.numericBoxDustScratchesThreshold.ShowFraction = false; - this.numericBoxDustScratchesThreshold.ShowPositiveSign = false; + this.numericBoxDustScratchesThreshold.RoundErrorAccuracy = -1; this.numericBoxDustScratchesThreshold.ShowUpDown = true; - this.numericBoxDustScratchesThreshold.Size = new System.Drawing.Size(116, 25); this.numericBoxDustScratchesThreshold.SkipEventDuringInput = false; this.numericBoxDustScratchesThreshold.SmartIncrement = true; - this.numericBoxDustScratchesThreshold.TabIndex = 43; - this.numericBoxDustScratchesThreshold.TextBoxForeColor = System.Drawing.SystemColors.WindowText; - this.numericBoxDustScratchesThreshold.ThonsandsSeparator = true; - this.numericBoxDustScratchesThreshold.ToolTip = ""; - this.numericBoxDustScratchesThreshold.UpDown_Increment = 1D; + this.numericBoxDustScratchesThreshold.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.numericBoxDustScratchesThreshold.ThonsandsSeparator = true; this.numericBoxDustScratchesThreshold.Value = 3D; - this.numericBoxDustScratchesThreshold.Visible = false; - this.numericBoxDustScratchesThreshold.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.imageFilterProperty_Changed); + this.numericBoxDustScratchesThreshold.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.imageFilterProperty_Changed); // // flowLayoutPanelGaussianBlur2 // - this.flowLayoutPanelGaussianBlur2.AutoSize = true; - this.flowLayoutPanelGaussianBlur2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.flowLayoutPanelGaussianBlur2, "flowLayoutPanelGaussianBlur2"); this.flowLayoutPanelGaussianBlur2.Controls.Add(this.checkBoxGaussianBlur); - this.flowLayoutPanelGaussianBlur2.Controls.Add(this.numericBoxGaussianRadius); - this.flowLayoutPanelGaussianBlur2.Location = new System.Drawing.Point(0, 27); - this.flowLayoutPanelGaussianBlur2.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanelGaussianBlur2.Controls.Add(this.numericBoxGaussianFWHM); this.flowLayoutPanelGaussianBlur2.Name = "flowLayoutPanelGaussianBlur2"; - this.flowLayoutPanelGaussianBlur2.Size = new System.Drawing.Size(264, 25); - this.flowLayoutPanelGaussianBlur2.TabIndex = 42; // // checkBoxGaussianBlur // - this.checkBoxGaussianBlur.AutoSize = true; - this.checkBoxGaussianBlur.Location = new System.Drawing.Point(2, 2); - this.checkBoxGaussianBlur.Margin = new System.Windows.Forms.Padding(2); + resources.ApplyResources(this.checkBoxGaussianBlur, "checkBoxGaussianBlur"); this.checkBoxGaussianBlur.Name = "checkBoxGaussianBlur"; - this.checkBoxGaussianBlur.Size = new System.Drawing.Size(97, 19); - this.checkBoxGaussianBlur.TabIndex = 40; - this.checkBoxGaussianBlur.Text = "Gaussian Blur"; this.checkBoxGaussianBlur.UseVisualStyleBackColor = true; this.checkBoxGaussianBlur.CheckedChanged += new System.EventHandler(this.imageFilterProperty_Changed); // - // numericBoxGaussianRadius - // - this.numericBoxGaussianRadius.BackColor = System.Drawing.SystemColors.Control; - this.numericBoxGaussianRadius.DecimalPlaces = 1; - this.numericBoxGaussianRadius.Font = new System.Drawing.Font("Segoe UI Symbol", 9.75F); - this.numericBoxGaussianRadius.FooterFont = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxGaussianRadius.FooterText = "pix."; - this.numericBoxGaussianRadius.HeaderFont = new System.Drawing.Font("Segoe UI Symbol", 9F); - this.numericBoxGaussianRadius.HeaderText = "Radius (HWHM)"; - this.numericBoxGaussianRadius.Location = new System.Drawing.Point(101, 0); - this.numericBoxGaussianRadius.Margin = new System.Windows.Forms.Padding(0); - this.numericBoxGaussianRadius.Maximum = 100D; - this.numericBoxGaussianRadius.MaximumSize = new System.Drawing.Size(1000, 25); - this.numericBoxGaussianRadius.Minimum = 0D; - this.numericBoxGaussianRadius.MinimumSize = new System.Drawing.Size(1, 25); - this.numericBoxGaussianRadius.Name = "numericBoxGaussianRadius"; - this.numericBoxGaussianRadius.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.numericBoxGaussianRadius.RadianValue = 0.017453292519943295D; - this.numericBoxGaussianRadius.RestrictLimitValue = true; - this.numericBoxGaussianRadius.ShowFraction = false; - this.numericBoxGaussianRadius.ShowPositiveSign = false; - this.numericBoxGaussianRadius.ShowUpDown = true; - this.numericBoxGaussianRadius.Size = new System.Drawing.Size(163, 25); - this.numericBoxGaussianRadius.SkipEventDuringInput = false; - this.numericBoxGaussianRadius.SmartIncrement = true; - this.numericBoxGaussianRadius.TabIndex = 43; - this.numericBoxGaussianRadius.TextBoxForeColor = System.Drawing.SystemColors.WindowText; - this.numericBoxGaussianRadius.ThonsandsSeparator = true; - this.numericBoxGaussianRadius.ToolTip = ""; - this.numericBoxGaussianRadius.UpDown_Increment = 1D; - this.numericBoxGaussianRadius.Value = 1D; - this.numericBoxGaussianRadius.Visible = false; - this.numericBoxGaussianRadius.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.imageFilterProperty_Changed); + // numericBoxGaussianFWHM + // + this.numericBoxGaussianFWHM.BackColor = System.Drawing.SystemColors.Control; + this.numericBoxGaussianFWHM.DecimalPlaces = 1; + resources.ApplyResources(this.numericBoxGaussianFWHM, "numericBoxGaussianFWHM"); + this.numericBoxGaussianFWHM.FooterBackColor = System.Drawing.SystemColors.Control; + this.numericBoxGaussianFWHM.HeaderBackColor = System.Drawing.SystemColors.Control; + this.numericBoxGaussianFWHM.Maximum = 100D; + this.numericBoxGaussianFWHM.Minimum = 0D; + this.numericBoxGaussianFWHM.Name = "numericBoxGaussianFWHM"; + this.numericBoxGaussianFWHM.RadianValue = 0.017453292519943295D; + this.numericBoxGaussianFWHM.RoundErrorAccuracy = -1; + this.numericBoxGaussianFWHM.ShowUpDown = true; + this.numericBoxGaussianFWHM.SkipEventDuringInput = false; + this.numericBoxGaussianFWHM.SmartIncrement = true; + this.numericBoxGaussianFWHM.TextFont = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.numericBoxGaussianFWHM.ThonsandsSeparator = true; + this.numericBoxGaussianFWHM.Value = 1D; + this.numericBoxGaussianFWHM.ValueChanged += new Crystallography.Controls.NumericBox.MyEventHandler(this.imageFilterProperty_Changed); // // panelUpper // this.panelUpper.Controls.Add(this.buttonCopyToClipBoard); this.panelUpper.Controls.Add(this.label); - this.panelUpper.Dock = System.Windows.Forms.DockStyle.Top; - this.panelUpper.Location = new System.Drawing.Point(0, 0); - this.panelUpper.Margin = new System.Windows.Forms.Padding(2); + resources.ApplyResources(this.panelUpper, "panelUpper"); this.panelUpper.Name = "panelUpper"; - this.panelUpper.Padding = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.panelUpper.Size = new System.Drawing.Size(397, 26); - this.panelUpper.TabIndex = 13; // // buttonCopyToClipBoard // - this.buttonCopyToClipBoard.AutoSize = true; - this.buttonCopyToClipBoard.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.buttonCopyToClipBoard.Dock = System.Windows.Forms.DockStyle.Right; - this.buttonCopyToClipBoard.Location = new System.Drawing.Point(282, 2); - this.buttonCopyToClipBoard.Margin = new System.Windows.Forms.Padding(2); + resources.ApplyResources(this.buttonCopyToClipBoard, "buttonCopyToClipBoard"); this.buttonCopyToClipBoard.Name = "buttonCopyToClipBoard"; - this.buttonCopyToClipBoard.Size = new System.Drawing.Size(115, 22); - this.buttonCopyToClipBoard.TabIndex = 10; - this.buttonCopyToClipBoard.Text = "Copy To ClipBoard"; this.buttonCopyToClipBoard.UseVisualStyleBackColor = true; this.buttonCopyToClipBoard.Click += new System.EventHandler(this.buttonCopyToClipBoard_Click); // @@ -458,42 +298,32 @@ private void InitializeComponent() this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripProgressBar1, this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 561); - this.statusStrip1.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(397, 22); - this.statusStrip1.TabIndex = 14; - this.statusStrip1.Text = "statusStrip1"; // // toolStripProgressBar1 // this.toolStripProgressBar1.Name = "toolStripProgressBar1"; - this.toolStripProgressBar1.Size = new System.Drawing.Size(100, 16); + resources.ApplyResources(this.toolStripProgressBar1, "toolStripProgressBar1"); // // toolStripStatusLabel1 // this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(10, 17); - this.toolStripStatusLabel1.Text = " "; + resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1"); // // scalablePictureBox // - this.scalablePictureBox.AutoSize = true; + resources.ApplyResources(this.scalablePictureBox, "scalablePictureBox"); this.scalablePictureBox.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.scalablePictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.scalablePictureBox.FixZoomAndCenter = false; this.scalablePictureBox.FocusEventEnabled = false; this.scalablePictureBox.HorizontalFlip = false; - this.scalablePictureBox.Location = new System.Drawing.Point(0, 26); this.scalablePictureBox.ManualSpotMode = false; - this.scalablePictureBox.Margin = new System.Windows.Forms.Padding(0); this.scalablePictureBox.MouseScaling = true; this.scalablePictureBox.MouseTranslation = true; this.scalablePictureBox.Name = "scalablePictureBox"; this.scalablePictureBox.ShowAreaRectangle = false; this.scalablePictureBox.ShowRimRentangle = false; - this.scalablePictureBox.Size = new System.Drawing.Size(397, 328); - this.scalablePictureBox.TabIndex = 0; this.scalablePictureBox.VerticalFlip = false; this.scalablePictureBox.Zoom = 128D; this.scalablePictureBox.Paint2 += new System.Windows.Forms.PaintEventHandler(this.scalablePictureBox_Paint2); @@ -510,10 +340,9 @@ private void InitializeComponent() this.graphControl.BottomMargin = 0D; this.graphControl.DivisionLineColor = System.Drawing.Color.Gray; this.graphControl.DivisionSubLineColor = System.Drawing.Color.LightGray; - this.graphControl.Dock = System.Windows.Forms.DockStyle.Bottom; + resources.ApplyResources(this.graphControl, "graphControl"); this.graphControl.FixRangeHorizontal = false; this.graphControl.FixRangeVertical = false; - this.graphControl.Font = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.graphControl.GraphName = ""; this.graphControl.HorizontalGradiationTextVisivle = true; this.graphControl.Interpolation = false; @@ -524,10 +353,8 @@ private void InitializeComponent() this.graphControl.LeftMargin = 0F; this.graphControl.LineColor = System.Drawing.Color.Red; this.graphControl.LineWidth = 1F; - this.graphControl.Location = new System.Drawing.Point(0, 408); this.graphControl.LowerX = 0D; this.graphControl.LowerY = 0D; - this.graphControl.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.graphControl.MaximalX = 1D; this.graphControl.MaximalY = 1D; this.graphControl.MinimalX = 0D; @@ -536,10 +363,8 @@ private void InitializeComponent() this.graphControl.MousePositionVisible = true; this.graphControl.Name = "graphControl"; this.graphControl.OriginPosition = new System.Drawing.Point(20, 20); - this.graphControl.Size = new System.Drawing.Size(397, 70); this.graphControl.Smoothing = false; - this.graphControl.TabIndex = 1; - this.graphControl.TextFont = new System.Drawing.Font("メイリオ", 7F); + this.graphControl.TextFont = new System.Drawing.Font("メイリオ", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.graphControl.UnitX = ""; this.graphControl.UnitY = ""; this.graphControl.UpperText = ""; @@ -556,7 +381,7 @@ private void InitializeComponent() // // ScalablePictureBoxAdvanced // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.scalablePictureBox); this.Controls.Add(this.panelTrackBar); @@ -565,10 +390,7 @@ private void InitializeComponent() this.Controls.Add(this.flowLayoutPanelImageFilter); this.Controls.Add(this.panelUpper); this.Controls.Add(this.statusStrip1); - this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Name = "ScalablePictureBoxAdvanced"; - this.Size = new System.Drawing.Size(397, 583); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ScalablePictureBoxAdvanced_DragDrop); this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ScalablePictureBoxAdvanced_DragEnter); this.panelTrackBar.ResumeLayout(false); @@ -616,7 +438,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox checkBoxDustScratches; private NumericBox numericBoxDustScratchesThreshold; private NumericBox numericBoxDustScratchesRadius; - private NumericBox numericBoxGaussianRadius; + private NumericBox numericBoxGaussianFWHM; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; diff --git a/Crystallography.Controls/ScalablePictureBoxAdvanced.cs b/Crystallography.Controls/ScalablePictureBoxAdvanced.cs index db5bdcef..a3d87d67 100644 --- a/Crystallography.Controls/ScalablePictureBoxAdvanced.cs +++ b/Crystallography.Controls/ScalablePictureBoxAdvanced.cs @@ -118,7 +118,7 @@ public bool CopyButtonVisible /// /// GaussianFilterの /// - public double ImageFilter_GaussianBlurRadius { set => numericBoxGaussianRadius.Value = value; get => numericBoxGaussianRadius.Value; } + public double ImageFilter_GaussianBlurRadius { set => numericBoxGaussianFWHM.Value = value; get => numericBoxGaussianFWHM.Value; } [Category("Image Filter")] /// @@ -537,7 +537,7 @@ private void imageFilterProperty_Changed(object sender, EventArgs e) { if (skipEvent) return; - numericBoxGaussianRadius.Visible = checkBoxGaussianBlur.Checked; + numericBoxGaussianFWHM.Visible = checkBoxGaussianBlur.Checked; //PseudoBitmap.BlurRadius = numericBoxGaussianRadius.Value; numericBoxDustScratchesRadius.Visible = numericBoxDustScratchesThreshold.Visible = checkBoxDustScratches.Checked; @@ -562,7 +562,7 @@ private void ProcessImageFilter() sw.Restart(); if (checkBoxGaussianBlur.Checked) { - PseudoBitmap.SetBlurImage(numericBoxGaussianRadius.Value, PseudoBitmap.BlurModeEnum.Gaussian, originalFlag); + PseudoBitmap.SetBlurImage(numericBoxGaussianFWHM.Value/2, PseudoBitmap.BlurModeEnum.Gaussian, originalFlag); originalFlag = false; StatusLabel += "Gaussian Blur: " + (sw.ElapsedMilliseconds / 1000.0).ToString("f3") + "msec. "; } diff --git a/Crystallography.Controls/ScalablePictureBoxAdvanced.ja.resx b/Crystallography.Controls/ScalablePictureBoxAdvanced.ja.resx new file mode 100644 index 00000000..e6e63a8e --- /dev/null +++ b/Crystallography.Controls/ScalablePictureBoxAdvanced.ja.resx @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 0, 352 + + + 297, 2 + + + 195, 2 + + + 63, 2 + + + メイリオ, 9pt + + + 139, 4 + + + 56, 18 + + + スケール + + + メイリオ, 9pt + + + 277, 4 + + + 20, 18 + + + 色 + + + メイリオ, 9pt + + + 61, 18 + + + ネガ/ポジ + + + 0, 476 + + + 0, 505 + + + 397, 56 + + + 315, 26 + + + メイリオ, 9pt + + + 135, 22 + + + ダスト＆スクラッチ + + + メイリオ, 9pt + + + 半径 + + + 139, 0 + + + 1000, 25 + + + 97, 25 + + + メイリオ, 9pt + + + 閾値 + + + 236, 0 + + + 79, 25 + + + 0, 28 + + + 251, 26 + + + メイリオ, 9pt + + + 123, 22 + + + ガウシアンぼかし + + + メイリオ, 9pt + + + 半値全幅 + + + 127, 0 + + + 1000, 25 + + + 124, 25 + + + メイリオ, 9pt + + + 247, 2 + + + 150, 22 + + + クリップボードにコピー + + + 397, 326 + + + 0, 406 + + \ No newline at end of file diff --git a/Crystallography.Controls/ScalablePictureBoxAdvanced.resx b/Crystallography.Controls/ScalablePictureBoxAdvanced.resx index 174ebc72..ddab217b 100644 --- a/Crystallography.Controls/ScalablePictureBoxAdvanced.resx +++ b/Crystallography.Controls/ScalablePictureBoxAdvanced.resx @@ -1,64 +1,4 @@ - - - + @@ -117,7 +57,962 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + + 2, 6 + + + + 2, 0, 2, 0 + + + 31, 15 + + + 5 + + + Min. + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelTrackBar + + + 0 + + + True + + + 2, 30 + + + 2, 0, 2, 0 + + + 33, 15 + + + 5 + + + Max. + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelTrackBar + + + 1 + + + + Top, Left, Right + + + GrowAndShrink + + + メイリオ, 9pt + + + Segoe UI Symbol, 9.75pt + + + + + + Segoe UI Symbol, 9.75pt + + + + + + 42, 3 + + + 2, 3, 2, 3 + + + 1000, 25 + + + 1, 22 + + + 352, 22 + + + 4 + + + trackBarAdvancedMinimum + + + Crystallography.Controls.TrackBarAdvanced, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + panelTrackBar + + + 2 + + + Top, Left, Right + + + GrowAndShrink + + + メイリオ, 9pt + + + Segoe UI Symbol, 9.75pt + + + + + + Segoe UI Symbol, 9.75pt + + + + + + 42, 29 + + + 2, 3, 2, 3 + + + 1000, 25 + + + 1, 22 + + + 352, 22 + + + 4 + + + trackBarAdvancedMaximum + + + Crystallography.Controls.TrackBarAdvanced, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + panelTrackBar + + + 3 + + + Bottom + + + 0, 354 + + + 2, 2, 2, 2 + + + 397, 54 + + + 7 + + + panelTrackBar + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + Left + + + 0, 2 + + + 2, 2, 2, 0 + + + 0, 2, 0, 0 + + + 0, 17 + + + 9 + + + label + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelUpper + + + 1 + + + Gray scale + + + Cold-Warm scale + + + 282, 2 + + + 0, 0, 0, 0 + + + 97, 23 + + + 36 + + + comboBoxScale2 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelGradient + + + 5 + + + Log Scale + + + Liner Scale + + + 164, 2 + + + 0, 0, 0, 0 + + + 80, 23 + + + 35 + + + comboBoxScale1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelGradient + + + 3 + + + Positive + + + Negative + + + 54, 2 + + + 0, 0, 0, 0 + + + 74, 23 + + + 34 + + + comboBoxGradient + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelGradient + + + 1 + + + True + + + NoControl + + + 130, 4 + + + 2, 2, 0, 0 + + + 34, 15 + + + 37 + + + Scale + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelGradient + + + 2 + + + True + + + NoControl + + + 246, 4 + + + 2, 2, 0, 0 + + + 36, 15 + + + 38 + + + Color + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelGradient + + + 4 + + + True + + + NoControl + + + 2, 4 + + + 2, 2, 0, 0 + + + 52, 15 + + + 39 + + + Gradient + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelGradient + + + 0 + + + True + + + GrowAndShrink + + + Bottom + + + 0, 478 + + + 2, 2, 2, 2 + + + 0, 2, 0, 4 + + + 397, 29 + + + 11 + + + flowLayoutPanelGradient + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + GrowAndShrink + + + True + + + GrowAndShrink + + + True + + + 2, 2 + + + 2, 2, 2, 2 + + + 110, 19 + + + 40 + + + Dust&&Scratches + + + checkBoxDustScratches + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelDustScratches + + + 0 + + + Segoe UI Symbol, 9pt + + + Segoe UI Symbol, 9pt + + + pix + + + Segoe UI Symbol, 9pt + + + Radius + + + 114, 0 + + + 0, 0, 0, 0 + + + 1000, 25 + + + 1, 23 + + + 0, 0, 1, 0 + + + 107, 25 + + + 43 + + + False + + + numericBoxDustScratchesRadius + + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + flowLayoutPanelDustScratches + + + 1 + + + Segoe UI Symbol, 9pt + + + Segoe UI Symbol, 9pt + + + Segoe UI Symbol, 9pt + + + Threshold + + + 221, 0 + + + 0, 0, 0, 0 + + + 1000, 25 + + + 1, 23 + + + 0, 0, 10, 0 + + + 112, 25 + + + 43 + + + False + + + numericBoxDustScratchesThreshold + + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + flowLayoutPanelDustScratches + + + 2 + + + 0, 2 + + + 0, 0, 0, 0 + + + 333, 25 + + + 42 + + + flowLayoutPanelDustScratches + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelImageFilter + + + 0 + + + True + + + GrowAndShrink + + + True + + + 2, 2 + + + 2, 2, 2, 2 + + + 97, 19 + + + 40 + + + Gaussian Blur + + + checkBoxGaussianBlur + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelGaussianBlur2 + + + 0 + + + Segoe UI Symbol, 9.75pt + + + Segoe UI Symbol, 9pt + + + pix + + + Segoe UI Symbol, 9pt + + + FWHM + + + 101, 0 + + + 0, 0, 0, 0 + + + 1000, 25 + + + 1, 23 + + + 0, 0, 1, 0 + + + 115, 25 + + + 43 + + + False + + + numericBoxGaussianFWHM + + + Crystallography.Controls.NumericBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + flowLayoutPanelGaussianBlur2 + + + 1 + + + 0, 27 + + + 0, 0, 0, 0 + + + 216, 25 + + + 42 + + + flowLayoutPanelGaussianBlur2 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flowLayoutPanelImageFilter + + + 1 + + + Bottom + + + 0, 507 + + + 2, 2, 2, 2 + + + 0, 2, 0, 2 + + + 397, 54 + + + 12 + + + flowLayoutPanelImageFilter + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + GrowAndShrink + + + Right + + + 282, 2 + + + 2, 2, 2, 2 + + + 115, 22 + + + 10 + + + Copy To ClipBoard + + + buttonCopyToClipBoard + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panelUpper + + + 0 + + + Top + + + 0, 0 + + + 2, 2, 2, 2 + + + 0, 2, 0, 2 + + + 397, 26 + + + 13 + + + panelUpper + + + System.Windows.Forms.Panel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + 17, 17 + + 100, 16 + + + 10, 17 + + + + + + 0, 561 + + + 0, 2, 0, 2 + + + 397, 22 + + + 14 + + + statusStrip1 + + + statusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + Fill + + + 0, 26 + + + 0, 0, 0, 0 + + + 397, 328 + + + 0 + + + scalablePictureBox + + + Crystallography.Controls.ScalablePictureBox, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + + + Bottom + + + Segoe UI Symbol, 9pt + + + 0, 408 + + + 2, 3, 2, 3 + + + 397, 70 + + + 1 + + + graphControl + + + Crystallography.Controls.GraphControl, Crystallography.Controls, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + True + + + 96, 96 + + + Segoe UI, 9pt + + + 2, 3, 2, 3 + + + 397, 583 + + + toolStripProgressBar1 + + + System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripStatusLabel1 + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ScalablePictureBoxAdvanced + + + System.Windows.Forms.UserControl, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Crystallography.OpenGL/Crystallography.OpenGL.csproj b/Crystallography.OpenGL/Crystallography.OpenGL.csproj index d597f218..46d9210b 100644 --- a/Crystallography.OpenGL/Crystallography.OpenGL.csproj +++ b/Crystallography.OpenGL/Crystallography.OpenGL.csproj @@ -4,8 +4,8 @@ Library net5.0-windows true - 2021.9.2.0046 - 2021.9.2.0046 + 2021.9.2.0350 + 2021.9.2.0350 diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj index fce2b1ce..2e33bb51 100644 --- a/Crystallography/Crystallography.csproj +++ b/Crystallography/Crystallography.csproj @@ -4,8 +4,8 @@ Library net5.0-windows true - 2021.9.2.0046 - 2021.9.2.0046 + 2021.9.2.0350 + 2021.9.2.0350 diff --git a/ReciPro/ReciPro.csproj b/ReciPro/ReciPro.csproj index 04951f63..a4e691b8 100644 --- a/ReciPro/ReciPro.csproj +++ b/ReciPro/ReciPro.csproj @@ -4,8 +4,8 @@ WinExe net5.0-windows true - 2021.9.2.0051 - 2021.9.2.0051 + 2021.9.2.0350 + 2021.9.2.0350 false false App.ico diff --git a/ReciPro/SpotID/FormSpotID.Designer.cs b/ReciPro/SpotID/FormSpotID.Designer.cs index 64a7346a..104deb60 100644 --- a/ReciPro/SpotID/FormSpotID.Designer.cs +++ b/ReciPro/SpotID/FormSpotID.Designer.cs @@ -53,12 +53,20 @@ private void InitializeComponent() this.buttonCopyMetafile = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel2 = new System.Windows.Forms.Panel(); + this.buttonDeleteSpot = new System.Windows.Forms.Button(); + this.buttonClearSpots = new System.Windows.Forms.Button(); + this.buttonCopyToClipboad = new System.Windows.Forms.Button(); + this.buttonSaveToFile = new System.Windows.Forms.Button(); + this.checkBoxDetailsOfFunction = new System.Windows.Forms.CheckBox(); + this.checkBoxDetailsOfSpot = new System.Windows.Forms.CheckBox(); + this.checkBoxShowObsSpotSymbol = new System.Windows.Forms.CheckBox(); + this.checkBoxShowObsSpotLabel = new System.Windows.Forms.CheckBox(); + this.buttonCopmprehensiveFitting = new System.Windows.Forms.Button(); this.buttonResetRangeForAllSpots = new System.Windows.Forms.Button(); this.numericBoxNumberOfSpots = new Crystallography.Controls.NumericBox(); this.buttonFindSpots = new System.Windows.Forms.Button(); this.numericBoxNearestNeighbor = new Crystallography.Controls.NumericBox(); this.numericBoxFittingRange = new Crystallography.Controls.NumericBox(); - this.buttonClearSpots = new System.Windows.Forms.Button(); this.buttonGlobalFit = new System.Windows.Forms.Button(); this.numericBoxDonut = new Crystallography.Controls.NumericBox(); this.buttonDonut = new System.Windows.Forms.Button(); @@ -82,13 +90,6 @@ private void InitializeComponent() this.Column1 = new System.Windows.Forms.DataGridViewButtonColumn(); this.bindingSourceObsSpots = new System.Windows.Forms.BindingSource(this.components); this.dataSet = new ReciPro.DataSetReciPro(); - this.buttonCopyToClipboad = new System.Windows.Forms.Button(); - this.buttonSaveToFile = new System.Windows.Forms.Button(); - this.checkBoxDetailsOfFunction = new System.Windows.Forms.CheckBox(); - this.checkBoxDetailsOfSpot = new System.Windows.Forms.CheckBox(); - this.checkBoxShowObsSpotSymbol = new System.Windows.Forms.CheckBox(); - this.checkBoxShowObsSpotLabel = new System.Windows.Forms.CheckBox(); - this.buttonCopmprehensiveFitting = new System.Windows.Forms.Button(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.buttonIdentifySpots = new System.Windows.Forms.Button(); @@ -117,7 +118,7 @@ private void InitializeComponent() this.numericBoxPixelSize = new Crystallography.Controls.NumericBox(); this.waveLengthControl1 = new Crystallography.Controls.WaveLengthControl(); this.checkBoxShowDebyeRing = new System.Windows.Forms.CheckBox(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.readToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.shortcutHintsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -128,7 +129,7 @@ private void InitializeComponent() this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripProgressBar = new System.Windows.Forms.ToolStripProgressBar(); this.toolStripStatusLabelImageFilter = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelFindSpot = new System.Windows.Forms.ToolStripStatusLabel(); @@ -153,15 +154,15 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.dataGridViewCandidates)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSourceCandidates)).BeginInit(); this.groupBox2.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.statusStrip1.SuspendLayout(); + this.menuStrip.SuspendLayout(); + this.statusStrip.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 // this.splitContainer1.BackColor = System.Drawing.SystemColors.Control; this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.splitContainer1.Cursor = System.Windows.Forms.Cursors.Default; + this.splitContainer1.Cursor = System.Windows.Forms.Cursors.VSplit; resources.ApplyResources(this.splitContainer1, "splitContainer1"); this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; this.splitContainer1.Name = "splitContainer1"; @@ -201,7 +202,7 @@ private void InitializeComponent() this.scalablePictureBoxAdvanced.MinimumIntensity = -2306.3408203125D; this.scalablePictureBoxAdvanced.MousePositionLabelVisible = true; this.scalablePictureBoxAdvanced.Name = "scalablePictureBoxAdvanced"; - this.scalablePictureBoxAdvanced.PictureSize = new System.Drawing.Size(588, 586); + this.scalablePictureBoxAdvanced.PictureSize = new System.Drawing.Size(588, 609); this.scalablePictureBoxAdvanced.ShowGradiaent = true; this.scalablePictureBoxAdvanced.StatusLabel = "Elapsed time: Dust && Scratches: 0.123msec. Gaussian Blur: 0.205msec. "; this.scalablePictureBoxAdvanced.StatusProgress = 0D; @@ -245,25 +246,104 @@ private void InitializeComponent() // // panel2 // + this.panel2.Controls.Add(this.buttonDeleteSpot); + this.panel2.Controls.Add(this.buttonClearSpots); + this.panel2.Controls.Add(this.buttonCopyToClipboad); + this.panel2.Controls.Add(this.buttonSaveToFile); + this.panel2.Controls.Add(this.checkBoxDetailsOfFunction); + this.panel2.Controls.Add(this.checkBoxDetailsOfSpot); + this.panel2.Controls.Add(this.checkBoxShowObsSpotSymbol); + this.panel2.Controls.Add(this.checkBoxShowObsSpotLabel); + this.panel2.Controls.Add(this.buttonCopmprehensiveFitting); this.panel2.Controls.Add(this.buttonResetRangeForAllSpots); this.panel2.Controls.Add(this.numericBoxNumberOfSpots); this.panel2.Controls.Add(this.buttonFindSpots); this.panel2.Controls.Add(this.numericBoxNearestNeighbor); this.panel2.Controls.Add(this.numericBoxFittingRange); - this.panel2.Controls.Add(this.buttonClearSpots); this.panel2.Controls.Add(this.buttonGlobalFit); this.panel2.Controls.Add(this.numericBoxDonut); this.panel2.Controls.Add(this.buttonDonut); this.panel2.Controls.Add(this.dataGridViewSpots); - this.panel2.Controls.Add(this.buttonCopyToClipboad); - this.panel2.Controls.Add(this.buttonSaveToFile); - this.panel2.Controls.Add(this.checkBoxDetailsOfFunction); - this.panel2.Controls.Add(this.checkBoxDetailsOfSpot); - this.panel2.Controls.Add(this.checkBoxShowObsSpotSymbol); - this.panel2.Controls.Add(this.checkBoxShowObsSpotLabel); - this.panel2.Controls.Add(this.buttonCopmprehensiveFitting); resources.ApplyResources(this.panel2, "panel2"); this.panel2.Name = "panel2"; + this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint); + // + // buttonDeleteSpot + // + resources.ApplyResources(this.buttonDeleteSpot, "buttonDeleteSpot"); + this.buttonDeleteSpot.BackColor = System.Drawing.Color.IndianRed; + this.buttonDeleteSpot.ForeColor = System.Drawing.Color.White; + this.buttonDeleteSpot.Name = "buttonDeleteSpot"; + this.toolTip.SetToolTip(this.buttonDeleteSpot, resources.GetString("buttonDeleteSpot.ToolTip")); + this.buttonDeleteSpot.UseVisualStyleBackColor = false; + this.buttonDeleteSpot.Click += new System.EventHandler(this.buttonDeleteSpot_Click); + // + // buttonClearSpots + // + resources.ApplyResources(this.buttonClearSpots, "buttonClearSpots"); + this.buttonClearSpots.BackColor = System.Drawing.Color.IndianRed; + this.buttonClearSpots.ForeColor = System.Drawing.Color.White; + this.buttonClearSpots.Name = "buttonClearSpots"; + this.toolTip.SetToolTip(this.buttonClearSpots, resources.GetString("buttonClearSpots.ToolTip")); + this.buttonClearSpots.UseVisualStyleBackColor = false; + this.buttonClearSpots.Click += new System.EventHandler(this.buttonClearSpots_Click); + // + // buttonCopyToClipboad + // + resources.ApplyResources(this.buttonCopyToClipboad, "buttonCopyToClipboad"); + this.buttonCopyToClipboad.Name = "buttonCopyToClipboad"; + this.toolTip.SetToolTip(this.buttonCopyToClipboad, resources.GetString("buttonCopyToClipboad.ToolTip")); + this.buttonCopyToClipboad.UseVisualStyleBackColor = true; + this.buttonCopyToClipboad.Click += new System.EventHandler(this.buttonCopyToClipboad_Click); + // + // buttonSaveToFile + // + resources.ApplyResources(this.buttonSaveToFile, "buttonSaveToFile"); + this.buttonSaveToFile.Name = "buttonSaveToFile"; + this.toolTip.SetToolTip(this.buttonSaveToFile, resources.GetString("buttonSaveToFile.ToolTip")); + this.buttonSaveToFile.UseVisualStyleBackColor = true; + this.buttonSaveToFile.Click += new System.EventHandler(this.buttonCopyToClipboad_Click); + // + // checkBoxDetailsOfFunction + // + resources.ApplyResources(this.checkBoxDetailsOfFunction, "checkBoxDetailsOfFunction"); + this.checkBoxDetailsOfFunction.Checked = true; + this.checkBoxDetailsOfFunction.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBoxDetailsOfFunction.Name = "checkBoxDetailsOfFunction"; + this.checkBoxDetailsOfFunction.UseVisualStyleBackColor = true; + this.checkBoxDetailsOfFunction.CheckedChanged += new System.EventHandler(this.checkBoxDetailsOfFunction_CheckedChanged); + // + // checkBoxDetailsOfSpot + // + resources.ApplyResources(this.checkBoxDetailsOfSpot, "checkBoxDetailsOfSpot"); + this.checkBoxDetailsOfSpot.Name = "checkBoxDetailsOfSpot"; + this.checkBoxDetailsOfSpot.UseVisualStyleBackColor = true; + this.checkBoxDetailsOfSpot.CheckedChanged += new System.EventHandler(this.checkBoxDetailsOfSpot_CheckedChanged); + // + // checkBoxShowObsSpotSymbol + // + resources.ApplyResources(this.checkBoxShowObsSpotSymbol, "checkBoxShowObsSpotSymbol"); + this.checkBoxShowObsSpotSymbol.Checked = true; + this.checkBoxShowObsSpotSymbol.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBoxShowObsSpotSymbol.Name = "checkBoxShowObsSpotSymbol"; + this.checkBoxShowObsSpotSymbol.UseVisualStyleBackColor = true; + this.checkBoxShowObsSpotSymbol.CheckedChanged += new System.EventHandler(this.checkBoxShowObsSpots_CheckedChanged); + // + // checkBoxShowObsSpotLabel + // + resources.ApplyResources(this.checkBoxShowObsSpotLabel, "checkBoxShowObsSpotLabel"); + this.checkBoxShowObsSpotLabel.Checked = true; + this.checkBoxShowObsSpotLabel.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBoxShowObsSpotLabel.Name = "checkBoxShowObsSpotLabel"; + this.checkBoxShowObsSpotLabel.UseVisualStyleBackColor = true; + this.checkBoxShowObsSpotLabel.CheckedChanged += new System.EventHandler(this.checkBoxShowObsSpots_CheckedChanged); + // + // buttonCopmprehensiveFitting + // + resources.ApplyResources(this.buttonCopmprehensiveFitting, "buttonCopmprehensiveFitting"); + this.buttonCopmprehensiveFitting.Name = "buttonCopmprehensiveFitting"; + this.buttonCopmprehensiveFitting.UseVisualStyleBackColor = true; + this.buttonCopmprehensiveFitting.Click += new System.EventHandler(this.buttonRefit_Click); // // buttonResetRangeForAllSpots // @@ -343,16 +423,6 @@ private void InitializeComponent() this.numericBoxFittingRange.Value = 20D; this.numericBoxFittingRange.Load += new System.EventHandler(this.numericBoxFittingRange_Load); // - // buttonClearSpots - // - resources.ApplyResources(this.buttonClearSpots, "buttonClearSpots"); - this.buttonClearSpots.BackColor = System.Drawing.Color.IndianRed; - this.buttonClearSpots.ForeColor = System.Drawing.Color.White; - this.buttonClearSpots.Name = "buttonClearSpots"; - this.toolTip.SetToolTip(this.buttonClearSpots, resources.GetString("buttonClearSpots.ToolTip")); - this.buttonClearSpots.UseVisualStyleBackColor = false; - this.buttonClearSpots.Click += new System.EventHandler(this.buttonClearSpots_Click); - // // buttonGlobalFit // resources.ApplyResources(this.buttonGlobalFit, "buttonGlobalFit"); @@ -604,63 +674,6 @@ private void InitializeComponent() this.dataSet.Namespace = "http://tempuri.org/DataSet.xsd"; this.dataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // buttonCopyToClipboad - // - resources.ApplyResources(this.buttonCopyToClipboad, "buttonCopyToClipboad"); - this.buttonCopyToClipboad.Name = "buttonCopyToClipboad"; - this.toolTip.SetToolTip(this.buttonCopyToClipboad, resources.GetString("buttonCopyToClipboad.ToolTip")); - this.buttonCopyToClipboad.UseVisualStyleBackColor = true; - this.buttonCopyToClipboad.Click += new System.EventHandler(this.buttonCopyToClipboad_Click); - // - // buttonSaveToFile - // - resources.ApplyResources(this.buttonSaveToFile, "buttonSaveToFile"); - this.buttonSaveToFile.Name = "buttonSaveToFile"; - this.toolTip.SetToolTip(this.buttonSaveToFile, resources.GetString("buttonSaveToFile.ToolTip")); - this.buttonSaveToFile.UseVisualStyleBackColor = true; - this.buttonSaveToFile.Click += new System.EventHandler(this.buttonCopyToClipboad_Click); - // - // checkBoxDetailsOfFunction - // - resources.ApplyResources(this.checkBoxDetailsOfFunction, "checkBoxDetailsOfFunction"); - this.checkBoxDetailsOfFunction.Checked = true; - this.checkBoxDetailsOfFunction.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxDetailsOfFunction.Name = "checkBoxDetailsOfFunction"; - this.checkBoxDetailsOfFunction.UseVisualStyleBackColor = true; - this.checkBoxDetailsOfFunction.CheckedChanged += new System.EventHandler(this.checkBoxDetailsOfFunction_CheckedChanged); - // - // checkBoxDetailsOfSpot - // - resources.ApplyResources(this.checkBoxDetailsOfSpot, "checkBoxDetailsOfSpot"); - this.checkBoxDetailsOfSpot.Name = "checkBoxDetailsOfSpot"; - this.checkBoxDetailsOfSpot.UseVisualStyleBackColor = true; - this.checkBoxDetailsOfSpot.CheckedChanged += new System.EventHandler(this.checkBoxDetailsOfSpot_CheckedChanged); - // - // checkBoxShowObsSpotSymbol - // - resources.ApplyResources(this.checkBoxShowObsSpotSymbol, "checkBoxShowObsSpotSymbol"); - this.checkBoxShowObsSpotSymbol.Checked = true; - this.checkBoxShowObsSpotSymbol.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxShowObsSpotSymbol.Name = "checkBoxShowObsSpotSymbol"; - this.checkBoxShowObsSpotSymbol.UseVisualStyleBackColor = true; - this.checkBoxShowObsSpotSymbol.CheckedChanged += new System.EventHandler(this.checkBoxShowObsSpots_CheckedChanged); - // - // checkBoxShowObsSpotLabel - // - resources.ApplyResources(this.checkBoxShowObsSpotLabel, "checkBoxShowObsSpotLabel"); - this.checkBoxShowObsSpotLabel.Checked = true; - this.checkBoxShowObsSpotLabel.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxShowObsSpotLabel.Name = "checkBoxShowObsSpotLabel"; - this.checkBoxShowObsSpotLabel.UseVisualStyleBackColor = true; - this.checkBoxShowObsSpotLabel.CheckedChanged += new System.EventHandler(this.checkBoxShowObsSpots_CheckedChanged); - // - // buttonCopmprehensiveFitting - // - resources.ApplyResources(this.buttonCopmprehensiveFitting, "buttonCopmprehensiveFitting"); - this.buttonCopmprehensiveFitting.Name = "buttonCopmprehensiveFitting"; - this.buttonCopmprehensiveFitting.UseVisualStyleBackColor = true; - this.buttonCopmprehensiveFitting.Click += new System.EventHandler(this.buttonRefit_Click); - // // pictureBox1 // resources.ApplyResources(this.pictureBox1, "pictureBox1"); @@ -970,13 +983,13 @@ private void InitializeComponent() this.checkBoxShowDebyeRing.UseVisualStyleBackColor = true; this.checkBoxShowDebyeRing.CheckedChanged += new System.EventHandler(this.checkBoxShowDebyeRing_CheckedChanged); // - // menuStrip1 + // menuStrip // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.shortcutHintsToolStripMenuItem}); - resources.ApplyResources(this.menuStrip1, "menuStrip1"); - this.menuStrip1.Name = "menuStrip1"; + resources.ApplyResources(this.menuStrip, "menuStrip"); + this.menuStrip.Name = "menuStrip"; // // fileToolStripMenuItem // @@ -1038,16 +1051,16 @@ private void InitializeComponent() resources.ApplyResources(this.toolStripMenuItem3, "toolStripMenuItem3"); this.toolStripMenuItem3.Name = "toolStripMenuItem3"; // - // statusStrip1 + // statusStrip // - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripProgressBar, this.toolStripStatusLabelImageFilter, this.toolStripStatusLabelFindSpot, this.toolStripStatusLabelIdentifySpot, this.toolStripStatusLabelRefine}); - resources.ApplyResources(this.statusStrip1, "statusStrip1"); - this.statusStrip1.Name = "statusStrip1"; + resources.ApplyResources(this.statusStrip, "statusStrip"); + this.statusStrip.Name = "statusStrip"; // // toolStripProgressBar // @@ -1089,9 +1102,9 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.statusStrip1); - this.Controls.Add(this.menuStrip1); - this.MainMenuStrip = this.menuStrip1; + this.Controls.Add(this.statusStrip); + this.Controls.Add(this.menuStrip); + this.MainMenuStrip = this.menuStrip; this.Name = "FormSpotID"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormSpotID_FormClosing); this.Load += new System.EventHandler(this.FormSpotID_Load); @@ -1119,10 +1132,10 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.bindingSourceCandidates)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1131,7 +1144,7 @@ private void InitializeComponent() #endregion - private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.MenuStrip menuStrip; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem readToolStripMenuItem; private Crystallography.Controls.WaveLengthControl waveLengthControl1; @@ -1142,7 +1155,7 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.DataGridView dataGridViewCandidates; private System.Windows.Forms.BindingSource bindingSourceCandidates; - private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.StatusStrip statusStrip; private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelFindSpot; private Crystallography.Controls.NumericBox numericBoxAcceptableError; @@ -1221,5 +1234,6 @@ private void InitializeComponent() private System.Windows.Forms.Panel panel2; private System.Windows.Forms.CheckBox checkBoxDetailsOfFunction; public System.Windows.Forms.CheckBox checkBoxDetailsOfSpot; + private System.Windows.Forms.Button buttonDeleteSpot; } } \ No newline at end of file diff --git a/ReciPro/SpotID/FormSpotID.cs b/ReciPro/SpotID/FormSpotID.cs index 0b49ed16..c09b17c3 100644 --- a/ReciPro/SpotID/FormSpotID.cs +++ b/ReciPro/SpotID/FormSpotID.cs @@ -410,6 +410,25 @@ private void buttonClearSpots_Click(object sender, EventArgs e) scalablePictureBoxAdvanced.Refresh(); } + private void buttonDeleteSpot_Click(object sender, EventArgs e) + { + if (bindingSourceObsSpots.Position > -1) + { + int no = (int)(((DataRowView)bindingSourceObsSpots.Current).Row[1]); + if (no > -1) + { + skipEvent = true; + bindingSourceObsSpots.DataMember = ""; + dataSet.DataTableSpot.Remove(no); + bindingSourceObsSpots.DataMember = "DataTableSpot"; + skipEvent = false; + bindingSourceObsSpots_ListChanged(sender, new ListChangedEventArgs(ListChangedType.ItemDeleted, 0)); + } + } + } + + + private void buttonRefit_Click(object sender, EventArgs e) { Enabled = false; @@ -1547,5 +1566,10 @@ private void checkBoxDetailsOfFunction_CheckedChanged(object sender, EventArgs e { pictureBox1.Visible = checkBoxDetailsOfFunction.Checked; } + + private void panel2_Paint(object sender, PaintEventArgs e) + { + + } } } \ No newline at end of file diff --git a/ReciPro/SpotID/FormSpotID.ja.resx b/ReciPro/SpotID/FormSpotID.ja.resx index 86b35f1b..d9b6d36f 100644 --- a/ReciPro/SpotID/FormSpotID.ja.resx +++ b/ReciPro/SpotID/FormSpotID.ja.resx @@ -59,53 +59,12 @@ - 520, 751 - - - 520, 26 - - - メイリオ, 9pt - - - 3, 104 - - - - 1, 3, 1, 3 - - - 749, 484 - - - スポット情報 - - - 6, 594 - - - 746, 185 - - - 195, 0 - - - 557, 102 - - - - NoControl - - - 1285, 781 - - - - 524 + 500, 751 メイリオ, 9pt + NoControl @@ -130,77 +89,33 @@ メタファイルとしてコピー - - 743, 383 - - - メイリオ, 9pt - - - NoControl - - - 620, 6 - - - 114, 28 - - - 全スポットに適用 - - - メイリオ, 9pt + + 500, 26 - - メイリオ, 9pt + + Bottom, Left - - スポット数 - - - 96, 6 + + + True - - 111, 27 + + GrowAndShrink - + メイリオ, 9pt - + NoControl - - 90, 28 - - - スポット検出 - - - メイリオ, 9pt + + 401, 334 - - メイリオ, 9pt - - - スポット間最低距離 - - - 219, 6 - - - 186, 27 - - - メイリオ, 9pt - - - フィッティング半径 - - - 416, 6 + + 42, 28 - - 196, 27 + + 削除 メイリオ, 9pt @@ -209,55 +124,13 @@ NoControl - 371, 336 + 445, 334 - 102, 28 + 54, 28 - 全スポット消去 - - - NoControl - - - 618, 337 - - - 696, 360 - - - NoControl - - - 581, 359 - - - 43 - - - 44 - - - 39 - - - 45 - - - 44 - - - 45 - - - 26 - - - 3, 40 - - - 737, 288 + 全削除 メイリオ, 9pt @@ -266,7 +139,7 @@ NoControl - 522, 336 + 544, 334 54, 28 @@ -281,7 +154,7 @@ NoControl - 478, 336 + 502, 334 42, 28 @@ -290,7 +163,7 @@ 保存 - 240, 357 + 233, 357 111, 22 @@ -299,13 +172,13 @@ 関数形状の詳細 - 240, 337 + 233, 337 - 99, 22 + 135, 22 - スポット詳細 + 選択スポットの詳細 メイリオ, 9pt @@ -314,7 +187,7 @@ NoControl - 123, 337 + 120, 337 111, 22 @@ -329,7 +202,7 @@ NoControl - 123, 356 + 120, 356 99, 22 @@ -353,6 +226,102 @@ 全スポットを 再フィッティング + + メイリオ, 9pt + + + NoControl + + + 620, 6 + + + 114, 28 + + + 全スポットに適用 + + + メイリオ, 9pt + + + メイリオ, 9pt + + + スポット数 + + + 96, 6 + + + 111, 27 + + + メイリオ, 9pt + + + NoControl + + + 90, 28 + + + スポット検出 + + + メイリオ, 9pt + + + メイリオ, 9pt + + + スポット間最低距離 + + + 219, 6 + + + 186, 27 + + + メイリオ, 9pt + + + フィッティング半径 + + + 416, 6 + + + 196, 27 + + + NoControl + + + 638, 337 + + + 726, 360 + + + 34, 22 + + + NoControl + + + 613, 359 + + + 3, 40 + + + 757, 291 + + + 763, 383 + NoControl @@ -360,7 +329,20 @@ 3, 404 - 743, 77 + 763, 77 + + + メイリオ, 9pt + + + + 1, 3, 1, 3 + + + 769, 484 + + + スポット情報 メイリオ, 9pt @@ -444,7 +426,7 @@ ラベルを表示 - 291, 111 + 311, 111 メイリオ, 9pt @@ -464,6 +446,12 @@ NoControl + + 6, 594 + + + 766, 185 + メイリオ, 9pt @@ -476,10 +464,25 @@ ピクセルサイズ - + + 195, 0 + + + 577, 102 + + + NoControl + + + 1285, 781 + + + 504 + + 1285, 24 - + 1285, 22 diff --git a/ReciPro/SpotID/FormSpotID.resx b/ReciPro/SpotID/FormSpotID.resx index 13dc65fa..295f174a 100644 --- a/ReciPro/SpotID/FormSpotID.resx +++ b/ReciPro/SpotID/FormSpotID.resx @@ -211,6 +211,333 @@ Top, Bottom, Left, Right + + True + + + GrowAndShrink + + + 412, 332 + + + 55, 27 + + + 8 + + + Delete + + + 1074, 17 + + + Clear all spots + + + buttonDeleteSpot + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 0 + + + Bottom, Left + + + True + + + GrowAndShrink + + + Segoe UI Symbol, 9pt + + + 469, 333 + + + 44, 25 + + + 8 + + + Clear + + + Clear all spots + + + buttonClearSpots + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 1 + + + Bottom, Left + + + True + + + GrowAndShrink + + + Segoe UI Symbol, 9pt + + + 560, 333 + + + 0, 0, 0, 0 + + + 45, 25 + + + 10 + + + Copy + + + Copy the above information to clipboard + + + buttonCopyToClipboad + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 2 + + + Bottom, Left + + + True + + + GrowAndShrink + + + Segoe UI Symbol, 9pt + + + 516, 333 + + + 0, 0, 0, 0 + + + 41, 25 + + + 9 + + + Save + + + Save the above information + + + buttonSaveToFile + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 3 + + + Bottom, Left + + + True + + + NoControl + + + 200, 353 + + + 0, 0, 0, 0 + + + 191, 21 + + + 15 + + + Details of the fitting function + + + checkBoxDetailsOfFunction + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 4 + + + Bottom, Left + + + True + + + 200, 333 + + + 134, 21 + + + 15 + + + Details of the spot + + + checkBoxDetailsOfSpot + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 5 + + + Bottom, Left + + + True + + + Segoe UI Symbol, 9.75pt + + + 78, 353 + + + 110, 21 + + + 0 + + + Show symbols + + + checkBoxShowObsSpotSymbol + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 6 + + + Bottom, Left + + + True + + + Segoe UI Symbol, 9.75pt + + + 78, 333 + + + 113, 21 + + + 1 + + + Show numbers + + + checkBoxShowObsSpotLabel + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 7 + + + Bottom, Left + + + True + + + GrowAndShrink + + + Segoe UI Symbol, 9.75pt + + + 4, 332 + + + 66, 27 + + + 11 + + + Re-fit all + + + buttonCopmprehensiveFitting + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 8 + True @@ -242,7 +569,7 @@ panel2 - 0 + 9 GrowAndShrink @@ -274,9 +601,6 @@ 5 - - 1074, 17 - Specify the number of spots to detect @@ -293,7 +617,7 @@ panel2 - 1 + 10 True @@ -331,7 +655,7 @@ and the fitting range in the right box . panel2 - 2 + 11 GrowAndShrink @@ -382,7 +706,7 @@ and the fitting range in the right box . panel2 - 3 + 12 GrowAndShrink @@ -433,46 +757,7 @@ and the fitting range in the right box . panel2 - 4 - - - Bottom, Left - - - True - - - GrowAndShrink - - - Segoe UI Symbol, 9pt - - - 423, 333 - - - 44, 25 - - - 8 - - - Clear - - - Clear all spots - - - buttonClearSpots - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 5 + 13 Bottom, Right @@ -508,7 +793,7 @@ and the fitting range in the right box . panel2 - 6 + 14 Bottom, Right @@ -520,13 +805,13 @@ and the fitting range in the right box . Segoe UI Symbol, 9.75pt - 722, 357 + 729, 357 0, 0, 0, 0 - 1000, 22 + 1000, 20 1, 20 @@ -535,7 +820,7 @@ and the fitting range in the right box . 0, 0, 1, 0 - 44, 22 + 37, 20 14 @@ -550,7 +835,7 @@ and the fitting range in the right box . panel2 - 7 + 15 Bottom, Right @@ -565,7 +850,7 @@ and the fitting range in the right box . Segoe UI Symbol, 7pt - 610, 356 + 615, 356 0, 0, 0, 0 @@ -589,7 +874,7 @@ and the fitting range in the right box . panel2 - 8 + 16 Top, Bottom, Left, Right @@ -772,259 +1057,7 @@ and the fitting range in the right box . panel2 - 9 - - - Bottom, Left - - - True - - - GrowAndShrink - - - Segoe UI Symbol, 9pt - - - 514, 333 - - - 0, 0, 0, 0 - - - 45, 25 - - - 10 - - - Copy - - - Copy the above information to clipboard - - - buttonCopyToClipboad - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 10 - - - Bottom, Left - - - True - - - GrowAndShrink - - - Segoe UI Symbol, 9pt - - - 470, 333 - - - 0, 0, 0, 0 - - - 41, 25 - - - 9 - - - Save - - - Save the above information - - - buttonSaveToFile - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 11 - - - Bottom, Left - - - True - - - NoControl - - - 225, 353 - - - 0, 0, 0, 0 - - - 191, 21 - - - 15 - - - Details of the fitting function - - - checkBoxDetailsOfFunction - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 12 - - - Bottom, Left - - - True - - - 225, 333 - - - 134, 21 - - - 15 - - - Details of the spot - - - checkBoxDetailsOfSpot - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 13 - - - Bottom, Left - - - True - - - Segoe UI Symbol, 9.75pt - - - 88, 353 - - - 110, 21 - - - 0 - - - Show symbols - - - checkBoxShowObsSpotSymbol - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 14 - - - Bottom, Left - - - True - - - Segoe UI Symbol, 9.75pt - - - 88, 333 - - - 113, 21 - - - 1 - - - Show numbers - - - checkBoxShowObsSpotLabel - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 15 - - - Bottom, Left - - - True - - - GrowAndShrink - - - Segoe UI Symbol, 9.75pt - - - 4, 332 - - - 66, 27 - - - 11 - - - Re-fit all - - - buttonCopmprehensiveFitting - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 16 + 17 Fill @@ -1839,7 +1872,7 @@ and the fitting range in the right box . 0 - + 110, 17 @@ -1923,31 +1956,31 @@ and the fitting range in the right box . Shortcut Hints - + 0, 0 - + 1382, 24 - + 0 - + menuStrip1 - - menuStrip1 + + menuStrip - + System.Windows.Forms.MenuStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 2 - + 764, 17 @@ -1977,28 +2010,28 @@ and the fitting range in the right box . - + 0, 805 - + 1382, 22 - + 2 - + statusStrip1 - - statusStrip1 + + statusStrip - + System.Windows.Forms.StatusStrip, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 1 diff --git a/ReciPro/Version.cs b/ReciPro/Version.cs index 20a6d091..aa0e54f5 100644 --- a/ReciPro/Version.cs +++ b/ReciPro/Version.cs @@ -10,6 +10,7 @@ internal static class Version static public string History = "History" + + "\r\n ver4.815(2021/09/02) Improved: User intefaces and tool tips." + "\r\n ver4.814(2021/08/29) Fixed minor bugs: Drawing overlapping area of CBED disks (see https://github.com/seto77/ReciPro/issues/8)." + "\r\n ver4.813(2021/08/28) Fixed minor bugs on HRTEM simulation (see https://github.com/seto77/ReciPro/issues/9)." + "\r\n ver4.812(2021/08/17) Changed GUI. Fixed minor bugs." +