Skip to content

Commit a74d177

Browse files
committed
update 1.1
1 parent 71f1483 commit a74d177

17 files changed

Lines changed: 34 additions & 15 deletions

Geo360.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
import os.path
2222

2323
from Geo360Dialog import Geo360Dialog
24-
from PyQt4 import QtCore, QtGui
2524
from PyQt4.QtCore import QTimer, Qt
2625
from PyQt4.QtGui import QAction, QIcon, QCursor, QPixmap
27-
import config
28-
import gui.generated.resources_rc
2926
from qgis.core import *
3027
from qgis.gui import QgsMapToolIdentify, QgsMessageBar
3128
import qgis.utils
@@ -34,6 +31,9 @@
3431
from utils.qgsutils import qgsutils
3532

3633

34+
from PyQt4 import QtGui
35+
36+
3737
try:
3838
from pydevd import *
3939
except ImportError:

Geo360Dialog.py

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
"""
2121
# Import the PyQt and QGIS libraries
2222
import math
23-
import os
2423
import re
2524
import shutil
2625

27-
from PyQt4.QtCore import Qt, QTextCodec, QSettings, QPropertyAnimation, QSize, QObject
26+
from PyQt4.QtCore import Qt, QSettings, QPropertyAnimation, QSize, QObject
2827
from PyQt4.QtGui import QWidget, QDialog, QVBoxLayout, qApp
29-
import config
3028
from geom.transformgeom import transformGeometry
3129
from gui.generated.ui_orbitalDialog import Ui_orbitalDialog
3230
from qgis.core import QgsProject, QGis, QgsFeatureRequest, QgsPoint, QgsVectorLayer
@@ -46,6 +44,12 @@
4644
except ImportError:
4745
None
4846

47+
try:
48+
from PIL import Image
49+
except ImportError:
50+
None
51+
52+
4953

5054
class CefWidget(QWidget):
5155
""" CefPython Viewer"""
@@ -180,8 +184,22 @@ def CopyFile(self, src):
180184
os.remove(os.path.join(root, file))
181185

182186
# Copy image in local folder
187+
# Uncomment for large images if viewer is blank screen
188+
img = Image.open(src_dir)
189+
newwidth = 8000
183190
dst_dir = dst_dir + "\\image.jpg"
184-
shutil.copy(src_dir, dst_dir)
191+
width, height = img.size
192+
193+
if width > newwidth:
194+
wpercent = (newwidth / float(img.size[0]))
195+
hsize = int((float(img.size[1]) * float(wpercent)))
196+
img = img.resize((newwidth, hsize), Image.ANTIALIAS)
197+
img.save(dst_dir, optimize=True, quality=95)
198+
199+
# Comment for large images if viewer is blank screen
200+
else:
201+
shutil.copy(src_dir, dst_dir)
202+
185203
qApp.processEvents()
186204
return
187205

@@ -322,8 +340,8 @@ def GetBackNextImage(self):
322340

323341
# Filter mapa foto layer
324342
ids = [feat.id() for feat in layer.getFeatures(
325-
QgsFeatureRequest().setFilterExpression("order ='" +
326-
str(new_lordem) +
343+
QgsFeatureRequest().setFilterExpression(config.column_order + " ='" +
344+
str(new_lordem) +
327345
"'"))]
328346

329347
if len(ids) == 0:
@@ -332,8 +350,8 @@ def GetBackNextImage(self):
332350
QgsMessageBar.INFO)
333351
# Filter mapa foto layer
334352
ids = [feat.id() for feat in layer.getFeatures(
335-
QgsFeatureRequest().setFilterExpression("order ='" +
336-
str(ac_lordem) +
353+
QgsFeatureRequest().setFilterExpression(config.column_order + " ='" +
354+
str(ac_lordem) +
337355
"'"))]
338356
# Update selected feature
339357
self.ReloadView(ids[0])
@@ -439,8 +457,9 @@ def setOrientation(self, yaw=None):
439457
tmpGeom = self.actualPointOrientation.asGeometry()
440458

441459
self.rotateTool = transformGeometry()
460+
epsg = self.canvas.mapRenderer().destinationCrs().authid()
442461
self.dumLayer = QgsVectorLayer(
443-
"Point?crs=EPSG:4326", "temporary_points", "memory")
462+
"Point?crs=" + epsg, "temporary_points", "memory")
444463
self.actualPointOrientation.setToGeometry(self.rotateTool.rotate(
445464
tmpGeom, self.actualPointDx, angle), self.dumLayer)
446465
qApp.processEvents()

__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
try:
66
sys.path.append(
7-
"D:\eclipse\plugins\org.python.pydev_5.7.0.201704111357\pysrc")
7+
"D:\eclipse\plugins\org.python.pydev_5.9.2.201708151115\pysrc")
88
except ImportError:
99
None
1010

geom/__init__.pyc

163 Bytes
Binary file not shown.

geom/transformgeom.pyc

3.02 KB
Binary file not shown.

gui/__init__.pyc

162 Bytes
Binary file not shown.

gui/generated/__init__.pyc

172 Bytes
Binary file not shown.

gui/generated/resources_rc.pyc

5.1 KB
Binary file not shown.

gui/generated/ui_orbitalDialog.pyc

5 KB
Binary file not shown.

metadata.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name= Equirectangular Viewer
33
qgisMinimumVersion= 2.16
44
description= Plugin for viewer local equirectangular images.
5-
version= 1.0
5+
version= 1.1
66
author= Francisco Raga
77
email= franka1986@gmail.com
88
icon=images/icon.png

0 commit comments

Comments
 (0)