Revert "Support for AID and AIMC Submodel Templates" #243
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 51d7192.
AlexanderWollbrink
added a commit
that referenced
this pull request
Aug 30, 2024
…package format (#217) * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * update before refactor showContent * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * test * * update * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * Update README.md Updated the links and badges * Update README.md Updated the links and badges * Update README.md Updated the links and badges * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * Create Contributors.md * update contributors and companies * Add contributors links to other information files * Fix minor issue with OperationVariable * Instantiate submodel list * *fix for supplementary files not appearing (#219) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * Set Submodel/Kind as per action (#225) * Fixes the issue 226 (#228) * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * try change to new OPC UA client library * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * Fix for the issue 235 (#236) * * a little scripting for testing * Fix for GitHub Issue 201 * Instantiate Submodel List * * work on empty list for CDs * find statistics fixed * * small fixes * Instantiate list of CDs * Support for AID and AIMC Submodel Templates (#211) * A commit for AID and AIMC implementations This commit combines all implementation based on AID and AIMC. AASXPluginAID is for AID and AASXPluginAssetInterfaceDesc is majorly for AIMC. * some newlines added for code readability * * remove Lucene.Net * Revert "Support for AID and AIMC Submodel Templates (#211)" (#243) This reverts commit 51d7192. * Update README.md * * update binary files changed by CR/LF flasg * fix bugs in predefined data * show AAS/thumbnail * * initial tinkering * * more SAMM models * CD sort order structured * box icons * * more SAMM details * editing * import TTL * * first SAMM ttl imported * * colorize Characteristics * * before refactoring becaus of anonymous instances * * de-serialize and combo box of enum types in Constraints * * editing of constraints * * temporary stage * * SAMM import extended * SAMM export to Turtle works initally * * more export * rework import * edit preferred names * create Submodel instance * * multiple SAMM versions * creat SM instance * * adding Qualifiers to the Samm SM instance creation * * update * * SMT value validation in 1st degree in UI * * checking based on CDs works first time * * fix SMT organizes * add SMT elements * working on add SAMM * * just update * * update * * create Submodel from SMT/SAMM CDs * * update sources * * update sources * * load repositories resident to find CDs for SAMM/ SMT * * bug fixes * * bugfix menu * * have Cardinality for SME but put it in Organizes as well * Add documentation (#670) (#671) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * * bug fix for SM Documents in some cases * Add new chapters to documentation (#675) * Add documentation (#670) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * Add new chapters to documentation (#674) * add documentation to src/AASxCore_Samm2_2_0 * add link to source of Movement.ttl example used in document * Add new chapter "Edit new SAMM aspect model" and new chapter "Background on Implementation" explaining data specifications and extensions * * small enhancements of guidance * Update docu with SMT-attribute-set extensions (#683) * Delete src/AasxCore.Samm2_2_0/docs directory Directory will be renamed to "documentation" * Create folder "documentation" file temp.txt will be removed later * Extend Documentation with SMT-attribute-Extensions Documentation updated, common parts extracted. SAMM and SMT-attribute extensions described * Delete src/AasxCore.Samm2_2_0/documentation/temp.txt was only created for creating a folder * Create temp.txt * Createfolder examples * Delete src/AasxCore.Samm2_2_0/documentation/src/temp.txt was for creating folder only * Add examples aasx and ttl Examples added that are used in documentation * Delete src/AasxCore.Samm2_2_0/documentation/examples/temp.txt was created to create folder only * Create folder src * Upload figures Figures for documentation added * fix table format in Annex Annex SMT Attributes Sets: fix table * Fix table of content Table of content did not match with chapter structure. * * temp commit * * issue with compiling * * .suo file was defect * * modbus v0.1 working * * HTTP and Modbus * * investigate dll error for MQTT * * continous run for http 1st gen * * first steps in async * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * update before refactor showContent * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * update * * test * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * try change to new OPC UA client library * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * * a little scripting for testing * * work on empty list for CDs * find statistics fixed * * small fixes * * remove Lucene.Net * * after rebase to main (without AID update) and merges, push back to PR * * pending fixes from merge * * remove exception from text find/replace * add support for script log access * * trying to script copy/paste * screenshot by script * * fix for activate actions by scripting * * options for auto-size behavior of window * * select first plugin in SM for scripting --------- Co-authored-by: Michael Hoffmeister <michael.hoffmeister@festo.com> Co-authored-by: AlexanderWollbrink <alexander.wollbrink@iosb-ina.fraunhofer.de> Co-authored-by: MichaHofft <michahofft2@googlemail.com> Co-authored-by: Marta <84308731+martafullen@users.noreply.github.com> Co-authored-by: martaf <marta.fullen@iosb-ina.fraunhofer.de> Co-authored-by: Oliver <info@oliver-fries.de> Co-authored-by: juileetikekar <juilee.tikekar@idtwin.org> Co-authored-by: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Co-authored-by: juileetikekar <99317579+juileetikekar@users.noreply.github.com> Co-authored-by: Kazeem Oladipupo <67549739+Kaz040@users.noreply.github.com> Co-authored-by: Birgit Boss <59824205+BirgitBoss@users.noreply.github.com>
AlexanderWollbrink
added a commit
that referenced
this pull request
Sep 2, 2024
…package format (#217) * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * update before refactor showContent * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * test * * update * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * Update README.md Updated the links and badges * Update README.md Updated the links and badges * Update README.md Updated the links and badges * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * Create Contributors.md * update contributors and companies * Add contributors links to other information files * Fix minor issue with OperationVariable * Instantiate submodel list * *fix for supplementary files not appearing (#219) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * Set Submodel/Kind as per action (#225) * Fixes the issue 226 (#228) * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * try change to new OPC UA client library * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * Fix for the issue 235 (#236) * * a little scripting for testing * Fix for GitHub Issue 201 * Instantiate Submodel List * * work on empty list for CDs * find statistics fixed * * small fixes * Instantiate list of CDs * Support for AID and AIMC Submodel Templates (#211) * A commit for AID and AIMC implementations This commit combines all implementation based on AID and AIMC. AASXPluginAID is for AID and AASXPluginAssetInterfaceDesc is majorly for AIMC. * some newlines added for code readability * * remove Lucene.Net * Revert "Support for AID and AIMC Submodel Templates (#211)" (#243) This reverts commit 51d7192. * Update README.md * * update binary files changed by CR/LF flasg * fix bugs in predefined data * show AAS/thumbnail * * initial tinkering * * more SAMM models * CD sort order structured * box icons * * more SAMM details * editing * import TTL * * first SAMM ttl imported * * colorize Characteristics * * before refactoring becaus of anonymous instances * * de-serialize and combo box of enum types in Constraints * * editing of constraints * * temporary stage * * SAMM import extended * SAMM export to Turtle works initally * * more export * rework import * edit preferred names * create Submodel instance * * multiple SAMM versions * creat SM instance * * adding Qualifiers to the Samm SM instance creation * * update * * SMT value validation in 1st degree in UI * * checking based on CDs works first time * * fix SMT organizes * add SMT elements * working on add SAMM * * just update * * update * * create Submodel from SMT/SAMM CDs * * update sources * * update sources * * load repositories resident to find CDs for SAMM/ SMT * * bug fixes * * bugfix menu * * have Cardinality for SME but put it in Organizes as well * Add documentation (#670) (#671) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * * bug fix for SM Documents in some cases * Add new chapters to documentation (#675) * Add documentation (#670) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * Add new chapters to documentation (#674) * add documentation to src/AASxCore_Samm2_2_0 * add link to source of Movement.ttl example used in document * Add new chapter "Edit new SAMM aspect model" and new chapter "Background on Implementation" explaining data specifications and extensions * * small enhancements of guidance * Update docu with SMT-attribute-set extensions (#683) * Delete src/AasxCore.Samm2_2_0/docs directory Directory will be renamed to "documentation" * Create folder "documentation" file temp.txt will be removed later * Extend Documentation with SMT-attribute-Extensions Documentation updated, common parts extracted. SAMM and SMT-attribute extensions described * Delete src/AasxCore.Samm2_2_0/documentation/temp.txt was only created for creating a folder * Create temp.txt * Createfolder examples * Delete src/AasxCore.Samm2_2_0/documentation/src/temp.txt was for creating folder only * Add examples aasx and ttl Examples added that are used in documentation * Delete src/AasxCore.Samm2_2_0/documentation/examples/temp.txt was created to create folder only * Create folder src * Upload figures Figures for documentation added * fix table format in Annex Annex SMT Attributes Sets: fix table * Fix table of content Table of content did not match with chapter structure. * * temp commit * * issue with compiling * * .suo file was defect * * modbus v0.1 working * * HTTP and Modbus * * investigate dll error for MQTT * * continous run for http 1st gen * * first steps in async * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * update before refactor showContent * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * update * * test * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * try change to new OPC UA client library * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * * a little scripting for testing * * work on empty list for CDs * find statistics fixed * * small fixes * * remove Lucene.Net * * after rebase to main (without AID update) and merges, push back to PR * * pending fixes from merge * * remove exception from text find/replace * add support for script log access * * trying to script copy/paste * screenshot by script * * fix for activate actions by scripting * * options for auto-size behavior of window * * select first plugin in SM for scripting --------- Co-authored-by: Michael Hoffmeister <michael.hoffmeister@festo.com> Co-authored-by: AlexanderWollbrink <alexander.wollbrink@iosb-ina.fraunhofer.de> Co-authored-by: MichaHofft <michahofft2@googlemail.com> Co-authored-by: Marta <84308731+martafullen@users.noreply.github.com> Co-authored-by: martaf <marta.fullen@iosb-ina.fraunhofer.de> Co-authored-by: Oliver <info@oliver-fries.de> Co-authored-by: juileetikekar <juilee.tikekar@idtwin.org> Co-authored-by: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Co-authored-by: juileetikekar <99317579+juileetikekar@users.noreply.github.com> Co-authored-by: Kazeem Oladipupo <67549739+Kaz040@users.noreply.github.com> Co-authored-by: Birgit Boss <59824205+BirgitBoss@users.noreply.github.com>
AlexanderWollbrink
added a commit
that referenced
this pull request
Sep 2, 2024
* bump version of JetBrains * bumped JetBrains.Annotations to 2024.2.0 * bumping version of Scottie * bumping CefSharp.Common.NETCore to 117.2.20 * removing CountryFlag and its functionality * bumping Microsoft.Windows.Compatibility bumping Magick.NET * bumping System.IdentityModel.Tokens.Jwt * Bumped Microsoft.AspNetCore.Components and Microsoft.AspNetCore.Components.Web as well as their dependencies to 6.0.33 (last release for dotnet6, no vulnerabilities) * bumping Avalon * *remove AasxPluginUaNetServer folder * Features and fixes: SAMM, IEC61360, AsciiDoc, Fixes, no empty lists, package format (#217) * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * update before refactor showContent * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * test * * update * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * Update README.md Updated the links and badges * Update README.md Updated the links and badges * Update README.md Updated the links and badges * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * Create Contributors.md * update contributors and companies * Add contributors links to other information files * Fix minor issue with OperationVariable * Instantiate submodel list * *fix for supplementary files not appearing (#219) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * Set Submodel/Kind as per action (#225) * Fixes the issue 226 (#228) * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * try change to new OPC UA client library * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * Fix for the issue 235 (#236) * * a little scripting for testing * Fix for GitHub Issue 201 * Instantiate Submodel List * * work on empty list for CDs * find statistics fixed * * small fixes * Instantiate list of CDs * Support for AID and AIMC Submodel Templates (#211) * A commit for AID and AIMC implementations This commit combines all implementation based on AID and AIMC. AASXPluginAID is for AID and AASXPluginAssetInterfaceDesc is majorly for AIMC. * some newlines added for code readability * * remove Lucene.Net * Revert "Support for AID and AIMC Submodel Templates (#211)" (#243) This reverts commit 51d7192. * Update README.md * * update binary files changed by CR/LF flasg * fix bugs in predefined data * show AAS/thumbnail * * initial tinkering * * more SAMM models * CD sort order structured * box icons * * more SAMM details * editing * import TTL * * first SAMM ttl imported * * colorize Characteristics * * before refactoring becaus of anonymous instances * * de-serialize and combo box of enum types in Constraints * * editing of constraints * * temporary stage * * SAMM import extended * SAMM export to Turtle works initally * * more export * rework import * edit preferred names * create Submodel instance * * multiple SAMM versions * creat SM instance * * adding Qualifiers to the Samm SM instance creation * * update * * SMT value validation in 1st degree in UI * * checking based on CDs works first time * * fix SMT organizes * add SMT elements * working on add SAMM * * just update * * update * * create Submodel from SMT/SAMM CDs * * update sources * * update sources * * load repositories resident to find CDs for SAMM/ SMT * * bug fixes * * bugfix menu * * have Cardinality for SME but put it in Organizes as well * Add documentation (#670) (#671) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * * bug fix for SM Documents in some cases * Add new chapters to documentation (#675) * Add documentation (#670) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * Add new chapters to documentation (#674) * add documentation to src/AASxCore_Samm2_2_0 * add link to source of Movement.ttl example used in document * Add new chapter "Edit new SAMM aspect model" and new chapter "Background on Implementation" explaining data specifications and extensions * * small enhancements of guidance * Update docu with SMT-attribute-set extensions (#683) * Delete src/AasxCore.Samm2_2_0/docs directory Directory will be renamed to "documentation" * Create folder "documentation" file temp.txt will be removed later * Extend Documentation with SMT-attribute-Extensions Documentation updated, common parts extracted. SAMM and SMT-attribute extensions described * Delete src/AasxCore.Samm2_2_0/documentation/temp.txt was only created for creating a folder * Create temp.txt * Createfolder examples * Delete src/AasxCore.Samm2_2_0/documentation/src/temp.txt was for creating folder only * Add examples aasx and ttl Examples added that are used in documentation * Delete src/AasxCore.Samm2_2_0/documentation/examples/temp.txt was created to create folder only * Create folder src * Upload figures Figures for documentation added * fix table format in Annex Annex SMT Attributes Sets: fix table * Fix table of content Table of content did not match with chapter structure. * * temp commit * * issue with compiling * * .suo file was defect * * modbus v0.1 working * * HTTP and Modbus * * investigate dll error for MQTT * * continous run for http 1st gen * * first steps in async * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * update before refactor showContent * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * update * * test * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * try change to new OPC UA client library * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * * a little scripting for testing * * work on empty list for CDs * find statistics fixed * * small fixes * * remove Lucene.Net * * after rebase to main (without AID update) and merges, push back to PR * * pending fixes from merge * * remove exception from text find/replace * add support for script log access * * trying to script copy/paste * screenshot by script * * fix for activate actions by scripting * * options for auto-size behavior of window * * select first plugin in SM for scripting --------- Co-authored-by: Michael Hoffmeister <michael.hoffmeister@festo.com> Co-authored-by: AlexanderWollbrink <alexander.wollbrink@iosb-ina.fraunhofer.de> Co-authored-by: MichaHofft <michahofft2@googlemail.com> Co-authored-by: Marta <84308731+martafullen@users.noreply.github.com> Co-authored-by: martaf <marta.fullen@iosb-ina.fraunhofer.de> Co-authored-by: Oliver <info@oliver-fries.de> Co-authored-by: juileetikekar <juilee.tikekar@idtwin.org> Co-authored-by: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Co-authored-by: juileetikekar <99317579+juileetikekar@users.noreply.github.com> Co-authored-by: Kazeem Oladipupo <67549739+Kaz040@users.noreply.github.com> Co-authored-by: Birgit Boss <59824205+BirgitBoss@users.noreply.github.com> * bump for JetBrains in Bom * remove UaNetServer from PackageRelease.ps1 * removing UaNetServer from BuildForRelease.ps1 * fix typo in PackageRelease.ps1 --------- Co-authored-by: Alexander Wollbrink <alexander.wollbrink@iosb-ina.fraunhofer.de> Co-authored-by: MichaelHoffmeisterFesto <65590855+MichaelHoffmeisterFesto@users.noreply.github.com> Co-authored-by: Michael Hoffmeister <michael.hoffmeister@festo.com> Co-authored-by: MichaHofft <michahofft2@googlemail.com> Co-authored-by: Oliver <info@oliver-fries.de> Co-authored-by: juileetikekar <juilee.tikekar@idtwin.org> Co-authored-by: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Co-authored-by: juileetikekar <99317579+juileetikekar@users.noreply.github.com> Co-authored-by: Kazeem Oladipupo <67549739+Kaz040@users.noreply.github.com> Co-authored-by: Birgit Boss <59824205+BirgitBoss@users.noreply.github.com>
|
Hi @juileetikekar, I got to know that PR 211 has been reverted on Friday (04/10/2024) when @sebastiankb checked. I also saw the reason was because of conflict with the branch MIHO/Post_XMASBUG_SpecConf. I am not sure I worked on that branch. according to the PR, the branches where I extracted the two projects from are:
When I checked the main branch, I saw that one of the projects [1] (see image below) has been merged from one of MIHO branches.
This project is outdated and missing some features based on the specification. I will update it and create another PR for it. About the other project from branch [2] that handles TD <--> AID transformation, please how are we going to move forward with it. It is important that it also be part of the main branch. can you take some time to look at the branch and state how to handle it so that it can be merged to the main branch. We would like this work to be part of next package explorer release because projects within Factory-X are starting to request for a reference implementation. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #211
Reverting due to conflicts with MIHO/Post_XMASBUG_SpecConf