rename settings.py to conf.py and clean up imports

datamanager.py

@@ -21,10 +21,9 @@
 """
 import os
 
-from qgis.PyQt.QtCore import Qt, QDir, QSize
-from qgis.PyQt.QtGui import QColor, QImage, QPainter
-from PyQt5.QtGui import QImageReader
-from qgis.core import QgsMapLayer, QgsPalLabeling, QgsProject
+from PyQt5.QtCore import Qt, QSize
+from PyQt5.QtGui import QColor, QImage, QImageReader, QPainter
+from qgis.core import QgsMapLayer
 
 from . import gdal2threejs
 from . import qgis2threejstools as tools
@@ -99,18 +98,6 @@ def saveMapCanvasImage(self):
     self.exportSettings.canvas.saveAsImage(texfilename)
     tools.removeTemporaryFiles([texfilename + "w"])
 
-  def _initRenderer(self):
-    # set up a renderer
-    labeling = QgsPalLabeling()
-    renderer = QgsMapRenderer()
-    renderer.setDestinationCrs(self.exportSettings.crs)
-    renderer.setProjectionsEnabled(True)
-    renderer.setLabelingEngine(labeling)
-
-    # save renderer
-    self._labeling = labeling
-    self._renderer = renderer
-
   def renderedImage(self, width, height, extent, transp_background=False, layerids=None):
     # render layers with QgsMapRendererCustomPainterJob
     from qgis.core import QgsMapRendererCustomPainterJob
@@ -243,7 +230,7 @@ def _write(self, f):    #TODO: remove
         args = (index, width, height, self.base64image(index))
 
       else:   #imageType == self.CANVAS_IMAGE:
-        transp_background = image[1]
+        #transp_background = image[1]
         size = self.exportSettings.mapSettings.outputSize()
         args = (index, size.width(), size.height(), self.base64image(index))
 

export.py

@@ -22,7 +22,7 @@
 import json
 import os
 
-from qgis.PyQt.QtCore import QDir
+from PyQt5.QtCore import QDir
 from qgis.core import QgsMapLayer, QgsProject
 
 from .datamanager import ImageManager, ModelManager

exportsettings.py

@@ -20,13 +20,13 @@
 import os
 import datetime
 
-from qgis.PyQt.QtCore import QSettings
+from PyQt5.QtCore import QSettings
 from qgis.core import QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsProject
 
+from .conf import def_vals
 from .rotatedrect import RotatedRect
 from .qgis2threejscore import ObjectTreeItem, MapTo3D, GDALDEMProvider, FlatDEMProvider, createQuadTree
 from .qgis2threejstools import logMessage
-from .settings import def_vals
 from . import qgis2threejstools as tools
 
 

exportvector.py

@@ -20,12 +20,7 @@
  ***************************************************************************/
 """
 from qgis.core import QgsCoordinateTransform, QgsFeatureRequest, QgsGeometry, QgsMapLayer, QgsPoint, QgsProject, QgsRenderContext, QgsWkbTypes
-
-try:
-  from osgeo import ogr, osr
-except ImportError:
-  import ogr
-  import osr
+from osgeo import ogr, osr
 
 from .exportlayer import LayerExporter
 from .geometry import PointGeometry, LineGeometry, PolygonGeometry, TriangleMesh, dissolvePolygonsOnCanvas

gdal2threejs.py

@@ -20,10 +20,7 @@
 import struct
 import base64
 
-try:
-  from osgeo import gdal
-except ImportError:
-  import gdal
+from osgeo import gdal
 
 
 class Raster:

geometry.py

@@ -18,13 +18,10 @@
  *                                                                         *
  ***************************************************************************/
 """
+from osgeo import ogr
 from qgis.core import QgsGeometry, QgsPoint, QgsRectangle, QgsFeature, QgsSpatialIndex, QgsCoordinateTransform, QgsFeatureRequest
-from .qgis2threejstools import logMessage
 
-try:
-  from osgeo import ogr
-except ImportError:
-  import ogr
+from .qgis2threejstools import logMessage
 
 
 class Point:

layerselectdialog.py

@@ -17,8 +17,7 @@
  *                                                                         *
  ***************************************************************************/
 """
