개정판 acfb1ca2
APIDConverter AutoCAD 2021 support. Project Symbol Mapping.
Change-Id: I282e46dba8250bfbd777b78f4f8752da3992ccfc
DTI_PID/APIDConverter/APIDConverterExplorer.resx | ||
---|---|---|
117 | 117 |
<resheader name="writer"> |
118 | 118 |
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | 119 |
</resheader> |
120 |
<assembly alias="DevExpress.Data.v18.2" name="DevExpress.Data.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
120 |
<assembly alias="DevExpress.Data.v18.2" name="DevExpress.Data.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
121 | 121 |
<data name="btnGetAttribute.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v18.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> |
122 | 122 |
<value> |
123 | 123 |
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE4LjIsIFZlcnNpb249MTguMi43 |
DTI_PID/APIDConverter/AVEVA.PID.CustomizationUtility_ACAD2018_x64.csproj | ||
---|---|---|
111 | 111 |
<HintPath>C:\Program Files\AVEVA\P&ID 12.2.SP1\Install\Exe\AVEVA.PID.VBUtils.dll</HintPath> |
112 | 112 |
<Private>False</Private> |
113 | 113 |
</Reference> |
114 |
<Reference Include="DevExpress.Data.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
115 |
<Reference Include="DevExpress.Dialogs.v18.2.Core, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
116 |
<Reference Include="DevExpress.Printing.v18.2.Core, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
117 |
<Reference Include="DevExpress.Sparkline.v18.2.Core, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
118 |
<Reference Include="DevExpress.Utils.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
119 |
<Reference Include="DevExpress.XtraBars.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
120 |
<Reference Include="DevExpress.XtraDialogs.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
121 |
<Reference Include="DevExpress.XtraEditors.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
122 |
<Reference Include="DevExpress.XtraGrid.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
123 |
<Reference Include="DevExpress.XtraLayout.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
124 |
<Reference Include="DevExpress.XtraTreeList.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
114 |
<Reference Include="DevExpress.Data.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
115 |
<Reference Include="DevExpress.Dialogs.v18.2.Core, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
116 |
<Reference Include="DevExpress.Printing.v18.2.Core, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
117 |
<Reference Include="DevExpress.Sparkline.v18.2.Core, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
118 |
<Reference Include="DevExpress.Utils.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
119 |
<Reference Include="DevExpress.XtraBars.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
120 |
<Reference Include="DevExpress.XtraDialogs.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
121 |
<Reference Include="DevExpress.XtraEditors.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
122 |
<Reference Include="DevExpress.XtraGrid.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
123 |
<Reference Include="DevExpress.XtraLayout.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
124 |
<Reference Include="DevExpress.XtraTreeList.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
125 | 125 |
<Reference Include="Infragistics.Shared, Version=17.1.20171.2032, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL"> |
126 | 126 |
<SpecificVersion>False</SpecificVersion> |
127 | 127 |
<HintPath>C:\Program Files\AVEVA\P&ID 12.2.SP1\Install\Exe\Infragistics.Shared.dll</HintPath> |
DTI_PID/APIDConverter/ConverterRibbonUI.cs | ||
---|---|---|
17 | 17 |
using Autodesk.AutoCAD.Ribbon; |
18 | 18 |
using Autodesk.Windows; |
19 | 19 |
using Autodesk.Windows.ToolBars; |
20 |
using AcadApp = Autodesk.AutoCAD.ApplicationServices.Application; |
|
21 | 20 | |
22 | 21 |
using AVEVA.PID.CustomizationUtility.Properties; |
23 | 22 |
namespace AVEVA.PID.CustomizationUtility |
DTI_PID/APIDConverter/DB/Project_DB.cs | ||
---|---|---|
1436 | 1436 |
using (SqlCommand cmd = connection.CreateCommand()) |
1437 | 1437 |
{ |
1438 | 1438 |
cmd.CommandText = string.Format(@" |
1439 |
SELECT * FROM {0}
|
|
1439 |
SELECT ID, Relative_Path, 'STANDARD' as Type FROM {0} WHERE Relative_Path > ' '
|
|
1440 | 1440 |
;", "StdPrjFolStructure"); |
1441 | 1441 | |
1442 | 1442 |
using (SqlDataReader dr = cmd.ExecuteReader()) |
... | ... | |
1447 | 1447 | |
1448 | 1448 |
return dt; |
1449 | 1449 |
} |
1450 |
public static DataTable SelectProjectSymbolStructureTable() |
|
1451 |
{ |
|
1452 |
DataTable dt = new DataTable(); |
|
1453 | ||
1454 |
using (SqlConnection connection = new SqlConnection()) |
|
1455 |
{ |
|
1456 |
connection.ConnectionString = GetAvevaConnectionString_Admin(); |
|
1457 |
connection.Open(); |
|
1458 |
using (SqlCommand cmd = connection.CreateCommand()) |
|
1459 |
{ |
|
1460 |
cmd.CommandText = string.Format(@" |
|
1461 |
SELECT ID, Relative_Path, 'PROJECT' as Type FROM {0} WHERE Relative_Path > ' ' |
|
1462 |
;", "UsrStdFolStructure"); |
|
1463 | ||
1464 |
using (SqlDataReader dr = cmd.ExecuteReader()) |
|
1465 |
dt.Load(dr); |
|
1466 |
} |
|
1467 |
connection.Close(); |
|
1468 |
} |
|
1469 | ||
1470 |
return dt; |
|
1471 |
} |
|
1450 | 1472 |
public static DataTable SelectStandardSymbolImageTable() |
1451 | 1473 |
{ |
1452 | 1474 |
DataTable dt = new DataTable(); |
... | ... | |
1458 | 1480 |
using (SqlCommand cmd = connection.CreateCommand()) |
1459 | 1481 |
{ |
1460 | 1482 |
cmd.CommandText = string.Format(@" |
1461 |
SELECT ss.Symbol_Name, ss.Pic_Binary, sps.Relative_Path FROM {0} as ss |
|
1483 |
SELECT ss.Symbol_Name, ss.Pic_Binary, sps.Relative_Path, 'STANDARD' as Type FROM {0} as ss
|
|
1462 | 1484 |
LEFT OUTER JOIN {1} as sps |
1463 | 1485 |
ON ss.Relative_Path = sps.ID |
1464 | 1486 |
ORDER BY sps.ID ASC |
... | ... | |
1472 | 1494 | |
1473 | 1495 |
return dt; |
1474 | 1496 |
} |
1497 |
public static DataTable SelectProjectSymbolImageTable() |
|
1498 |
{ |
|
1499 |
DataTable dt = new DataTable(); |
|
1500 | ||
1501 |
using (SqlConnection connection = new SqlConnection()) |
|
1502 |
{ |
|
1503 |
connection.ConnectionString = GetAvevaConnectionString_Admin(); |
|
1504 |
connection.Open(); |
|
1505 |
using (SqlCommand cmd = connection.CreateCommand()) |
|
1506 |
{ |
|
1507 |
cmd.CommandText = string.Format(@" |
|
1508 |
SELECT ss.Symbol_Name, ss.Pic_Binary, sps.Relative_Path, 'PROJECT' as Type FROM {0} as ss |
|
1509 |
LEFT OUTER JOIN {1} as sps |
|
1510 |
ON ss.Relative_Path = sps.ID |
|
1511 |
ORDER BY sps.ID ASC |
|
1512 |
;", "prjSymbols", "UsrStdFolStructure"); |
|
1513 | ||
1514 |
using (SqlDataReader dr = cmd.ExecuteReader()) |
|
1515 |
dt.Load(dr); |
|
1516 |
} |
|
1517 |
connection.Close(); |
|
1518 |
} |
|
1519 | ||
1520 |
return dt; |
|
1521 |
} |
|
1475 | 1522 |
public static DataTable SelectDrawingTable() |
1476 | 1523 |
{ |
1477 | 1524 |
DataTable dt = new DataTable(); |
DTI_PID/APIDConverter/Form/APIDConverter.cs | ||
---|---|---|
315 | 315 | |
316 | 316 |
private void btnItemMapping_Click(object sender, EventArgs e) |
317 | 317 |
{ |
318 |
MappingForm form = new MappingForm();
|
|
319 |
if (form.ShowDialog() == DialogResult.OK)
|
|
318 |
Project_Info project = Project_Info.GetInstance();
|
|
319 |
if (!project.Enable)
|
|
320 | 320 |
{ |
321 |
MessageBox.Show("Check Project Setting!", "APID Converter", MessageBoxButtons.OK, MessageBoxIcon.Warning); |
|
322 |
} |
|
323 |
else |
|
324 |
{ |
|
325 |
MappingForm form = new MappingForm(); |
|
326 |
if (form.ShowDialog() == DialogResult.OK) |
|
327 |
{ |
|
321 | 328 | |
329 |
} |
|
322 | 330 |
} |
323 | 331 |
} |
324 | 332 |
} |
DTI_PID/APIDConverter/Form/APIDConverter.resx | ||
---|---|---|
117 | 117 |
<resheader name="writer"> |
118 | 118 |
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | 119 |
</resheader> |
120 |
<assembly alias="DevExpress.Data.v18.2" name="DevExpress.Data.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
120 |
<assembly alias="DevExpress.Data.v18.2" name="DevExpress.Data.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
121 | 121 |
<data name="btnItemMapping.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v18.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> |
122 | 122 |
<value> |
123 | 123 |
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE4LjIsIFZlcnNpb249MTguMi43 |
DTI_PID/APIDConverter/Form/MappingForm.cs | ||
---|---|---|
116 | 116 |
private void SetAvevaSymbolStructure() |
117 | 117 |
{ |
118 | 118 |
DataTable stdStructure = Project_DB.SelectStandardSymbolStructureTable(); |
119 |
DataTable prjStructure = Project_DB.SelectProjectSymbolStructureTable(); |
|
120 |
stdStructure.Merge(prjStructure, false); |
|
119 | 121 |
DataTable symbolTable = new DataTable(); |
120 | 122 |
symbolTable.Columns.Add("ID1", typeof(string)); |
121 | 123 |
symbolTable.Columns.Add("ID2", typeof(string)); |
122 | 124 |
symbolTable.Columns.Add("Name", typeof(string)); |
123 | 125 |
symbolTable.Rows.Add("STANDARD", null, "Standard"); |
126 |
symbolTable.Rows.Add("PROJECT", null, "Project"); |
|
124 | 127 | |
125 | 128 |
foreach (DataRow row in stdStructure.Rows) |
126 | 129 |
{ |
127 | 130 |
string path = row["Relative_Path"].ToString(); |
131 |
string type = row["Type"].ToString(); |
|
128 | 132 |
string[] split = path.Split(new char[] { '\\' }); |
129 | 133 |
string prevID = null; |
130 | 134 |
for (int i = 0; i < split.Length; i++) |
... | ... | |
132 | 136 |
string splitName = split[i]; |
133 | 137 |
if (i == 0) |
134 | 138 |
{ |
135 |
DataRow[] rows = symbolTable.Select(string.Format("Name = '{0}' AND ID2 = 'STANDARD'", splitName)); |
|
139 |
//DataRow[] rows = symbolTable.Select(string.Format("Name = '{0}' AND ID2 = 'STANDARD'", splitName)); |
|
140 |
DataRow[] rows = symbolTable.Select(string.Format("Name = '{0}' AND ID2 = '{1}'", splitName, type)); |
|
136 | 141 |
if (rows.Length == 0) |
137 | 142 |
{ |
138 | 143 |
string newID = Guid.NewGuid().ToString(); |
139 |
symbolTable.Rows.Add(newID, "STANDARD", splitName); |
|
144 |
//symbolTable.Rows.Add(newID, "STANDARD", splitName); |
|
145 |
symbolTable.Rows.Add(newID, type, splitName); |
|
140 | 146 |
prevID = newID; |
141 | 147 |
} |
142 | 148 |
else |
... | ... | |
485 | 491 |
Cursor = Cursors.WaitCursor; |
486 | 492 |
try |
487 | 493 |
{ |
494 |
bool isPartial = false; |
|
488 | 495 |
ClearImage(); |
489 | 496 | |
490 | 497 |
while (galleryControlAvevaSymbols.Gallery.Groups[0].Items.Count > 0) |
... | ... | |
496 | 503 |
} |
497 | 504 | |
498 | 505 |
Project_Info project_Info = Project_Info.GetInstance(); |
499 |
if (Directory.Exists(project_Info.AVEVA_ImageDirPath)) |
|
500 |
Directory.Delete(project_Info.AVEVA_ImageDirPath, true); |
|
506 |
try |
|
507 |
{ |
|
508 |
if (Directory.Exists(project_Info.AVEVA_ImageDirPath)) |
|
509 |
Directory.Delete(project_Info.AVEVA_ImageDirPath, true); |
|
510 |
} |
|
511 |
catch |
|
512 |
{ |
|
513 |
isPartial = true; |
|
514 |
} |
|
501 | 515 | |
502 | 516 |
Directory.CreateDirectory(project_Info.AVEVA_ImageDirPath); |
503 | 517 |
string stdDirPath = project_Info.AVEVA_ImageDirPath + @"\Standard"; |
504 |
Directory.CreateDirectory(stdDirPath); |
|
518 |
string prjDirPath = project_Info.AVEVA_ImageDirPath + @"\Project"; |
|
519 |
if (!Directory.Exists(stdDirPath)) |
|
520 |
{ |
|
521 |
Directory.CreateDirectory(stdDirPath); |
|
522 |
} |
|
523 |
if (!Directory.Exists(prjDirPath)) |
|
524 |
{ |
|
525 |
Directory.CreateDirectory(prjDirPath); |
|
526 |
} |
|
505 | 527 | |
506 | 528 |
#region directory |
507 | 529 |
DataTable stdStructure = Project_DB.SelectStandardSymbolStructureTable(); |
530 |
DataTable prjStructure = Project_DB.SelectProjectSymbolStructureTable(); |
|
531 |
stdStructure.Merge(prjStructure, false); |
|
508 | 532 |
foreach (DataRow row in stdStructure.Rows) |
509 | 533 |
{ |
510 | 534 |
string path = row["Relative_Path"].ToString(); |
535 |
string type = row["Type"].ToString(); |
|
511 | 536 |
if (!string.IsNullOrEmpty(path)) |
512 | 537 |
{ |
513 |
string newPath = stdDirPath + @"\" + path; |
|
538 |
//string newPath = stdDirPath + @"\" + path; |
|
539 |
string newPath = (type == "STANDARD" ? stdDirPath : prjDirPath) + @"\" + path; |
|
514 | 540 |
if (!Directory.Exists(newPath)) |
515 | 541 |
Directory.CreateDirectory(newPath); |
516 | 542 |
} |
... | ... | |
518 | 544 |
stdStructure.Dispose(); |
519 | 545 |
#endregion |
520 | 546 | |
521 |
DataTable imageTable = Project_DB.SelectStandardSymbolImageTable(); |
|
522 |
foreach (DataRow row in imageTable.Rows) |
|
547 |
DataTable stdImageTable = Project_DB.SelectStandardSymbolImageTable(); |
|
548 |
DataTable prjImageTable = Project_DB.SelectProjectSymbolImageTable(); |
|
549 |
stdImageTable.Merge(prjImageTable, false); |
|
550 |
foreach (DataRow row in stdImageTable.Rows) |
|
523 | 551 |
{ |
524 |
string path = stdDirPath + @"\" + row["Relative_Path"] + @"\" + row["Symbol_Name"] + ".png"; |
|
552 |
string type = row["Type"].ToString(); |
|
553 |
//string path = stdDirPath + @"\" + row["Relative_Path"] + @"\" + row["Symbol_Name"] + ".png"; |
|
554 |
string path = (type == "STANDARD" ? stdDirPath : prjDirPath) + @"\" + row["Relative_Path"] + @"\" + row["Symbol_Name"] + ".png"; |
|
555 |
if (row["Pic_Binary"] == DBNull.Value) continue; |
|
525 | 556 |
byte[] picBinary = (byte[])row["Pic_Binary"]; |
526 | 557 |
MemoryStream mStream = new MemoryStream(); |
527 | 558 |
mStream.Write(picBinary, 0, picBinary.Length); |
528 | 559 |
mStream.Seek(0, SeekOrigin.Begin); |
529 | 560 |
Bitmap bm = new Bitmap(mStream); |
530 |
bm.Save(path); |
|
561 |
try |
|
562 |
{ |
|
563 |
bm.Save(path); |
|
564 |
} |
|
565 |
catch |
|
566 |
{ |
|
567 |
isPartial = true; |
|
568 |
} |
|
531 | 569 |
bm.Dispose(); |
532 | 570 |
mStream.Dispose(); |
533 | 571 |
} |
534 |
imageTable.Dispose();
|
|
572 |
stdImageTable.Dispose();
|
|
535 | 573 | |
536 |
MessageBox.Show("End Aveva Symbol Refresh", "APID Converter", MessageBoxButtons.OK, MessageBoxIcon.Information); |
|
574 |
if (isPartial) |
|
575 |
{ |
|
576 |
MessageBox.Show("Aveva Symbol partially refreshed", "APID Converter", MessageBoxButtons.OK, MessageBoxIcon.Information); |
|
577 |
} |
|
578 |
else |
|
579 |
{ |
|
580 |
MessageBox.Show("End Aveva Symbol Refresh", "APID Converter", MessageBoxButtons.OK, MessageBoxIcon.Information); |
|
581 |
} |
|
537 | 582 |
} |
538 | 583 |
catch (Exception ex) |
539 | 584 |
{ |
DTI_PID/APIDConverter/Form/ProjectForm.resx | ||
---|---|---|
117 | 117 |
<resheader name="writer"> |
118 | 118 |
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | 119 |
</resheader> |
120 |
<assembly alias="DevExpress.Data.v18.2" name="DevExpress.Data.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
120 |
<assembly alias="DevExpress.Data.v18.2" name="DevExpress.Data.v18.2, Version=18.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
121 | 121 |
<data name="btnCancel.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v18.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> |
122 | 122 |
<value> |
123 | 123 |
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE4LjIsIFZlcnNpb249MTguMi43 |
DTI_PID/APIDConverter/Model/PlantItem/Document.cs | ||
---|---|---|
145 | 145 |
HASINSTRUMENTLABEL = item.Element("HASINSTRUMENTLABEL").Value, |
146 | 146 |
AREA = item.Element("AREA").Value, |
147 | 147 |
FLIP = Convert.ToInt32(item.Element("FLIP").Value), |
148 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
148 |
//CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
149 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(string.IsNullOrWhiteSpace(item.Element("CURRENTPOINTMODEINDEX").Value) ? "0" : item.Element("CURRENTPOINTMODEINDEX").Value) |
|
149 | 150 |
}; |
150 | 151 |
SetAssociations(item.Element("ASSOCIATIONS"), specBreak.ASSOCIATIONS); |
151 | 152 |
SetSymbolConnectors(item.Element("CONNECTORS"), specBreak.CONNECTORS, specBreak.CONNECTIONPOINT); |
... | ... | |
174 | 175 |
HASINSTRUMENTLABEL = item.Element("HASINSTRUMENTLABEL").Value, |
175 | 176 |
AREA = item.Element("AREA").Value, |
176 | 177 |
FLIP = Convert.ToInt32(item.Element("FLIP").Value), |
177 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
178 |
//CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
179 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(string.IsNullOrWhiteSpace(item.Element("CURRENTPOINTMODEINDEX").Value) ? "0" : item.Element("CURRENTPOINTMODEINDEX").Value) |
|
178 | 180 |
}; |
179 | 181 |
SetAssociations(item.Element("ASSOCIATIONS"), endBreak.ASSOCIATIONS); |
180 | 182 |
SetSymbolConnectors(item.Element("CONNECTORS"), endBreak.CONNECTORS, endBreak.CONNECTIONPOINT); |
... | ... | |
203 | 205 |
HASINSTRUMENTLABEL = item.Element("HASINSTRUMENTLABEL").Value, |
204 | 206 |
AREA = item.Element("AREA").Value, |
205 | 207 |
FLIP = Convert.ToInt32(item.Element("FLIP").Value), |
206 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
208 |
//CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
209 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(string.IsNullOrWhiteSpace(item.Element("CURRENTPOINTMODEINDEX").Value) ? "0" : item.Element("CURRENTPOINTMODEINDEX").Value) |
|
207 | 210 |
}; |
208 | 211 |
SetAssociations(item.Element("ASSOCIATIONS"), equipment.ASSOCIATIONS); |
209 | 212 |
SetSymbolConnectors(item.Element("CONNECTORS"), equipment.CONNECTORS, equipment.CONNECTIONPOINT); |
... | ... | |
231 | 234 |
HASINSTRUMENTLABEL = item.Element("HASINSTRUMENTLABEL").Value, |
232 | 235 |
AREA = item.Element("AREA").Value, |
233 | 236 |
FLIP = Convert.ToInt32(item.Element("FLIP").Value), |
234 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
237 |
//CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
238 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(string.IsNullOrWhiteSpace(item.Element("CURRENTPOINTMODEINDEX").Value) ? "0" : item.Element("CURRENTPOINTMODEINDEX").Value) |
|
235 | 239 |
}; |
236 | 240 | |
237 | 241 |
SetAssociations(item.Element("ASSOCIATIONS"), opc.ASSOCIATIONS); |
... | ... | |
266 | 270 |
HASINSTRUMENTLABEL = item.Element("HASINSTRUMENTLABEL").Value, |
267 | 271 |
AREA = item.Element("AREA").Value, |
268 | 272 |
FLIP = Convert.ToInt32(item.Element("FLIP").Value), |
269 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
273 |
//CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
|
274 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(string.IsNullOrWhiteSpace(item.Element("CURRENTPOINTMODEINDEX").Value) ? "0" : item.Element("CURRENTPOINTMODEINDEX").Value) |
|
270 | 275 |
}; |
271 | 276 | |
272 | 277 |
SetAssociations(item.Element("ASSOCIATIONS"), symbol.ASSOCIATIONS); |
DTI_PID/APIDConverter/Properties/Resource.Designer.cs | ||
---|---|---|
19 | 19 |
// 클래스에서 자동으로 생성되었습니다. |
20 | 20 |
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 |
21 | 21 |
// 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. |
22 |
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
|
|
22 |
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
|
23 | 23 |
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
24 | 24 |
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
25 | 25 |
internal class Resource { |
DTI_PID/APIDConverter/Properties/Settings.Designer.cs | ||
---|---|---|
12 | 12 |
|
13 | 13 |
|
14 | 14 |
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
15 |
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
|
|
15 |
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
|
|
16 | 16 |
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { |
17 | 17 |
|
18 | 18 |
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); |
내보내기 Unified diff