Feature/209 add of initial class for cefx template and study template for default subsystems #221

DimitriDiantos · 2024-03-14T09:54:51Z

To accomplish this task, we followed the steps outlined below:

Created the CEF X package.
Developed various classes in accordance with the principles of the CEF Template and implemented them.
Incorporated the different components of the template into the template Menu to ensure visibility.
Updated the "Create DLR CEFX Equipment" command.
Addressed and resolved any errors encountered during the process.

Default subsystems encompasses:
Power
Structure
AOCS
Payload
DataHandling.

franzTobiasDLR · 2024-03-14T10:20:51Z

Hi Dimitri, didn’t we close this PR? I thought we decided that all features of this PR are also in this: #209 Why do we have it here again? Cheers Tobi Von: Dimitri Ngatcha Pokouane ***@***.***> Gesendet: Donnerstag, 14. März 2024 10:55 An: virtualsatellite/VirtualSatellite4-CEF ***@***.***> Cc: Franz, Tobias ***@***.***>; Review requested ***@***.***> Betreff: Re: [virtualsatellite/VirtualSatellite4-CEF] Feature/209 add of initial class for cefx template and study template for default subsystems (PR #221) @DimitriDiantos<https://github.com/DimitriDiantos> requested your review on: #221<#221> Feature/209 add of initial class for cefx template and study template for default subsystems. — Reply to this email directly, view it on GitHub<#221 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AL2YSL4K3MC55H3IFX5OK43YYFXYBAVCNFSM6AAAAABEVYJ5JOVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJSGEYTKNJWGQ2TOMA>. You are receiving this because your review was requested.Message ID: ***@***.******@***.***>>

codecov · 2024-03-14T10:33:22Z

Codecov Report

Merging #221 (ddddf31) into development (993494a) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

@@              Coverage Diff               @@
##             development     #221   +/-   ##
==============================================
  Coverage          88.00%   88.00%           
  Complexity           518      518           
==============================================
  Files                 74       74           
  Lines               1750     1750           
  Branches             217      217           
==============================================
  Hits                1540     1540           
  Misses               134      134           
  Partials              76       76

DimitriDiantos · 2024-03-14T10:47:08Z

Hi Dimitri, didn’t we close this PR? I thought we decided that all features of this PR are also in this: #209 Why do we have it here again? Cheers Tobi Von: Dimitri Ngatcha Pokouane @.> Gesendet: Donnerstag, 14. März 2024 10:55 An: virtualsatellite/VirtualSatellite4-CEF @.> Cc: Franz, Tobias @.>; Review requested @.> Betreff: Re: [virtualsatellite/VirtualSatellite4-CEF] Feature/209 add of initial class for cefx template and study template for default subsystems (PR #221) @DimitriDiantos https://github.com/DimitriDiantos requested your review on: #221<#221> Feature/209 add of initial class for cefx template and study template for default subsystems. — Reply to this email directly, view it on GitHub<#221 (comment)>, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AL2YSL4K3MC55H3IFX5OK43YYFXYBAVCNFSM6AAAAABEVYJ5JOVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJSGEYTKNJWGQ2TOMA. You are receiving this because your review was requested.Message ID: @.@.>>

Because i couldn't push the update on github. I got a message like the failed. You can see the picture attached.

dellerDLR · 2024-03-14T11:09:11Z

Hi Dimitri, didn’t we close this PR? I thought we decided that all features of this PR are also in this: #209 Why do we have it here again? Cheers Tobi Von: Dimitri Ngatcha Pokouane @.> Gesendet: Donnerstag, 14. März 2024 10:55 An: virtualsatellite/VirtualSatellite4-CEF _@**._> Cc: Franz, Tobias _@.>; Review requested @._> Betreff: Re: [virtualsatellite/VirtualSatellite4-CEF] Feature/209 add of initial class for cefx template and study template for default subsystems (PR #221) @DimitriDiantoshttps://github.com/DimitriDiantos requested your review on: #221<#221> Feature/209 add of initial class for cefx template and study template for default subsystems. — Reply to this email directly, view it on GitHub<#221 (comment)>, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AL2YSL4K3MC55H3IFX5OK43YYFXYBAVCNFSM6AAAAABEVYJ5JOVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJSGEYTKNJWGQ2TOMA. You are receiving this because your review was requested.Message ID: _@.@.**_>>

