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

Filter by resources type using checkbox #29

Merged
merged 2 commits into from
May 22, 2023
Merged

Filter by resources type using checkbox #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bba42e
added resource type filter by checkbox
ronitjadhav May 8, 2023
ead92fd
Implementing proxy model for filter
ronitjadhav May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions qgis_hub_plugin/gui/resource_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def __init__(self, parent=None, iface=None):
self.graphicsViewPreview.setScene(self.graphicsScene)

# Resources
self.resources = []
self.resource_model = QStandardItemModel(self.listViewResources)
self.listViewResources.setModel(self.resource_model)

Expand All @@ -50,6 +51,16 @@ def __init__(self, parent=None, iface=None):

self.pushButtonDownload.clicked.connect(self.download_resource)

self.checkBoxGeopackage.stateChanged.connect(
Copy link
Collaborator

Choose a reason for hiding this comment

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

If we check in the hub API, there are 5 resource types
image

It seems the API doesn't return all five resource types. Could you check it? Add the missing 2 check boxes after that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I checked the API URL used, it only returns three types of resources.
Is there any other API I can use, or can you direct me to the place where I can find the API's.

Copy link
Collaborator

Choose a reason for hiding this comment

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

It's not really documented, but it's from this https://github.com/qgis/QGIS-Django/blob/master/qgis-app/api/urls.py

Copy link
Collaborator

Choose a reason for hiding this comment

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

I will create an issue in that repo to include the other resource type also.

Copy link
Collaborator

Choose a reason for hiding this comment

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

qgis/QGIS-Django#280

lambda: self.populate_resources(force_update=False)
)
self.checkBoxStyle.stateChanged.connect(
lambda: self.populate_resources(force_update=False)
)
self.checkBoxModel.stateChanged.connect(
lambda: self.populate_resources(force_update=False)
)

self.reloadToolButton.setIcon(
QIcon(":/images/themes/default/mActionRefresh.svg")
)
Expand All @@ -60,15 +71,27 @@ def __init__(self, parent=None, iface=None):
self.hide_preview()

def populate_resources(self, force_update=False):
response = get_all_resources(force_update=force_update)
# total = response.get("total")
# previous_url = response.get("previous")
# next_url = response.get("next")
resources = response.get("results", {})
if force_update or not self.resources:
response = get_all_resources(force_update=force_update)
# total = response.get("total")
# previous_url = response.get("previous")
# next_url = response.get("next")
self.resources = response.get("results", {})

geopackage_checked = self.checkBoxGeopackage.isChecked()
style_checked = self.checkBoxStyle.isChecked()
model_checked = self.checkBoxModel.isChecked()

filtered_resources = [
Copy link
Collaborator

Choose a reason for hiding this comment

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

Actually, I prefer to use qsortfilterproxymodel for filtering (and search also sorting in the future). Could you try to use qsortfilterproxymodel? It's more challenging to use of course :)

Copy link
Collaborator Author

@ronitjadhav ronitjadhav May 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I have implemented the qsortfilterproxymodel for filtering in the new commit.

ResourceItem(r)
for r in self.resources
if (geopackage_checked and r["resource_type"] == "Geopackage")
or (style_checked and r["resource_type"] == "Style")
or (model_checked and r["resource_type"] == "Model")
]

self.resource_model.clear()
for resource in resources:
item = ResourceItem(resource)
for item in filtered_resources:
self.resource_model.appendRow(item)

@pyqtSlot("QItemSelection", "QItemSelection")
Expand Down
207 changes: 137 additions & 70 deletions qgis_hub_plugin/gui/resource_browser.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,78 +14,9 @@
<string>QGIS Hub Explorer</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2">
<widget class="QWidget" name="widget_3" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelSearch">
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="lineEditSearch"/>
</item>
<item>
<widget class="QToolButton" name="toolButtonSearch">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelResourceType">
<property name="text">
<string>Resource Type</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelReloadResources">
<property name="text">
<string>Reload Resources</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="reloadToolButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QWidget" name="widget_4" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QHBoxLayout">
<item>
<widget class="QListView" name="listViewResources">
<property name="sizePolicy">
Expand Down Expand Up @@ -336,6 +267,142 @@
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QWidget" name="widget_3" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelSearch">
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="lineEditSearch"/>
</item>
<item>
<widget class="QToolButton" name="toolButtonSearch">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelResourceType">
<property name="text">
<string>Resource Type</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelReloadResources">
<property name="text">
<string>Reload Resources</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QToolButton" name="reloadToolButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QWidget" name="widget_2" native="true">
<widget class="QCheckBox" name="checkBoxStyle">
<property name="geometry">
<rect>
<x>10</x>
<y>-8</y>
<width>58</width>
<height>31</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Style</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkBoxGeopackage">
<property name="geometry">
<rect>
<x>90</x>
<y>-8</y>
<width>106</width>
<height>31</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Geopackage</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkBoxModel">
<property name="geometry">
<rect>
<x>210</x>
<y>-8</y>
<width>90</width>
<height>31</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Model</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down