Skip to content

Commit 61b9866

Browse files
jogibear9988jogibear9988
committed
2 parents 35f955b + 756a22e commit 61b9866

File tree

6 files changed

+54
-28
lines changed

6 files changed

+54
-28
lines changed

‎DotNetSiemensPLCToolBoxLibrary.TIAV19/DotNetSiemensPLCToolBoxLibrary.TIAV19.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<UseWPF>true</UseWPF>
88
</PropertyGroup>
99
<PropertyGroup>
10-
<PackageId>DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV18</PackageId>
10+
<PackageId>DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV19</PackageId>
1111
<Authors>DotNetProjects</Authors>
1212
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1313
<PackageProjectUrl>https://github.com/jogibear9988/DotNetSiemensPLCToolBoxLibrary</PackageProjectUrl>

‎DotNetSiemensPLCToolBoxLibrary.TIAV19/Step7ProjectV19Tia.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5-
using System.Security;
65
using System.Xml.Linq;
76
using DotNetSiemensPLCToolBoxLibrary.DataTypes;
87
using DotNetSiemensPLCToolBoxLibrary.DataTypes.Blocks;
@@ -459,6 +458,21 @@ public List<ITIAVarTab> TagTables
459458
return retVal;
460459
}
461460
}
461+
462+
public override ProjectFolder CreateFolder(string name)
463+
{
464+
var gp = group.Groups.Create(name);
465+
var newFld = new TIAOpennessVariablesFolder((Step7ProjectV19)Project, ControllerFolder, gp);
466+
newFld.Name = gp.Name;
467+
newFld.Parent = this;
468+
this.SubItems.Add(newFld);
469+
return newFld;
470+
}
471+
472+
public override void ImportFile(FileInfo file, bool overwrite, bool importFromSource)
473+
{
474+
this.group.TagTables.Import(file, overwrite ? ImportOptions.Override : ImportOptions.None);
475+
}
462476
}
463477

464478
public class TIAOpennessWatchTable : ITIAWatchTable

‎DotNetSiemensPLCToolBoxLibrary.TIAV20/Step7ProjectV20Tia.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,21 @@ public List<ITIAVarTab> TagTables
458458
}
459459
return retVal;
460460
}
461+
}
462+
463+
public override ProjectFolder CreateFolder(string name)
464+
{
465+
var gp = group.Groups.Create(name);
466+
var newFld = new TIAOpennessVariablesFolder((Step7ProjectV20)Project, ControllerFolder, gp);
467+
newFld.Name = gp.Name;
468+
newFld.Parent = this;
469+
this.SubItems.Add(newFld);
470+
return newFld;
471+
}
472+
473+
public override void ImportFile(FileInfo file, bool overwrite, bool importFromSource)
474+
{
475+
this.group.TagTables.Import(file, overwrite ? ImportOptions.Override : ImportOptions.None);
461476
}
462477
}
463478

‎LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V11/ITIAVarTabFolder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using DotNetSiemensPLCToolBoxLibrary.DataTypes.Projectfolders;
2+
using DotNetSiemensPLCToolBoxLibrary.Projectfiles.TIA.Openness;
23
using System.Collections.Generic;
34

45
namespace DotNetSiemensPLCToolBoxLibrary.DataTypes.Blocks.Step7V11
56
{
6-
public interface ITIAVarTabFolder: IProjectFolder
7+
public interface ITIAVarTabFolder: ITIAOpennessProjectFolder
78
{
89
List<ITIAVarTab> TagTables { get; }
910
}

‎TiaGitHandler/Program.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,12 @@ static void Main(string[] args)
242242
skippedBlocksList.ForEach(i => Console.WriteLine("{0}", i));
243243
Console.WriteLine();
244244
Console.WriteLine(skippedBlocksList.Count() + " blocks were skipped");
245+
246+
Console.WriteLine();
247+
Console.WriteLine();
248+
Console.ForegroundColor = ConsoleColor.Green;
249+
Console.WriteLine("Export finished!");
250+
245251
if (!hasArgs)
246252
Console.ReadKey();
247253
}
@@ -1234,6 +1240,7 @@ public static void DeleteDirectory(string path)
12341240
DeleteDir(path);
12351241
}
12361242

1243+
static int DeleteDirCounter = 0;
12371244
private static void DeleteDir(string dir)
12381245
{
12391246
try
@@ -1243,10 +1250,16 @@ private static void DeleteDir(string dir)
12431250
}
12441251
catch (IOException)
12451252
{
1253+
DeleteDirCounter++;
1254+
if (DeleteDirCounter > 10)
1255+
throw;
12461256
DeleteDir(dir);
12471257
}
12481258
catch (UnauthorizedAccessException)
12491259
{
1260+
DeleteDirCounter++;
1261+
if (DeleteDirCounter > 10)
1262+
throw;
12501263
DeleteDir(dir);
12511264
}
12521265
}

‎TiaImporter/Program.cs‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5-
using DotNetSiemensPLCToolBoxLibrary.DataTypes.Projectfolders;
5+
using DotNetSiemensPLCToolBoxLibrary.DataTypes.Blocks.Step7V11;
66
using DotNetSiemensPLCToolBoxLibrary.Projectfiles;
77
using DotNetSiemensPLCToolBoxLibrary.Projectfiles.TIA.Openness;
88

@@ -116,37 +116,20 @@ void ImportFiles()
116116
{
117117
var dtFolder = importFolder as ITIAOpennessPlcDatatypeFolder;
118118
var pgFolder = importFolder as ITIAOpennessProgramFolder;
119+
var tagFolder = importFolder as ITIAVarTabFolder;
119120

120121
if (dtFolder != null)
121122
{
122123
dtFolder.ImportFile(new FileInfo(importFile), true, false);
123124
}
124125
else if (pgFolder != null)
125126
{
126-
//if (importFile.ToLower().EndsWith("scl"))
127-
//{
128-
// string srcBeforeScl = null;
129-
// var blkInfo = pgFolder.BlockInfos.FirstOrDefault(x => x.Name.ToLower() == Path.GetFileNameWithoutExtension(importFile).ToLower());
130-
// if (blkInfo != null)
131-
// {
132-
// Console.WriteLine("SCL File with XML File: " + relativePath);
133-
// Console.WriteLine("Export current XML...");
134-
// srcBeforeScl = blkInfo.Export(ExportFormat.Xml);
135-
// Console.WriteLine("Import SCL...");
136-
// }
137-
// pgFolder.ImportFile(new FileInfo(importFile), true, !importFile.ToLower().EndsWith("xml"));
138-
// if (blkInfo != null)
139-
// {
140-
// Console.WriteLine("Export new XML...");
141-
// var blkAfter = pgFolder.BlockInfos.FirstOrDefault(x => x.Name.ToLower() == Path.GetFileNameWithoutExtension(importFile).ToLower());
142-
// var srcAfter = blkAfter.Export(ExportFormat.Xml);
143-
// Console.WriteLine("Import combined XML...");
144-
// }
145-
//}
146-
//else
147-
{
148-
pgFolder.ImportFile(new FileInfo(importFile), true, !importFile.ToLower().EndsWith("xml"));
149-
}
127+
128+
pgFolder.ImportFile(new FileInfo(importFile), true, !importFile.ToLower().EndsWith("xml"));
129+
}
130+
else if (tagFolder != null)
131+
{
132+
tagFolder.ImportFile(new FileInfo(importFile), true, false);
150133
}
151134

152135
Console.ForegroundColor = ConsoleColor.Green;

0 commit comments

Comments
 (0)