Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
seto77 committed Sep 6, 2024
1 parent 1aad138 commit 8f1f89a
Show file tree
Hide file tree
Showing 12 changed files with 4,000 additions and 3,924 deletions.
4 changes: 2 additions & 2 deletions Crystallography.Controls/Crystallography.Controls.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<OutputType>Library</OutputType>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2024.9.6.0852</AssemblyVersion>
<FileVersion>2024.9.6.0852</FileVersion>
<AssemblyVersion>2024.9.6.0939</AssemblyVersion>
<FileVersion>2024.9.6.0939</FileVersion>
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
<ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
<ApplicationVisualStyles>true</ApplicationVisualStyles>
Expand Down
4 changes: 2 additions & 2 deletions Crystallography.OpenGL/Crystallography.OpenGL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<OutputType>Library</OutputType>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2024.9.6.0556</AssemblyVersion>
<FileVersion>2024.9.6.0556</FileVersion>
<AssemblyVersion>2024.9.6.0929</AssemblyVersion>
<FileVersion>2024.9.6.0929</FileVersion>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions Crystallography/Crystallography.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<OutputType>Library</OutputType>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2024.9.6.0556</AssemblyVersion>
<FileVersion>2024.9.6.0556</FileVersion>
<AssemblyVersion>2024.9.6.0929</AssemblyVersion>
<FileVersion>2024.9.6.0929</FileVersion>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup>

Expand Down
106 changes: 106 additions & 0 deletions ReciPro/FormEBSD.Designer.cs

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

103 changes: 103 additions & 0 deletions ReciPro/FormEBSD.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Crystallography;
using Crystallography.Controls;
using Crystallography.OpenGL;
using OpenTK;
using V3 = OpenTK.Vector3d;
using C4 = OpenTK.Graphics.Color4;

namespace ReciPro;

public partial class FormEBSD : Form
{
#region フィールド、プロパティ
public FormMain FormMain;
public GLControlAlpha glControlGeometry;

#endregion

#region コンストラクタ、ロード、クローズ
public FormEBSD()
{
InitializeComponent();

glControlGeometry = new GLControlAlpha(GLControlAlpha.FragShaders.OIT)
{
AllowMouseRotation = true,
AllowMouseScaling = true,
AllowMouseTranslating = false,
Name = "glControlAxes",
ProjectionMode = GLControlAlpha.ProjectionModes.Orhographic,
ProjWidth = 8.0,
RotationMode = GLControlAlpha.RotationModes.Object,
Dock = DockStyle.Fill,
LightPosition = new V3(100, 100, 100),
BorderStyle = BorderStyle.Fixed3D,

WorldMatrix =/* Matrix4d.CreateRotationZ(-Math.PI / 8) * */Matrix4d.CreateRotationX(-0.5 * Math.PI)
};
panelGeometry.Controls.Add(glControlGeometry);

}

private void FormEBSD_FormClosing(object sender, FormClosingEventArgs e)
{
e.Cancel = true;
FormMain.toolStripButtonEBSD.Checked = false;
Visible = false;
}
#endregion

#region 入射電子、試料、検出器の幾何学を3Dで表示
/// <summary>
/// 試料と電子線が交差する位置は常に(0,0,0)
/// </summary>
public void DrawGeometry()
{
var glObjects = new List<GLObject>();

//試料の傾き
var rot = Matrix3D.RotY(numericBoxSampleTilt.RadianValue);

//試料を示す直方体
var sample = new Parallelepiped(rot * new V3(-1, -1, -0.2), rot * new V3(2, 0, 0), rot * new V3(0, 2, 0), rot * new V3(0, 0, 0.2), new Material(Color4.AliceBlue), DrawingMode.SurfacesAndEdges);
glObjects.Add(sample);

//検出器面
var detector = new Parallelepiped(new V3(2.99, -1.5, -1.5), new V3(0, 3, 0), new V3(0, 0, 3), new V3(0.2, 0, 0), new Material(Color4.GreenYellow, 0.7), DrawingMode.Surfaces);
glObjects.Add(detector);

//ポールピース
glObjects.AddRange(
[
new Pipe(new V3(0,0,2), new V3(0,0,1), 0.15,0.16,new Material(C4.Gray), DrawingMode.Surfaces,false){ IgnoreNormalSides=true},
new Pipe(new V3(0,0,2), new V3(0,0,1), 0.30,1.5,new Material(C4.Gray), DrawingMode.Surfaces,false){ IgnoreNormalSides=true},
new HoledDisk(new V3(0,0,2), new V3(0,0,1),0.15,0.3, new Material(C4.Gray), DrawingMode.Surfaces){ IgnoreNormalSides=true},
new HoledDisk(new V3(0,0,3), new V3(0,0,1),0.15,1.5, new Material(C4.Gray), DrawingMode.Surfaces){ IgnoreNormalSides=true},
]);

//電子線方向を示す矢印
glObjects.AddRange(
[
new Cone(new V3(0, 0, 0), new V3(0, 0, 2.5), 0.1, new Material(C4.Yellow,0.7), DrawingMode.Surfaces){ IgnoreNormalSides=true},
new Cone(new V3(0, 0, 0), new V3(3, 0, 0), 1, new Material(C4.Yellow, 0.7), DrawingMode.Surfaces) { IgnoreNormalSides = true }
]);

//結晶のa, b, c軸を表す矢印

glControlGeometry.DeleteAllObjects();
glControlGeometry.AddObjects(glObjects);
glControlGeometry.Refresh();
}
#endregion

}
120 changes: 120 additions & 0 deletions ReciPro/FormEBSD.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<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>
</root>
Loading

0 comments on commit 8f1f89a

Please sign in to comment.