diff --git a/Machining/DemoMillingByCutterLocation.cs b/Machining/DemoMillingByCutterLocation.cs index 974da17..d3cf8e5 100644 --- a/Machining/DemoMillingByCutterLocation.cs +++ b/Machining/DemoMillingByCutterLocation.cs @@ -56,35 +56,35 @@ namespace Sample.Machining project.Workpiece.IdealGeom = new StlFile(stlFile_CylinderR19, projectDir); project.Workpiece.InitResolution = resolution_mm; - RuntimeApi runtimeApi = new RuntimeApi(localProjectService); + RuntimeApi runtimeApi = project.RuntimeApi; runtimeApi.SetNcResolutionFixed(9999, 15); runtimeApi.EnableCollisionDetection = false; runtimeApi.EnablePhysics = false; runtimeApi.MachiningResolution_mm = resolution_mm; //RunConsole(project, projectDisplayee, resolution_mm); - RunWindow(project, projectDisplayee, resolution_mm); + RunWindow(localProjectService, projectDisplayee, resolution_mm); } - static void RunConsole(MachiningProject project, + static void RunConsole(IProjectService projectService, MachiningProjectDisplayee projectDisplayee, double resolution_mm) { - RunSession(project, resolution_mm); + RunSession(projectService, resolution_mm); DispEngine dispEngine = new DispEngine(projectDisplayee); dispEngine.SetViewToIsometricView(); - dispEngine.SketchView = project.ClStrip.GetFittingView(dispEngine.SketchView); + dispEngine.SketchView = projectService.MachiningProject.ClStrip.GetFittingView(dispEngine.SketchView); dispEngine.SketchView = dispEngine.SketchView.Scale(0.5); dispEngine.Snapshot($"Cache/result.bmp", 1000, 1000); - project.Dispose(); + projectService.GetLocalProjectService().CloseProject(); LocalApp.AppEnd(); Console.WriteLine($"App exit."); } - static void RunWindow(MachiningProject project, + static void RunWindow(IProjectService projectService, MachiningProjectDisplayee projectDisplayee, double resolution_mm) { var task = Task.Run(() => { - RunSession(project, resolution_mm); + RunSession(projectService, resolution_mm); Console.WriteLine($"task done."); }).ShowIfCatched(null); @@ -95,7 +95,7 @@ namespace Sample.Machining }; app.Exit += (o, e) => { - project.Dispose(); + projectService.GetLocalProjectService().CloseProject(); LocalApp.AppEnd(); Console.WriteLine($"App exit."); }; @@ -106,9 +106,10 @@ namespace Sample.Machining }); #endregion } - static void RunSession(MachiningProject project, double resolution_mm) + static void RunSession(IProjectService projectService, double resolution_mm) { - RuntimeApi runtimeApi = new RuntimeApi(project); + var project=projectService.MachiningProject; + RuntimeApi runtimeApi = project.RuntimeApi; project.BeginSession(); double radius = 20;