105040 Update
1. 修复部分情况下导致动力刹车线没有显示长度的问题; 2. 修复布线助手无法回到上一个电机的问题; 3. 修复直通线类型识别问题。 4. 提升版本号到1.0.0.22
This commit is contained in:
parent
d302676e5e
commit
6465a465ac
|
|
@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
|
||||||
// 生成号
|
// 生成号
|
||||||
// 修订号
|
// 修订号
|
||||||
//
|
//
|
||||||
[assembly: AssemblyVersion("1.0.0.020")]
|
[assembly: AssemblyVersion("1.0.0.22")]
|
||||||
[assembly: AssemblyFileVersion("1.0.0.20")]
|
[assembly: AssemblyFileVersion("1.0.0.22")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.0.20-rls")]
|
[assembly: AssemblyInformationalVersion("1.0.0.22")]
|
||||||
|
|
@ -16,5 +16,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: Guid("aec39474-528b-4da8-b650-99189acb7a2c")]
|
[assembly: Guid("aec39474-528b-4da8-b650-99189acb7a2c")]
|
||||||
|
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.0.0.19")]
|
[assembly: AssemblyVersion("1.0.0.22")]
|
||||||
[assembly: AssemblyFileVersion("1.0.0.19")]
|
[assembly: AssemblyFileVersion("1.0.0.22")]
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Datas;
|
using EPLAN.Harness.AppCore.AttributeEvents;
|
||||||
|
using Sinvo.EplanHpD.Plugin.WPFUI.Datas;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
|
using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
@ -149,13 +150,13 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Models
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (IsPowerLine)
|
if (IsEncoderLine)
|
||||||
{
|
{
|
||||||
return PowerLineLength;
|
return EncoderLineLength;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return EncoderLineLength;
|
return PowerLineLength;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
|
|
@ -458,6 +459,8 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Models
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public string LibraryName { get; set; }
|
||||||
private List<LectotypeLineModel> GetSubLines(string drawingNo)
|
private List<LectotypeLineModel> GetSubLines(string drawingNo)
|
||||||
{
|
{
|
||||||
return MotorExcelHelper.Instance.GetBomList(drawingNo).Where(it =>
|
return MotorExcelHelper.Instance.GetBomList(drawingNo).Where(it =>
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,6 @@ using System.Windows;
|
||||||
// 生成号
|
// 生成号
|
||||||
// 修订号
|
// 修订号
|
||||||
//
|
//
|
||||||
[assembly: AssemblyVersion("1.0.0.20")]
|
[assembly: AssemblyVersion("1.0.0.22")]
|
||||||
[assembly: AssemblyFileVersion("1.0.0.20")]
|
[assembly: AssemblyFileVersion("1.0.0.22")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.0.20-rls")]
|
[assembly: AssemblyInformationalVersion("1.0.0.22")]
|
||||||
|
|
@ -38,6 +38,8 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Selector
|
||||||
switch (cableType)
|
switch (cableType)
|
||||||
{
|
{
|
||||||
case "动力线":
|
case "动力线":
|
||||||
|
case "动力刹车线":
|
||||||
|
case "刹车线":
|
||||||
return PowerLineTemplate;
|
return PowerLineTemplate;
|
||||||
case "编码器线":
|
case "编码器线":
|
||||||
return EncoderLineTemplate;
|
return EncoderLineTemplate;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
using Sinvo.EplanHpD.Plugin.Service.Model;
|
using Sinvo.EplanHpD.Plugin.Service.Model;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Enum;
|
using Sinvo.EplanHpD.Plugin.WPFUI.Enum;
|
||||||
|
using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Models;
|
using Sinvo.EplanHpD.Plugin.WPFUI.Models;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
|
using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.ViewModel;
|
using Sinvo.EplanHpD.Plugin.WPFUI.ViewModel;
|
||||||
|
|
@ -25,6 +26,24 @@ namespace Sinvo.EplanHpD.Plugin.Service
|
||||||
.First();
|
.First();
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 判断电机列表中哪些是存在数据的(保存过)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="motors"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public List<MotorModel> GetSavedMotorList(List<MotorModel> motors)
|
||||||
|
{
|
||||||
|
var flags = motors.Select(it => it.GetUniqueFlag()).ToList();
|
||||||
|
if (flags == null || !flags.Any())
|
||||||
|
{
|
||||||
|
return new List<MotorModel>();
|
||||||
|
}
|
||||||
|
var savedMotors = DBHelper.DB.Queryable<Motor>("mt")
|
||||||
|
.Where(mt => flags.Contains(mt.MotorUniqueFlag))
|
||||||
|
.Select(mt => mt.MotorUniqueFlag)
|
||||||
|
.ToList();
|
||||||
|
return motors.Where(it => savedMotors.Contains(it.GetUniqueFlag())).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
//public string GetMotorLectotypeData(string motorOccId)
|
//public string GetMotorLectotypeData(string motorOccId)
|
||||||
//{
|
//{
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<Border Background="{DynamicResource MainContentForegroundDrawingBrush}">
|
<Border Background="{DynamicResource MainContentForegroundDrawingBrush}">
|
||||||
<Grid Margin="2">
|
<Grid x:Name="MainGrid" Margin="2">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="15" />
|
<RowDefinition Height="15" />
|
||||||
<RowDefinition Height="30" />
|
<RowDefinition Height="30" />
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="80" />
|
<ColumnDefinition Width="60" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<hc:SimpleStackPanel Grid.Row="0" Orientation="Horizontal">
|
<hc:SimpleStackPanel Grid.Row="0" Orientation="Horizontal">
|
||||||
<!--<TextBlock FontSize="14" TextWrapping="Wrap">
|
<!--<TextBlock FontSize="14" TextWrapping="Wrap">
|
||||||
|
|
@ -86,8 +86,11 @@
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.RowSpan="2"
|
Grid.RowSpan="2"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
|
Margin="0"
|
||||||
|
Padding="5"
|
||||||
Click="ToMotorBtn_Click"
|
Click="ToMotorBtn_Click"
|
||||||
Content="转到电机"
|
Content="转到电机"
|
||||||
|
FontSize="12"
|
||||||
Style="{StaticResource ButtonPrimary}" />
|
Style="{StaticResource ButtonPrimary}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<ListView
|
<ListView
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,10 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
|
||||||
viewModel = new LayoutHelperViewModel(_currentFlexDesigner, motors);
|
viewModel = new LayoutHelperViewModel(_currentFlexDesigner, motors);
|
||||||
|
|
||||||
this.DataContext = viewModel;
|
this.DataContext = viewModel;
|
||||||
|
if(motors == null || motors.Count == 0)
|
||||||
|
{
|
||||||
|
MainGrid.IsEnabled = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
private void OnInit()
|
private void OnInit()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -424,8 +424,8 @@
|
||||||
<Expander.Header>
|
<Expander.Header>
|
||||||
<DockPanel Height="30">
|
<DockPanel Height="30">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Width="100"
|
MinWidth="100"
|
||||||
Margin="5,0,0,0"
|
Margin="5,0,5,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
Text="{Binding Path=Name, StringFormat=轴号:{0}}" />
|
Text="{Binding Path=Name, StringFormat=轴号:{0}}" />
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ using HandyControl.Controls;
|
||||||
using HandyControl.Tools.Extension;
|
using HandyControl.Tools.Extension;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
using Microsoft.WindowsAPICodePack.Dialogs;
|
using Microsoft.WindowsAPICodePack.Dialogs;
|
||||||
|
using Sinvo.EplanHpD.Plugin.Service;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Common;
|
using Sinvo.EplanHpD.Plugin.WPFUI.Common;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
|
using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
|
||||||
using Sinvo.EplanHpD.Plugin.WPFUI.Models;
|
using Sinvo.EplanHpD.Plugin.WPFUI.Models;
|
||||||
|
|
@ -37,6 +38,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
|
||||||
public partial class LectotypeWindow : System.Windows.Window
|
public partial class LectotypeWindow : System.Windows.Window
|
||||||
{
|
{
|
||||||
private LectotypeViewModel ViewModel;
|
private LectotypeViewModel ViewModel;
|
||||||
|
private MotorLectotypeService service = new MotorLectotypeService();
|
||||||
public LectotypeWindow(string docId)
|
public LectotypeWindow(string docId)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
@ -415,7 +417,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
|
||||||
private void ToLayout()
|
private void ToLayout()
|
||||||
{
|
{
|
||||||
ViewModel.ClearNotSavedLectotypeList();
|
ViewModel.ClearNotSavedLectotypeList();
|
||||||
var window = new LayoutHelperWindow(ViewModel.Motors);
|
var window = new LayoutHelperWindow(service.GetSavedMotorList(ViewModel.Motors));
|
||||||
//window.MotorIds = motorIds;
|
//window.MotorIds = motorIds;
|
||||||
ElementHost.EnableModelessKeyboardInterop(window);
|
ElementHost.EnableModelessKeyboardInterop(window);
|
||||||
var mainApp = BaseApp.ActiveApplication;
|
var mainApp = BaseApp.ActiveApplication;
|
||||||
|
|
|
||||||
|
|
@ -223,13 +223,6 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CurrentMotorIndex++;
|
|
||||||
if (CurrentMotorIndex < _motors.Count)
|
|
||||||
{
|
|
||||||
CurrentMotorSelectLineIndex = 0;
|
|
||||||
GetMotorCables();
|
|
||||||
}
|
|
||||||
}).Wait();
|
}).Wait();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -219,6 +219,7 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
|
||||||
return new LectotypeLineModel
|
return new LectotypeLineModel
|
||||||
{
|
{
|
||||||
Name= GetLectotypeName(occCable.LibraryName),
|
Name= GetLectotypeName(occCable.LibraryName),
|
||||||
|
LibraryName = occCable.LibraryName,
|
||||||
CableName = occCable.Name,
|
CableName = occCable.Name,
|
||||||
AxisNo = GetAxisNo(insulatorGraph.Imprint),
|
AxisNo = GetAxisNo(insulatorGraph.Imprint),
|
||||||
CurrentLine = GetCableLine(insulatorGraph.Imprint),
|
CurrentLine = GetCableLine(insulatorGraph.Imprint),
|
||||||
|
|
@ -285,7 +286,18 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
|
||||||
lineCount = cables.Count(cable => cable.AxisNo == axisNo && cable.CableType == cabType);
|
lineCount = cables.Count(cable => cable.AxisNo == axisNo && cable.CableType == cabType);
|
||||||
}
|
}
|
||||||
it.LineCount = lineCount;
|
it.LineCount = lineCount;
|
||||||
if (it.CurrentLine == 1)
|
it.CableConnectionClass = "";
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(it.LibraryName))
|
||||||
|
{
|
||||||
|
if (it.LibraryName.Contains("直通线"))
|
||||||
|
{
|
||||||
|
it.CableConnectionClass = "直通";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (string.IsNullOrEmpty(it.CableConnectionClass))
|
||||||
|
{
|
||||||
|
if (it.CurrentLine == 1 && it.CurrentLine != lineCount)
|
||||||
{
|
{
|
||||||
it.CableConnectionClass = "前段";
|
it.CableConnectionClass = "前段";
|
||||||
}
|
}
|
||||||
|
|
@ -294,15 +306,17 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
|
||||||
it.CableConnectionClass = "中段";
|
it.CableConnectionClass = "中段";
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (it.CurrentLine == lineCount)
|
else if (it.CurrentLine == lineCount && lineCount > 1)
|
||||||
{
|
{
|
||||||
|
|
||||||
it.CableConnectionClass = "尾段";
|
it.CableConnectionClass = "尾段";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
it.CableConnectionClass = "未知类型";
|
it.CableConnectionClass = "直通";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(axisNo))
|
if (string.IsNullOrEmpty(axisNo))
|
||||||
{
|
{
|
||||||
it.IsError = true;
|
it.IsError = true;
|
||||||
|
|
|
||||||
|
|
@ -18,15 +18,12 @@ Global
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
Debug|x86 = Debug|x86
|
Debug|x86 = Debug|x86
|
||||||
Release_CableLayout|Any CPU = Release_CableLayout|Any CPU
|
|
||||||
Release_CableLayout|x64 = Release_CableLayout|x64
|
|
||||||
Release_CableLayout|x86 = Release_CableLayout|x86
|
|
||||||
Release_Scanner|Any CPU = Release_Scanner|Any CPU
|
Release_Scanner|Any CPU = Release_Scanner|Any CPU
|
||||||
Release_Scanner|x64 = Release_Scanner|x64
|
Release_Scanner|x64 = Release_Scanner|x64
|
||||||
Release_Scanner|x86 = Release_Scanner|x86
|
Release_Scanner|x86 = Release_Scanner|x86
|
||||||
Release_WireCheck|Any CPU = Release_WireCheck|Any CPU
|
Release_WireAndCable|Any CPU = Release_WireAndCable|Any CPU
|
||||||
Release_WireCheck|x64 = Release_WireCheck|x64
|
Release_WireAndCable|x64 = Release_WireAndCable|x64
|
||||||
Release_WireCheck|x86 = Release_WireCheck|x86
|
Release_WireAndCable|x86 = Release_WireAndCable|x86
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
Release|x86 = Release|x86
|
Release|x86 = Release|x86
|
||||||
|
|
@ -38,24 +35,18 @@ Global
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x64.Build.0 = Debug|x64
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x64.Build.0 = Debug|x64
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.ActiveCfg = Debug|x86
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.Build.0 = Debug|x86
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Debug|x86.Build.0 = Debug|x86
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_CableLayout|Any CPU.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_CableLayout|Any CPU.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_CableLayout|x64.ActiveCfg = Release_CableLayout|x64
|
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_CableLayout|x64.Build.0 = Release_CableLayout|x64
|
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_CableLayout|x86.ActiveCfg = Release_CableLayout|x86
|
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_CableLayout|x86.Build.0 = Release_CableLayout|x86
|
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.Build.0 = Release_Scanner|x64
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.Build.0 = Release_Scanner|x64
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireCheck|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireCheck|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireCheck|x64.ActiveCfg = Release_WireCheck|x64
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|x64
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireCheck|x64.Build.0 = Release_WireCheck|x64
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireCheck|x86.ActiveCfg = Release_WireCheck|x86
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireCheck|x86.Build.0 = Release_WireCheck|x86
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.Build.0 = Release|Any CPU
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|x64.ActiveCfg = Release|x64
|
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
|
@ -68,24 +59,18 @@ Global
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x64.Build.0 = Debug|x64
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x64.Build.0 = Debug|x64
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.ActiveCfg = Debug|x86
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.Build.0 = Debug|x86
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Debug|x86.Build.0 = Debug|x86
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_CableLayout|Any CPU.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_CableLayout|Any CPU.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_CableLayout|x64.ActiveCfg = Release_CableLayout|x64
|
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_CableLayout|x64.Build.0 = Release_CableLayout|x64
|
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_CableLayout|x86.ActiveCfg = Release_CableLayout|x86
|
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_CableLayout|x86.Build.0 = Release_CableLayout|x86
|
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.ActiveCfg = Release_Scanner|x64
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.Build.0 = Release_Scanner|x64
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.Build.0 = Release_Scanner|x64
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireCheck|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireCheck|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireCheck|x64.ActiveCfg = Release_WireCheck|x64
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|x64
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireCheck|x64.Build.0 = Release_WireCheck|x64
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireCheck|x86.ActiveCfg = Release_WireCheck|x86
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireCheck|x86.Build.0 = Release_WireCheck|x86
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.Build.0 = Release|Any CPU
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|x64.ActiveCfg = Release|x64
|
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
|
@ -98,24 +83,18 @@ Global
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x64.Build.0 = Debug|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.ActiveCfg = Debug|x86
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.Build.0 = Debug|x86
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Debug|x86.Build.0 = Debug|x86
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_CableLayout|Any CPU.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_CableLayout|Any CPU.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_CableLayout|x64.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_CableLayout|x64.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_CableLayout|x86.ActiveCfg = Release_CableLayout|x86
|
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_CableLayout|x86.Build.0 = Release_CableLayout|x86
|
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireCheck|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireCheck|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireCheck|x64.ActiveCfg = Release_WireCheck|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireCheck|x64.Build.0 = Release_WireCheck|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireCheck|x86.ActiveCfg = Release_WireCheck|x86
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireCheck|x86.Build.0 = Release_WireCheck|x86
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.Build.0 = Release|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|x64.ActiveCfg = Release|Any CPU
|
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
|
@ -128,24 +107,18 @@ Global
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x64.Build.0 = Debug|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.ActiveCfg = Debug|x86
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.Build.0 = Debug|x86
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Debug|x86.Build.0 = Debug|x86
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_CableLayout|Any CPU.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_CableLayout|Any CPU.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_CableLayout|x64.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_CableLayout|x64.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_CableLayout|x86.ActiveCfg = Release_CableLayout|x86
|
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_CableLayout|x86.Build.0 = Release_CableLayout|x86
|
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireCheck|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireCheck|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireCheck|x64.ActiveCfg = Release_WireCheck|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireCheck|x64.Build.0 = Release_WireCheck|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireCheck|x86.ActiveCfg = Release_WireCheck|x86
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireCheck|x86.Build.0 = Release_WireCheck|x86
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.Build.0 = Release|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|x64.ActiveCfg = Release|Any CPU
|
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
|
@ -158,24 +131,18 @@ Global
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x64.Build.0 = Debug|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.Build.0 = Debug|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_CableLayout|Any CPU.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_CableLayout|Any CPU.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_CableLayout|x64.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_CableLayout|x64.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_CableLayout|x86.ActiveCfg = Release_CableLayout|Any CPU
|
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_CableLayout|x86.Build.0 = Release_CableLayout|Any CPU
|
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|Any CPU.Build.0 = Release_Scanner|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.ActiveCfg = Release_Scanner|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.ActiveCfg = Release_Scanner|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.Build.0 = Release_Scanner|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.Build.0 = Release_Scanner|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireCheck|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireCheck|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireCheck|x64.ActiveCfg = Release_WireCheck|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireCheck|x64.Build.0 = Release_WireCheck|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireCheck|x86.ActiveCfg = Release_WireCheck|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireCheck|x86.Build.0 = Release_WireCheck|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.Build.0 = Release|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|x64.ActiveCfg = Release|Any CPU
|
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ using System.Windows.Forms.Integration;
|
||||||
|
|
||||||
namespace Sinvo.EplanHpD.Plugin
|
namespace Sinvo.EplanHpD.Plugin
|
||||||
{
|
{
|
||||||
#if Release_CableLayout
|
#if Release_WireAndCable || DEBUG
|
||||||
public class DesignPluginEntry : EPLAN.Harness.API.Plugins.IHpDPlugin
|
public class DesignPluginEntry : EPLAN.Harness.API.Plugins.IHpDPlugin
|
||||||
#else
|
#else
|
||||||
public class DesignPluginEntry
|
public class DesignPluginEntry
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ using System.Windows.Forms.Integration;
|
||||||
|
|
||||||
namespace Sinvo.EplanHpD.Plugin
|
namespace Sinvo.EplanHpD.Plugin
|
||||||
{
|
{
|
||||||
#if Release_WireCheck
|
#if Release_WireAndCable || DEBUG
|
||||||
public class PluginEntry : IHpDPlugin
|
public class PluginEntry : IHpDPlugin
|
||||||
#else
|
#else
|
||||||
public class PluginEntry
|
public class PluginEntry
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,6 @@ using System.Runtime.InteropServices;
|
||||||
// 生成号
|
// 生成号
|
||||||
// 修订号
|
// 修订号
|
||||||
//
|
//
|
||||||
[assembly: AssemblyVersion("1.0.0.21")]
|
[assembly: AssemblyVersion("1.0.0.22")]
|
||||||
[assembly: AssemblyFileVersion("1.0.0.21")]
|
[assembly: AssemblyFileVersion("1.0.0.22")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.0.21-rls")]
|
[assembly: AssemblyInformationalVersion("1.0.0.22-rls")]
|
||||||
|
|
@ -16,7 +16,7 @@ using System.Windows.Forms.Integration;
|
||||||
|
|
||||||
namespace Sinvo.EplanHpD.Plugin
|
namespace Sinvo.EplanHpD.Plugin
|
||||||
{
|
{
|
||||||
#if Release_Scanner
|
#if Release_Scanner || DEBUG
|
||||||
public class ScanPluginEntry : EPLAN.Harness.API.Plugins.IHpDPlugin
|
public class ScanPluginEntry : EPLAN.Harness.API.Plugins.IHpDPlugin
|
||||||
#else
|
#else
|
||||||
public class ScanPluginEntry
|
public class ScanPluginEntry
|
||||||
|
|
|
||||||
|
|
@ -104,8 +104,8 @@
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x64'">
|
||||||
<OutputPath>bin\x64\Release_WireCheck\</OutputPath>
|
<OutputPath>bin\x64\Release_WireAndCable\</OutputPath>
|
||||||
<DefineConstants>TRACE;Release_WireCheck</DefineConstants>
|
<DefineConstants>TRACE;Release_WireAndCable</DefineConstants>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue