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

add photo quality setting to mergin project properties #383

Merged
merged 5 commits into from
Apr 26, 2022
Merged

add photo quality setting to mergin project properties #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73c6b27
add photo quality setting to mergin project properties
alexbruy Apr 19, 2022
0c7d86f
more verbose text for image quality items
alexbruy Apr 22, 2022
083d5b5
update image quality items text to match changes in Input
alexbruy Apr 22, 2022
8dcbdc7
put photo quality widgets inside groupbox and add explanatory text
alexbruy Apr 25, 2022
f4ff802
improve text
alexbruy Apr 26, 2022
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
14 changes: 13 additions & 1 deletion Mergin/project_settings_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import json
import os
from qgis.PyQt import uic
from qgis.gui import QgsOptionsWidgetFactory, QgsOptionsPageWidget
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtWidgets import QFileDialog
from qgis.core import QgsProject
from qgis.gui import QgsOptionsWidgetFactory, QgsOptionsPageWidget
from .utils import icon_path, mergin_project_local_path

ui_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ui', 'ui_project_config.ui')
Expand All @@ -28,6 +29,16 @@ class ProjectConfigWidget(ProjectConfigUiWidget, QgsOptionsPageWidget):
def __init__(self, parent=None):
QgsOptionsPageWidget.__init__(self, parent)
self.setupUi(self)

self.cmb_photo_quality.addItem("Original", 0)
self.cmb_photo_quality.addItem("High (approx. 2-4 Mb)", 1)
self.cmb_photo_quality.addItem("Medium (approx. 1-2 Mb)", 2)
self.cmb_photo_quality.addItem("Low (approx. 0.5 Mb)", 3)

quality, ok = QgsProject.instance().readEntry("Mergin", "PhotoQuality")
idx = self.cmb_photo_quality.findData(quality) if ok else 0
self.cmb_photo_quality.setCurrentIndex(idx if idx > 0 else 0)

self.local_project_dir = mergin_project_local_path()

if self.local_project_dir:
Expand Down Expand Up @@ -70,4 +81,5 @@ def save_config_file(self):
json.dump(config, f, indent=2)

def apply(self):
QgsProject.instance().writeEntry("Mergin", "PhotoQuality", self.cmb_photo_quality.currentData())
self.save_config_file()
169 changes: 97 additions & 72 deletions Mergin/ui/ui_project_config.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QWidget</class>
<class>Mergin</class>
<widget class="QWidget" name="Mergin">
<property name="enabled">
<bool>true</bool>
Expand All @@ -9,98 +9,123 @@
<rect>
<x>0</x>
<y>0</y>
<width>501</width>
<height>148</height>
<width>495</width>
<height>242</height>
</rect>
</property>
<property name="windowTitle">
<string>Create Mergin Project</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="selective_sync_group">
<property name="title">
<string>Selective sync</string>
</property>
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="selective_sync_group">
<property name="title">
<string>Selective sync</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>451</width>
<height>17</height>
</rect>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is configuration for selective sync for Input in Mergin project. With selective sync enabled Input will not download photos from other surveyors to make synchronisation faster. Check out more in the &lt;a href=&quot;https://merginmaps.com/docs/manage/selective_sync/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;documentation&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLineEdit" name="edit_sync_dir">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Select sync directory</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QToolButton" name="btn_get_sync_dir">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_sync_dir">
<property name="text">
<string>This is configuration for selective sync for Input in Mergin project.</string>
<string> Only apply for folder: </string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="4">
<widget class="QCheckBox" name="chk_sync_enabled">
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>401</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Enable selective sync for Input</string>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>461</width>
<height>41</height>
</rect>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Photo quality</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Photo quality</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cmb_photo_quality"/>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>This option is used by Input when adding pictures to the project (taken from camera or using existing picture from gallery).</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="select_dir_layout">
<item>
<widget class="QLabel" name="label_sync_dir">
<property name="text">
<string> Only apply for folder: </string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="edit_sync_dir">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>175</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>Select sync directory</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btn_get_sync_dir">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
Expand Down