Skip to content

Commit c5147ad

Browse files
myToninomyTonino
committed
o fixes windows build setup to point to the correct QT translations
o fixes redraw issue of events by type on recording
1 parent f4056d1 commit c5147ad

File tree

3 files changed

+56
-20
lines changed

3 files changed

+56
-20
lines changed

‎artisanlib/main.py

+32-5
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@
182182
# to make py2exe happy with scipy >0.11
183183
def __dependencies_for_freezing():
184184
from scipy.sparse.csgraph import _validation
185-
from scipy.interpolate import UnivariateSpline
185+
from scipy.special import _ufuncs_cxx
186+
from scipy import integrate
187+
from scipy import interpolate
186188
import PyQt4.QtSvg
187189
import PyQt4.QtXml
188190
import PyQt4.QtDBus # needed for QT5 builds
@@ -4902,12 +4904,37 @@ def EventRecordAction(self,extraevent=None,eventtype=None,eventvalue=None,eventd
49024904
else:
49034905
row = {char1:self.phases[0]-10,char2:self.phases[0]-20,char3:self.phases[0]-30,char4:self.phases[0]-40}
49044906
#some times ET is not drawn (ET = 0) when using device NONE
4907+
# if self.temp1[index] >= self.temp2[index]:
4908+
# self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp1[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
4909+
# color=self.palette["text"],arrowprops=dict(arrowstyle='-',color=self.palette["et"],alpha=0.4,relpos=(0,0)),fontsize="x-small",fontproperties=aw.mpl_fontproperties,backgroundcolor='yellow')
4910+
# else:
4911+
# self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp2[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
4912+
# color=self.palette["text"],arrowprops=dict(arrowstyle='-',color=self.palette["bt"],alpha=0.4,relpos=(0,0)),fontsize="x-small",fontproperties=aw.mpl_fontproperties,backgroundcolor='yellow')
4913+
4914+
fontprop_small = aw.mpl_fontproperties.copy()
4915+
fontprop_small.set_size("xx-small")
49054916
if self.temp1[index] >= self.temp2[index]:
4906-
self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp1[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
4907-
color=self.palette["text"],arrowprops=dict(arrowstyle='-',color=self.palette["et"],alpha=0.4,relpos=(0,0)),fontsize="x-small",fontproperties=aw.mpl_fontproperties,backgroundcolor='yellow')
4917+
self.ax.annotate(firstletter + secondletter,
4918+
xy=(self.timex[index],
4919+
self.temp1[index]),xytext=(self.timex[index],row[firstletter]),
4920+
alpha=1.,
4921+
bbox=dict(boxstyle='square,pad=0.1', fc='yellow', ec='none'),
4922+
path_effects=[PathEffects.withStroke(linewidth=0.5,foreground="w")],
4923+
color=self.palette["text"],
4924+
arrowprops=dict(arrowstyle='-',color=self.palette["et"],alpha=0.4,relpos=(0,0)),
4925+
fontsize="xx-small",
4926+
fontproperties=fontprop_small)
49084927
else:
4909-
self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp2[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
4910-
color=self.palette["text"],arrowprops=dict(arrowstyle='-',color=self.palette["bt"],alpha=0.4,relpos=(0,0)),fontsize="x-small",fontproperties=aw.mpl_fontproperties,backgroundcolor='yellow')
4928+
self.ax.annotate(firstletter + secondletter,
4929+
xy=(self.timex[index],
4930+
self.temp2[index]),xytext=(self.timex[index],row[firstletter]),
4931+
alpha=1.,
4932+
bbox=dict(boxstyle='square,pad=0.1', fc='yellow', ec='none'),
4933+
path_effects=[PathEffects.withStroke(linewidth=0.5,foreground="w")],
4934+
color=self.palette["text"],
4935+
arrowprops=dict(arrowstyle='-',color=self.palette["bt"],alpha=0.4,relpos=(0,0)),
4936+
fontsize="xx-small",
4937+
fontproperties=fontprop_small)
49114938
elif self.eventsGraphflag == 2 and etype < 4:
49124939
# update lines data using the lists with new data
49134940
if etype == 0:

‎setup-packages-linux.txt

+9
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,20 @@ src/gui/styles/qgtkstyle_p.cpp Line 510-513
189189
--
190190

191191

192+
install QT4.x from source
192193

193194
# ./configure -opensource -confirm-license -release -nomake tests -nomake examples -nomake demos -gtkstyle
194195
# make -j3
195196
# sudo make install
196197

198+
install QT5.x from source
199+
200+
# ./configure -opensource -confirm-license -release -nomake tests -nomake examples —no-xcb
201+
# make -j3
202+
# sudo make install
203+
204+
205+
197206

198207
Add path to your environment (eg. .bashrc)
199208

‎setup-win.py

100644100755
+15-15
Original file line numberDiff line numberDiff line change
@@ -105,21 +105,21 @@
105105
os.system(r'copy Wheels\\Roasting\\* dist\\Wheels\\Roasting')
106106
os.system(r'mkdir dist\\translations')
107107
os.system(r'copy translations\\*.qm dist\\translations')
108-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ar.qm dist\\translations')
109-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_de.qm dist\\translations')
110-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_es.qm dist\\translations')
111-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_fr.qm dist\\translations')
112-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_he.qm dist\\translations')
113-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_hu.qm dist\\translations')
114-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ja.qm dist\\translations')
115-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ko.qm dist\\translations')
116-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ru.qm dist\\translations')
117-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_pl.qm dist\\translations')
118-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_pt.qm dist\\translations')
119-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ru.qm dist\\translations')
120-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_sv.qm dist\\translations')
121-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_zh_CN.qm dist\\translations')
122-
os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_zh_TW.qm dist\\translations')
108+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ar.qm dist\\translations')
109+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_de.qm dist\\translations')
110+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_es.qm dist\\translations')
111+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_fr.qm dist\\translations')
112+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_he.qm dist\\translations')
113+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_hu.qm dist\\translations')
114+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ja.qm dist\\translations')
115+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ko.qm dist\\translations')
116+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ru.qm dist\\translations')
117+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_pl.qm dist\\translations')
118+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_pt.qm dist\\translations')
119+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ru.qm dist\\translations')
120+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_sv.qm dist\\translations')
121+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_zh_CN.qm dist\\translations')
122+
os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_zh_TW.qm dist\\translations')
123123
os.system(r'rmdir /q /s dist\\mpl-data\\sample_data')
124124
# YOCTO HACK BEGIN: manually copy over the dlls
125125
os.system(r'mkdir dist\\lib')

0 commit comments

Comments
 (0)