Skip to content

Added GeometryLoaded event to DrawingControl3D (WPF) #205

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

Open
santiagoIT wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Added GeometryLoaded event to DrawingControl3D (WPF) #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085aba5
Added GeometryLoaded event to DrawingControl3D (WPF)
hsbSantiago Jun 20, 2023
df7b9a2
updated xbim packages:
Jun 3, 2024
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
10 changes: 7 additions & 3 deletions Xbim.Presentation/DrawingControl3D.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,11 +664,13 @@ private IPersistEntity GetClickedEntity(RayMeshGeometry3DHitTestResult hit)
: (modelHit.Instances[frag.EntityLabel]);
}

#endregion
public event EventHandler<EventArgs> GeometryLoaded;

#endregion

#region Dependency Properties
#region Dependency Properties

public double ModelOpacity
public double ModelOpacity
{
get { return (double)GetValue(ModelOpacityProperty); }
set { SetValue(ModelOpacityProperty, value); }
Expand Down Expand Up @@ -1518,6 +1520,8 @@ public void LoadGeometry(IfcStore model, ModelRefreshOptions options = ModelRefr
}

RecalculateView(options);

GeometryLoaded?.Invoke(this, EventArgs.Empty);
}

private void LoadReferencedModel(IReferencedModel refModel)
Expand Down
2 changes: 1 addition & 1 deletion Xbim.Presentation/Xbim.Presentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<ItemGroup>
<PackageReference Include="HelixToolkit.Wpf" Version="2.14.0" />
<PackageReference Include="PropertyTools.Wpf.DeploymentClone" Version="0.0.1" />
<PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />
<PackageReference Include="Xbim.Geometry" Version="5.1.541" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions Xbim.WinformsSample/Xbim.WinformsSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
<PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />
<PackageReference Include="Xbim.IO.Esent" Version="5.1.350" />
<PackageReference Include="Xbim.Geometry" Version="5.1.541" />
<PackageReference Include="Xbim.IO.Esent" Version="6.0.445" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xbim.Presentation\Xbim.Presentation.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions XbimXplorer/Commands/wdwCommands.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2813,9 +2813,9 @@ private static string ReportPropValue(object propVal, ref List<int> retIds, bool
? " [#" + propLabel + "]"
: ""
);
if (pe as Xbim.Ifc2x3.Interfaces.IIfcCartesianPoint != null)
if (pe as IIfcCartesianPoint != null)
{
var n = pe as Xbim.Ifc2x3.Interfaces.IIfcCartesianPoint;
var n = pe as IIfcCartesianPoint;
var vals = n.Coordinates.Select(x => x.Value);
ret += "\t" + string.Join("\t,\t", vals);
}
Expand Down
4 changes: 2 additions & 2 deletions XbimXplorer/XbimXplorer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
<PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
<PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />
<PackageReference Include="Xbim.IO.Esent" Version="5.1.350" />
<PackageReference Include="Xbim.Geometry" Version="5.1.541" />
<PackageReference Include="Xbim.IO.Esent" Version="6.0.445" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
Expand Down
7 changes: 5 additions & 2 deletions XbimXplorer/XplorerMainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
using Xbim.IO;
using Xbim.Geometry.Engine.Interop;
using System.Windows.Media;
using Xbim.Common.Configuration;
using Microsoft.Extensions.DependencyInjection;


#endregion

Expand Down Expand Up @@ -117,7 +120,7 @@ private void SetOpenedModelFileName(string ifcFilename)
public XplorerMainWindow(bool preventPluginLoad = false)
{
// So we can use *.xbim files.
IfcStore.ModelProviderFactory.UseHeuristicModelProvider();
XbimServices.Current.ConfigureServices(s => s.AddXbimToolkit(opt => opt.AddHeuristicModel()));

LogSink = new InMemoryLogSink { Tag = "MainWindow" };
LogSink.Logged += LogEvent_Added;
Expand All @@ -138,7 +141,7 @@ public XplorerMainWindow(bool preventPluginLoad = false)
.Enrich.FromLogContext()
.CreateLogger();
// Set XBIM Essentials/Geometries's LoggerFactory - so Serilog drives everything.
XbimLogging.LoggerFactory = LoggerFactory;
XbimServices.Current.ConfigureServices(s => s.AddSingleton(typeof(ILoggerFactory), LoggerFactory));

Logger = LoggerFactory.CreateLogger<XplorerMainWindow>();

Expand Down
2 changes: 1 addition & 1 deletion XplorerPlugin.Bcf/XplorerPlugin.Bcf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
<PackageReference Include="Xbim.Geometry" Version="5.1.443-develop" />
<PackageReference Include="Xbim.Geometry" Version="5.1.541" />
</ItemGroup>
</Project>