Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
Nice3point committed Nov 15, 2023
1 parent 8e87c9f commit 5a07f46
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 23 deletions.
13 changes: 6 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[*]
charset = utf-8
end_of_line = crlf
Expand Down Expand Up @@ -102,7 +101,7 @@ dotnet_naming_style.lower_camel_case_style_1.capitalization = camel_case
dotnet_naming_style.t_upper_camel_case_style.capitalization = pascal_case
dotnet_naming_style.t_upper_camel_case_style.required_prefix = T
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.constants_symbols.applicable_kinds = field
dotnet_naming_symbols.constants_symbols.required_modifiers = const
dotnet_naming_symbols.event_symbols.applicable_accessibilities = *
Expand Down Expand Up @@ -130,16 +129,16 @@ dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
dotnet_naming_symbols.property_symbols.applicable_accessibilities = *
dotnet_naming_symbols.property_symbols.applicable_kinds = property
dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly
dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static, readonly
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities = *
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate
dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, class, struct, enum, delegate
dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = *
dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
dotnet_separate_import_directive_groups = false
Expand Down
5 changes: 1 addition & 4 deletions RevitLookup/Commands/SearchElementsCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ public override void Execute()
{
Host.GetService<ILookupService>()
.Show<DashboardView>()
.Execute<DashboardViewModel>(dashboard =>
{
dashboard.OpenDialogCommand.Execute("search");
});
.Execute<DashboardViewModel>(dashboard => { dashboard.OpenDialogCommand.Execute("search"); });
}
}
4 changes: 0 additions & 4 deletions RevitLookup/Services/Contracts/IWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,5 @@ public interface IWindow
bool IsLoaded { get; }
Visibility Visibility { get; set; }

void Show();
bool? ShowDialog();
bool Focus();

event RoutedEventHandler Loaded;
}
2 changes: 1 addition & 1 deletion RevitLookup/Services/SnoopVisualService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public async Task SnoopAsync(SnoopableType snoopableType)
UpdateWindowVisibility(Visibility.Visible);
}
}

private void UpdateWindowVisibility(Visibility visibility)
{
if (!_window.IsLoaded) return;
Expand Down
5 changes: 3 additions & 2 deletions RevitLookup/ViewModels/Dialogs/SearchElementsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public bool SearchIds(ISnoopVisualService snoopVisualService)
}
else if (rawId.Length == 22 && rawId.Count(c => c == ' ') == 0)
{
var elements = SearchBuIfcGuid(rawId);
var elements = SearchByIfcGuid(rawId);
results.AddRange(elements);
}
else
Expand All @@ -69,6 +69,7 @@ public bool SearchIds(ISnoopVisualService snoopVisualService)
if (results.Count == 0) return false;

snoopVisualService.Snoop(new SnoopableObject(results));
throw new Exception("Required navigation");
return true;
}

Expand All @@ -81,7 +82,7 @@ private static IEnumerable<Element> SearchByName(string rawId)
.Where(element => element.Name.Contains(rawId, StringComparison.OrdinalIgnoreCase));
}

private static IList<Element> SearchBuIfcGuid(string rawId)
private static IList<Element> SearchByIfcGuid(string rawId)
{
var guidProvider = new ParameterValueProvider(new ElementId(BuiltInParameter.IFC_GUID));
var typeGuidProvider = new ParameterValueProvider(new ElementId(BuiltInParameter.IFC_TYPE_GUID));
Expand Down
2 changes: 1 addition & 1 deletion RevitLookup/Views/Converters/DescriptorConverters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
if ((attributes & MemberAttributes.Property) != 0 && (attributes & MemberAttributes.Static) != 0) return SymbolRegular.ClipboardNote16;
if ((attributes & MemberAttributes.Property) != 0) return SymbolRegular.ClipboardBulletListLtr16;

if ((attributes & MemberAttributes.Method) != 0 && (attributes & MemberAttributes.Private) != 0 && (attributes & MemberAttributes.Static) != 0) return SymbolRegular.ShieldLock16;
if ((attributes & MemberAttributes.Method) != 0 && (attributes & MemberAttributes.Private) != 0 && (attributes & MemberAttributes.Static) != 0) return SymbolRegular.ShieldLock16;
if ((attributes & MemberAttributes.Method) != 0 && (attributes & MemberAttributes.Private) != 0) return SymbolRegular.TableLock16;
if ((attributes & MemberAttributes.Method) != 0 && (attributes & MemberAttributes.Static) != 0) return SymbolRegular.Box16;
if ((attributes & MemberAttributes.Method) != 0) return SymbolRegular.Cube16;
Expand Down
4 changes: 2 additions & 2 deletions RevitLookup/Views/Pages/EventsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,11 @@
<GroupStyle>
<GroupStyle.Panel>
<ItemsPanelTemplate>
<DataGridRowsPresenter
<DataGridRowsPresenter
IsVirtualizing="True"
VirtualizationMode="Recycling"
IsContainerVirtualizable="True"
IsVirtualizingWhenGrouping="True"/>
IsVirtualizingWhenGrouping="True" />
</ItemsPanelTemplate>
</GroupStyle.Panel>
<GroupStyle.ContainerStyle>
Expand Down
4 changes: 2 additions & 2 deletions RevitLookup/Views/Pages/SnoopView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@
<GroupStyle>
<GroupStyle.Panel>
<ItemsPanelTemplate>
<DataGridRowsPresenter
<DataGridRowsPresenter
IsVirtualizing="True"
VirtualizationMode="Recycling"
IsContainerVirtualizable="True"
IsVirtualizingWhenGrouping="True"/>
IsVirtualizingWhenGrouping="True" />
</ItemsPanelTemplate>
</GroupStyle.Panel>
<GroupStyle.ContainerStyle>
Expand Down

0 comments on commit 5a07f46

Please sign in to comment.