39 Commits
v0.2 ... v0.4

Author SHA1 Message Date
Florian Kaiser
74481f7394 Merge pull request #24 from H4CK3R-01/app-source-code
Small bug fix
2022-05-06 08:35:51 +02:00
e59b4113dc Small bug fix 2022-05-06 08:34:22 +02:00
Florian Kaiser
3e9ece4a4a Update README.md 2022-05-06 08:03:30 +02:00
Florian Kaiser
c63b7192b2 Update README.md 2022-05-06 08:03:24 +02:00
Linus E
59a902d162 Add files via upload 2022-05-06 07:24:14 +02:00
Linus E
a4038c55ad Delete TINF20C_CRS_Projektname_Team_1_0v1-1.docx 2022-05-06 07:23:49 +02:00
Linus E
6b8074bcbe Add files via upload 2022-05-06 07:23:27 +02:00
Linus E
3631829500 Add files via upload 2022-05-06 07:20:56 +02:00
mhorst00
03264a5828 Create README.md 2022-05-06 07:04:00 +02:00
Cyber-Luke
f3ff6e14bb Add files via upload 2022-05-05 19:10:46 +02:00
Cyber-Luke
6c6f21f648 Add files via upload 2022-05-05 19:10:29 +02:00
Cyber-Luke
d4d93da82c Delete TINF20C_SAS_Team1_v1.4.docx 2022-05-05 19:10:12 +02:00
malte.horst
83ae05a8b1 updated STR 2022-05-05 19:00:45 +02:00
Florian Kaiser
09c9eccaa7 Create README.md 2022-05-05 19:00:10 +02:00
Florian Kaiser
15472d43ee Merge pull request #23 from H4CK3R-01/app-source-code
App source code
2022-05-05 18:32:37 +02:00
f6f7fd7d05 Check length of IEnumerable 2022-05-05 18:19:42 +02:00
Cyber-Luke
efb98dc541 Create readme.md 2022-04-29 16:46:25 +02:00
Cyber-Luke
3fc4b4a09e Delete MOD.003 Runtime 2022-04-29 16:45:57 +02:00
Cyber-Luke
13f83cb4bc Create MOD.003 Runtime 2022-04-29 16:45:44 +02:00
Cyber-Luke
cdbc2684d7 Add files via upload 2022-04-29 16:43:59 +02:00
Cyber-Luke
09c8c7ce78 Create readme.md 2022-04-29 16:43:27 +02:00
Cyber-Luke
13024c77e1 Add files via upload 2022-04-29 15:59:47 +02:00
Cyber-Luke
a75070edc3 Create readme.md 2022-04-29 15:57:49 +02:00
Cyber-Luke
def947cef3 Delete PROJECT/MODS directory 2022-04-29 15:56:08 +02:00
Cyber-Luke
a0256bc505 Create readme.md 2022-04-29 15:54:48 +02:00
Cyber-Luke
b85a540ec2 Add files via upload 2022-04-29 13:19:06 +02:00
Rripped
17af206a67 Small PM Corrections 2022-04-28 09:59:01 +02:00
c4183f1b95 Improve GUI 2022-04-26 11:45:03 +02:00
be82e509a0 Some improvements
Use specific CAEX file version
Update assembly information
Code cleanup
2022-04-25 23:58:30 +02:00
malte.horst
47d2ba67fc added STR 2022-04-24 11:46:10 +02:00
malte.horst
3a06c1e90a added STP and STR 2022-04-24 11:45:23 +02:00
mhorst00
f3f5dbae3a Add files via upload 2022-04-24 11:39:10 +02:00
mhorst00
5b5f9acbef Delete TINF20C_STP_Team_1.pdf 2022-04-24 11:37:58 +02:00
mhorst00
9873362105 Add files via upload 2022-04-24 11:37:21 +02:00
Rripped
cfc90dd9ea added STP 0.1 2022-03-11 11:27:04 +01:00
Rripped
b36a8fc4ca Delete STP directory 2022-03-11 11:26:32 +01:00
Rripped
fdcd7a0d6a Create README.md 2022-03-11 11:26:07 +01:00
Rripped
76a6455c0e Added STP 0.1 2022-03-11 11:25:13 +01:00
Rripped
7b308b9283 Create README.md 2022-03-11 11:24:31 +01:00
26 changed files with 84 additions and 86 deletions

