Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@seto77
seto77 committed Oct 4, 2024
1 parent fa4c091 commit a573b1d
Show file tree
Hide file tree
Showing 11 changed files with 62 additions and 33 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>net8.0-windows10.0.22621.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2024.10.4.0730</AssemblyVersion>
<FileVersion>2024.10.4.0730</FileVersion>
<AssemblyVersion>2024.10.4.0908</AssemblyVersion>
<FileVersion>2024.10.4.0908</FileVersion>
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
<ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
<ApplicationVisualStyles>true</ApplicationVisualStyles>
Expand Down
4 changes: 2 additions & 2 deletions Crystallography.OpenGL/Crystallography.OpenGL.csproj
View file
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.10.4.0730</AssemblyVersion>
<FileVersion>2024.10.4.0730</FileVersion>
<AssemblyVersion>2024.10.4.0908</AssemblyVersion>
<FileVersion>2024.10.4.0908</FileVersion>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Crystallography/Crystallography.csproj
View file
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.10.4.0730</AssemblyVersion>
<FileVersion>2024.10.4.0730</FileVersion>
<AssemblyVersion>2024.10.4.0908</AssemblyVersion>
<FileVersion>2024.10.4.0908</FileVersion>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
Expand Down
19 changes: 9 additions & 10 deletions ReciPro.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ Global
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|ARM.Build.0 = Release|Any CPU
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|ARM64.ActiveCfg = Release|Any CPU
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|ARM64.Build.0 = Release|Any CPU
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|x64.ActiveCfg = Release|Any CPU
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|x64.Build.0 = Release|Any CPU
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|x64.ActiveCfg = Release|x64
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|x64.Build.0 = Release|x64
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|x86.ActiveCfg = Release|Any CPU
{D01883A1-458D-4127-8E9B-EEC176201483}.Release|x86.Build.0 = Release|Any CPU
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -74,8 +74,8 @@ Global
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|ARM.Build.0 = Release|Any CPU
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|ARM64.ActiveCfg = Release|Any CPU
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|ARM64.Build.0 = Release|Any CPU
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|x64.ActiveCfg = Release|Any CPU
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|x64.Build.0 = Release|Any CPU
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|x64.ActiveCfg = Release|x64
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|x64.Build.0 = Release|x64
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|x86.ActiveCfg = Release|Any CPU
{3AABEFB0-E84E-4AF6-8496-4D1F33C8F517}.Release|x86.Build.0 = Release|Any CPU
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -94,8 +94,8 @@ Global
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|ARM.Build.0 = Release|Any CPU
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|ARM64.ActiveCfg = Release|Any CPU
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|ARM64.Build.0 = Release|Any CPU
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|x64.ActiveCfg = Release|Any CPU
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|x64.Build.0 = Release|Any CPU
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|x64.ActiveCfg = Release|x64
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|x64.Build.0 = Release|x64
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|x86.ActiveCfg = Release|Any CPU
{FD96FE43-6DEE-4520-BB26-CFF7976DE27D}.Release|x86.Build.0 = Release|Any CPU
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -114,8 +114,8 @@ Global
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|ARM.Build.0 = Release|Any CPU
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|ARM64.ActiveCfg = Release|Any CPU
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|ARM64.Build.0 = Release|Any CPU
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|x64.ActiveCfg = Release|Any CPU
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|x64.Build.0 = Release|Any CPU
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|x64.ActiveCfg = Release|x64
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|x64.Build.0 = Release|x64
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|x86.ActiveCfg = Release|Any CPU
{BE7CC301-70E0-4BAA-9349-FDA49B38CC93}.Release|x86.Build.0 = Release|Any CPU
{0A6070E5-8843-4C4B-A4ED-4ABC55BFDBDD}.Debug|Any CPU.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -163,8 +163,7 @@ Global
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Debug|x86.ActiveCfg = Debug|x86
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Debug|x86.Build.0 = Debug|x86
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Debug|x86.Deploy.0 = Debug|x86
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Release|Any CPU.Build.0 = Release|Any CPU
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Release|Any CPU.ActiveCfg = Release|x64
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Release|ARM.ActiveCfg = Release|ARM
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Release|ARM.Build.0 = Release|ARM
{C48B063F-573B-4DEC-99AC-C954BBDE0638}.Release|ARM.Deploy.0 = Release|ARM
Expand Down
18 changes: 17 additions & 1 deletion ReciPro/FormMain.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,23 @@ private void checkBoxAnimation_CheckedChanged(object sender, EventArgs e)

