Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
seto77 committed Feb 10, 2023
1 parent 813a22d commit 40b865a
Show file tree
Hide file tree
Showing 43 changed files with 10,665 additions and 9,420 deletions.
4 changes: 2 additions & 2 deletions CSManager/CSManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyVersion>2022.12.3.0941</AssemblyVersion>
<FileVersion>2022.12.3.0941</FileVersion>
<AssemblyVersion>2023.2.10.1154</AssemblyVersion>
<FileVersion>2023.2.10.1154</FileVersion>
<ApplicationIcon>App.ico</ApplicationIcon>
</PropertyGroup>

Expand Down
7 changes: 6 additions & 1 deletion Crystallography.Controls/Crystal/AtomControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,19 @@ public partial class AtomControl : UserControl

public Crystal Crystal
{
get => crystal; set
get => crystal;
set
{
crystal = value;

if (crystal != null)
{
SuspendLayout();
table.Clear();
AddRange(Crystal.Atoms);
//なぜかEnabledカラムのVisibleが予期せず変わってしまうことがあるので、appearanceTabVisibleを使う.
dataGridView.Columns["enabledColumn"].Visible = appearanceTabVisible;
ResumeLayout();
}
}
}
Expand Down Expand Up @@ -433,8 +436,10 @@ public void AddRange(IEnumerable<Atoms> atoms)
if (atoms != null)
{
SkipEvent = true;
dataGridView.SuspendLayout();
foreach (var a in atoms)
table.Add(a);
dataGridView.ResumeLayout();
SkipEvent = false;
ItemsChanged?.Invoke(this, new EventArgs());
bindingSource_PositionChanged(new object(), new EventArgs());
Expand Down
210 changes: 67 additions & 143 deletions Crystallography.Controls/Crystal/CrystalControl.Designer.cs

Large diffs are not rendered by default.

1,355 changes: 804 additions & 551 deletions Crystallography.Controls/Crystal/CrystalControl.cs

Large diffs are not rendered by default.

Loading

0 comments on commit 40b865a

Please sign in to comment.