4
EXECUTABLE/README.md Normal file
View File

@@ -0,0 +1,4 @@
Link to Releases: [Releases](https://github.com/H4CK3R-01/TINF20C_ModellingWizard_Devices/tags)
Latest stable version: [v0.2](https://github.com/H4CK3R-01/TINF20C_ModellingWizard_Devices/releases/tag/v0.2)

Binary file not shown.

View File

@@ -0,0 +1 @@
MOD.001 Graphical User Interface (GUI)

View File

@@ -0,0 +1 @@
MOD.002 Controller

View File

@@ -0,0 +1 @@
MOD.003 Runtime

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

1
PROJECT/STP/README.md Normal file
View File

@@ -0,0 +1 @@
Link to Wiki: [Systemtestplan]()

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1 @@
Link to WorkingMinutes: [Here](https://github.com/H4CK3R-01/TINF20C_ModellingWizard_Devices/issues/4)

View File

@@ -55,8 +55,9 @@ namespace Aml.Editor.Plugin
this.automationComponentLibraryv100FullCAEX3BETAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.electricConnectorLibraryv100ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.industrialSensorLibraryv100ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.advancedModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.caexVersionFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpButton = new System.Windows.Forms.ToolStripDropDownButton();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.manualToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -293,7 +294,7 @@ namespace Aml.Editor.Plugin
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileButton,
this.librariesSplitButton,
this.viewToolStripMenuItem,
this.optionsToolStripMenuItem,
this.helpButton,
this.vendorNameTextBox,
this.filePathLabel,
@@ -441,21 +442,29 @@ namespace Aml.Editor.Plugin
this.industrialSensorLibraryv100ToolStripMenuItem.Text = "IndustrialSensorLibrary_v1_0_0";
this.industrialSensorLibraryv100ToolStripMenuItem.Click += new System.EventHandler(this.industrialSensorLibraryv100ToolStripMenuItem_Click);
//
// viewToolStripMenuItem
// optionsToolStripMenuItem
//
this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.advancedModeToolStripMenuItem});
this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 23);
this.viewToolStripMenuItem.Text = "View";
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.advancedModeToolStripMenuItem,
this.caexVersionFileToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 23);
this.optionsToolStripMenuItem.Text = "Options";
//
// advancedModeToolStripMenuItem
//
this.advancedModeToolStripMenuItem.Name = "advancedModeToolStripMenuItem";
this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
this.advancedModeToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
this.advancedModeToolStripMenuItem.Text = "Advanced Mode";
this.advancedModeToolStripMenuItem.Click += new System.EventHandler(this.advancedModeToolStripMenuItem_Click);
//
// caexVersionFileToolStripMenuItem
//
this.caexVersionFileToolStripMenuItem.Name = "caexVersionFileToolStripMenuItem";
this.caexVersionFileToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
this.caexVersionFileToolStripMenuItem.Text = "Use CAEX 2.15 File";
this.caexVersionFileToolStripMenuItem.Click += new System.EventHandler(this.caexVersionFileToolStripMenuItem_Click);
//
// helpButton
//
this.helpButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -2674,7 +2683,8 @@ namespace Aml.Editor.Plugin
private System.Windows.Forms.TextBox genericDataDescriptionTxtBx;
private System.Windows.Forms.ToolStrip toolStrip5;
private System.Windows.Forms.ToolStripLabel genericDataHeaderLabel;
private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem advancedModeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem caexVersionFileToolStripMenuItem;
}
}

View File

