From 33255355d209cab0d35e1b616f5eb024b843a2c8 Mon Sep 17 00:00:00 2001
From: "benjamin.jakimow@geo.hu-berlin.de" <q8DTkxUg-BB>
Date: Fri, 30 Jun 2017 18:34:59 +0200
Subject: [PATCH] unified resource file naming from *_py2.py / *_py3.py to the
more convenient *_rc.py
---
make/make.py | 23 ++++++-----------------
timeseriesviewer/main.py | 6 ------
timeseriesviewer/mapcanvas.py | 4 ----
3 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/make/make.py b/make/make.py
index 406ac69e..c6fbc33a 100644
--- a/make/make.py
+++ b/make/make.py
@@ -209,23 +209,12 @@ def make(ROOT):
assert os.path.exists(pathQrc), pathQrc
bn = os.path.basename(f)
bn = os.path.splitext(bn)[0]
- pathPy2 = jp(DIR_UI, bn+'_py2.py' )
- pathPy3 = jp(DIR_UI, bn+'_py3.py' )
- print('Make {}'.format(pathPy2))
+ pathPy2 = jp(DIR_UI, bn+'_rc.py' )
+ #pathPy3 = jp(DIR_UI, bn+'_py3.py' )
+ #print('Make {}'.format(pathPy2))
subprocess.call(['pyrcc4','-py2','-o',pathPy2, pathQrc])
- print('Make {}'.format(pathPy3))
- subprocess.call(['pyrcc4','-py3','-o',pathPy3, pathQrc])
-
-
- if False: #compile QGIS resource files
- pathQrc = r'D:\Repositories\QGIS\images\images.qrc'
- assert os.path.exists(pathQrc)
- pathPy2 = jp(DIR_UI, 'qgis_icons_py2.py')
- pathPy3 = jp(DIR_UI, 'qgis_icons_py3.py')
- print('Make {}'.format(pathPy2))
- subprocess.call(['pyrcc4','-py2','-o',pathPy2, pathQrc])
- print('Make {}'.format(pathPy3))
- subprocess.call(['pyrcc4','-py3','-o',pathPy3, pathQrc])
+ #print('Make {}'.format(pathPy3))
+ #subprocess.call(['pyrcc4','-py3','-o',pathPy3, pathQrc])
def fileNeedsUpdate(file1, file2):
if not os.path.exists(file2):
@@ -499,7 +488,7 @@ if __name__ == '__main__':
d = pathDirTestData = DIR_EXAMPLES
createFilePackage(d, recursive=False)
- if True:
+ if False:
createCreditsHTML()
diff --git a/timeseriesviewer/main.py b/timeseriesviewer/main.py
index 9c9f1d69..30be88d9 100644
--- a/timeseriesviewer/main.py
+++ b/timeseriesviewer/main.py
@@ -443,12 +443,6 @@ class TimeSeriesViewer:
if isinstance(iface, QgisInterface):
self.mQgisBridge.connect(self)
- print('TINFO:')
- from PyQt4.QtCore import QThread
- print(QThread.currentThreadId())
- print(QgisTsvBridge.instance())
- print(self.mQgisBridge)
- print('TSV init done')
def loadImageFiles(self, files):
assert isinstance(files, list)
diff --git a/timeseriesviewer/mapcanvas.py b/timeseriesviewer/mapcanvas.py
index 7eaaab44..13f5201c 100644
--- a/timeseriesviewer/mapcanvas.py
+++ b/timeseriesviewer/mapcanvas.py
@@ -161,7 +161,6 @@ class MapCanvas(QgsMapCanvas):
self.checkRenderFlag()
if self.renderFlag() or force:
- #print('Refresh {}'.format(self.objectName()))
self.setLayers(self.mapLayersToRender())
super(MapCanvas, self).refresh()
#self.refreshAllLayers()
@@ -277,9 +276,6 @@ class MapCanvas(QgsMapCanvas):
menu.addSeparator()
action = menu.addAction('Add raster to QGIS')
from PyQt4.QtCore import QThread
- print('ON_MENU')
- print(QThread.currentThreadId())
- print(QgisTsvBridge.instance())
import qgis.utils
if qgis.utils is not None:
--
GitLab