Merge pull request #11 from dayjournal/dev

Dev

Author: dayjournal

AttributeAssignment.py

@@ -35,12 +35,13 @@
     def _fromUtf8(s):
         return s
 
+
 class AttributeAssignment:
     def __init__(self, iface):
         self.iface = iface
         self.canvas = self.iface.mapCanvas()
         self.dlg = AttributeAssignmentDialog()
-        self.dlg.hide()  
+        self.dlg.hide()
         self.plugin_dir = os.path.dirname(__file__)
         locale = QSettings().value('locale/userLocale')[0:2]
         locale_path = os.path.join(
@@ -56,19 +57,21 @@ def __init__(self, iface):
         self.menu = self.tr(u'&AttributeAssignment')
         self.toolbar = self.iface.addToolBar(u'AttributeAssignment')
         self.toolbar.setObjectName(u'AttributeAssignment')
+
     def tr(self, message):
         return QCoreApplication.translate('AttributeAssignment', message)
+
     def add_action(
-        self,
-        icon_path,
-        text,
-        callback,
-        enabled_flag=True,
-        add_to_menu=True,
-        add_to_toolbar=True,
-        status_tip=None,
-        whats_this=None,
-        parent=None):
+            self,
+            icon_path,
+            text,
+            callback,
+            enabled_flag=True,
+            add_to_menu=True,
+            add_to_toolbar=True,
+            status_tip=None,
+            whats_this=None,
+            parent=None):
         icon = QIcon(icon_path)
         action = QAction(icon, text, parent)
         action.triggered.connect(callback)
@@ -85,45 +88,49 @@ def add_action(
                 action)
         self.actions.append(action)
         return action
+
     def initGui(self):
         icon_path = ':/plugins/AttributeAssignment/icon.png'
         self.add_action(
             icon_path,
             text=self.tr(u'AttributeAssignment'),
             callback=self.run,
             parent=self.iface.mainWindow())
+
     def unload(self):
         for action in self.actions:
             self.iface.removePluginMenu(
                 self.tr(u'&AttributeAssignment'),
                 action)
             self.iface.removeToolBarIcon(action)
         del self.toolbar
+
     def run(self):
         self.dlg.show()
-        self.dlg.mMapLayerComboBox.setLayer(self.iface.layerTreeView().currentLayer()) 
+        self.dlg.mMapLayerComboBox.setLayer(
+            self.iface.layerTreeView().currentLayer())
         self.toolClick = QgsMapToolClick(self.iface, self.canvas, self.dlg)
         self.canvas.setMapTool(self.toolClick)
 
+
 class QgsMapToolClick(QgsMapTool):
     def __init__(self, iface, canvas, dlg):
         QgsMapTool.__init__(self, canvas)
         self.iface = iface
         self.canvas = canvas
         self.dlg = dlg
+
     def canvasPressEvent(self, mouseEvent):
-        layer = self.dlg.mMapLayerComboBox.currentText()
+        layer = self.dlg.mMapLayerComboBox.currentLayer()
         fieldname = self.dlg.mFieldComboBox.currentText()
-        textvalue = self.dlg.lineEdit_text.text()
-        layers = QgsProject.instance().mapLayers()
-        for k,v in layers.items():
-           if v.name() == layer:
-               layer = v
-           else:
-               pass
+        if self.dlg.wrapper is not None:
+            value = self.dlg.wrapper.value()
+        else:
+            value = None
         if not layer or layer.type() != QgsMapLayer.VectorLayer:
             QMessageBox.warning(None, u"Error", u"This is not a vector layer.")
             return
+
         mPosBefore = mouseEvent.mapPoint()
         layerCRS = layer.crs()
         destcrs = self.iface.mapCanvas().mapSettings().destinationCrs()
@@ -136,13 +143,13 @@ def canvasPressEvent(self, mouseEvent):
                             mPos.y() + width)
         layer.startEditing()
         rectadd = layer.getFeatures(QgsFeatureRequest().setFilterRect(rect))
-        featureid = "";
+        featureid = None
         for f in rectadd:
             attrs = f.attributes()
             findex = f.fieldNameIndex(fieldname)
             featureid = f.id()
-        if featureid != "":
-            layer.changeAttributeValue(featureid, findex, textvalue)
+        if featureid is not None:
+            layer.changeAttributeValue(featureid, findex, value)
         else:
             QMessageBox.warning(None, u"Error", u"This is not a feature.")
         layer.triggerRepaint()