-from qgis.PyQt.QtCore import Qt
-from qgis.PyQt.QtWidgets import QDialog
+from PyQt5.QtWidgets import QDialog
 from qgis.core import QgsLayerTreeModel, QgsProject
 
 from .ui.layerselectdialog import Ui_LayerSelectDialog

pluginmanager.py

@@ -23,7 +23,7 @@
 import os
 import sys
 
-from qgis.PyQt.QtCore import QDir, QFile, QSettings
+from PyQt5.QtCore import QDir, QFile, QSettings
 from .qgis2threejstools import logMessage
 
 
@@ -44,7 +44,6 @@ def reloadPlugins(self):
       p = QSettings().value("/Qgis2threejs/plugins", "", type=str)
       plugins = p.split(",") if p else []
 
-    import importlib
     for name in plugins:
       try:
         modname = "Qgis2threejs.plugins." + str(name)

plugins/gsielevtile/downloader.py

@@ -18,8 +18,8 @@
  *                                                                         *
  ***************************************************************************/
 """
-from qgis.PyQt.QtCore import QDateTime, QEventLoop, QObject, QTimer, QUrl, qDebug, pyqtSignal, pyqtSlot
-from qgis.PyQt.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt5.QtCore import QDateTime, QEventLoop, QObject, QTimer, QUrl, qDebug, pyqtSignal, pyqtSlot
+from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
 from qgis.core import QgsNetworkAccessManager
 import threading
 

plugins/gsielevtile/gsielevtileprovider.py

@@ -25,14 +25,10 @@
 import numpy
 import struct
 
-from qgis.PyQt.QtCore import QSettings
+from osgeo import gdal
+from PyQt5.QtCore import QSettings
 from qgis.core import Qgis, QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsPoint, QgsRectangle
 
-try:
-  from osgeo import gdal
-except ImportError:
-  import gdal
-
 from .downloader import Downloader
 from Qgis2threejs.qgis2threejstools import logMessage
 

propertypages.py

@@ -22,20 +22,20 @@
 import os
 import re
 
-from qgis.PyQt.QtCore import Qt, QDir, QSettings, QPoint
-from qgis.PyQt.QtWidgets import QCheckBox, QColorDialog, QComboBox, QFileDialog, QLineEdit, QMessageBox, QRadioButton, QSlider, QSpinBox, QToolTip, QWidget
-from qgis.PyQt.QtGui import QColor
-from qgis.core import QgsMapLayer, QgsProject, QgsWkbTypes
+from PyQt5.QtCore import Qt, QDir, QSettings, QPoint
+from PyQt5.QtWidgets import QCheckBox, QColorDialog, QComboBox, QFileDialog, QLineEdit, QRadioButton, QSlider, QSpinBox, QToolTip, QWidget
+from PyQt5.QtGui import QColor
+from qgis.core import QgsMapLayer, QgsWkbTypes
 
 from .ui.worldproperties import Ui_WorldPropertiesWidget
 from .ui.controlsproperties import Ui_ControlsPropertiesWidget
 from .ui.demproperties import Ui_DEMPropertiesWidget
 from .ui.vectorproperties import Ui_VectorPropertiesWidget
 
+from .conf import def_vals
 from .qgis2threejscore import calculateDEMSize, createQuadTree
 from .qgis2threejstools import getLayersInProject, logMessage
 from .rotatedrect import RotatedRect
-from .settings import def_vals
 from .stylewidget import StyleWidget
 from . import qgis2threejstools as tools
 from .vectorobject import objectTypeManager

propertyreader.py

@@ -21,8 +21,8 @@
 """
 import os
 import random
-from qgis.PyQt.QtCore import QSize
-from qgis.PyQt.QtGui import QColor
+from PyQt5.QtCore import QSize
+from PyQt5.QtGui import QColor
 from qgis.core import NULL
 
 from .qgis2threejscore import calculateDEMSize

qgis2threejs.py