Hi Dimitri, didn’t we close this PR? I thought we decided that all features of this PR are also in this: #209 Why do we have it here again? Cheers Tobi Von: Dimitri Ngatcha Pokouane @.> Gesendet: Donnerstag, 14. März 2024 10:55 An: virtualsatellite/VirtualSatellite4-CEF _@**._> Cc: Franz, Tobias _@.>; Review requested @._> Betreff: Re: [virtualsatellite/VirtualSatellite4-CEF] Feature/209 add of initial class for cefx template and study template for default subsystems (PR #221) @DimitriDiantoshttps://github.com/DimitriDiantos requested your review on: #221<#221> Feature/209 add of initial class for cefx template and study template for default subsystems. — Reply to this email directly, view it on GitHub<#221 (comment)>, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AL2YSL4K3MC55H3IFX5OK43YYFXYBAVCNFSM6AAAAABEVYJ5JOVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJSGEYTKNJWGQ2TOMA. You are receiving this because your review was requested.Message ID: _@.@.**_>>

Hi Dimitri, didn’t we close this PR? I thought we decided that all features of this PR are also in this: #209 Why do we have it here again? Cheers Tobi Von: Dimitri Ngatcha Pokouane @.> Gesendet: Donnerstag, 14. März 2024 10:55 An: virtualsatellite/VirtualSatellite4-CEF _@**._> Cc: Franz, Tobias _@.>; Review requested @._> Betreff: Re: [virtualsatellite/VirtualSatellite4-CEF] Feature/209 add of initial class for cefx template and study template for default subsystems (PR #221) @DimitriDiantoshttps://github.com/DimitriDiantos requested your review on: #221<#221> Feature/209 add of initial class for cefx template and study template for default subsystems. — Reply to this email directly, view it on GitHub<#221 (comment)>, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AL2YSL4K3MC55H3IFX5OK43YYFXYBAVCNFSM6AAAAABEVYJ5JOVHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJSGEYTKNJWGQ2TOMA. You are receiving this because your review was requested.Message ID: _@.@.**_>>

Because i couldn't push the update on github. I got a message like the failed. You can see the picture attached.

Hey Dima,
did you try to pull (resolve conflicts if needed) and push again?
The same you have to do with this branch (if we proceed here) to make it up to date with the dev branch

dellerDLR · 2024-03-14T14:05:35Z

From a code point of view it looks good to me.
But the template button is grayed out, eventhough the needed concepts are activated:

dellerDLR · 2024-03-14T14:11:55Z

Also, dont forget to update this branch, so it has the current changes of development

dellerDLR · 2024-03-14T14:23:16Z

Okay, the problem was that the CommandHelper is using the new discipline API.
@DimitriDiantos Do not forget to use the release target platform, since this feature will be included in the 4.16.2 release.
As a result you have to set the discipline name as follows ``newDiscipline.setUser(UserRegistry.getInstance().getUserName());`.

Furthermore the ElementDefinitions do not have PowerEquipment parameters.
A bonus would be also to have a Systemmodes Subsystem. But we should focus on the things above first

DimitriDiantos · 2024-03-14T14:31:46Z

From a code point of view it looks good to me. But the template button is grayed out, eventhough the needed concepts are activated:

Hello Dennis,

Thanks for the feedback, but I just tried again and everything is working fine on my end. Please take a look at the attached photo. Maybe you'll need to try again or re-import or check out the branch again.

DimitriDiantos · 2024-03-14T14:37:24Z

Okay, the problem was that the CommandHelper is using the new discipline API. @DimitriDiantos Do not forget to use the release target platform, since this feature will be included in the 4.16.2 release. As a result you have to set the discipline name as follows ``newDiscipline.setUser(UserRegistry.getInstance().getUserName());`.

Furthermore the ElementDefinitions do not have PowerEquipment parameters. A bonus would be also to have a Systemmodes Subsystem. But we should focus on the things above first

Thank you for the feedback. Initially, I used the target release platform and made the modifications accordingly. However, when I pushed to GitHub, an error occurred indicating that 'setUser' did not exist. Consequently, I had to switch to the target development platform. If you could verify this, you will see.

