Skip to content

Commit

Permalink
Arreglo de paths
Browse files Browse the repository at this point in the history
  • Loading branch information
JCAIMI committed Jan 7, 2019
1 parent 3e70ce3 commit 62239ae
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CuBista3.ui
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ color: #FFFFFF</string>
</property>
<property name="icon">
<iconset>
<normaloff>../../Users/Jo/Dropbox/qVistaProd/Imatges/arrow-left.png</normaloff>../../Users/Jo/Dropbox/qVistaProd/Imatges/arrow-left.png</iconset>
<normaloff>imatges/arrow-left.png</normaloff>../../Users/Jo/Dropbox/qVistaProd/Imatges/arrow-left.png</iconset>
</property>
<property name="iconSize">
<size>
Expand Down Expand Up @@ -331,7 +331,7 @@ color: #FFFFFF</string>
</property>
<property name="icon">
<iconset>
<normaloff>../../Users/Jo/Dropbox/qVistaProd/Imatges/arrow-right.png</normaloff>../../Users/Jo/Dropbox/qVistaProd/Imatges/arrow-right.png</iconset>
<normaloff>imatges/arrow-right.png</normaloff>imatges/arrow-right.png</iconset>
</property>
<property name="iconSize">
<size>
Expand Down
2 changes: 1 addition & 1 deletion QvThumbnails.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def obrirDialegProjecte(self):
"""

dialegObertura=QFileDialog()
dialegObertura.setDirectoryUrl(QUrl('d:/dropbox/qvistaProd/../dades/projectes/'))
dialegObertura.setDirectoryUrl(QUrl('../dades/projectes/'))

nfiles,_ = dialegObertura.getOpenFileNames(None,"Open Projecte Qgis", ".", "Projectes Qgis (*.qgs)")
return nfiles
Expand Down
4 changes: 2 additions & 2 deletions cubista3.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def setupUi(self, MainWindow):
self.tbEnrera.setMaximumSize(QtCore.QSize(20, 20))
self.tbEnrera.setStyleSheet("border-color: rgb(121, 144, 155);")
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap("../../Users/Jo/Dropbox/qVistaProd/Imatges/arrow-left.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
icon.addPixmap(QtGui.QPixmap("imatges/arrow-left.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.tbEnrera.setIcon(icon)
self.tbEnrera.setIconSize(QtCore.QSize(40, 40))
self.tbEnrera.setObjectName("tbEnrera")
Expand All @@ -113,7 +113,7 @@ def setupUi(self, MainWindow):
self.tbEndevant.setMaximumSize(QtCore.QSize(20, 20))
self.tbEndevant.setStyleSheet("border-color: rgb(121, 144, 155);")
icon1 = QtGui.QIcon()
icon1.addPixmap(QtGui.QPixmap("../../Users/Jo/Dropbox/qVistaProd/Imatges/arrow-right.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
icon1.addPixmap(QtGui.QPixmap("imatges/arrow-right.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.tbEndevant.setIcon(icon1)
self.tbEndevant.setIconSize(QtCore.QSize(40, 40))
self.tbEndevant.setObjectName("tbEndevant")
Expand Down
12 changes: 9 additions & 3 deletions moduls/QvPrint.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
from qgis.PyQt.QtGui import QFont, QColor,QStandardItemModel, QStandardItem, QDesktopServices
from PyQt5.QtWebKitWidgets import QWebView , QWebPage
from PyQt5.QtWebKit import QWebSettings

from moduls.QvApp import QvApp

import time
projecteInicial='../dades/projectes/BCN11_nord.qgs'

Expand Down Expand Up @@ -173,6 +176,7 @@ def pintarRectangle(self,poligon):
self.rubberband.show()

def printPlanol(self):
#
if self.checkRotacio.checkState():
rotacio=44.75
else:
Expand All @@ -183,7 +187,9 @@ def printPlanol(self):
else:
self.plantillaMapa = 'plantillaMapaH.qpt'
self.imprimirPlanol(self.posXY[0], self.posXY[1], int(self.combo.currentText()), rotacio, self.plantillaMapa , 'd:/EUREKA.pdf', 'PDF')


QvApp().logRegistre('Impressió: '+self.combo.currentText() )

def imprimirPlanol(self,x, y, escala, rotacion, templateFile, fitxerSortida, tipusSortida):
tInicial=time.time()

Expand Down Expand Up @@ -221,7 +227,7 @@ def imprimirPlanol(self,x, y, escala, rotacion, templateFile, fitxerSortida, tip
settings.dpi=300
settings.exportMetadata=False

fitxerSortida='d:/dropbox/qpic/sortida_'+timestamp+'.PDF'
fitxerSortida='d:/sortida_'+timestamp+'.PDF'
result = exporter.exportToPdf(fitxerSortida, settings)

print (fitxerSortida)
Expand All @@ -230,7 +236,7 @@ def imprimirPlanol(self,x, y, escala, rotacion, templateFile, fitxerSortida, tip
settings = QgsLayoutExporter.ImageExportSettings()
settings.dpi = 300

fitxerSortida='d:/dropbox/qpic/sortida_'+timestamp+'.PNG'
fitxerSortida='d:/sortida_'+timestamp+'.PNG'
result = exporter.exportToImage(fitxerSortida, settings)

#Obra el document si està marcat checkObrirResultat
Expand Down

0 comments on commit 62239ae

Please sign in to comment.