@@ -29,6 +29,7 @@ namespace Aml.Editor.Plugin
private object _row;
private bool isEditing = false;
private bool expertMode = false;
private bool useCaex2_15 = false;
private OpenFileDialog openFileDialog = new OpenFileDialog();
private List<string> AllInterfaces = new List<string>();
@@ -1591,10 +1592,11 @@ namespace Aml.Editor.Plugin
try
{
SaveFileDialog saveFileDialog = new SaveFileDialog();
saveFileDialog.Filter = "AML Files( *.amlx )| *.amlx;";
saveFileDialog.FileName = vendorNameTextBox.Text + "-" + deviceNameTextBox.Text + "-V.1.0-" + DateTime.Now.Date.ToShortDateString();
SaveFileDialog saveFileDialog = new SaveFileDialog
{
Filter = "AML Files( *.amlx )| *.amlx;",
FileName = vendorNameTextBox.Text + "-" + deviceNameTextBox.Text + "-V.1.0-" + DateTime.Now.Date.ToShortDateString()
};
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
@@ -1603,11 +1605,10 @@ namespace Aml.Editor.Plugin
device.environment = Path.GetDirectoryName(saveFileDialog.FileName);
device.fileName = saveFileDialog.FileName;
// storing user defined values of Attachebles data grid view in to list
// Pass the device to the controller
string result1 = mWController.CreateDeviceOnClick(device, isEditing);
string result1 = mWController.CreateDeviceOnClick(device, isEditing, useCaex2_15);
//clear();
@@ -1730,7 +1731,7 @@ namespace Aml.Editor.Plugin
// storing user defined values of Attachebles data grid view in to list
// Pass the device to the controller
string result1 = mWController.CreateDeviceOnClick(device, isEditing);
string result1 = mWController.CreateDeviceOnClick(device, isEditing, useCaex2_15);
@@ -1760,6 +1761,7 @@ namespace Aml.Editor.Plugin
private void newToolStripMenuItem_Click(object sender, EventArgs e)
{
isEditing = false;
clear();
@@ -1827,6 +1829,8 @@ namespace Aml.Editor.Plugin
private void openToolStripMenuItem_Click(object sender, EventArgs e)
{
isEditing = true;
searchAMLComponentFile.DictionaryofElectricalConnectorType = new Dictionary<string, List<List<ClassOfListsFromReferencefile>>>();
searchAMLComponentFile.DictioanryofElectricalConnectorPinType = new Dictionary<string, List<List<ClassOfListsFromReferencefile>>>();
@@ -1869,7 +1873,7 @@ namespace Aml.Editor.Plugin
IEnumerable<PackagePart> rootParts = amlx.GetPartsByRelationShipType(AutomationMLContainer.RelationshipType.Root);
// We expect the aml to only have one root part
if (rootParts.First() != null)
if (rootParts.Count() != 0 && rootParts.First() != null)
{
PackagePart part = rootParts.First();
@@ -4492,7 +4496,7 @@ namespace Aml.Editor.Plugin
}
else
{
this.advancedModeToolStripMenuItem.Text = "Expert mode";
this.advancedModeToolStripMenuItem.Text = "Advanced mode";
}
// Show/hide elements
@@ -4579,5 +4583,21 @@ namespace Aml.Editor.Plugin
}
catch (Exception) { }
}
private void caexVersionFileToolStripMenuItem_Click(object sender, EventArgs e)
{
// Switch mode
useCaex2_15 = !useCaex2_15;
// Change text
if (useCaex2_15)
{
this.caexVersionFileToolStripMenuItem.Text = "Use CAEX 3.0 File";
}
else
{
this.caexVersionFileToolStripMenuItem.Text = "Use CAEX 2.15 File";
}
}
}
}

View File

@@ -131,7 +131,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD6
DAAAAk1TRnQBSQFMAgEBAwEAAVABBAFQAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DAAAAk1TRnQBSQFMAgEBAwEAAZgBBAGYAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABcAMAARwDAAEBAQABCAUAAUABDBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -344,7 +344,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABC
DQAAAk1TRnQBSQFMAgEBAwEAAVABBAFQAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
DQAAAk1TRnQBSQFMAgEBAwEAAZgBBAGYAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABcAMAARwDAAEBAQABCAUAAUABDBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -417,7 +417,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC4
CQAAAk1TRnQBSQFMAgEBAgEAAUgBBAFIAQQBGQEAARkBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CQAAAk1TRnQBSQFMAgEBAgEAAZABBAGQAQQBGQEAARkBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABZAMAARkDAAEBAQABCAUAAcQBCRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -472,7 +472,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAA
CAAAAk1TRnQBSQFMAwEBAAFQAQQBUAEEARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
CAAAAk1TRnQBSQFMAwEBAAGYAQQBmAEEARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm

View File