#endregion 回転ボタン

#region ベクトルでの回転指定
#region hklやuvwベクトルでの回転指定

public void SetPlane (int h, int k, int l)
{
numericBoxPlaneH.Value = h;
numericBoxPlaneK.Value = k;
numericBoxPlaneL.Value = l;
}
public void SetAxis (int u, int v, int w)
{
numericBoxAxisU.Value = u;
numericBoxAxisV.Value = v;
numericBoxAxisW.Value = w;
}
public void ProjectAlongAxis() => buttonSetVector_Click(buttonSetAxis, new EventArgs());
public void ProjectAlongPlane() => buttonSetVector_Click(buttonSetPlane, new EventArgs());

private void buttonSetVector_Click(object sender, EventArgs e)
{
if (Crystal == null) return;
Expand Down
16 changes: 8 additions & 8 deletions ReciPro/FormMain.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ To delete all crystals in the list, click the 'All Clear' button.</value>
<value>0, 0, 0, 0</value>
</data>
<data name="crystalControl.Size" type="System.Drawing.Size, System.Drawing">
<value>400, 365</value>
<value>400, 312</value>
</data>
<data name="crystalControl.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand Down Expand Up @@ -555,7 +555,7 @@ To delete all crystals in the list, click the 'All Clear' button.</value>
<value>0, 3, 0, 0</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>406, 389</value>
<value>406, 336</value>
</data>
<data name="groupBox6.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
Expand Down Expand Up @@ -723,7 +723,7 @@ To delete all crystals in the list, click the 'All Clear' button.</value>
<value>1</value>
</data>
<data name="splitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>416, 677</value>
<value>416, 624</value>
</data>
<data name="splitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>253</value>
Expand Down Expand Up @@ -2920,7 +2920,7 @@ To delete all crystals in the list, click the 'All Clear' button.</value>
<value>0, 0, 0, 0</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>142, 677</value>
<value>142, 624</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
Expand All @@ -2941,7 +2941,7 @@ To delete all crystals in the list, click the 'All Clear' button.</value>
<value>0, 0, 0, 0</value>
</data>
<data name="toolStripContainer1.ContentPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>558, 677</value>
<value>558, 624</value>
</data>
<data name="&gt;&gt;toolStripContainer1.ContentPanel.Name" xml:space="preserve">
<value>toolStripContainer1.ContentPanel</value>
Expand Down Expand Up @@ -3697,7 +3697,7 @@ construction)</value>
<value>0, 0, 0, 0</value>
</data>
<data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 628</value>
<value>121, 609</value>
</data>
<data name="toolStrip1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
Expand Down Expand Up @@ -3730,7 +3730,7 @@ construction)</value>
<value>2</value>
</data>
<data name="toolStripContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>683, 724</value>
<value>683, 671</value>
</data>
<data name="toolStripContainer1.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
Expand Down Expand Up @@ -4044,7 +4044,7 @@ construction)</value>
<value>None</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>683, 724</value>
<value>683, 671</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI Symbol, 11.25pt</value>
Expand Down
17 changes: 14 additions & 3 deletions ReciPro/Macro.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ public class DirectionClass : MacroSub
public DirectionClass(Macro _p) : base(_p.main)
{
this.p = _p;
p.help.Add("ReciPro.Dir.Euler(double phi, double theta, double psi) # Sets the rotation state by Euler angles.");
p.help.Add("ReciPro.Dir.EulerInDegree(double phi, double theta, double psi) # Sets the rotation state by Euler angles (in degree).");
p.help.Add("ReciPro.Dir.Euler(double phi, double theta, double psi) # Set the rotation state by Euler angles.");
p.help.Add("ReciPro.Dir.EulerInDegree(double phi, double theta, double psi) # Set the rotation state by Euler angles (in degree).");
p.help.Add("ReciPro.Dir.Rotate(double vX, double vY, double vZ, double angle) # Rotate the current crystal by specifying the rotation axis and angle.");
p.help.Add("ReciPro.Dir.RotateAroundAxis(int u, int v, int w, double angle) # Rotate the current crystal with the crystal axis (uvw) as the rotation axis");
p.help.Add("ReciPro.Dir.RotateAroundPlane(int h, int k, int l, double angle) # Rotate the current crystal with the crystal plane (hkl) as the rotation axis");
p.help.Add("ReciPro.Dir.ProjectAlongAxis(int u, int v, int w) # Rotate the current crystal so that the specified axis (uvw) is normal to the screen.");
p.help.Add("ReciPro.Dir.ProjectAlongPlane(int h, int k, int l) # Rotate the current crystal so that the specified plane (hkl) is normal to the screen.");
}

