-
Notifications
You must be signed in to change notification settings - Fork 0
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
Alustava arkkitehtuurisuunnitelma #1
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Empty file.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
from __future__ import annotations | ||
|
||
from dataclasses import dataclass | ||
from typing import TYPE_CHECKING, Sequence | ||
|
||
if TYPE_CHECKING: | ||
from qgis.core import QgsVectorLayer | ||
from qgis.gui import QgsDoubleSpinBox, QgsSpinBox | ||
from qgis.PyQt.QtGui import QIcon | ||
from qgis.PyQt.QtWidgets import QLineEdit | ||
|
||
|
||
@dataclass | ||
class FeatureAttribute: | ||
name: str | ||
display_name: str | ||
feature_attribte_group: str | ||
# attribute_layer: QgsMapLayer # Is this correct type? | ||
additional_information: str | ||
input_field_type: QLineEdit | QgsSpinBox | QgsDoubleSpinBox | None | ||
modifiable: bool = False | ||
hidden: bool = False | ||
|
||
|
||
@dataclass | ||
class FeatureTemplate: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is now missing possible child features. But that's totally fine for now! Let's first try to get this working with the most simple one feature case. Probably the library config should be updated accordingly. |
||
name: str | ||
description: str | ||
feature_layer: QgsVectorLayer | ||
feature_attributes: Sequence[FeatureAttribute] | ||
display_icon: QIcon | None = None |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
from __future__ import annotations | ||
|
||
import json | ||
from typing import TYPE_CHECKING, Sequence | ||
|
||
if TYPE_CHECKING: | ||
from os import PathLike | ||
|
||
from arho_feature_template.core.feature_template import FeatureTemplate | ||
|
||
|
||
class FeatureTemplateLibrary: | ||
"""Class for storing FeatureTemplates and loading them from a JSON (or other conf. file).""" | ||
|
||
def __init__(self, json_path: str | PathLike): | ||
self.templates = [] | ||
library_dict = self.read_json(json_path) | ||
self.build_templates(library_dict) | ||
|
||
def read_json(self, json_path: str | PathLike) -> dict: | ||
self.source_json = json_path | ||
with open(json_path) as f: | ||
return json.load(f) | ||
|
||
def build_templates(self, library_dict: dict): | ||
templates = [] | ||
|
||
_templates_raw = library_dict["templates"] | ||
# for template_raw in templates_raw: | ||
## ... build FeatureTemplate from dict here, in FeatureTemplate class or elsewhere? | ||
# template = FeatureTemplate() | ||
# templates.append(template) | ||
self.templates = templates | ||
|
||
def get_templates(self) -> Sequence[FeatureTemplate]: | ||
return self.templates |
Empty file.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
from arho_feature_template.core.feature_template import FeatureTemplate | ||
from arho_feature_template.core.forms.feature_attribute_form import FeatureAttributeForm | ||
|
||
|
||
class AddFeatureForm(FeatureAttributeForm): | ||
"""Dialog for filling and saving attribute data that opens when a new feature has been digitized.""" | ||
|
||
def __init__(self, feature_template: FeatureTemplate): | ||
super().__init__(feature_template) | ||
|
||
def _init_feature_attributes(self): | ||
# for feature_attribute in self.feature_template.feature_attributes: | ||
# # Create the form here, add rows with labels and input fields | ||
pass | ||
|
||
def save(self): | ||
pass |
17 changes: 17 additions & 0 deletions
17
arho_feature_template/core/forms/feature_attribute_form.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
from importlib import resources | ||
|
||
from qgis.PyQt import uic | ||
from qgis.PyQt.QtWidgets import QDialog | ||
|
||
from arho_feature_template.core.feature_template import FeatureTemplate | ||
|
||
ui_path = resources.files(__package__) / "feature_attribute_form.ui" | ||
FormClass, _ = uic.loadUiType(ui_path) | ||
|
||
class FeatureAttributeForm(QDialog, FormClass): | ||
"""Parent class for feature forms for adding and modifying feature attribute data.""" | ||
|
||
def __init__(self, feature_template: FeatureTemplate): | ||
super().__init__() | ||
self.setupUi(self) | ||
self.feature_template = feature_template |
68 changes: 68 additions & 0 deletions
68
arho_feature_template/core/forms/feature_attribute_form.ui
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<ui version="4.0"> | ||
<class>Dialog</class> | ||
<widget class="QDialog" name="Dialog"> | ||
<property name="geometry"> | ||
<rect> | ||
<x>0</x> | ||
<y>0</y> | ||
<width>640</width> | ||
<height>480</height> | ||
</rect> | ||
</property> | ||
<property name="windowTitle"> | ||
<string>Dialog</string> | ||
</property> | ||
<widget class="QDialogButtonBox" name="buttonBox"> | ||
<property name="geometry"> | ||
<rect> | ||
<x>10</x> | ||
<y>440</y> | ||
<width>621</width> | ||
<height>32</height> | ||
</rect> | ||
</property> | ||
<property name="orientation"> | ||
<enum>Qt::Horizontal</enum> | ||
</property> | ||
<property name="standardButtons"> | ||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | ||
</property> | ||
</widget> | ||
</widget> | ||
<resources/> | ||
<connections> | ||
<connection> | ||
<sender>buttonBox</sender> | ||
<signal>accepted()</signal> | ||
<receiver>Dialog</receiver> | ||
<slot>accept()</slot> | ||
<hints> | ||
<hint type="sourcelabel"> | ||
<x>248</x> | ||
<y>254</y> | ||
</hint> | ||
<hint type="destinationlabel"> | ||
<x>157</x> | ||
<y>274</y> | ||
</hint> | ||
</hints> | ||
</connection> | ||
<connection> | ||
<sender>buttonBox</sender> | ||
<signal>rejected()</signal> | ||
<receiver>Dialog</receiver> | ||
<slot>reject()</slot> | ||
<hints> | ||
<hint type="sourcelabel"> | ||
<x>316</x> | ||
<y>260</y> | ||
</hint> | ||
<hint type="destinationlabel"> | ||
<x>286</x> | ||
<y>274</y> | ||
</hint> | ||
</hints> | ||
</connection> | ||
</connections> | ||
</ui> |
Empty file.
21 changes: 21 additions & 0 deletions
21
arho_feature_template/core/panels/template_library_panel.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
from importlib import resources | ||
|
||
from qgis.PyQt import uic | ||
from qgis.PyQt.QtWidgets import QWidget | ||
|
||
from arho_feature_template.core.feature_template_library import FeatureTemplateLibrary | ||
|
||
ui_path = resources.files(__package__) / "template_library_panel.ui" | ||
FormClass, _ = uic.loadUiType(ui_path) | ||
|
||
class TemplateLibraryPanel(QWidget, FormClass): | ||
"""Dock widget for selecting a feature template.""" | ||
|
||
def __init__(self, feature_template_library: FeatureTemplateLibrary): | ||
super().__init__() | ||
self.setupUi(self) | ||
self.initialize_from_library(feature_template_library) | ||
|
||
def initialize_from_library(self, feature_template_library: FeatureTemplateLibrary): | ||
# Initialization logic | ||
self.library = feature_template_library |
19 changes: 19 additions & 0 deletions
19
arho_feature_template/core/panels/template_library_panel.ui
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<ui version="4.0"> | ||
<class>Form</class> | ||
<widget class="QWidget" name="Form"> | ||
<property name="geometry"> | ||
<rect> | ||
<x>0</x> | ||
<y>0</y> | ||
<width>640</width> | ||
<height>480</height> | ||
</rect> | ||
</property> | ||
<property name="windowTitle"> | ||
<string>Form</string> | ||
</property> | ||
</widget> | ||
<resources/> | ||
<connections/> | ||
</ui> |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably be read at form rendering time from the layer settings.