@@ -537,6 +537,7 @@ def plot_histology(self, fig, ax='left', movable=True):
537537 axis = fig .getAxis (ax )
538538 axis .setTicks ([self .hist_data ['axis_label' ][self .idx ]])
539539 axis .setZValue (10 )
540+ self .set_axis (self .fig_hist , 'bottom' , pen = 'w' , label = 'blank' )
540541
541542 # Plot each histology region
542543 for ir , reg in enumerate (self .hist_data ['region' ][self .idx ]):
@@ -597,7 +598,7 @@ def plot_histology_ref(self, fig, ax='right', movable=False):
597598 axis = fig .getAxis (ax )
598599 axis .setTicks ([self .hist_data_ref ['axis_label' ]])
599600 axis .setZValue (10 )
600- self .set_axis (self .fig_hist_ref , 'bottom' , pen = 'w' )
601+ self .set_axis (self .fig_hist_ref , 'bottom' , pen = 'w' , label = 'blank' )
601602
602603 # Plot each histology region
603604 for ir , reg in enumerate (self .hist_data_ref ['region' ]):
@@ -753,6 +754,7 @@ def plot_scale_factor(self):
753754
754755 self .fig_scale .setYRange (min = self .probe_tip - self .probe_extra ,
755756 max = self .probe_top + self .probe_extra , padding = self .pad )
757+ self .set_axis (self .fig_scale , 'bottom' , pen = 'w' , label = 'blank' )
756758 self .fig_scale_cb .addItem (cbar )
757759
758760 def plot_fit (self ):
@@ -778,19 +780,19 @@ def plot_slice(self, data, img_type):
778780 self .slice_lines = []
779781 img = pg .ImageItem ()
780782 img .setImage (data [img_type ])
783+ transform = [data ['scale' ][0 ], 0. , 0. , 0. , data ['scale' ][1 ], 0. , data ['offset' ][0 ],
784+ data ['offset' ][1 ], 1. ]
785+ img .setTransform (QtGui .QTransform (* transform ))
781786
782787 if img_type == 'label' :
783- img .translate (data ['offset' ][0 ], data ['offset' ][1 ])
784- img .scale (data ['scale' ][0 ], data ['scale' ][1 ])
785788 self .fig_slice_layout .removeItem (self .slice_item )
786789 self .fig_slice_layout .addItem (self .fig_slice_hist_alt , 0 , 1 )
787790 self .slice_item = self .fig_slice_hist_alt
788791 else :
789- img .translate (data ['offset' ][0 ], data ['offset' ][1 ])
790- img .scale (data ['scale' ][0 ], data ['scale' ][1 ])
791792 color_bar = cb .ColorBar ('cividis' )
792793 lut = color_bar .getColourMap ()
793794 img .setLookupTable (lut )
795+
794796 self .fig_slice_layout .removeItem (self .slice_item )
795797 self .fig_slice_hist = pg .HistogramLUTItem ()
796798 self .fig_slice_hist .axis .hide ()
@@ -868,7 +870,6 @@ def plot_scatter(self, data):
868870 self .img_plots = []
869871 self .img_cbars = []
870872 start = time .time ()
871- connect = np .zeros (data ['x' ].size , dtype = int )
872873 size = data ['size' ].tolist ()
873874 symbol = data ['symbol' ].tolist ()
874875 end = time .time ()
@@ -883,20 +884,20 @@ def plot_scatter(self, data):
883884 if type (np .any (data ['colours' ])) == QtGui .QColor :
884885 start = time .time ()
885886 brush = data ['colours' ].tolist ()
887+ plot = pg .ScatterPlotItem ()
888+ plot .setData (x = data ['x' ], y = data ['y' ],
889+ symbol = symbol , size = size , brush = brush , pen = data ['pen' ])
886890 end = time .time ()
887891 print (end - start )
888892 else :
889893 brush = color_bar .map .mapToQColor (data ['colours' ])
894+ plot = pg .ScatterPlotItem ()
895+ start = time .time ()
896+ plot .setData (x = data ['x' ], y = data ['y' ],
897+ symbol = symbol , size = size , brush = brush , pen = data ['pen' ])
898+ end = time .time ()
899+ print (end - start )
890900
891- #plot = pg.PlotDataItem()
892- #plot.setData(x=data['x'], y=data['y'], connect=connect,
893- # symbol=symbol, symbolSize=size, symbolBrush=brush, symbolPen=data['pen'])
894- plot = pg .ScatterPlotItem ()
895- start = time .time ()
896- plot .setData (x = data ['x' ], y = data ['y' ],
897- symbol = symbol , size = size , brush = brush , pen = data ['pen' ])
898- end = time .time ()
899- print (end - start )
900901 self .fig_img .addItem (plot )
901902 self .fig_img .setXRange (min = data ['xrange' ][0 ], max = data ['xrange' ][1 ],
902903 padding = 0 )
@@ -970,8 +971,9 @@ def plot_probe(self, data, bounds=None):
970971 for img , scale , offset in zip (data ['img' ], data ['scale' ], data ['offset' ]):
971972 image = pg .ImageItem ()
972973 image .setImage (img )
973- image .translate (offset [0 ], offset [1 ])
974- image .scale (scale [0 ], scale [1 ])
974+ transform = [scale [0 ], 0. , 0. , 0. , scale [1 ], 0. , offset [0 ],
975+ offset [1 ], 1. ]
976+ image .setTransform (QtGui .QTransform (* transform ))
975977 image .setLookupTable (lut )
976978 image .setLevels ((data ['levels' ][0 ], data ['levels' ][1 ]))
977979 self .fig_probe .addItem (image )
@@ -985,6 +987,8 @@ def plot_probe(self, data, bounds=None):
985987 self .fig_probe .setXRange (min = data ['xrange' ][0 ], max = data ['xrange' ][1 ], padding = 0 )
986988 self .fig_probe .setYRange (min = self .probe_tip - self .probe_extra ,
987989 max = self .probe_top + self .probe_extra , padding = self .pad )
990+ # so stupid!!!!!
991+ self .set_axis (self .fig_probe , 'bottom' , pen = 'w' , label = 'blank' )
988992 if bounds is not None :
989993 # add some infinite line stuff
990994 for bound in bounds :
@@ -1018,8 +1022,9 @@ def plot_image(self, data):
10181022
10191023 image = pg .ImageItem ()
10201024 image .setImage (data ['img' ])
1021- image .translate (data ['offset' ][0 ], data ['offset' ][1 ])
1022- image .scale (data ['scale' ][0 ], data ['scale' ][1 ])
1025+ transform = [data ['scale' ][0 ], 0. , 0. , 0. , data ['scale' ][1 ], 0. , data ['offset' ][0 ],
1026+ data ['offset' ][1 ], 1. ]
1027+ image .setTransform (QtGui .QTransform (* transform ))
10231028 cmap = data .get ('cmap' , [])
10241029 if cmap :
10251030 color_bar = cb .ColorBar (data ['cmap' ])
0 commit comments