Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
seto77 committed Nov 11, 2022
1 parent be00448 commit 459bb19
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 33 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>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2022.11.11.0546</AssemblyVersion>
<FileVersion>2022.11.11.0546</FileVersion>
<AssemblyVersion>2022.11.11.0555</AssemblyVersion>
<FileVersion>2022.11.11.0555</FileVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
36 changes: 8 additions & 28 deletions Crystallography/Crystal/BondsAndPolyhedra.cs
Original file line number Diff line number Diff line change
@@ -1,74 +1,54 @@
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using MessagePack;
using System.Drawing;
using System.Linq;
//using MemoryPack;

namespace Crystallography
{
[Serializable()]
[MessagePackObject]
public class Bonds
//[MemoryPackable]
public partial class Bonds
{
#region フィールド
[Key(0)]
public string Element1;
[Key(1)]
public string Element2;
[Key(2)]
public float MinLength;//nm単位
[Key(3)]
public float MaxLength;//nm単位
[Key(4)]
public float Radius;//nm単位
[Key(5)]
public float BondTransParency;
[Key(6)]
public int ArgbBond;
[Key(7)]
public float PolyhedronTransParency;
[Key(8)]
public bool ShowPolyhedron;
[Key(9)]
public bool ShowCenterAtom;
[Key(10)]
public bool ShowVertexAtom;
[Key(11)]
public bool ShowInnerBonds;
[Key(12)]
public int ArgbPolyhedron;
[Key(13)]
public bool ShowEdges;
[Key(14)]
public float EdgeLineWidth;
[Key(15)]
public int ArgbEdge;
[Key(16)]
public bool Enabled = true;
[Key(17)]
public bool ShowBond = true;
[Key(18)]
public bool UseFixedColor = false;

[IgnoreMember]
//[MemoryPackIgnore]
public string[] ElementList;

//2020/05/11追加 (標準の単位をnmに変更したための対処)
[IgnoreMember]
//[MemoryPackIgnore]
public bool NanometerUnit = false;


[XmlIgnore]
[IgnoreMember]
//[MemoryPackIgnore]
public List<int[]> pairID = new();

#endregion

#region コンストラクタ
public Bonds()
{
}
//[MemoryPackConstructor]
public Bonds() { }

public Bonds(bool enabled,
string[] elementList, string element1, string element2, float minLength, float maxLength,
Expand Down
2 changes: 1 addition & 1 deletion Crystallography/Crystal/CrystalMinimum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Crystallography;
[MemoryPackable]
public partial class Crystal2
{
#region フィールド シリアル化対象 [Key(#)]が必須
#region フィールド プライベートメンバーの場合[MemoryPackInclude]が必要
[MemoryPackInclude]
private byte[][] cellBytes;
public int argb;
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>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2022.11.11.0546</AssemblyVersion>
<FileVersion>2022.11.11.0546</FileVersion>
<AssemblyVersion>2022.11.11.0555</AssemblyVersion>
<FileVersion>2022.11.11.0555</FileVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down

0 comments on commit 459bb19

Please sign in to comment.