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

Jump to bottom

Fix class and attribute types #40

Merged
merged 12 commits into from
Nov 16, 2024
Merged

Fix class and attribute types #40

merged 12 commits into from
Nov 16, 2024

Conversation

tom-hg57
Copy link
Collaborator

@tom-hg57 tom-hg57 commented Oct 27, 2024 •
edited
Loading

  • Common:
    • Fix some attribute types
    • Fix handling of Decimal as float class
    • Add class property "is_a_primitive_class" and attribute property "is_primitive_float_attribute"
    • Improve _get_attribute_type in cimgen.py
    • Improve setting of long profile names
    • Refactor _merge_profiles and _merge_classes in cimgen.py
    • Add "is_a_datatype_class" and "is_datatype_attribute" (stereotype == "CIMDatatype"), use these instead of "is_a_float_class" and "is_primitive_float_attribute"
  • modernpython:

@tom-hg57
Fix some attribute types in classes DiagramObjectGluePoint, VCompIEEE…
7944f6e 
…Type2, WindContPType3IEC for cpp and modernpython

Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Add class property "is_a_primitive_class" and attribute property "is_…
3b6e9d2 
…primitive_float_attribute"

Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Fix type and default of some attributes for modernpython (for enums a…
bded89c 
…nd attribute types Date, DateTime, MonthDay, Status, StreetAddress, StreetDetail, TownDetail)

Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Fix handling of Decimal as float class
037dc1c 
Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Remove generation of unused classes for modernpython
08dfa2e 
Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Improve setting of long profile names
4ad48d7 
Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Refactor _merge_profiles and _merge_classes in cimgen.py
ac487b3 
Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Fix attribute type of TieFlow in class Terminal for cpp and modernpython
4ce0983 
Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57 tom-hg57 force-pushed the fix-class-and-attribute-types branch from ad41d88 to ab563b3 Compare October 31, 2024 02:23
@m-mirz
Copy link
Contributor

m-mirz commented Nov 8, 2024

@tom-hg57 could you please add a description summarizing the most important changes? The same goes for #41

@tom-hg57 tom-hg57 mentioned this pull request Nov 16, 2024
Merged
@m-mirz
Copy link
Contributor

m-mirz commented Nov 16, 2024

@tom-hg57 what is the motivation to copy all the libcimpp code here? For the base classes it might make sense but also including the handlers seems a little bit out of scope when compared to other languages. This would essentially merge the two projects.

@m-mirz m-mirz self-assigned this Nov 16, 2024
m-mirz
m-mirz requested changes Nov 16, 2024
View reviewed changes
Copy link
Contributor

@m-mirz m-mirz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this PR includes too many different things. Copying the cimpp code goes way beyond fixing some classes and attribute types and I don’t understand the motivation of copying all this over here.

@tom-hg57
Fix unused import (pre-commit flake8: cimgen/cimgen.py:5:1: F401 're'…
e3b05ac 
… imported but unused)

Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Add dependency to setuptools to fix ModuleNotFoundError for distutils…
569cd0f 
… in modernpython/lang_pack.py

Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Add "is_a_datatype_class" and "is_datatype_attribute" (stereotype == …
e68a0be 
…"CIMDatatype"), use these instead of "is_a_float_class" and "is_primitive_float_attribute"

There are now 4 disjoint class types:
- is_a_datatype_class (= float)
- is_an_enum_class
- is_a_primitive_class (Integer, Boolean, Float/Decimal = float, String/Date/DateTime/MonthDay = string)
- all others are normal classes

and 5 disjoint attribute types:
- is_class_attribute
- is_enum_attribute
- is_datatype_attribute
- is_list_attribute
- is_primitive_attribute

Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57
Rename writer.py to chevron_writer.py for modernpython (to prevent co…
b2376a8 
…nflicts with the new writer in https://github.com/zaphiro-technologies/cimgen/tree/xml-generation-and-parsing)

Signed-off-by: Thomas Günther <[email protected]>
@tom-hg57 tom-hg57 force-pushed the fix-class-and-attribute-types branch from 0fc5750 to b2376a8 Compare November 16, 2024 14:37
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
1.2% Duplication on New Code

See analysis details on SonarQube Cloud

@tom-hg57
Copy link
Collaborator Author

I feel like this PR includes too many different things. Copying the cimpp code goes way beyond fixing some classes and attribute types and I don’t understand the motivation of copying all this over here.

I've now removed most of the cpp changes and will put these into a new branch.

@tom-hg57 tom-hg57 requested a review from m-mirz November 16, 2024 14:54
@m-mirz m-mirz merged commit 8010364 into sogno-platform:master Nov 16, 2024
8 checks passed
@tom-hg57 tom-hg57 deleted the fix-class-and-attribute-types branch November 16, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chicco785 chicco785 chicco785 left review comments

@m-mirz m-mirz m-mirz approved these changes

Assignees

@m-mirz m-mirz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tom-hg57 @m-mirz @chicco785