-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* モジュールの順番を入れ替え可能にした * ・モジュール一覧のソート順を初期化する機能を追加 ・モジュール一覧のコンテキストメニュー関連処理を別クラスに切り分けた ・モジュール一覧がソートされている場合、手動で並べ替え出来ないようにした * モジュール一覧のソート順をクリアしても列ヘッダに三角マークが残らないように修正 * 一部のBindingExpressionを解消 * 設定→ステーション→本部がチェック入の場合にモジュール一覧を全削除すると、 概要→労働力の必要労働者数が不正になり、 概要→労働力→モジュール情報から不明なモジュール(本部)が消えるのを修正 * モジュール一覧がソート済みの場合でも並べ替え可能にした * ソート順クリア可能なDataGridのコンストラクタをstaticに変更 * 帝国の概要画面でまれにInvalidOperationExceptionが発生するのを対策
- Loading branch information
1 parent
cf33a32
commit 6964547
Showing
16 changed files
with
762 additions
and
190 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| namespace X4_ComplexCalculator.Common | ||
| { | ||
| /// <summary> | ||
| /// 順番を入れ替え可能なコレクションの要素に対するインターフェイス | ||
| /// </summary> | ||
| interface IReorderble | ||
| { | ||
| /// <summary> | ||
| /// 順番入れ替え対象か | ||
| /// </summary> | ||
| public bool IsReorderTarget { get; set; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
255 changes: 255 additions & 0 deletions
255
X4_ComplexCalculator/Main/WorkArea/UI/ModulesGrid/ContextMenuOperation.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,255 @@ | ||
| using Prism.Commands; | ||
| using Prism.Mvvm; | ||
| using System; | ||
| using System.Collections.Specialized; | ||
| using System.Linq; | ||
| using System.Windows; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Data; | ||
| using System.Windows.Input; | ||
| using System.Xml.Linq; | ||
| using X4_ComplexCalculator.Common.EditStatus; | ||
| using X4_ComplexCalculator.Main.WorkArea.WorkAreaData.Modules; | ||
|
|
||
| namespace X4_ComplexCalculator.Main.WorkArea.UI.ModulesGrid | ||
| { | ||
| /// <summary> | ||
| /// モジュール一覧タブのコンテキストメニューの処理用クラス | ||
| /// </summary> | ||
| public class ContextMenuOperation : BindableBase, IDisposable | ||
| { | ||
| #region メンバ | ||
| /// <summary> | ||
| /// モジュール一覧 | ||
| /// </summary> | ||
| private readonly IModulesInfo _ModulesInfo; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// モジュール一覧(表示用) | ||
| /// </summary> | ||
| private readonly ListCollectionView _CollectionView; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// モジュール並び替え用 | ||
| /// </summary> | ||
| private readonly ModulesReorder _ModuleReorder; | ||
| #endregion | ||
|
|
||
|
|
||
| #region プロパティ | ||
| /// <summary> | ||
| /// モジュールをコピー | ||
| /// </summary> | ||
| public ICommand CopyModulesCommand { get; } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// モジュールを貼り付け | ||
| /// </summary> | ||
| public ICommand PasteModulesCommand { get; } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// モジュールを削除 | ||
| /// </summary> | ||
| public ICommand DeleteModulesCommand { get; } | ||
|
|
||
| // ---------------------------------------------------------------------- // | ||
|
|
||
| /// <summary> | ||
| /// モジュール選択 | ||
| /// </summary> | ||
| public ICommand SelectModulesCommand => _ModuleReorder.SelectModulesCommand; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// モジュール選択解除 | ||
| /// </summary> | ||
| public ICommand ClearSelectionCommand => _ModuleReorder.ClearSelectionCommand; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// 選択項目を上に移動する | ||
| /// </summary> | ||
| public ICommand MoveUpTheSelectionCommand => _ModuleReorder.MoveUpTheSelectionCommand; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// 選択項目を下に移動する | ||
| /// </summary> | ||
| public ICommand MoveDownTheSelectionCommand => _ModuleReorder.MoveDownTheSelectionCommand; | ||
|
|
||
|
|
||
| // ---------------------------------------------------------------------- // | ||
|
|
||
| /// <summary> | ||
| /// ソート順を初期化 | ||
| /// </summary> | ||
| public DelegateCommand ResetSortOrderCommand { get; } | ||
|
|
||
| // ---------------------------------------------------------------------- // | ||
|
|
||
| /// <summary> | ||
| /// セルフォーカス用のコマンド | ||
| /// </summary> | ||
| public ICommand? CellFocusCommand { private get; set; } | ||
| #endregion | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// コンストラクタ | ||
| /// </summary> | ||
| /// <param name="modulesInfo">モジュール一覧情報</param> | ||
| /// <param name="listCollectionView">モジュール一覧のCollectionView</param> | ||
| public ContextMenuOperation(IModulesInfo modulesInfo, ListCollectionView listCollectionView) | ||
| { | ||
| _ModulesInfo = modulesInfo; | ||
| _CollectionView = listCollectionView; | ||
| _ModuleReorder = new ModulesReorder(modulesInfo, listCollectionView); | ||
|
|
||
| ((INotifyCollectionChanged)_CollectionView.SortDescriptions).CollectionChanged += ContextMenuOperation_CollectionChanged; | ||
|
|
||
| CopyModulesCommand = new DelegateCommand(CopyModules); | ||
| PasteModulesCommand = new DelegateCommand<DataGrid>(PasteModules); | ||
| DeleteModulesCommand = new DelegateCommand<DataGrid>(DeleteModules); | ||
| ResetSortOrderCommand = new DelegateCommand( | ||
| () => _CollectionView.SortDescriptions.Clear(), | ||
| () => 0 < _CollectionView.SortDescriptions.Count | ||
| ); | ||
| } | ||
|
|
||
|
|
||
| /// <inheritdoc/> | ||
| public void Dispose() | ||
| { | ||
| ((INotifyCollectionChanged)_CollectionView.SortDescriptions).CollectionChanged -= ContextMenuOperation_CollectionChanged; | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// ソート内容が変更された場合 | ||
| /// </summary> | ||
| /// <param name="sender"></param> | ||
| /// <param name="e"></param> | ||
| private void ContextMenuOperation_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) | ||
| { | ||
| // 未ソートの場合のみ入れ替え可能にする | ||
| _ModuleReorder.SortedColumnCount = _CollectionView.SortDescriptions.Count; | ||
|
|
||
| // ソート順初期化可不可更新 | ||
| ResetSortOrderCommand.RaiseCanExecuteChanged(); | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// 選択中のモジュールをコピー | ||
| /// </summary> | ||
| private void CopyModules() | ||
| { | ||
| var xml = new XElement("modules"); | ||
| var selectedModules = CollectionViewSource.GetDefaultView(_CollectionView) | ||
| .Cast<ModulesGridItem>() | ||
| .Where(x => x.IsSelected); | ||
|
|
||
| foreach (var module in selectedModules) | ||
| { | ||
| xml.Add(module.ToXml()); | ||
| } | ||
|
|
||
| Clipboard.SetText(xml.ToString()); | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// コピーしたモジュールを貼り付け | ||
| /// </summary> | ||
| /// <param name="dataGrid"></param> | ||
| private void PasteModules(DataGrid dataGrid) | ||
| { | ||
| try | ||
| { | ||
| var clipboardXml = XDocument.Parse(Clipboard.GetText()); | ||
|
|
||
| // xmlの内容に問題がないか確認するため、ここでToArray()する | ||
| var modules = clipboardXml.Root.Elements().Select(x => new ModulesGridItem(x) { EditStatus = EditStatus.Edited }).ToArray(); | ||
|
|
||
| _ModulesInfo.Modules.AddRange(modules); | ||
|
|
||
| dataGrid.Focus(); | ||
| } | ||
| catch | ||
| { | ||
|
|
||
| } | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// 選択中のモジュールを削除 | ||
| /// </summary> | ||
| /// <param name="dataGrid"></param> | ||
| private void DeleteModules(DataGrid dataGrid) | ||
| { | ||
| var currPos = _CollectionView.CurrentPosition; | ||
|
|
||
| // モジュール数を編集した後に削除するとcurrPosが-1になる場合があるため、 | ||
| // ここで最初に選択されている表示上のモジュールの要素番号を取得する | ||
| if (currPos == -1) | ||
| { | ||
| var cnt = 0; | ||
| foreach (var module in _CollectionView.OfType<ModulesGridItem>()) | ||
| { | ||
| if (module.IsSelected) | ||
| { | ||
| currPos = cnt; | ||
| break; | ||
| } | ||
| cnt++; | ||
| } | ||
| } | ||
|
|
||
| var items = CollectionViewSource.GetDefaultView(_CollectionView) | ||
| .Cast<ModulesGridItem>() | ||
| .Where(x => x.IsSelected); | ||
|
|
||
| _ModulesInfo.Modules.RemoveRange(items); | ||
|
|
||
| // 削除後に全部の選択状態を外さないと余計なものまで選択される | ||
| foreach (var module in _ModulesInfo.Modules) | ||
| { | ||
| module.IsSelected = false; | ||
| } | ||
|
|
||
| // 選択行を設定 | ||
| if (currPos < 0) | ||
| { | ||
| // 先頭行を削除した場合 | ||
| _CollectionView.MoveCurrentToFirst(); | ||
| } | ||
| else if (_CollectionView.Count <= currPos) | ||
| { | ||
| // 最後の行を消した場合、選択行を最後にする | ||
| _CollectionView.MoveCurrentToLast(); | ||
| } | ||
| else | ||
| { | ||
| // 中間行の場合 | ||
| _CollectionView.MoveCurrentToPosition(currPos); | ||
| } | ||
|
|
||
| // 再度選択 | ||
| if (_CollectionView.CurrentItem is ModulesGridItem item) | ||
| { | ||
| item.IsSelected = true; | ||
| } | ||
|
|
||
| // セルフォーカス | ||
| if (dataGrid.CurrentCell.Column != null) | ||
| { | ||
| CellFocusCommand?.Execute(new Tuple<DataGrid, int, int>(dataGrid, _CollectionView.CurrentPosition, dataGrid.CurrentCell.Column.DisplayIndex)); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.