Skip to content

RevitRooms: Замена устаревших компараторов #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dosymep merged 1 commit into from
Jun 22, 2026
Merged

RevitRooms: Замена устаревших компараторов #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions src/RevitRooms/Commands/Numerates/NumerateCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,14 @@

using dosymep.Bim4Everyone;
using dosymep.Revit;
using dosymep.Revit.Comparators;

using RevitRooms.Comparators;
using RevitRooms.Models;
using RevitRooms.ViewModels;

namespace RevitRooms.Commands.Numerates;
internal abstract class NumerateCommand {
private readonly RevitRepository _revitRepository;

protected readonly IComparer<string> _logicStringComparer = new LogicalStringComparer();
protected readonly IComparer<Element> _elementComparer = new dosymep.Revit.Comparators.ElementComparer();

public NumerateCommand(RevitRepository revitRepository) {
_revitRepository = revitRepository;
}
internal abstract class NumerateCommand(RevitRepository revitRepository) {
protected readonly IComparer<Element> _elementComparer = RevitElementComparer.ElementName;

public int Start { get; set; }
public string Prefix { get; set; }
Expand All @@ -33,7 +26,7 @@ public void Numerate(SpatialElementViewModel[] spatialElements,
IProgress<int> progress = default,
CancellationToken cancellationToken = default) {
var orderedElements = OrderElements(spatialElements);
using(var transaction = _revitRepository.Document.StartTransaction(TransactionName)) {
using(var transaction = revitRepository.Document.StartTransaction(TransactionName)) {
int flatCount = Start;

int count = 0;
Expand Down
25 changes: 12 additions & 13 deletions src/RevitRooms/ViewModels/RoomsNums/RevitRoomNumsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Autodesk.Revit.UI;

using dosymep.Bim4Everyone.ProjectParams;
using dosymep.Revit.Comparators;
using dosymep.SimpleServices;
using dosymep.WPF.Commands;
using dosymep.WPF.ViewModels;
Expand Down Expand Up @@ -181,12 +182,12 @@ public ObservableCollection<IElementViewModel<Element>> Sections {

public ObservableCollection<NumberingOrderViewModel> NumberingOrders {
get => _numberingOrders;
set => RaiseAndSetIfChanged(ref _numberingOrders, value);
private set => RaiseAndSetIfChanged(ref _numberingOrders, value);
}

public ObservableCollection<NumberingOrderViewModel> SelectedNumberingOrders {
get => _selectedNumberingOrders;
set => RaiseAndSetIfChanged(ref _selectedNumberingOrders, value);
private set => RaiseAndSetIfChanged(ref _selectedNumberingOrders, value);
}

private IEnumerable<PhaseViewModel> GetPhases() {
Expand Down Expand Up @@ -216,7 +217,7 @@ private IEnumerable<IElementViewModel<Element>> GetGroups() {
.Where(item => item != null)
.Select(item => new ElementViewModel<Element>(item, _revitRepository))
.Distinct()
.OrderBy(item => item.Element, new dosymep.Revit.Comparators.ElementComparer());
.OrderBy(item => item.Element, RevitElementComparer.ElementName);
}

private IEnumerable<IElementViewModel<Element>> GetSections() {
Expand All @@ -225,7 +226,7 @@ private IEnumerable<IElementViewModel<Element>> GetSections() {
.Where(item => item != null)
.Select(item => new ElementViewModel<Element>(item, _revitRepository))
.Distinct()
.OrderBy(item => item.Element, new dosymep.Revit.Comparators.ElementComparer());
.OrderBy(item => item.Element, RevitElementComparer.ElementName);
}

private IEnumerable<NumberingOrderViewModel> GetNumberingOrders() {
Expand Down Expand Up @@ -373,7 +374,7 @@ public void SelectNumberingOrder(IEnumerable<NumberingOrderViewModel> selection)

private string[] GetNotFoundNames(IEnumerable<SpatialElementViewModel> orderedObjects) {
return IsNumFlats
? (new string[0])
? ([])
: orderedObjects
.Select(item => item.Room.Name)
.Except(SelectedNumberingOrders.Select(item => item.Name))
Expand Down Expand Up @@ -447,9 +448,7 @@ private bool CheckWorkingObjects(SpatialElementViewModel[] workingObjects) {
AddElements(WarningInfo.GetErrorMultiLevelRoom(_localizationService), multiLevelRoomGroup, errors);
}
}

bool showWarnings = true;
return _errorWindowService.ShowNoticeWindow(showWarnings, [.. errors.Values]);
return _errorWindowService.ShowNoticeWindow(true, [.. errors.Values]);
}

private bool CanNumerateRooms(object param) {
Expand Down Expand Up @@ -537,11 +536,11 @@ private void LoadPluginConfig() {
var settings = _roomsNumsConfig.GetSettings(_revitRepository.DocumentName);

StartNumber = settings?.StartNumber ?? "1";
IsNumFlats = settings?.IsNumFlats ?? default;
IsNumRooms = settings?.IsNumRooms ?? default;
IsNumRoomsGroup = settings?.IsNumRoomsGroup ?? default;
IsNumRoomsSection = settings?.IsNumRoomsSection ?? default;
IsNumRoomsSectionLevels = settings?.IsNumRoomsSectionLevels ?? default;
IsNumFlats = settings?.IsNumFlats ?? false;
IsNumRooms = settings?.IsNumRooms ?? false;
IsNumRoomsGroup = settings?.IsNumRoomsGroup ?? false;
IsNumRoomsSection = settings?.IsNumRoomsSection ?? false;
IsNumRoomsSectionLevels = settings?.IsNumRoomsSectionLevels ?? false;

if(_revitRepository.GetElement(settings?.PhaseElementId ?? ElementId.InvalidElementId) is Phase phase) {
Phase = Phases.FirstOrDefault(item => item.ElementId == phase.Id) ?? Phases.FirstOrDefault();
Expand Down
Loading