Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@seto77
seto77 committed Sep 2, 2021
1 parent b3a2b10 commit d31909e
Show file tree
Hide file tree
Showing 13 changed files with 1,912 additions and 918 deletions.
4 changes: 2 additions & 2 deletions Crystallography.Controls/Crystallography.Controls.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<OutputType>Library</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2021.9.2.0051</AssemblyVersion>
<FileVersion>2021.9.2.0051</FileVersion>
<AssemblyVersion>2021.9.2.0350</AssemblyVersion>
<FileVersion>2021.9.2.0350</FileVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
326 changes: 74 additions & 252 deletions Crystallography.Controls/ScalablePictureBoxAdvanced.Designer.cs
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Crystallography.Controls/ScalablePictureBoxAdvanced.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public bool CopyButtonVisible
/// <summary>
/// GaussianFilterの
/// </summary>
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")]
/// <summary>
Expand Down Expand Up @@ -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;
Expand All @@ -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. ";
}
Expand Down
202 changes: 202 additions & 0 deletions Crystallography.Controls/ScalablePictureBoxAdvanced.ja.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="panelTrackBar.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 352</value>
</data>
<data name="comboBoxScale2.Location" type="System.Drawing.Point, System.Drawing">
<value>297, 2</value>
</data>
<data name="comboBoxScale1.Location" type="System.Drawing.Point, System.Drawing">
<value>195, 2</value>
</data>
<data name="comboBoxGradient.Location" type="System.Drawing.Point, System.Drawing">
<value>63, 2</value>
</data>
<data name="label7.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 4</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>56, 18</value>
</data>
<data name="label7.Text" xml:space="preserve">
<value>スケール</value>
</data>
<data name="label9.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>277, 4</value>
</data>
<data name="label9.Size" type="System.Drawing.Size, System.Drawing">
<value>20, 18</value>
</data>
<data name="label9.Text" xml:space="preserve">
<value>色</value>
</data>
<data name="label5.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 18</value>
</data>
<data name="label5.Text" xml:space="preserve">
<value>ネガ/ポジ</value>
</data>
<data name="flowLayoutPanelGradient.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 476</value>
</data>
<data name="flowLayoutPanelImageFilter.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 505</value>
</data>
<data name="flowLayoutPanelImageFilter.Size" type="System.Drawing.Size, System.Drawing">
<value>397, 56</value>
</data>
<data name="flowLayoutPanelDustScratches.Size" type="System.Drawing.Size, System.Drawing">
<value>315, 26</value>
</data>
<data name="checkBoxDustScratches.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="checkBoxDustScratches.Size" type="System.Drawing.Size, System.Drawing">
<value>135, 22</value>
</data>
<data name="checkBoxDustScratches.Text" xml:space="preserve">
<value>ダスト＆スクラッチ</value>
</data>
<data name="numericBoxDustScratchesRadius.HeaderFont" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="numericBoxDustScratchesRadius.HeaderText" xml:space="preserve">
<value>半径</value>
</data>
<data name="numericBoxDustScratchesRadius.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 0</value>
</data>
<data name="numericBoxDustScratchesRadius.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 25</value>
</data>
<data name="numericBoxDustScratchesRadius.Size" type="System.Drawing.Size, System.Drawing">
<value>97, 25</value>
</data>
<data name="numericBoxDustScratchesThreshold.HeaderFont" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="numericBoxDustScratchesThreshold.HeaderText" xml:space="preserve">
<value>閾値</value>
</data>
<data name="numericBoxDustScratchesThreshold.Location" type="System.Drawing.Point, System.Drawing">
<value>236, 0</value>
</data>
<data name="numericBoxDustScratchesThreshold.Size" type="System.Drawing.Size, System.Drawing">
<value>79, 25</value>
</data>
<data name="flowLayoutPanelGaussianBlur2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 28</value>
</data>
<data name="flowLayoutPanelGaussianBlur2.Size" type="System.Drawing.Size, System.Drawing">
<value>251, 26</value>
</data>
<data name="checkBoxGaussianBlur.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="checkBoxGaussianBlur.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 22</value>
</data>
<data name="checkBoxGaussianBlur.Text" xml:space="preserve">
<value>ガウシアンぼかし</value>
</data>
<data name="numericBoxGaussianRadius.HeaderFont" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="numericBoxGaussianRadius.HeaderText" xml:space="preserve">
<value>半値全幅</value>
</data>
<data name="numericBoxGaussianRadius.Location" type="System.Drawing.Point, System.Drawing">
<value>127, 0</value>
</data>
<data name="numericBoxGaussianRadius.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 25</value>
</data>
<data name="numericBoxGaussianRadius.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 25</value>
</data>
<data name="buttonCopyToClipBoard.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="buttonCopyToClipBoard.Location" type="System.Drawing.Point, System.Drawing">
<value>247, 2</value>
</data>
<data name="buttonCopyToClipBoard.Size" type="System.Drawing.Size, System.Drawing">
<value>150, 22</value>
</data>
<data name="buttonCopyToClipBoard.Text" xml:space="preserve">
<value>クリップボードにコピー</value>
</data>
<data name="scalablePictureBox.Size" type="System.Drawing.Size, System.Drawing">
<value>397, 326</value>
</data>
<data name="graphControl.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 406</value>
</data>
</root>
Loading

0 comments on commit d31909e

Please sign in to comment.