public void Euler(double phi, double theta, double psi)
Expand Down Expand Up @@ -72,9 +74,18 @@ public void RotateAroundPlane(int h, int k, int l, double angle)
p.main.Rotate(axis, angle);
}

public void SetZoneAxis(int h, int k, int l)
public void ProjectAlongPlane(int h, int k, int l)
{
p.main.SetPlane(h, k, l);
p.main.ProjectAlongPlane();
Application.DoEvents();
}

public void ProjectAlongAxis(int u, int v, int w)
{
p.main.SetAxis(u, v, w);
p.main.ProjectAlongAxis();
Application.DoEvents();
}


Expand Down
4 changes: 2 additions & 2 deletions ReciPro/ReciPro.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2024.10.4.0730</AssemblyVersion>
<FileVersion>2024.10.4.0730</FileVersion>
<AssemblyVersion>2024.10.4.0912</AssemblyVersion>
<FileVersion>2024.10.4.0912</FileVersion>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<ApplicationIcon>App.ico</ApplicationIcon>
Expand Down
1 change: 1 addition & 0 deletions ReciPro/Version.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ internal static class Version

public const string History =
"History" +
"\r\n ver4.892(2024/10/04) Added several 'Macro' functions." +
"\r\n ver4.891(2024/09/06) Added the function to simulate electron trajectories based on the Monte Carlo method." +
"\r\n ver4.890(2024/08/10) Improved 'Macro' functions." +
"\r\n ver4.889(2024/08/09) Fixed bugs on the 'Diffraction Simulator'." +
Expand Down
4 changes: 2 additions & 2 deletions WapProj/Package.appxmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity
Name="73ce42a4-fd7e-4bad-8d9f-910ef50dc3c7"
Publisher="CN=seto"
Version="1.0.14.0" />
Version="1.0.18.0" />

<Properties>
<DisplayName>WapProj</DisplayName>
Expand All @@ -32,7 +32,7 @@
EntryPoint="$targetentrypoint$">
<uap:VisualElements
DisplayName="ReciPro"
Description="WapProj"
Description="ReciPro"
BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png">
Expand Down
4 changes: 3 additions & 1 deletion WapProj/WapProj.wapproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<DefaultLanguage>ja-JP</DefaultLanguage>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
<NoWarn>$(NoWarn);NU1702</NoWarn>
<EntryPointProjectUniqueName>..\ReciPro\ReciPro.csproj</EntryPointProjectUniqueName>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
Expand All @@ -63,6 +63,7 @@
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<PackageCertificateThumbprint>DE9648A614DDAA58AD85FBB668497CBE67FE1406</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<DefaultLanguage>en</DefaultLanguage>
Expand Down Expand Up @@ -117,6 +118,7 @@
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Images\StoreLogo.png" />
<Content Include="Images\Wide310x150Logo.scale-200.png" />
<None Include="WapProj_TemporaryKey.pfx" />
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
<ItemGroup>
Expand Down

0 comments on commit a573b1d

Please sign in to comment.