DimitriDiantos · 2024-03-14T14:39:39Z

Okay, the problem was that the CommandHelper is using the new discipline API. @DimitriDiantos Do not forget to use the release target platform, since this feature will be included in the 4.16.2 release. As a result you have to set the discipline name as follows ``newDiscipline.setUser(UserRegistry.getInstance().getUserName());`.

Furthermore the ElementDefinitions do not have PowerEquipment parameters. A bonus would be also to have a Systemmodes Subsystem. But we should focus on the things above first

DimitriDiantos · 2024-03-14T14:42:23Z

From a code point of view it looks good to me. But the template button is grayed out, eventhough the needed concepts are activated:

Hello Dennis,

Thanks for the feedback, but I just tried again and everything is working fine on my end. Please take a look at the attached photo. Maybe you'll need to try again or re-import or check out the branch again.

platform.

DimitriDiantos · 2024-03-14T15:03:15Z

Okay, the problem was that the CommandHelper is using the new discipline API. @DimitriDiantos Do not forget to use the release target platform, since this feature will be included in the 4.16.2 release. As a result you have to set the discipline name as follows ``newDiscipline.setUser(UserRegistry.getInstance().getUserName());`.

Furthermore the ElementDefinitions do not have PowerEquipment parameters. A bonus would be also to have a Systemmodes Subsystem. But we should focus on the things above first

Thanks for your comment. Initially, I used the target release platform and made the modifications accordingly. However, when I pushed to GitHub, an error occurred indicating that 'setUser' did not exist. Consequently, I had to switch to the target development platform. See the picture attached below.

EC:Equipment in the CT. Also exchanging positions between PT and CT.

franzTobiasDLR

Thanks! Looking good :)

…CEFX_template-and_study_template_for_default_subsystems

dellerDLR

The looks good to me.
Following things I noticed:

The Subsystem under the CT:System has PowerParameters. I think we agreed on only adding mass parameters by default. same with SystemPowerParameters.
When adding a Subsystem or Equipment Power as well as TemperatureParameters are getting added. Should this be the default or only the mass parameters?
An Equipment can be added on Subsystemlevel. But I guess this should be possible due to the dynamic structure of the Product Structure Concept? What do you think @franzTobiasDLR

Despite that I think it can be merged :)

…study_template_for_default_subsystems' of https://github.com/virtualsatellite/VirtualSatellite4-CEF.git into feature/209-add_of_initial_class_for_CEFX_template-and_study_template_for_default_subsystems

DimitriDiantos · 2024-03-22T06:33:13Z

The looks good to me. Following things I noticed:

The Subsystem under the CT:System has PowerParameters. I think we agreed on only adding mass parameters by default. same with SystemPowerParameters.

When adding a Subsystem or Equipment Power as well as TemperatureParameters are getting added. Should this be the default or only the mass parameters?

An Equipment can be added on Subsystemlevel. But I guess this should be possible due to the dynamic structure of the Product Structure Concept? What do you think @franzTobiasDLR

Despite that I think it can be merged :)

Okay Dennis :). i modified it.

...efx.ui/src/de/dlr/sc/virsat/model/extension/cefx/ui/templates/DLRCEFXStudyCommandHelper.java

discipline.

ngat_di and others added 18 commits November 21, 2023 15:32

Task #83 Add initial class for CEFX template.

9887261

Task #83 updating of the CEFX Templates class.

3e3a32e

Task #83 Update the author's list.

37f3ff2

Task #83 Update of the Create dlr CEFX equipment command.

9f4a74f

Task #83 initialize the concept

538ac32

Task #83 Remove class for template CEF.

fcdd4fe

Task #83 Add elements of the Templates.

7ec8269

Task #83 Update methods for creating.

6af2fe2

Task #83 Replace the concept.xmi with the head version.

7e5fd12

Task #207 create of the Default subsystems.

74ddc0f

Task #207 Improve the code quality.

295db5c

Task #207 revert the xmi with the development branches.

79cce16

Task #207 code revision.

b31bd86

Task #207 Code review.

dae18de

Task #207 Code improvement and review.

ef97dcc

