o fixes windows build setup to point to the correct QT translations

o fixes redraw issue of events by type on recording
artisan-roaster-scope · Jul 20, 2015 · c5147ad · c5147ad
1 parent f4056d1
commit c5147ad
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 20 deletions.
diff --git a/artisanlib/main.py b/artisanlib/main.py
@@ -182,7 +182,9 @@
 # to make py2exe happy with scipy >0.11
 def __dependencies_for_freezing():
     from scipy.sparse.csgraph import _validation
-    from scipy.interpolate import UnivariateSpline
+    from scipy.special import _ufuncs_cxx
+    from scipy import integrate
+    from scipy import interpolate
     import PyQt4.QtSvg
     import PyQt4.QtXml
     import PyQt4.QtDBus # needed for QT5 builds
@@ -4902,12 +4904,37 @@ def EventRecordAction(self,extraevent=None,eventtype=None,eventvalue=None,eventd
                                 else:
                                     row = {char1:self.phases[0]-10,char2:self.phases[0]-20,char3:self.phases[0]-30,char4:self.phases[0]-40}
                                 #some times ET is not drawn (ET = 0) when using device NONE
+#                                if self.temp1[index] >= self.temp2[index]:
+#                                    self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp1[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
+#                                                     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')
+#                                else:
+#                                    self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp2[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
+#                                                 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')
+
+                                fontprop_small = aw.mpl_fontproperties.copy()
+                                fontprop_small.set_size("xx-small")
                                 if self.temp1[index] >= self.temp2[index]:
-                                    self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp1[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
-                                                     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')
+                                    self.ax.annotate(firstletter + secondletter, 
+                                        xy=(self.timex[index], 
+                                        self.temp1[index]),xytext=(self.timex[index],row[firstletter]),
+                                        alpha=1.,
+                                        bbox=dict(boxstyle='square,pad=0.1', fc='yellow', ec='none'),
+                                        path_effects=[PathEffects.withStroke(linewidth=0.5,foreground="w")],
+                                        color=self.palette["text"],
+                                        arrowprops=dict(arrowstyle='-',color=self.palette["et"],alpha=0.4,relpos=(0,0)),
+                                        fontsize="xx-small",
+                                        fontproperties=fontprop_small)
                                 else:
-                                    self.ax.annotate(firstletter + secondletter, xy=(self.timex[index], self.temp2[index]),xytext=(self.timex[index],row[firstletter]),alpha=1.,
-                                                 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')
+                                    self.ax.annotate(firstletter + secondletter, 
+                                            xy=(self.timex[index], 
+                                            self.temp2[index]),xytext=(self.timex[index],row[firstletter]),
+                                            alpha=1.,
+                                            bbox=dict(boxstyle='square,pad=0.1', fc='yellow', ec='none'),
+                                            path_effects=[PathEffects.withStroke(linewidth=0.5,foreground="w")],
+                                            color=self.palette["text"],
+                                            arrowprops=dict(arrowstyle='-',color=self.palette["bt"],alpha=0.4,relpos=(0,0)),
+                                            fontsize="xx-small",
+                                            fontproperties=fontprop_small)
                             elif self.eventsGraphflag == 2 and etype < 4:
                                 # update lines data using the lists with new data
                                 if etype == 0:

diff --git a/setup-packages-linux.txt b/setup-packages-linux.txt
@@ -189,11 +189,20 @@ src/gui/styles/qgtkstyle_p.cpp Line 510-513
 --
 
 
+install QT4.x from source
 
 # ./configure -opensource -confirm-license -release -nomake tests -nomake examples -nomake demos -gtkstyle
 # make -j3
 # sudo make install
 
+install QT5.x from source
+
+# ./configure -opensource -confirm-license -release -nomake tests -nomake examples —no-xcb
+# make -j3
+# sudo make install
+
+
+
 
 Add path to your environment (eg. .bashrc)
 

diff --git a/setup-win.py b/setup-win.py
@@ -105,21 +105,21 @@
 os.system(r'copy Wheels\\Roasting\\* dist\\Wheels\\Roasting')
 os.system(r'mkdir dist\\translations')
 os.system(r'copy translations\\*.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ar.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_de.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_es.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_fr.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_he.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_hu.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ja.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ko.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ru.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_pl.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_pt.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_ru.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_sv.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_zh_CN.qm dist\\translations')
-os.system(r'copy c:\\Qt\\4.8.7\\translations\\qt_zh_TW.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ar.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_de.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_es.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_fr.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_he.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_hu.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ja.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ko.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ru.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_pl.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_pt.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_ru.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_sv.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_zh_CN.qm dist\\translations')
+os.system(r'copy c:\\Python27\\Lib\\site-packages\\PyQt4\\translations\\qt_zh_TW.qm dist\\translations')
 os.system(r'rmdir /q /s dist\\mpl-data\\sample_data')
 # YOCTO HACK BEGIN: manually copy over the dlls
 os.system(r'mkdir dist\\lib')