AttributeAssignment_base.py

@@ -1,85 +1,105 @@
-# -*- coding: utf-8 -*-
-"""
-/***************************************************************************
- AttributeAssignment
-                                 A QGIS plugin
- Easy to assign an attribute on QGIS
-                              -------------------
-        begin                : 2018-03-14
-        git sha              : $Format:%H$
-        copyright            : (C) 2018 by Yasunori Kirimoto
-        email                : [email protected]
-        license              : GNU General Public License v2.0
- ***************************************************************************/
-"""
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtWidgets.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtWidgets.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtWidgets.QApplication.translate(context, text, disambig)
-
-class Ui_AttributeAssignment(object):
-    def setupUi(self, AttributeAssignment):
-        AttributeAssignment.setObjectName(_fromUtf8("AttributeAssignment"))
-        AttributeAssignment.resize(240, 220)
-        AttributeAssignment.move(50, 125)
-        self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)
-        self.label_layer = QtWidgets.QLabel(AttributeAssignment)
-        self.label_layer.setGeometry(QtCore.QRect(20, 15, 201, 21))
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.label_layer.setFont(font)
-        self.label_layer.setObjectName(_fromUtf8("label_layer"))
-        self.mMapLayerComboBox = QgsMapLayerComboBox(AttributeAssignment)
-        self.mMapLayerComboBox.setGeometry(QtCore.QRect(20, 35, 200, 25))
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.mMapLayerComboBox.setFont(font)
-        self.mMapLayerComboBox.setObjectName(_fromUtf8("mMapLayerComboBox"))
-        self.label_field = QtWidgets.QLabel(AttributeAssignment)
-        self.label_field.setGeometry(QtCore.QRect(20, 75, 201, 21))
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.label_field.setFont(font)
-        self.label_field.setObjectName(_fromUtf8("label_field"))
-        self.mFieldComboBox = QgsFieldComboBox(AttributeAssignment)
-        self.mFieldComboBox.setGeometry(QtCore.QRect(20, 95, 200, 25))
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.mFieldComboBox.setFont(font)
-        self.mFieldComboBox.setObjectName(_fromUtf8("mFieldComboBox"))
-        self.label_text = QtWidgets.QLabel(AttributeAssignment)
-        self.label_text.setGeometry(QtCore.QRect(20, 140, 201, 21))
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.label_text.setFont(font)
-        self.label_text.setObjectName(_fromUtf8("label_text"))
-        self.lineEdit_text = QtWidgets.QLineEdit(AttributeAssignment)
-        self.lineEdit_text.setGeometry(QtCore.QRect(20, 160, 200, 25))
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.lineEdit_text.setFont(font)
-        self.lineEdit_text.setObjectName(_fromUtf8("lineEdit_text"))
-        self.retranslateUi(AttributeAssignment)
-        # QtCore.QObject.connect(self.mMapLayerComboBox, QtCore.SIGNAL(_fromUtf8("layerChanged(QgsMapLayer*)")), self.mFieldComboBox.setLayer)
-        self.mMapLayerComboBox.layerChanged.connect(self.mFieldComboBox.setLayer)
-        QtCore.QMetaObject.connectSlotsByName(AttributeAssignment)
-
-    def retranslateUi(self, AttributeAssignment):
-        AttributeAssignment.setWindowTitle(_translate("AttributeAssignment", u"AttributeAssignment", None))
-        self.label_layer.setText(_translate("AttributeAssignment", u"Layer", None))
-        self.label_field.setText(_translate("AttributeAssignment", u"Field", None))
-        self.label_text.setText(_translate("AttributeAssignment", u"Value", None)) 
-
-from qgis.gui import QgsFieldComboBox, QgsMapLayerComboBox
+# -*- coding: utf-8 -*-
+"""
+/***************************************************************************
+ AttributeAssignment
+                                 A QGIS plugin
+ Easy to assign an attribute on QGIS
+                              -------------------
+        begin                : 2018-03-14
+        git sha              : $Format:%H$
+        copyright            : (C) 2018 by Yasunori Kirimoto
+        email                : [email protected]
+        license              : GNU General Public License v2.0
+ ***************************************************************************/
+"""
+
+from qgsfieldcombobox import QgsFieldComboBox
+from qgsmaplayercombobox import QgsMapLayerComboBox
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_AttributeAssignment(object):
+    def setupUi(self, AttributeAssignment):
+        AttributeAssignment.setObjectName("AttributeAssignment")
+        AttributeAssignment.setEnabled(True)
+        AttributeAssignment.resize(240, 220)
+        self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)
+        self.formLayout = QtWidgets.QFormLayout(AttributeAssignment)
+        self.formLayout.setFieldGrowthPolicy(
+            QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
+        self.formLayout.setRowWrapPolicy(QtWidgets.QFormLayout.DontWrapRows)
+        self.formLayout.setContentsMargins(20, 20, 20, 20)
+        self.formLayout.setSpacing(10)
+        self.formLayout.setObjectName("formLayout")
+        self.label_layer = QtWidgets.QLabel(AttributeAssignment)
+        font = QtGui.QFont()
+        font.setPointSize(10)
+        self.label_layer.setFont(font)
+        self.label_layer.setObjectName("label_layer")
+        self.formLayout.setWidget(
+            0, QtWidgets.QFormLayout.LabelRole, self.label_layer)
+        self.mMapLayerComboBox = QgsMapLayerComboBox(AttributeAssignment)
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(25)
+        sizePolicy.setHeightForWidth(
+            self.mMapLayerComboBox.sizePolicy().hasHeightForWidth())
+        self.mMapLayerComboBox.setSizePolicy(sizePolicy)
+        self.mMapLayerComboBox.setAllowEmptyLayer(False)
+        self.mMapLayerComboBox.setShowCrs(False)
+        self.mMapLayerComboBox.setObjectName("mMapLayerComboBox")
+        self.formLayout.setWidget(
+            1, QtWidgets.QFormLayout.SpanningRole, self.mMapLayerComboBox)
+        self.label_field = QtWidgets.QLabel(AttributeAssignment)
+        font = QtGui.QFont()
+        font.setPointSize(10)
+        self.label_field.setFont(font)
+        self.label_field.setObjectName("label_field")
+        self.formLayout.setWidget(
+            3, QtWidgets.QFormLayout.LabelRole, self.label_field)
+        self.mFieldComboBox = QgsFieldComboBox(AttributeAssignment)
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(25)
+        sizePolicy.setHeightForWidth(
+            self.mFieldComboBox.sizePolicy().hasHeightForWidth())
+        self.mFieldComboBox.setSizePolicy(sizePolicy)
+        self.mFieldComboBox.setObjectName("mFieldComboBox")
+        self.formLayout.setWidget(
+            4, QtWidgets.QFormLayout.SpanningRole, self.mFieldComboBox)
+        self.label_value = QtWidgets.QLabel(AttributeAssignment)
+        font = QtGui.QFont()
+        font.setPointSize(10)
+        self.label_value.setFont(font)
+        self.label_value.setObjectName("label_value")
+        self.formLayout.setWidget(
+            6, QtWidgets.QFormLayout.LabelRole, self.label_value)
+        self.mValuePlaceholder = QtWidgets.QWidget(AttributeAssignment)
+        sizePolicy = QtWidgets.QSizePolicy(
+            QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(25)
+        sizePolicy.setHeightForWidth(
+            self.mValuePlaceholder.sizePolicy().hasHeightForWidth())
+        self.mValuePlaceholder.setSizePolicy(sizePolicy)
+        self.mValuePlaceholder.setObjectName("mValuePlaceholder")
+        self.formLayout.setWidget(
+            7, QtWidgets.QFormLayout.SpanningRole, self.mValuePlaceholder)
+        self.label_layer.raise_()
+        self.mValuePlaceholder.raise_()
+        self.label_field.raise_()
+        self.mMapLayerComboBox.raise_()
+        self.mFieldComboBox.raise_()
+        self.label_value.raise_()
+        self.retranslateUi(AttributeAssignment)
+        QtCore.QMetaObject.connectSlotsByName(AttributeAssignment)
+
+    def retranslateUi(self, AttributeAssignment):
+        _translate = QtCore.QCoreApplication.translate
+        AttributeAssignment.setWindowTitle(_translate(
+            "AttributeAssignment", "AttributeAssignment"))
+        self.label_layer.setText(_translate("AttributeAssignment", "Layer"))
+        self.label_field.setText(_translate("AttributeAssignment", "Field"))
+        self.label_value.setText(_translate("AttributeAssignment", "Value"))