Обновлен конструктор класса

Author: sssenya

src/RevitMarkAllDocuments/Services/FiltrationService.cs

@@ -3,6 +3,7 @@
 
 using Autodesk.Revit.DB;
 
+using Bim4Everyone.RevitFiltration;
 using Bim4Everyone.RevitFiltration.Controls;
 
 using dosymep.Revit;
@@ -13,27 +14,32 @@ namespace RevitMarkAllDocuments.Services;
 
 internal class FiltrationService {
     private readonly bool _isMarkForTypes;
+    private readonly Category _category;
+    private readonly DocumentService _docService;
+    private readonly ILogicalFilter _logicalFilter;
     private readonly FilterOptions _filterOptions;
 
-    public FiltrationService(bool isMarkForTypes) {
+    public FiltrationService(bool isMarkForTypes, 
+                             Category category,
+                             DocumentService docService,
+                             ILogicalFilterContext logicalFilterContext) {
         _isMarkForTypes = isMarkForTypes;
+        _category = category;
         _filterOptions = new FilterOptions() { Tolerance = 0 };
+        _docService = docService;
+        _logicalFilter = logicalFilterContext.GetFilter();
     }
 
-    public MarkData FilterElements(MarkData markData, 
-                                   Category category,
-                                   IReadOnlyList<Document> documents,
-                                   DocumentService docService, 
-                                   ILogicalFilterProvider filterProvider) {
+    public MarkData FilterElements(MarkData markData, IReadOnlyList<Document> documents) {
         foreach(var document in documents) {
             var marksByDocument = new MarkDataByDocument() {
-                DocumentName = docService.GetDocumentFullName(document)
+                DocumentName = _docService.GetDocumentFullName(document)
             };
 
-            var filter = filterProvider.GetFilter().GetFilter().Build(document, _filterOptions);
+            var filter = _logicalFilter.Build(document, _filterOptions);
 
             var elements = new FilteredElementCollector(document)
-                .OfCategory(category.GetBuiltInCategory())
+                .OfCategory(_category.GetBuiltInCategory())
                 .WhereElementIsNotElementType()
                 .WherePasses(filter)
                 .ToElements();

src/RevitMarkAllDocuments/Services/ParamValidationService.cs

@@ -10,8 +10,8 @@ namespace RevitMarkAllDocuments.Services;
 
 internal class ParamValidationService {
     public IList<WarningElement> CheckAreExistParams(bool isForTypes,
-                                                    IReadOnlyList<FilterableParam> paramsToCheck, 
-                                                    IReadOnlyList<MarkedElement> elementsToCheck) {
+                                                     IReadOnlyList<FilterableParam> paramsToCheck, 
+                                                     IReadOnlyList<MarkedElement> elementsToCheck) {
         var elementsWithError = new List<WarningElement>();
 
         foreach(var param in paramsToCheck) {
@@ -25,8 +25,8 @@ public IList<WarningElement> CheckAreExistParams(bool isForTypes,
     }
 
     public IList<WarningElement> CheckIsExistParam(bool isForTypes, 
-                                                  FilterableParam paramToCheck, 
-                                                  IReadOnlyList<MarkedElement> elementsToCheck) {
+                                                   FilterableParam paramToCheck, 
+                                                   IReadOnlyList<MarkedElement> elementsToCheck) {
         if(isForTypes) {
             return elementsToCheck
                 .Where(x => !x.RevitElement.IsExistsParam(paramToCheck.RevitParam))

src/RevitMarkAllDocuments/ViewModels/MainViewModel.cs

@@ -122,9 +122,12 @@ private void AcceptView() {
         var markData = new MarkData() {
             MarkRevitParam = selectedMarkParam.RevitParam,
         };
-        var filtrationService = new FiltrationService(_isMarkForTypes);
-        markData = filtrationService.FilterElements(markData, _selectedCategory, 
-            checkedDocuments, _documentService, FilterPageViewModel.FilterProvider);
+        var logicalFilterContext = FilterPageViewModel.FilterProvider.GetFilter();
+        var filtrationService = new FiltrationService(_isMarkForTypes, 
+                                                      _selectedCategory, 
+                                                      _documentService,
+                                                      logicalFilterContext);
+        markData = filtrationService.FilterElements(markData, checkedDocuments);
 
         var sortParams = SortPageViewModel.SelectedParams
             .Select(x => x.FilterableParam)