diff --git a/make/make.py b/make/make.py index 406ac69e24932a363338a92d56179225bf4993ea..c6fbc33a4407760e5c20ded42b415c030b151b78 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 9c9f1d698e2eeda4d6eeff08b3318f7184326cd3..30be88d901a381b3bb7a7cae20d34933af1f8ecf 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 7eaaab44428a438bb71bacb5c3db75881f9b015a..13f5201c2107ba3017a8e53168bd03d213b24577 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: