Skip to content

Commit

Permalink
netlistsvg attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
HendrikMennen committed Nov 16, 2023
1 parent 554eaf1 commit 5ba4142
Show file tree
Hide file tree
Showing 21 changed files with 41,398 additions and 11 deletions.
14 changes: 14 additions & 0 deletions OneWare.sln
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{BD761CED
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.OssCadSuiteIntegration", "src\OneWare.OssCadSuiteIntegration\OneWare.OssCadSuiteIntegration.csproj", "{4E2FD886-862B-4DE9-A69E-AE82E52979B5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.NetListSvgIntegration", "src\OneWare.NetListSvgIntegration\OneWare.NetListSvgIntegration.csproj", "{C3A5837C-6679-493A-A6FD-F3440AF57FDE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneWare.NetListSvgIntegration.UnitTests", "tests\OneWare.NetListSvgIntegration.UnitTests\OneWare.NetListSvgIntegration.UnitTests.csproj", "{89668C99-1F29-453B-828C-D89EBA9EA218}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -281,6 +285,14 @@ Global
{4E2FD886-862B-4DE9-A69E-AE82E52979B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E2FD886-862B-4DE9-A69E-AE82E52979B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E2FD886-862B-4DE9-A69E-AE82E52979B5}.Release|Any CPU.Build.0 = Release|Any CPU
{C3A5837C-6679-493A-A6FD-F3440AF57FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3A5837C-6679-493A-A6FD-F3440AF57FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3A5837C-6679-493A-A6FD-F3440AF57FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3A5837C-6679-493A-A6FD-F3440AF57FDE}.Release|Any CPU.Build.0 = Release|Any CPU
{89668C99-1F29-453B-828C-D89EBA9EA218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89668C99-1F29-453B-828C-D89EBA9EA218}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89668C99-1F29-453B-828C-D89EBA9EA218}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89668C99-1F29-453B-828C-D89EBA9EA218}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F08B36E8-AB80-42CD-BD47-6B05E96DA390} = {0761690C-7DA0-4554-9F6B-211088412DCD}
Expand Down Expand Up @@ -322,5 +334,7 @@ Global
{60A1DF89-0129-42B7-A509-D717A887667C} = {3782EFDF-2990-4B2C-907F-12739A839A3C}
{BD761CED-3D61-4D9E-A2A1-494584F2ED5F} = {6FF7E7F6-DA3F-477E-AAD7-47E3655FA34D}
{4E2FD886-862B-4DE9-A69E-AE82E52979B5} = {BD761CED-3D61-4D9E-A2A1-494584F2ED5F}
{C3A5837C-6679-493A-A6FD-F3440AF57FDE} = {BD761CED-3D61-4D9E-A2A1-494584F2ED5F}
{89668C99-1F29-453B-828C-D89EBA9EA218} = {EB783E04-C3C8-45F8-B810-24798DAE2450}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion build/props/JavaScriptEngineSwitcher.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.21.2" />
<PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.21.4" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions demo/OneWare.Demo.Desktop/DesktopDemoApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using OneWare.Core.Views.Windows;
using OneWare.Cpp;
using OneWare.Demo.Desktop.ViewModels;
using OneWare.NetListSvgIntegration;
using OneWare.OssCadSuiteIntegration;
using OneWare.PackageManager;
using OneWare.SerialMonitor;
Expand All @@ -39,6 +40,7 @@ protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
moduleCatalog.AddModule<SerialMonitorModule>();
moduleCatalog.AddModule<CppModule>();
moduleCatalog.AddModule<OssCadSuiteIntegrationModule>();
moduleCatalog.AddModule<NetListSvgIntegrationModule>();

try
{
Expand Down
1 change: 1 addition & 0 deletions demo/OneWare.Demo.Desktop/OneWare.Demo.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\OneWare.NetListSvgIntegration\OneWare.NetListSvgIntegration.csproj" />
<ProjectReference Include="..\..\src\OneWare.OssCadSuiteIntegration\OneWare.OssCadSuiteIntegration.csproj" />
<ProjectReference Include="..\..\src\OneWare.PackageManager\OneWare.PackageManager.csproj" />
<ProjectReference Include="..\..\src\OneWare.SerialMonitor\OneWare.SerialMonitor.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/OneWare.Core/App.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
containerRegistry.RegisterSingleton<IModuleTracker, ModuleTracker>();
containerRegistry.RegisterSingleton<IHotkeyService, HotkeyService>();
containerRegistry.RegisterSingleton<BackupService>();
containerRegistry.RegisterSingleton<IChildProcessService, ChildProcessService>();

//ViewModels - Windows
containerRegistry.RegisterSingleton<MainWindowViewModel>();
Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Services/ChildProcessService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public ChildProcessService(ILogger logger, IActive active)
_active = active;
}

private static ProcessStartInfo GetProcessStartInfo(string workingDirectory, string path, string arguments)
private static ProcessStartInfo GetProcessStartInfo(string path, string workingDirectory, string arguments)
{
return new ProcessStartInfo
{
Expand Down
2 changes: 1 addition & 1 deletion src/OneWare.Core/Styles/Icons.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</DrawingImage>

<DrawingImage x:Key="BoxIcons.RegularCheck.Green">
<GeometryDrawing Brush="LimeGreen"
<GeometryDrawing Brush="SpringGreen"
Geometry="M5.225,9.205 L1.57,5.55 L-1.747E-007,7.12 L5.225,12.34 L16,1.57 L14.43,-1.651E-007 z" />
</DrawingImage>

Expand Down
3 changes: 3 additions & 0 deletions src/OneWare.Core/ViewModels/Windows/MessageBoxViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.ObjectModel;
using Avalonia.Controls;
using OneWare.Shared;
using OneWare.Shared.Controls;
using OneWare.Shared.Enums;
Expand Down Expand Up @@ -115,6 +116,8 @@ public void Cancel(FlexibleWindow window)

public async Task SelectPathAsync(FlexibleWindow window)
{
if (window.Host == null) throw new NullReferenceException(nameof(TopLevel));

var folder = await StorageProviderHelper.SelectFolderAsync(window.Host, "Select Directory", Input);

Input = folder ?? "";
Expand Down
Loading

0 comments on commit 5ba4142

Please sign in to comment.