(hooke.py) scatter_red patch to have red scatterplot

diff --git a/hooke.py b/hooke.py
index 5c7dc06186ce06e095850909ba5099070b9f1c32..13f79d4fe7a919fe9fb6b7411218903b0b319758 100755 (executable)
--- a/hooke.py
+++ b/hooke.py
@@ -478,6 +478,8 @@ class MainWindow(wx.Frame):
                     if len(vectors_to_plot)==2: #3d plots are to come...
                         if len(plot.styles) > 0 and plot.styles[c] == 'scatter':
                             self.axes[dest].scatter(vectors_to_plot[0],vectors_to_plot[1])
+                        elif len(plot.styles) > 0 and plot.styles[c] == 'scatter_red':
+                            self.axes[dest].scatter(vectors_to_plot[0],vectors_to_plot[1],color='red')
                         else:
                             self.axes[dest].plot(vectors_to_plot[0],vectors_to_plot[1])
                             
@@ -665,6 +667,8 @@ class MainWindow(wx.Frame):
             for plotset in plot.vectors: 
                 if len(plot.styles) > 0 and plot.styles[c]=='scatter':
                     self.axes[dest].scatter(plotset[0], plotset[1])
+                elif len(plot.styles) > 0 and plot.styles[c] == 'scatter_red':
+                    self.axes[dest].scatter(plotset[0],plotset[1],color='red')
                 else:
                     self.axes[dest].plot(plotset[0], plotset[1])
                 c+=1

diff --git a/pcluster.py b/pcluster.py
index 583edad306525aaa02b611270c97d17a2f8a17a6..e38e4aedd9f3c5397cf76a9b764a70aff7417078 100644 (file)
--- a/pcluster.py
+++ b/pcluster.py
@@ -325,6 +325,7 @@ class pclusterCommands:
                 if (row[0]<9000 and row[1]<9000 and row[2]<9000 and row[3]<9000 and row[4]<9000 and row[5]<9000):
                     if (row[0]>0 and row[1]>0 and row[2]>0 and row[3]>0 and row[4]>0 and row[5]>0):
                         self.pca_paths[nPlotGood] = plot_path_temp
+                        row=[row[1],row[2]]
                         self.pca_myArray.append(row)
                         nPlotGood = nPlotGood+1
                         
@@ -349,9 +350,9 @@ class pclusterCommands:
         Y=myArrayTr[1]
         clustplot=lhc.PlotObject()
         clustplot.add_set(X,Y)
-        #clustplot.add_set(X[:14],Y[:14])
+        clustplot.add_set(X[:15],Y[:15])
         clustplot.normalize_vectors()
-        clustplot.styles=['scatter']
+        clustplot.styles=['scatter', 'scatter_red']
         #clustplot.styles=['scatter',None]
         clustplot.destination=1
         self._send_plot([clustplot])