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 8f1f89a commit fec640c
Show file tree
Hide file tree
Showing 8 changed files with 1,402 additions and 887 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.0939</AssemblyVersion>
<FileVersion>2024.9.6.0939</FileVersion>
<AssemblyVersion>2024.9.6.0959</AssemblyVersion>
<FileVersion>2024.9.6.0959</FileVersion>
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
<ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
<ApplicationVisualStyles>true</ApplicationVisualStyles>
Expand Down
89 changes: 86 additions & 3 deletions ReciPro/FormEBSD.Designer.cs

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

8 changes: 6 additions & 2 deletions ReciPro/FormEBSD.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ public void DrawGeometry()
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);
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(C4.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);
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(C4.GreenYellow, 0.7), DrawingMode.Surfaces);
glObjects.Add(detector);

//ポールピース
Expand All @@ -100,4 +100,8 @@ public void DrawGeometry()
}
#endregion

private void button2_Click(object sender, EventArgs e)
{
DrawGeometry();
}
}
34 changes: 17 additions & 17 deletions ReciPro/FormTrajectory.Designer.cs

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

Loading

0 comments on commit fec640c

Please sign in to comment.