Task #209 Code improvement and code review.

3a19d79

Task #209 Code improvement and review.

b913f3e

Task #209 Code review.

442ece4

DimitriDiantos requested review from franzTobiasDLR and dellerDLR March 14, 2024 09:54

Task #209 change for a single user to multiple users.

f392302

Task #209 switch from multiple users to a single user for the release

955ef51

platform.

Task #209 change for a single user to multiple users and removing of the

6fb6609

EC:Equipment in the CT. Also exchanging positions between PT and CT.

franzTobiasDLR approved these changes Mar 15, 2024

View reviewed changes

Merge branch 'development' into feature/209-add_of_initial_class_for_…

8a73c18

…CEFX_template-and_study_template_for_default_subsystems

dellerDLR requested changes Mar 18, 2024

View reviewed changes

ngat_di added 2 commits March 20, 2024 15:10

Task #209 Removing of the SSP, SSPP, EPP and ETP.

97d26fe

Merge branch 'feature/209-add_of_initial_class_for_CEFX_template-and_…

d32086e

…study_template_for_default_subsystems' of https://github.com/virtualsatellite/VirtualSatellite4-CEF.git into feature/209-add_of_initial_class_for_CEFX_template-and_study_template_for_default_subsystems

franzTobiasDLR requested changes Mar 27, 2024

View reviewed changes

...efx.ui/src/de/dlr/sc/virsat/model/extension/cefx/ui/templates/DLRCEFXStudyCommandHelper.java Outdated Show resolved Hide resolved

ngat_di added 2 commits March 28, 2024 16:06

Task #209 Fix the bug on the template during the adding of the

c0272b7

discipline.

Task 1178 implement the assigned Discipline to the subsystem correctly.

d1b3302

franzTobiasDLR approved these changes Apr 4, 2024

View reviewed changes

Task #209 - improve code quality

ddddf31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/209 add of initial class for cefx template and study template for default subsystems #221

Feature/209 add of initial class for cefx template and study template for default subsystems #221

DimitriDiantos commented Mar 14, 2024

franzTobiasDLR commented Mar 14, 2024 via email

codecov bot commented Mar 14, 2024 •

edited

Loading

DimitriDiantos commented Mar 14, 2024

dellerDLR commented Mar 14, 2024 •

edited

Loading

dellerDLR commented Mar 14, 2024

dellerDLR commented Mar 14, 2024

dellerDLR commented Mar 14, 2024

DimitriDiantos commented Mar 14, 2024 •

edited

Loading

DimitriDiantos commented Mar 14, 2024

DimitriDiantos commented Mar 14, 2024 •

edited

Loading

DimitriDiantos commented Mar 14, 2024

DimitriDiantos commented Mar 14, 2024

franzTobiasDLR left a comment

dellerDLR left a comment

DimitriDiantos commented Mar 22, 2024

Feature/209 add of initial class for cefx template and study template for default subsystems #221

Are you sure you want to change the base?

Feature/209 add of initial class for cefx template and study template for default subsystems #221

Conversation

DimitriDiantos commented Mar 14, 2024

franzTobiasDLR commented Mar 14, 2024 via email

codecov bot commented Mar 14, 2024 • edited Loading

Codecov Report

DimitriDiantos commented Mar 14, 2024

dellerDLR commented Mar 14, 2024 • edited Loading

dellerDLR commented Mar 14, 2024

dellerDLR commented Mar 14, 2024

dellerDLR commented Mar 14, 2024

DimitriDiantos commented Mar 14, 2024 • edited Loading

DimitriDiantos commented Mar 14, 2024

DimitriDiantos commented Mar 14, 2024 • edited Loading

DimitriDiantos commented Mar 14, 2024

DimitriDiantos commented Mar 14, 2024

franzTobiasDLR left a comment

Choose a reason for hiding this comment

dellerDLR left a comment

Choose a reason for hiding this comment

DimitriDiantos commented Mar 22, 2024

codecov bot commented Mar 14, 2024 •

edited

Loading

dellerDLR commented Mar 14, 2024 •

edited

Loading

DimitriDiantos commented Mar 14, 2024 •

edited

Loading

DimitriDiantos commented Mar 14, 2024 •

edited

Loading