QGIS 3 Migration

Author: All4Gis

.gitignore

@@ -0,0 +1 @@
+Deploy/

Project_example/example_project.qgs

@@ -6,96 +6,20 @@ This plugin allows the visualization of equirectangular local images, although m
 
 ## Prerequisites
 
-The libraries [CefPython](https://github.com/cztomczak/cefpython) is required, you can find them in:
-- [x86](https://github.com/All4Gis/EquirectangularViewer/tree/master/ext-libs/x86/cefpython3)
-- [x64](https://github.com/All4Gis/EquirectangularViewer/tree/master/ext-libs/x64/cefpython3)
+The libraries [CefPython](https://github.com/cztomczak/cefpython) is required and Pillow,  install the **cefpython3** python package and **Pillow**.
+Always from command prompt:
 
-These libraries must be placed in Windows `D:\OSGeo4W64\apps\Python27\Lib\site-packages ` or something similar depending on your Qgis installation.
+`python3 -m pip install cefpython3`
+`python3 -m pip install pillow`
 
-If you don't find this path ,are wrong or you are using other platform, open the python console of QGIS and try with this for print it:
+Or using:
 
-`import site; site.getsitepackages()`
- 
-On the other hand, the plugin must be placed in the `.qgis` path, it should be something like 
+`python3 -m pip install -r requirements.txt`
 
- - Windows
- 
- 	`C:\Users\<username>\.qgis2\python\plugins`
- 	
- - Linux
- 
- 	`/home/<username>/.qgis2/python/plugins`
- 	
- - Mac OSX
- 
- 	`/Users/<username>/.qgis2/python/plugins`
 
-If you don't find this path ,are wrong or you are using other platform, open the python console of QGIS and try with this for print it:
-
-`print QgsApplication.qgisSettingsDirPath()`
-
-and search the `python/plugins` folder in this path.
- 
 Once installed, you can test the correct functioning of the plugin with the example that is provided,a shapefile with some images.
  [Test Project](https://github.com/All4Gis/EquirectangularViewer/tree/master/Project_example)
 
- ## Install Note for Windows 10
-
-***As for python in the environment variables:***
-
-Don't add anything in user environment variables,In system environment variables create a new variable:
-
-Name: `PYTHONHOME`
-Folder: `C:\Program Files\QGIS 2.18\apps\Python27`
-
-Instead, in the already existing `Path` variable add:
-
-    C:\OSGeo4W64\bin
-
-If there is not the folder `C:\OSGeo4W64\bin` add alternatively in `Path` variable:
-
-    C:\Program Files\QGIS 2.18\bin
-
-**Test** working python in command windows opening it as administrator ad typing `python`and If says python version all works.
-
-If says `python` is not recognized as an internal or external command remove `C:\OSGeo4W64\bin` from `Path` variable (even if it exists) and use `C:\Program Files\QGIS 2.18\bin`.
-
-***Open the command prompt as an administrator:***
-
-Right click on the windows button at the bottom left,
-Search for **CMD**,
-Key combination **CTRL + SHIFT + ENTER** (*administrator mode*).
-
-Type python, returns the python version.Type: `import pip`
-If not errors it means that pip is present. **CTRL + Z** to exit the python console.
-
-Install the **cefpython3** python package.
-Always from command prompt:
-
-    python -m pip install cefpython3
-
-***Copy the plugin folder:***
-
-Copy EquirectangularViewer in the QGIS plugins folder.
-Type in the python console of QGIS:
-
-    print QgsApplication.qgisSettingsDirPath ()
-
-to find the QGIS plugins folder:
-
-    C:\Users\user\.qgis2\python\plugins
- 
- 
- ### Note : 
- For show the images you need put the absolute path in the shapefile or modify the code ,method GetImage() in Geo360Dialog.py
-
-
- ### common mistakes: 
- 
- If not work or show this log:
- `NameError: global name 'cefpython' is not defined`
- Please,install cefpython using pip.
- `pip install cefpython3`
 
 ## How it works?
 

README.md

@@ -0,0 +1,7 @@
+/.pydevproject
+/.project
+/Compile.bat
+/py3-env.bat
+*.pyc
+.settings/
+__pycache__/

code/.gitignore

@@ -18,21 +18,18 @@
  *                                                                         *
  ***************************************************************************/
 """
-import os.path
+from qgis.gui import QgsMapToolIdentify
 
-from Geo360Dialog import Geo360Dialog
-from PyQt4.QtCore import QTimer, Qt
-from PyQt4.QtGui import QAction, QIcon, QCursor, QPixmap
-from qgis.core import *
-from qgis.gui import QgsMapToolIdentify, QgsMessageBar
-import qgis.utils
-from server.local_server import *
-from utils.log import log
-from utils.qgsutils import qgsutils
-
-
-from PyQt4 import QtGui
+from PyQt5.QtCore import QTimer, Qt, QSettings, QThread
+from PyQt5.QtGui import QIcon, QCursor, QPixmap
+from PyQt5.QtWidgets import QAction
 
+from EquirectangularViewer.Geo360Dialog import Geo360Dialog
+import EquirectangularViewer.config as config
+from EquirectangularViewer.server.local_server import openWebApp
+from EquirectangularViewer.utils.log import log
+from EquirectangularViewer.utils.qgsutils import qgsutils
+from qgis.core import QgsApplication
 
 try:
     from pydevd import *
@@ -54,8 +51,13 @@ def __init__(self, iface):
 
         self.iface = iface
         self.canvas = self.iface.mapCanvas()
-
-        self.plugin_path = os.path.dirname(os.path.realpath(__file__))
+        threadcount = QThread.idealThreadCount()
+        # use all available cores and parallel rendering
+        QgsApplication.setMaxThreads(threadcount)
+        QSettings().setValue("/qgis/parallel_rendering", True)
+        # OpenCL acceleration
+        QSettings().setValue("/core/OpenClEnabled", True)
+        self.dlg = None
 
     def createTimer(self):
         self.timer = QTimer()
@@ -65,17 +67,14 @@ def createTimer(self):
     def onTimer(self):
         try:
             cefpython.MessageLoopWork()
-        except:
+        except Exception:
             None
 
     def stopTimer(self):
         self.timer.stop()
 
     def StartCefPython(self):
         ''' Start CefPython '''
-        qgsutils.showUserAndLogMessage(
-            self, u"Information: ", u"Create Viewer.", QgsMessageBar.INFO,
-            onlyLog=True)
         settings = {}
         settings["browser_subprocess_path"] = "%s/%s" % (
             cefpython.GetModuleDirectory(), "subprocess")
@@ -114,23 +113,17 @@ def run(self):
         lys = self.canvas.layers()
         if len(lys) == 0:
             qgsutils.showUserAndLogMessage(
-                self, u"Information: ", u"You need to upload the photo layer.",
-                QgsMessageBar.INFO)
+                u"Information: ", u"You need to upload the photo layer.")
             return
 
         # Folder viewer for local server
-        folder = self.plugin_path + "\\viewer"
-
+        folder = QgsApplication.qgisSettingsDirPath() + 'python/plugins/EquirectangularViewer/viewer'
         # Start local server in plugin folder
         openWebApp(folder)
-        QtGui.qApp.processEvents()
-
         self.StartCefPython()
-        QtGui.qApp.processEvents()
 
         # Create Timer is necessary for cefpython
         self.createTimer()
-        QtGui.qApp.processEvents()
 
         for layer in lys:
             if layer.name() == config.layer_name:
@@ -140,8 +133,7 @@ def run(self):
 
         if self.encontrado is False:
             qgsutils.showUserAndLogMessage(
-                self, u"Information: ", u"You need to upload the photo layer.",
-                level=QgsMessageBar.INFO)
+                u"Information: ", u"You need to upload the photo layer.")
 
         return
 
@@ -150,22 +142,12 @@ def ShowDialog(self, featuresId=None, layer=None):
         self.featuresId = featuresId
         self.layer = layer
 
-        Geo360 = qgis.utils.plugins["EquirectangularViewer"]
-        try:
-            if (Geo360.dlg):
-                qgsutils.removeAllHighlightFeaturesFromCanvasScene(self.canvas)
-                self.dlg.ReloadView(self.featuresId)
-
-                if(Geo360.dlg.isVisible() is False):
-                    self.dlg.show()
-                return
-        except:
-            self.dlg = Geo360Dialog(self.iface, parent=self.iface.mainWindow(
-            ), featuresId=featuresId, layer=self.layer)
-            self.dlg.setWindowFlags(
-                Qt.WindowSystemMenuHint | Qt.WindowTitleHint)
+        if self.dlg is None:
+            self.dlg = Geo360Dialog(self.iface, parent=self, featuresId=featuresId, layer=self.layer)
+            self.dlg.setWindowFlags(Qt.Window | Qt.WindowCloseButtonHint)
             self.dlg.show()
-            None
+        else:
+            self.dlg.ReloadView(self.featuresId)
 
 
 class SelectTool(QgsMapToolIdentify):