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.

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

Add Flet app package #57

Merged
merged 22 commits into from
Jan 17, 2025
Merged

Add Flet app package #57

merged 22 commits into from
Jan 17, 2025

Conversation

ajkolenc
Copy link
Collaborator

Adds a new module containing a Flet app to manipulate pathways and display graphs

…PathwaysGenerator into feature/flet-frontend

# Conflicts:
#	pyproject.toml
#	source/package/pathways_app/controls/header.py
#	source/package/pathways_app/controls/panel.py
#	source/package/pathways_app/controls/tabbed_panel.py
#	source/package/pathways_app/main.py
#	source/package/pathways_app/theme.py
…PathwaysGenerator into feature/flet-frontend

# Conflicts:
#	source/package/adaptation_pathways/app/model/pathway.py
#	source/package/adaptation_pathways/app/model/pathways_project.py
#	source/package/adaptation_pathways/app/service/plotting_service.py
#	source/package/pathways_app/controls/action_icon.py
#	source/package/pathways_app/controls/actions_panel.py
#	source/package/pathways_app/controls/editable_cell.py
#	source/package/pathways_app/controls/graph_panel.py
#	source/package/pathways_app/controls/header.py
#	source/package/pathways_app/controls/metric_effect.py
#	source/package/pathways_app/controls/metric_value.py
#	source/package/pathways_app/controls/metrics_panel.py
#	source/package/pathways_app/controls/pathways_panel.py
#	source/package/pathways_app/controls/scenarios_panel.py
#	source/package/pathways_app/controls/sortable_header.py
#	source/package/pathways_app/controls/styled_button.py
#	source/package/pathways_app/controls/styled_dropdown.py
#	source/package/pathways_app/controls/styled_table.py
#	source/package/pathways_app/controls/unit_cell.py
#	source/package/pathways_app/example.py
#	source/package/pathways_app/main.py
@ajkolenc ajkolenc requested a review from kordejong December 21, 2024 14:25
Copy link
Collaborator

@kordejong kordejong left a comment

Choose a reason for hiding this comment

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

Maybe leave the mockup stuff out of the repo? I guess we won't be changing it anymore(?) and it will / is superseded by the actual app, right?

Copy link
Collaborator

Choose a reason for hiding this comment

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

build, env and .venv are conventions of individual developers. I would not put them in a project's .gitignore. They can be in a dev's personal .gitignore.

Copy link
Collaborator

Choose a reason for hiding this comment

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

This should not be necessary. All generated files should be in CMake's binary directory. I can help with that.

@kordejong
Copy link
Collaborator

If you agree, I can look into integrating your targets into the CMake scripts so all generated files end up in the binary directory and not in the source directory. This should only result in some additional CMakeLists.txt files. I don't think I would have to change any of the files you added.

@ajkolenc
Copy link
Collaborator Author

Maybe leave the mockup stuff out of the repo? I guess we won't be changing it anymore(?) and it will / is superseded by the actual app, right?

That is true, but it's still a useful reference for me and I'm still drawing icons and other images from it. Rather than risk it being lost I'd rather have it in the repo

@kordejong kordejong merged commit 8c58c89 into main Jan 17, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants