Skip to content

Commit 4c329d9

Browse files
committed
* scripting to wait
for completion
1 parent a65af9a commit 4c329d9

File tree

4 files changed

+221
-181
lines changed

4 files changed

+221
-181
lines changed

src/AasxIntegrationBase/AasxMenu.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ public AasxMenu AddLambda(
622622
// Operate
623623
//
624624

625-
public async Task ActivateAction(AasxMenuItemBase mi, AasxMenuActionTicket ticket)
625+
public async Task ActivateAction(AasxMenuItemBase mi, AasxMenuActionTicket ticket, Action<object> lambdaDone = null)
626626
{
627627
var name = mi?.Name?.Trim()?.ToLower();
628628

@@ -634,6 +634,8 @@ public async Task ActivateAction(AasxMenuItemBase mi, AasxMenuActionTicket ticke
634634
await this.DefaultActionAsync(name, mi, ticket);
635635
else if (this.DefaultAction != null)
636636
this.DefaultAction(name, mi, ticket);
637+
638+
lambdaDone?.Invoke(this);
637639
}
638640

639641
//

src/AasxPackageExplorer/debug.MIHO.script

+36-13
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@
4848
// WriteLine(GetLastLogLine());
4949
// TakeScreenShot("Test123");
5050

51-
Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\00_FestoDemoBox-Module-2.aasx");
52-
Select("AAS", "First");
53-
Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
54-
Sleep(6000);
51+
//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\00_FestoDemoBox-Module-2.aasx");
52+
//Select("AAS", "First");
53+
//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
54+
//Sleep(1000);
5555

56-
Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\12_article-dpdm-32-instance_1.aasx");
57-
Select("AAS", "First");
58-
Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
59-
Sleep(6000);
56+
//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\12_article-dpdm-32-instance_1.aasx");
57+
//Select("AAS", "First");
58+
//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
59+
//Sleep(1000);
6060

61-
Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\13_article-dpdm-32-instance_2.aasx");
62-
Select("AAS", "First");
63-
Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
64-
Sleep(6000);
61+
//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\13_article-dpdm-32-instance_2.aasx");
62+
//Select("AAS", "First");
63+
//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
64+
//Sleep(1000);
6565

6666
//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\16_article-ovel-10.aasx");
6767
//Select("AAS", "First");
6868
//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
69-
//Sleep(6000);
69+
//Sleep(1000);
7070

7171
//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\17_article-spau.aasx");
7272
//Select("AAS", "First");
@@ -108,3 +108,26 @@ Sleep(6000);
108108
//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
109109
//Sleep(1000);
110110

111+
112+
var fns = [
113+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\00_FestoDemoBox-Module-2.aasx",
114+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\12_article-dpdm-32-instance_1.aasx",
115+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\13_article-dpdm-32-instance_2.aasx",
116+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\16_article-ovel-10.aasx",
117+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\17_article-spau.aasx",
118+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\18_article-vuvg-l14_1.aasx",
119+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\18_article-vuvg-l14_2.aasx",
120+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\20_Festo_579071_SMT-8M-A-PS-24V-E-0.3-M12_proximity_switch.aasx",
121+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\21_article-elgs-45-200.aasx",
122+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\22_article-CPX-E-CEC-M1-PN.aasx",
123+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\30_Festo_SPAU_VR3.aasx",
124+
"C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\31_HMI22_Festo_CMMT.aasx"
125+
];
126+
127+
foreach (fn in fns)
128+
{
129+
Tool("Open", "File", fn);
130+
Select("AAS", "First");
131+
Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
132+
Sleep(1000);
133+
}

0 commit comments

Comments
 (0)