Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@seto77
seto77 committed Mar 7, 2024
1 parent 35b623f commit 3b9a7a9
Show file tree
Hide file tree
Showing 12 changed files with 655 additions and 730 deletions.
5 changes: 2 additions & 3 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.3.5.1055</AssemblyVersion>
<FileVersion>2024.3.5.1055</FileVersion>
<AssemblyVersion>2024.3.7.0630</AssemblyVersion>
<FileVersion>2024.3.7.0630</FileVersion>
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
<ApplicationUseCompatibleTextRendering>true</ApplicationUseCompatibleTextRendering>
<ApplicationVisualStyles>true</ApplicationVisualStyles>
Expand Down Expand Up @@ -33,7 +33,6 @@
<ItemGroup>
<PackageReference Include="IronPython" Version="3.4.1" />
<PackageReference Include="SimdLinq" Version="1.3.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Crystallography.Controls/GraphControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1270,8 +1270,8 @@ private void pictureBox_MouseMove(object sender, MouseEventArgs e)
{
if (verticalLineList.Count > selectedVerticalLineIndex && selectedVerticalLineIndex >= 0)
{
//lineList[selectedLineIndex].X = x;
verticalLineList[selectedVerticalLineIndex] = new PointD(pt.X, verticalLineList[selectedVerticalLineIndex].Y);
var x = XLog ? Math.Pow(10,pt.X) : pt.X;
verticalLineList[selectedVerticalLineIndex] = new PointD(x, verticalLineList[selectedVerticalLineIndex].Y);

Draw();
LinePositionChanged?.Invoke();
Expand Down
11 changes: 9 additions & 2 deletions Crystallography.Controls/Wave/WaveLengthControl.Designer.cs
View file

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

49 changes: 29 additions & 20 deletions Crystallography.Controls/Wave/WaveLengthControl.ja.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="comboBoxXRayElement.Location" type="System.Drawing.Point, System.Drawing">
<value>32, 2</value>
<value>32, 0</value>
</data>
<data name="radioButtonXray.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
</data>
<data name="radioButtonXray.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 22</value>
<value>48, 22</value>
</data>
<data name="radioButtonXray.Text" xml:space="preserve">
<value>X線</value>
Expand All @@ -137,13 +137,13 @@
<value>48, 0</value>
</data>
<data name="radioButtonElectron.Size" type="System.Drawing.Size, System.Drawing">
<value>62, 22</value>
<value>64, 22</value>
</data>
<data name="radioButtonElectron.Text" xml:space="preserve">
<value>電子線</value>
</data>
<data name="comboBoxXrayLine.Location" type="System.Drawing.Point, System.Drawing">
<value>104, 2</value>
<value>104, 0</value>
</data>
<data name="numericBoxEnergy.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
Expand All @@ -158,13 +158,7 @@
<value>エネルギー</value>
</data>
<data name="numericBoxEnergy.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 27</value>
</data>
<data name="flowLayoutPanelElement.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 27</value>
</data>
<data name="flowLayoutPanelElement.ToolTip" xml:space="preserve">
<value />
<value>183, 27</value>
</data>
<data name="label1.Font" type="System.Drawing.Font, System.Drawing">
<value>メイリオ, 9pt</value>
Expand Down Expand Up @@ -197,28 +191,43 @@
<value>メイリオ, 9pt</value>
</data>
<data name="radioButtonNeutron.Location" type="System.Drawing.Point, System.Drawing">
<value>111, 0</value>
<value>112, 0</value>
</data>
<data name="radioButtonNeutron.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 22</value>
<value>76, 22</value>
</data>
<data name="radioButtonNeutron.Text" xml:space="preserve">
<value>中性子線</value>
</data>
<data name="labelFlatWhite.ToolTip" xml:space="preserve">
<value />
</data>
<data name="flowLayoutPanelWaveSource.Size" type="System.Drawing.Size, System.Drawing">
<value>198, 25</value>
<value>210, 22</value>
</data>
<data name="flowLayoutPanelWaveSource.ToolTip" xml:space="preserve">
<value />
</data>
<data name="flowLayoutPanelElement.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 25</value>
</data>
<data name="flowLayoutPanelElement.ToolTip" xml:space="preserve">
<value />
</data>
<data name="flowLayoutPanelMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 25</value>
<data name="flowLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 22</value>
</data>
<data name="flowLayoutPanel2.ToolTip" xml:space="preserve">
<value />
</data>
<data name="flowLayoutPanelMain.Size" type="System.Drawing.Size, System.Drawing">
<value>198, 86</value>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 118</value>
</data>
<data name="flowLayoutPanelMain.ToolTip" xml:space="preserve">
<data name="panel1.ToolTip" xml:space="preserve">
<value />
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>198, 111</value>
<value>210, 119</value>
</data>
<data name="$this.ToolTip" xml:space="preserve">
<value />
Expand Down
Loading

0 comments on commit 3b9a7a9

Please sign in to comment.