@@ -21,13 +21,12 @@
 """
 import os
 
-from qgis.PyQt.QtCore import QFile, QProcess, Qt    #, QSettings, QTranslator, qVersion
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
-from qgis.PyQt.QtGui import QIcon
+from PyQt5.QtCore import QFile, Qt    #, QSettings, QTranslator, qVersion
+from PyQt5.QtWidgets import QAction, QMessageBox
+from PyQt5.QtGui import QIcon
 from qgis.core import QgsMapLayer, QgsPluginLayerRegistry, QgsProject
 
 from .qgis2threejstools import logMessage, removeTemporaryOutputDir
-from .settings import live_in_another_process
 
 
 class Qgis2threejs:
@@ -156,7 +155,6 @@ def launchViewer(self):
 
     logMessage("Launching Live Exporter...")
 
-    serverName = "null"
     parent = self.iface.mainWindow()
     self.liveExporter = Q3DWindow(self.iface, isViewer=True, parent=parent, controller=self.controller)
     self.liveExporter.show()

qgis2threejscore.py

@@ -21,14 +21,10 @@
 """
 import struct
 
-from qgis.PyQt.QtCore import QSize
+from osgeo import gdal
+from PyQt5.QtCore import QSize
 from qgis.core import QgsMapLayer, QgsRectangle, QgsWkbTypes
 
-try:
-  from osgeo import gdal
-except ImportError:
-  import gdal
-
 from .gdal2threejs import Raster
 from .geometry import Point
 from .rotatedrect import RotatedRect

qgis2threejsdialog.py

@@ -24,20 +24,20 @@
 """
 import os
 
-from qgis.PyQt.QtCore import Qt, QDir, QEventLoop, QSettings, qDebug
-from qgis.PyQt.QtWidgets import QAction, QDialog, QFileDialog, QMessageBox, QMenu, QTreeWidgetItem, QTreeWidgetItemIterator, QToolButton
-from qgis.PyQt.QtGui import QColor, QIcon
+from PyQt5.QtCore import Qt, QDir, QEventLoop, QSettings, qDebug
+from PyQt5.QtWidgets import QAction, QDialog, QFileDialog, QMessageBox, QMenu, QTreeWidgetItem, QTreeWidgetItemIterator, QToolButton
+from PyQt5.QtGui import QColor, QIcon
 from qgis.core import QgsApplication, QgsFeature, QgsMapLayer, QgsPoint, QgsProject, QgsRectangle, QgsUnitTypes, QgsWkbTypes
 from qgis.gui import QgsMessageBar, QgsMapToolEmitPoint, QgsRubberBand
 
 from .ui.qgis2threejsdialog import Ui_Qgis2threejsDialog
 
+from .conf import debug_mode, def_vals, plugin_version
 from .export import exportToThreeJS
 from .exportsettings import ExportSettings
 from .qgis2threejscore import ObjectTreeItem, MapTo3D
 from .qgis2threejstools import getLayersInProject, logMessage
 from .rotatedrect import RotatedRect
-from .settings import debug_mode, def_vals, plugin_version
 from . import propertypages as ppages
 from . import qgis2threejstools as tools
 
@@ -656,7 +656,7 @@ def __init__(self, canvas):
 
   def canvasPressEvent(self, e):
     self.point = self.toMapCoordinates(e.pos())
-    self.emit(SIGNAL("pointSelected()"))
+    self.emit(SIGNAL("pointSelected()"))    #TODO: new style signal
 
 
 # first changed on 2014-01-03 (last changed on 2015-03-09)
@@ -689,7 +689,7 @@ def canvasPressEvent(self, e):
 
   def canvasReleaseEvent(self, e):
     self.isDrawing = False
-    self.emit(SIGNAL("rectangleCreated()"))
+    self.emit(SIGNAL("rectangleCreated()"))   #TODO: new style signal
 
   def canvasMoveEvent(self, e):
     if not self.isDrawing:

qgis2threejstools.py

@@ -19,16 +19,17 @@
  *                                                                         *
  ***************************************************************************/
 """