@@ -56,14 +56,14 @@ namespace Aml.Editor.Plugin
/// <param name="newDevice"></param>
/// <param name="isEdit"></param>
/// <returns></returns>
public String CreateDeviceOnClick(MWDevice newDevice, bool isEdit)
public String CreateDeviceOnClick(MWDevice newDevice, bool isEdit, bool useCaex2_15)
{
string result = "";
if (newDevice.deviceName != null && newDevice.vendorName != null)
{
// create the device
result = mWData.CreateDevice(newDevice, isEdit);
result = mWData.CreateDevice(newDevice, isEdit, useCaex2_15);
}
// update the device list

View File

@@ -55,49 +55,32 @@ namespace Aml.Editor.Plugin
/// <param name="device">The device which will be created</param>
/// <param name="isEdit">true if an amlx file get update, false if a new file will be created</param>
/// <returns></returns>
public string CreateDevice(MWDevice device, bool isEdit)
public string CreateDevice(MWDevice device, bool isEdit, bool useCaex2_15)
{
CAEXDocument document = null;
CAEXDocument document;
AutomationMLContainer amlx = null;
// Init final .amlx Filepath
//first of all create a folder on "Vendor Name"
string vendorCompanyName = device.vendorName;
string amlFilePath;
string fileName = device.fileName;
if (fileName.Contains(".amlx"))
{
amlFilePath = System.IO.Path.Combine(device.filepath, fileName);
}
else
{
amlFilePath = System.IO.Path.Combine(device.filepath, fileName + ".amlx");
}
amlFilePath = fileName.Contains(".amlx") ? Path.Combine(device.filepath, fileName) : Path.Combine(device.filepath, fileName + ".amlx");
FileInfo file = new FileInfo(amlFilePath);
// Create directory if it's not existing
file.Directory.Create();
// Init CAEX Document
if (isEdit)
{
// Load the amlx file
amlx = new AutomationMLContainer(amlFilePath, FileMode.Open);
amlx = new AutomationMLContainer(amlFilePath, FileMode.OpenOrCreate);
IEnumerable<PackagePart> rootParts = amlx.GetPartsByRelationShipType(AutomationMLContainer.RelationshipType.Root);
// We expect the aml to only have one root part
if (rootParts.First() != null)
if (rootParts.Count() != 0 && rootParts.First() != null)
{
PackagePart part = rootParts.First();
@@ -107,27 +90,26 @@ namespace Aml.Editor.Plugin
else
{
// the amlx contains no aml file
document = CAEXDocument.New_CAEXDocument();
if (useCaex2_15) document = CAEXDocument.New_CAEXDocument(CAEXDocument.CAEXSchema.CAEX2_15);
else document = CAEXDocument.New_CAEXDocument(CAEXDocument.CAEXSchema.CAEX3_0);
}
}
else
{
// create a new CAEX document
document = CAEXDocument.New_CAEXDocument();
if (useCaex2_15) document = CAEXDocument.New_CAEXDocument(CAEXDocument.CAEXSchema.CAEX2_15);
else document = CAEXDocument.New_CAEXDocument(CAEXDocument.CAEXSchema.CAEX3_0);
try
{
amlx = new AutomationMLContainer(amlFilePath, FileMode.Create);
amlx = new AutomationMLContainer(amlFilePath, FileMode.OpenOrCreate);
}
catch (Exception)
{
Console.WriteLine("Failed to create AutomationMLContainer object");
}
}
// Init the default Libs
AutomationMLBaseRoleClassLibType.RoleClassLib(document);
AutomationMLInterfaceClassLibType.InterfaceClassLib(document);
@@ -152,15 +134,9 @@ namespace Aml.Editor.Plugin
}
else
{
Boolean myBool;
Boolean.TryParse(eachparameter.AddToFile, out myBool);
if (myBool == true)
{
}
Uri eachUri = null;
AttachablesDataGridViewParameters par = new AttachablesDataGridViewParameters();
eachUri = createPictureRef(eachparameter.FilePath, eachparameter.ElementName.ToString(), "ExternalDataConnector", systemUnitClass);
@@ -168,14 +144,11 @@ namespace Aml.Editor.Plugin
par.FilePath = eachparameter.FilePath;
device.listWithURIConvertedToString.Add(par);
}
}
foreach (var pair in device.DictionaryForRoleClassofComponent)
{
Match numberfromElectricalConnectorType = Regex.Match(pair.Key.ToString(), @"\((\d+)\)");
string initialnumberbetweenparanthesisofElectricalConnectorType =
numberfromElectricalConnectorType.Groups[1].Value;
@@ -285,8 +258,6 @@ namespace Aml.Editor.Plugin
SRC.RefRoleClassPath = item.SupportesRoleClassType;
}
}
}
@@ -327,8 +298,7 @@ namespace Aml.Editor.Plugin
foundSysClassLib = true;
}
}
if (!foundSysClassLib)
systemUnitClass = document.CAEXFile.SystemUnitClassLib.Append("ComponentSystemUnitClassLib").SystemUnitClass.Append(device.deviceName);
if (!foundSysClassLib) systemUnitClass = document.CAEXFile.SystemUnitClassLib.Append("ComponentSystemUnitClassLib").SystemUnitClass.Append(device.deviceName);
}
// Create the internalElement Interfaces
@@ -458,9 +428,6 @@ namespace Aml.Editor.Plugin
electricalConnectorType.RefBaseClassPath = item.RefBaseClassPath;
}
}
}
@@ -474,9 +441,6 @@ namespace Aml.Editor.Plugin
electricalConnectorPinName = Regex.Replace(electricalConnectorPinName, @"\{.*?\}", "");
electricalConnectorPinName = electricalConnectorPinName.Replace(electricalConnectorTypeName, "");
if (initialnumberbetweenparanthesisofElectricalConnectorType == initialnumberbetweenparanthesisElectricalConnectorPins)
{
electricalConnectorPins = electricalConnectorType.ExternalInterface.Append(electricalConnectorPinName);
@@ -625,14 +589,7 @@ namespace Aml.Editor.Plugin
amlx.Save();
amlx.Close();
if (isEdit)
{
return "Sucessfully updated device!\nFilepath " + amlFilePath;
}
else
{
return "Device description file created!\nFilepath " + amlFilePath;
}
return isEdit ? "Sucessfully updated device!\nFilepath " + amlFilePath : "Device description file created!\nFilepath " + amlFilePath;
}
@@ -894,7 +851,7 @@ namespace Aml.Editor.Plugin
// Load Libary .dll
Assembly assembly = Assembly.Load("Iodd2AmlConverter.Library");
Assembly assembly = Assembly.Load(File.ReadAllBytes("Dd2Aml.Lib.dll"));
Type conversionHandler = null;
// Iterate over all Types in the Libary and get the ConversionHandler Type
foreach (Type type in assembly.ExportedTypes)
@@ -945,7 +902,7 @@ namespace Aml.Editor.Plugin
// If it is, then it's calling the Convert Function
// Gsd2Aml.Lib.Converter.Convert(string inputFilepath, bool strictValidation)
Assembly assembly = Assembly.Load("Gsd2Aml.Lib");
Assembly assembly = Assembly.Load(File.ReadAllBytes("Gsd2Aml.Lib.dll"));
Type conversionHandler = null;
// Iterate over all Types in the Libary and get the ConversionHandler Type
foreach (Type type in assembly.ExportedTypes)
@@ -999,6 +956,7 @@ namespace Aml.Editor.Plugin
byte[] bytearray = System.Text.Encoding.Unicode.GetBytes(caex);
CAEXDocument document = CAEXDocument.LoadFromBinary(bytearray);
// create the amlx file
string name = Path.GetFileNameWithoutExtension(filename);

View File

@@ -32,7 +32,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\TINF20C_ModellingWizard_Devices\SOURCE\bin\Release\</OutputPath>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -179,6 +179,7 @@
<ItemGroup>
<EmbeddedResource Include="DeviceDescription.resx">
<DependentUpon>DeviceDescription.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("DHBW-Stuttgart")]
[assembly: AssemblyProduct("ModellingWizard")]
[assembly: AssemblyCopyright("Copyright © DHBW-Stuttgart TINF19C")]
[assembly: AssemblyCopyright("Copyright © DHBW-Stuttgart TINF20C")]
[assembly: AssemblyTrademark("ModellingWizard")]
[assembly: AssemblyCulture("")]