DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Code style - Use file scoped namespaces

Browse Source 
Code style - Ran code cleanup
This commit is contained in:
Robert committed 2022-08-21 11:36:15 +02:00
1 parent e68e16df4d
commit f6090dc296
691 files changed
+37301 -38119
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionView.axaml.cs
+12 -15
View File
@@ -1,20 +1,17 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.VisualScripting.Pins
{
public partial class InputPinCollectionView : ReactiveUserControl<PinCollectionViewModel>
{
public InputPinCollectionView()
{
InitializeComponent();
}
namespace Artemis.UI.Screens.VisualScripting.Pins;
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
public class InputPinCollectionView : ReactiveUserControl<PinCollectionViewModel>
{
public InputPinCollectionView()
{
InitializeComponent();
}
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
src/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionViewModel.cs
+3 -2
View File
@@ -8,7 +8,6 @@ public class InputPinCollectionViewModel : PinCollectionViewModel
{
private readonly NodeScriptViewModel _nodeScriptViewModel;
private readonly INodeVmFactory _nodeVmFactory;
public IPinCollection InputPinCollection { get; }
public InputPinCollectionViewModel(IPinCollection inputPinCollection, NodeScriptViewModel nodeScriptViewModel, INodeVmFactory nodeVmFactory, INodeEditorService nodeEditorService)
: base(inputPinCollection, nodeScriptViewModel, nodeEditorService)
@@ -17,7 +16,9 @@ public class InputPinCollectionViewModel : PinCollectionViewModel
_nodeVmFactory = nodeVmFactory;
InputPinCollection = inputPinCollection;
}
public IPinCollection InputPinCollection { get; }
protected override PinViewModel CreatePinViewModel(IPin pin)
{
PinViewModel vm = _nodeVmFactory.InputPinViewModel(pin, _nodeScriptViewModel);
src/Artemis.UI/Screens/VisualScripting/Pins/InputPinViewModel.cs
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Artemis.UI.Screens.VisualScripting.Pins;
public class InputPinViewModel : PinViewModel
{
public InputPinViewModel(IPin inputPin, NodeScriptViewModel nodeScriptViewModel, INodeService nodeService, INodeEditorService nodeEditorService)
public InputPinViewModel(IPin inputPin, NodeScriptViewModel nodeScriptViewModel, INodeService nodeService, INodeEditorService nodeEditorService)
: base(inputPin, nodeScriptViewModel, nodeService, nodeEditorService)
{
}
src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionView.axaml.cs
+12 -15
View File
@@ -1,20 +1,17 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.VisualScripting.Pins
{
public partial class OutputPinCollectionView : ReactiveUserControl<PinCollectionViewModel>
{
public OutputPinCollectionView()
{
InitializeComponent();
}
namespace Artemis.UI.Screens.VisualScripting.Pins;
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
public class OutputPinCollectionView : ReactiveUserControl<PinCollectionViewModel>
{
public OutputPinCollectionView()
{
InitializeComponent();
}
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionViewModel.cs
+2 -1
View File
@@ -8,7 +8,6 @@ public class OutputPinCollectionViewModel : PinCollectionViewModel
{
private readonly NodeScriptViewModel _nodeScriptViewModel;
private readonly INodeVmFactory _nodeVmFactory;
public IPinCollection OutputPinCollection { get; }
public OutputPinCollectionViewModel(IPinCollection outputPinCollection, NodeScriptViewModel nodeScriptViewModel, INodeVmFactory nodeVmFactory, INodeEditorService nodeEditorService)
: base(outputPinCollection, nodeScriptViewModel, nodeEditorService)
@@ -18,6 +17,8 @@ public class OutputPinCollectionViewModel : PinCollectionViewModel
OutputPinCollection = outputPinCollection;
}
public IPinCollection OutputPinCollection { get; }
protected override PinViewModel CreatePinViewModel(IPin pin)
{
PinViewModel vm = _nodeVmFactory.OutputPinViewModel(pin, _nodeScriptViewModel);
src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinViewModel.cs
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Artemis.UI.Screens.VisualScripting.Pins;
public class OutputPinViewModel : PinViewModel
{
public OutputPinViewModel(IPin outputPin, NodeScriptViewModel nodeScriptViewModel, INodeService nodeService, INodeEditorService nodeEditorService)
public OutputPinViewModel(IPin outputPin, NodeScriptViewModel nodeScriptViewModel, INodeService nodeService, INodeEditorService nodeEditorService)
: base(outputPin, nodeScriptViewModel, nodeService, nodeEditorService)
{
}
src/Artemis.UI/Screens/VisualScripting/Pins/PinCollectionViewModel.cs
-1
View File
@@ -5,7 +5,6 @@ using System.Reactive;
using System.Reactive.Linq;
using Artemis.Core;
using Artemis.Core.Events;
using Artemis.UI.Ninject.Factories;
using Artemis.UI.Shared;
using Artemis.UI.Shared.Services.NodeEditor;
using Artemis.UI.Shared.Services.NodeEditor.Commands;
src/Artemis.UI/Screens/VisualScripting/Pins/PinView.cs
+1 -1
View File
@@ -9,8 +9,8 @@ namespace Artemis.UI.Screens.VisualScripting.Pins;
public class PinView : ReactiveUserControl<PinViewModel>
{
private bool _dragging;
private Canvas? _container;
private bool _dragging;
private Border? _pinPoint;
protected void InitializePin(Border pinPoint)
src/Artemis.UI/Screens/VisualScripting/Pins/PinViewModel.cs
+11 -11
View File
@@ -19,10 +19,10 @@ namespace Artemis.UI.Screens.VisualScripting.Pins;
public abstract class PinViewModel : ActivatableViewModelBase
{
private readonly INodeService _nodeService;
private ReactiveCommand<IPin, Unit>? _removePin;
private Point _position;
private Color _pinColor;
private Color _darkenedPinColor;
private Color _pinColor;
private Point _position;
private ReactiveCommand<IPin, Unit>? _removePin;
protected PinViewModel(IPin pin, NodeScriptViewModel nodeScriptViewModel, INodeService nodeService, INodeEditorService nodeEditorService)
{
@@ -30,7 +30,7 @@ public abstract class PinViewModel : ActivatableViewModelBase
Pin = pin;
DisconnectPin = ReactiveCommand.Create(() => nodeEditorService.ExecuteCommand(nodeScriptViewModel.NodeScript, new DisconnectPins(Pin)));
SourceList<IPin> connectedPins = new();
this.WhenActivated(d =>
{
@@ -47,13 +47,6 @@ public abstract class PinViewModel : ActivatableViewModelBase
connectedPins.AddRange(Pin.ConnectedTo);
}
private void UpdatePinColor()
{
TypeColorRegistration registration = _nodeService.GetTypeColorRegistration(Pin.Type);
PinColor = registration.Color.ToColor();
DarkenedPinColor = registration.DarkenedColor.ToColor();
}
public IObservableList<IPin> Connections { get; }
public IPin Pin { get; }
@@ -91,4 +84,11 @@ public abstract class PinViewModel : ActivatableViewModelBase
return Pin.IsTypeCompatible(pinViewModel.Pin.Type);
}
private void UpdatePinColor()
{
TypeColorRegistration registration = _nodeService.GetTypeColorRegistration(Pin.Type);
PinColor = registration.Color.ToColor();
DarkenedPinColor = registration.DarkenedColor.ToColor();
}
}