Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@seto77
seto77 committed Nov 17, 2020
1 parent 87d39b3 commit 527825e
Show file tree
Hide file tree
Showing 30 changed files with 2,354 additions and 2,403 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

references/
IPAnalyzerSetup/
Eigen/
Crystallography.Native/Eigen/
*.exe

# User-specific files
Expand Down
2 changes: 0 additions & 2 deletions Crystallography.Controls/Crystal/CrystalControl.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Crystallography.Controls/Crystal/CrystalControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ private void setTabPages()

#endregion Tabページの表示/非表示プロパティ

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Crystal Crystal
{
set
Expand Down Expand Up @@ -99,6 +100,7 @@ public Crystal Crystal
}
private Crystal crystal;

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]

public (double A, double B, double C, double Alpha, double Beta, double Gamma) CellConstants
{ get => symmetryControl.CellConstants; set => symmetryControl.CellConstants = value; }
Expand Down
92 changes: 28 additions & 64 deletions Crystallography.Controls/Crystal/CrystalControl.resx
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Crystallography.Controls/Crystal/PoleFigureControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Media.Animation;

namespace Crystallography.Controls
{
Expand Down
348 changes: 174 additions & 174 deletions Crystallography.Controls/Crystal/SymmetryControl.Designer.cs
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions Crystallography.Controls/Crystal/SymmetryControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Data;
using System.Linq;
using System.Windows.Forms;
using System.ComponentModel;

namespace Crystallography.Controls
{
Expand Down Expand Up @@ -47,6 +48,8 @@ public int SymmetrySeriesNumber
/// <summary>
/// Cell constants の get/set. 単位はnm, radian.
/// </summary>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[Browsable(false)]
public (double A, double B, double C, double Alpha, double Beta, double Gamma) CellConstants
{
get => (numericBoxA.Value /10, numericBoxB.Value / 10, numericBoxC.Value / 10, numericBoxAlpha.RadianValue, numericBoxBeta.RadianValue,numericBoxGamma.RadianValue);
Expand Down Expand Up @@ -74,6 +77,8 @@ public int SymmetrySeriesNumber
/// <summary>
/// Cell constants error の get/set. 単位はnm, radian.
/// </summary>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[Browsable(false)]
public (double AErr, double BErr, double CErr, double AlphaErr, double BetaErr, double GammaErr) CellConstantsErr
{
get => (numericBoxAErr.Value / 10, numericBoxBErr.Value / 10, numericBoxCErr.Value / 10,
Expand Down
72 changes: 0 additions & 72 deletions Crystallography.Controls/Crystal/SymmetryControl.ja.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,69 +133,15 @@
<data name="label48.Location" type="System.Drawing.Point, System.Drawing">
<value>314, 54</value>
</data>
<data name="numericBoxBeta.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxBeta.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxAlpha.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxAlpha.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxGammaErr.Location" type="System.Drawing.Point, System.Drawing">
<value>249, 54</value>
</data>
<data name="numericBoxGammaErr.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxGammaErr.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxAlphaErr.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxAlphaErr.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxBetaErr.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxBetaErr.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxA.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxA.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="label45.Location" type="System.Drawing.Point, System.Drawing">
<value>146, 54</value>
</data>
<data name="numericBoxGamma.Location" type="System.Drawing.Point, System.Drawing">
<value>184, 54</value>
</data>
<data name="numericBoxGamma.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxGamma.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxBErr.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxBErr.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxB.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxB.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="label25.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 54</value>
</data>
Expand All @@ -205,27 +151,9 @@
<data name="numericBoxC.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 54</value>
</data>
<data name="numericBoxC.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxC.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxCErr.Location" type="System.Drawing.Point, System.Drawing">
<value>81, 54</value>
</data>
<data name="numericBoxCErr.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxCErr.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<data name="numericBoxAErr.MaximumSize" type="System.Drawing.Size, System.Drawing">
<value>1000, 23</value>
</data>
<data name="numericBoxAErr.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 1, 1, 0</value>
Expand Down
Loading

0 comments on commit 527825e

Please sign in to comment.