Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update on AsciiDoc export, direct viewing option #275

Merged
merged 1 commit into from
Mar 7, 2025
+23 −27
Merged

Update on AsciiDoc export, direct viewing option #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions src/AasxPackageExplorer/options-debug.MIHO.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
// "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_TechData_Work\\IDTA 02003-1-2_SubmodelTemplate_TechnicalData_v1.2__with_Draft_1_3_and_AsciiDoc_v01.aasx",
// "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\IDTA_02036-1-0_SMT_ProductChangeNotification_Draft_v22.aasx",
// "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\IDTA_02036-1-0_SMT_ProductChangeNotification_Examples_v08.aasx",
"AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\SMT_ProductChangeNotification_Draft_v20_spiel.aasx",
// "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\SMT_ProductChangeNotification_Draft_v20_spiel.aasx",
// "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\aaspe-testing\\210_Copy_Paste\\Sample_AAS.aasx",
// "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\aaspe-testing\\310_Plugin_DNP\\Sample_AAS.aasx",
// "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\aaspe-testing\\200_Find_Replace\\Sample_SMT.aasx",
Expand All @@ -64,7 +64,7 @@
// "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\aid\\robotic_cell_for_demo_suitcase_new-v3.aasx",
// "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\IDTA 02006-2-1_Template_Digital Nameplate_V3_Demo_ExportSMT - Kopie.aasx",
// "AasxToLoad": "C:\\Users\\homi0002\\Desktop\\SMT_ProductChangeNotification\\SMT_ProductChangeNotification_Draft_play_02.aasx",
"AasxRepositoryFn": "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\Festo-DemoCase-repo-V3-local.json",
// "AasxRepositoryFn": "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\Festo-DemoCase-repo-V3-local.json",
// "AasxToLoad": "C:\\MIHO\\Develop\\Aasx\\repo\\smt_pcn\\SMT_ProductChangeNotification_Draft_play_02.aasx",
// "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\dnp30\\IDTA 02006-3-0_Template_Digital Nameplate_AsciiDoc_Draft_v06.aasx",
// "AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\repo\\contactv11\\IDTA 02002-1-1_Template_ContactInformation_AsciiDoc_Draft_v04.aasx",
Expand Down Expand Up @@ -139,22 +139,6 @@
],
"PluginPrefer": "ANYUI",
"PluginDll": [
{
"Path": "..\\..\\..\\..\\..\\..\\AasxPluginUaNetServer\\bin\\Debug\\net8.0-windows\\AasxPluginUaNetServer.dll",
"Args": [
"-single-nodeids",
"-single-keys",
"-ns",
"2",
"-ns",
"3"
],
"Options": null
},
{
"Path": "..\\..\\..\\..\\..\\..\\AasxPluginUaNetClient\\bin\\Debug\\net8.0-windows\\AasxPluginUaNetClient.dll",
"Args": []
},
{
"Path": "..\\..\\..\\..\\..\\..\\AasxPluginProductChangeNotifications\\bin\\Debug\\net8.0-windows\\AasxPluginProductChangeNotifications.dll",
"Args": []
Expand Down Expand Up @@ -214,8 +198,7 @@
{
"Path": "..\\..\\..\\..\\..\\..\\AasxPluginWebBrowser\\bin\\x64\\Debug\\AasxPluginWebBrowser.dll",
"Args": []
},

} /*,
// Festo specific from here on
{
"Path": "..\\..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawViewer\\bin\\Debug\\net8.0-windows\\AasxPluginFluiddrawViewer.dll",
Expand All @@ -224,7 +207,7 @@
{
"Path": "..\\..\\..\\..\\..\\..\\..\\..\\AasxFesto\\AasxFesto\\AasxPluginFluiddrawBom\\bin\\Debug\\net8.0-windows\\AasxPluginFluiddrawBom.dll",
"Args": []
}
} */
],
"SecureConnectPresets": [
{
Expand Down Expand Up @@ -416,7 +399,7 @@
"Tool(\"LocationPush\");",
"Select(\"Submodel\", \"First\");",
"Select(\"Submodel\", \"Next\");",
"Tool(\"ExportSmtAsciiDoc\", \"File\", \"C:\\Users\\homi0002\\Desktop\\tmp\\new.zip\");",
"Tool(\"ExportSmtAsciiDoc\", \"File\", \"C:\\Users\\Micha\\Desktop\\tmp\\new.zip\");",
"Tool(\"LocationPop\");"
]
},
Expand All @@ -426,7 +409,7 @@
"Tool(\"LocationPush\");",
"Select(\"Submodel\", \"First\");",
"Select(\"Submodel\", \"Next\");",
"Tool(\"ExportSmtAsciiDoc\", \"File\", \"C:\\Users\\homi0002\\Desktop\\tmp\\new.zip\", \"ExportHtml\", \"true\", \"ExportPdf\", \"false\", \"AntoraStyle\", \"false\", \"ViewResult\", \"true\");",
"Tool(\"ExportSmtAsciiDoc\", \"File\", \"C:\\Users\\Micha\\Desktop\\tmp\\new.zip\", \"ExportHtml\", \"true\", \"ExportPdf\", \"false\", \"AntoraStyle\", \"false\", \"ViewResult\", \"true\");",
"Tool(\"LocationPop\");"
]
}
Expand Down
17 changes: 15 additions & 2 deletions src/AasxPluginExportTable/Smt/AnyUiDialogueSmtExport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static async Task ExportSmtDialogBased(
var panel = new AnyUiStackPanel();
var helper = new AnyUiSmallWidgetToolkit();

var g = helper.AddSmallGrid(6, 2, new[] { "220:", "*" },
var g = helper.AddSmallGrid(7, 2, new[] { "220:", "*" },
padding: new AnyUiThickness(0, 5, 0, 5));
panel.Add(g);

Expand Down Expand Up @@ -166,7 +166,7 @@ public static async Task ExportSmtDialogBased(
colSpan: 2),
(b) => { record.AntoraStyle = b; });

// Row 4 : Export PDF
// Row 5 : Export PDF
helper.AddSmallLabelTo(g, 5, 0, content: "Export PDF:",
verticalAlignment: AnyUiVerticalAlignment.Center,
verticalContentAlignment: AnyUiVerticalAlignment.Center);
Expand All @@ -179,6 +179,19 @@ public static async Task ExportSmtDialogBased(
colSpan: 2),
(b) => { record.ExportPdf = b; });

// Row 6 : View
helper.AddSmallLabelTo(g, 6, 0, content: "View result:",
verticalAlignment: AnyUiVerticalAlignment.Center,
verticalContentAlignment: AnyUiVerticalAlignment.Center);
AnyUiUIElement.SetBoolFromControl(
helper.Set(
helper.AddSmallCheckBoxTo(g, 6, 1,
content: "(export command given by options will be executed)",
isChecked: record.ViewResult,
verticalContentAlignment: AnyUiVerticalAlignment.Center),
colSpan: 2),
(b) => { record.ViewResult = b; });

// give back
return panel;
});
Expand Down
4 changes: 2 additions & 2 deletions src/Notes_V3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ These projects need to be UNLOADED (for Visual Studio), to get a compiling solut
* AasxSchemaExport.Tests
* AasxRestConsoleServer
* AasxToolkit.Tests
* AasxUaNetConsoleServer
* (AasxUaNetConsoleServer)
* AasxPackageExplorer.GuiTests
* AasxPackageExplorer.Tests
* BlazorUI
* (BlazorUI)

## Observations

Expand Down
Loading