-from qgis.PyQt.QtCore import qDebug, QProcess, QSettings, QUrl, QBuffer, QByteArray, QIODevice, QFile, QDir, QFileInfo
-from qgis.PyQt.QtWidgets import QMessageBox
-from qgis.core import NULL, QgsMessageLog, QgsProject
 import os
 import configparser
 import re
 import shutil
 import webbrowser
 
-from .settings import debug_mode
+from PyQt5.QtCore import qDebug, QProcess, QSettings, QUrl, QBuffer, QByteArray, QIODevice, QFile, QDir, QFileInfo
+from PyQt5.QtWidgets import QMessageBox
+from qgis.core import NULL, QgsMessageLog, QgsProject
+
+from .conf import debug_mode
 
 def getLayersInProject():
   layers = []

settingsdialog.py

@@ -19,8 +19,8 @@
 """
 import configparser
 import os
-from qgis.PyQt.QtCore import Qt, QDir, QFile, QSettings
-from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QAbstractItemView, QHeaderView, QTableWidgetItem
+from PyQt5.QtCore import Qt, QDir, QFile, QSettings
+from PyQt5.QtWidgets import QDialog, QFileDialog, QAbstractItemView, QHeaderView, QTableWidgetItem
 
 from .qgis2threejstools import logMessage
 from .ui.settingsdialog import Ui_SettingsDialog
@@ -66,7 +66,7 @@ def __init__(self, parent):
         metadata = dict(parser.items("general"))
         self.plugin_metadata.append(metadata)
       except Exception as e:
-        logMessage("Unable to read metadata of plugin: {}".format(name))
+        logMessage("Unable to read metadata of plugin: {} ({})".format(name, e))
 
     tableWidget.setRowCount(len(self.plugin_metadata))
     for i, metadata in enumerate(self.plugin_metadata):

stylewidget.py

@@ -21,9 +21,9 @@
 """
 import os
 
-from qgis.PyQt.QtCore import QDir, QVariant
-from qgis.PyQt.QtWidgets import QWidget, QColorDialog, QFileDialog
-from qgis.PyQt.QtGui import QColor
+from PyQt5.QtCore import QDir, QVariant
+from PyQt5.QtWidgets import QWidget, QColorDialog, QFileDialog
+from PyQt5.QtGui import QColor
 from qgis.core import QgsProject, QgsWkbTypes
 
 from .ui.widgetComboEdit import Ui_ComboEditWidget

tests/test_api.py

@@ -11,7 +11,7 @@
 # TODO: version >= 2.4
 import os
 from unittest import TestCase
-from qgis.PyQt.QtCore import QSize
+from PyQt5.QtCore import QSize
 from qgis.core import QgsCoordinateReferenceSystem, QgsMapSettings, QgsRectangle
 
 from Qgis2threejs.api import Exporter

tests/test_plugins.py

@@ -10,7 +10,7 @@
 """
 import os
 from unittest import TestCase
-from qgis.PyQt.QtCore import QSize
+from PyQt5.QtCore import QSize
 from qgis.core import QgsRectangle
 
 from Qgis2threejs.api import Exporter

tests/utilities.py

@@ -12,9 +12,9 @@
 import shutil
 import sys
 
-from qgis.PyQt.QtCore import QFileInfo, qDebug
-from qgis.PyQt.QtGui import QColor
-from qgis.PyQt.QtXml import QDomDocument
+from PyQt5.QtCore import QFileInfo, qDebug
+from PyQt5.QtGui import QColor
+from PyQt5.QtXml import QDomDocument
 from qgis.core import QgsMapSettings, QgsProject
 
 from Qgis2threejs.qgis2threejstools import getLayersByLayerIds

vectorobject.py

@@ -22,7 +22,7 @@
 import importlib
 import sys
 
-from qgis.PyQt.QtWidgets import QMessageBox
+from PyQt5.QtWidgets import QMessageBox
 from qgis.core import QgsWkbTypes
 
 
@@ -36,7 +36,7 @@ def objectTypeManager():
 
 
 def list_modules():
-  from qgis.PyQt.QtCore import qDebug
+  from PyQt5.QtCore import qDebug
   for nam, mod in sys.modules.items():
     qDebug(nam + ": " + str(mod))