zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-04-28 04:03:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.01

Browse Source
This commit is contained in:
艾竹
2022-12-12 22:33:17 +08:00
parent 02f428d61a
commit 4b798f75a0
60 changed files with 330 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj
View File

@@ -9,7 +9,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
<ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
</ItemGroup>
</Project>

11
AIStudio.Wpf.SFC/Themes/SFCNode.xaml
View File

@@ -1,13 +1,12 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram"
xmlns:viewmodel="clr-namespace:AIStudio.Wpf.SFC.ViewModels"
xmlns:local="clr-namespace:AIStudio.Wpf.SFC"
xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper">
xmlns:local="clr-namespace:AIStudio.Wpf.SFC">
<s:ColorBrushConverter x:Key="ColorBrushConverter"/>
<converter:HalfConverter x:Key="HalfConverter"/>
<converter:IntToBoolConverter x:Key="IntToBoolConverter"/>
<dd:ColorBrushConverter x:Key="ColorBrushConverter"/>
<dd:HalfConverter x:Key="HalfConverter"/>
<dd:IntToBoolConverter x:Key="IntToBoolConverter"/>
<ControlTemplate x:Key="StartStyle" TargetType="{x:Type ContentControl}">
<Grid IsHitTestVisible="False">

23
AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs
View File

@@ -1,10 +1,4 @@
using AIStudio.Wpf.DiagramHelper.Commands;
using AIStudio.Wpf.DiagramHelper.Models;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Windows.Input;
using AIStudio.Wpf.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner;
namespace AIStudio.Wpf.SFC.ViewModels
{
@@ -14,8 +8,21 @@ namespace AIStudio.Wpf.SFC.ViewModels
/// the popup to be cancelled without applying any changes to the calling ViewModel
/// whos data will be updated if the PopupWindow.xaml window is closed successfully
/// </summary>
public class SFCActionNodeData : TitleBindableBase
public class SFCActionNodeData : BindableBase
{
private string _title;
public string Title
{
get
{
return _title;
}
set
{
SetProperty(ref _title, value);
}
}
public SFCActionNodeData(LinkPoint linkPoint, string expression)
{
Title = "输出动作";

23
AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs
View File

@@ -1,7 +1,4 @@
using AIStudio.Wpf.DiagramHelper.Commands;
using AIStudio.Wpf.DiagramHelper.Models;
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Windows.Input;
using AIStudio.Wpf.DiagramDesigner;
@@ -14,8 +11,20 @@ namespace AIStudio.Wpf.SFC.ViewModels
/// the popup to be cancelled without applying any changes to the calling ViewModel
/// whos data will be updated if the PopupWindow.xaml window is closed successfully
/// </summary>
public class SFCConditionNodeData : TitleBindableBase
public class SFCConditionNodeData : BindableBase
{
private string _title;
public string Title
{
get
{
return _title;
}
set
{
SetProperty(ref _title, value);
}
}
public SFCConditionNodeData(IEnumerable<LinkPoint> linkPoint, string expression)
{
Title = "转移条件";
@@ -54,7 +63,7 @@ namespace AIStudio.Wpf.SFC.ViewModels
{
get
{
return this._addCommand ?? (this._addCommand = new DelegateCommand<object>(para => this.AddExecuted(para)));
return this._addCommand ?? (this._addCommand = new SimpleCommand(para => { return true; }, para => this.AddExecuted(para)));
}
}
@@ -63,7 +72,7 @@ namespace AIStudio.Wpf.SFC.ViewModels
{
get
{
return this._deleteCommand ?? (this._deleteCommand = new DelegateCommand<object>(para => this.DeleteExecuted(para)));
return this._deleteCommand ?? (this._deleteCommand = new SimpleCommand(para => { return true; }, para => this.DeleteExecuted(para)));
}
}

3
AIStudio.Wpf.SFC/ViewModels/SFCNode.cs
View File

@@ -4,8 +4,7 @@ using System.ComponentModel;
using System.Linq;
using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner;
using AIStudio.Wpf.DiagramHelper;
using AIStudio.Wpf.DiagramHelper.Services;
using AIStudio.Wpf.DiagramDesigner.Services;
using AIStudio.Wpf.SFC.Models;
namespace AIStudio.Wpf.SFC.ViewModels

21
AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs
View File

@@ -1,13 +1,22 @@
using AIStudio.Wpf.DiagramHelper.Models;
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner;
namespace AIStudio.Wpf.SFC.ViewModels
{
public class Simulate_SolenoidViewModelData : TitleBindableBase
public class Simulate_SolenoidViewModelData : BindableBase
{
private string _title;
public string Title
{
get
{
return _title;
}
set
{
SetProperty(ref _title, value);
}
}
public Simulate_SolenoidViewModelData(LinkPoint dILinkPoint, LinkPoint dOLinkPoint)
{
Title = "阀门";

21
AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs
View File

@@ -1,13 +1,22 @@
using AIStudio.Wpf.DiagramHelper.Models;
using System;
using System.Collections.Generic;
using System.Text;
using AIStudio.Wpf.DiagramDesigner;
using AIStudio.Wpf.DiagramDesigner;
namespace AIStudio.Wpf.SFC.ViewModels
{
public class Simulate_TankViewModelData : TitleBindableBase
public class Simulate_TankViewModelData : BindableBase
{
private string _title;
public string Title
{
get
{
return _title;
}
set
{
SetProperty(ref _title, value);
}
}
public Simulate_TankViewModelData(LinkPoint linkPoint)
{
Title = "容器";