[Quantproject-developers] QuantProject/b3_Data/Selectors ITickerReceiver.cs,1.1,1.2 ITickerSelector.cs,1.1,1.2 TickerSelector.cs,1.3,1.4

[Marco M. <mi...@us...>]

Update of /cvsroot/quantproject/QuantProject/b3_Data/Selectors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21315/b3_Data/Selectors

Modified Files:
	ITickerReceiver.cs ITickerSelector.cs TickerSelector.cs 
Log Message:
Changed ITickerSelector interface and consequently modified classes that implement it.
Method GetTableOfSelectedTickers now has to return a DataTable (not an upper class derived from a DataTable)

Index: ITickerReceiver.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/Selectors/ITickerReceiver.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ITickerReceiver.cs	25 Apr 2004 17:29:33 -0000	1.1
--- ITickerReceiver.cs	27 Jun 2004 19:20:31 -0000	1.2
***************
*** 22,26 ****
  
  using System;
! using QuantProject.Data.DataTables;
  
  
--- 22,27 ----
  
  using System;
! //using QuantProject.Data.DataTables;
! using System.Data;
  
  
***************
*** 32,36 ****
  	public interface ITickerReceiver
  	{
!     void ReceiveTickers(TickerDataTable tickersToReceive);
    }
  }
--- 33,37 ----
  	public interface ITickerReceiver
  	{
!     void ReceiveTickers(DataTable tickersToReceive);
    }
  }

Index: ITickerSelector.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/Selectors/ITickerSelector.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ITickerSelector.cs	25 Apr 2004 17:29:33 -0000	1.1
--- ITickerSelector.cs	27 Jun 2004 19:20:31 -0000	1.2
***************
*** 33,37 ****
  	{
      void SelectAllTickers();
!     TickerDataTable GetTableOfSelectedTickers();
    }
  }
--- 33,37 ----
  	{
      void SelectAllTickers();
!     DataTable GetTableOfSelectedTickers();
    }
  }

Index: TickerSelector.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b3_Data/Selectors/TickerSelector.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TickerSelector.cs	19 Jun 2004 01:13:00 -0000	1.3
--- TickerSelector.cs	27 Jun 2004 19:20:31 -0000	1.4
***************
*** 23,26 ****
--- 23,27 ----
  using System;
  using System.Data;
+ using System.Windows.Forms;
  using QuantProject.DataAccess.Tables;
  using QuantProject.Data.DataTables;
***************
*** 52,56 ****
      }
      
!     public DataTable GetSelectedTickers()
      {
         if(this.setOfTickersToBeSelected == null &&
--- 53,58 ----
      }
      
!     //implementation of ITickerSelector
!     public DataTable GetTableOfSelectedTickers()
      {
         if(this.setOfTickersToBeSelected == null &&
***************
*** 70,73 ****
--- 72,84 ----
                                              this.selectionRule.MaxNumOfReturnedTickers);    
         }
+        else if(this.setOfTickersToBeSelected == null &&
+          this.selectionRule.TypeOfSelection == SelectionType.BestPerformer)
+        {
+          return TickerDataTable.GetBestPerformingTickers(this.selectionRule.GroupID, 
+                                                         this.selectionRule.FirstQuoteDate,
+                                                         this.selectionRule.LastQuoteDate,
+                                                         this.selectionRule.MaxNumOfReturnedTickers);    
+        }
+ 
         else
         return new DataTable();
***************
*** 75,85 ****
      }
      
-     
-     //implementation of ITickerSelector
-     public TickerDataTable GetTableOfSelectedTickers()
-     {
-       return TickerDataTable.ConvertToTickerDataTable(this.GetSelectedTickers());
-     }
-     
      public void SelectAllTickers()
      {
--- 86,89 ----
***************
*** 87,90 ****
--- 91,123 ----
      }
      // end of implementation of ITickerSelector
+     
+     /// <summary>
+ 	  /// It returns a dataTable containing tickers selected by the user
+ 	  /// </summary>
+ 	  /// <param name="dataGrid">The data grid from which the user has selected tickers</param>
+     
+     
+     public static DataTable GetTableOfManuallySelectedTickers(DataGrid dataGrid)
+     {
+       DataTable dataTableOfDataGrid = (DataTable)dataGrid.DataSource;
+       DataTable tableOfSelectedTickers = new DataTable();
+       TickerDataTable.AddColumnsOfTickerTable(tableOfSelectedTickers);
+       int indexOfRow = 0;
+       while(indexOfRow != dataTableOfDataGrid.Rows.Count)
+       {
+         if(dataGrid.IsSelected(indexOfRow))
+         {
+           DataRow dataRow = tableOfSelectedTickers.NewRow(); 
+           dataRow[0] = dataTableOfDataGrid.Rows[indexOfRow][0];
+           //dataRow["tiTicker"] = dataTableOfDataGrid.Rows[indexOfRow][0];
+ 
+           dataRow[1] = dataTableOfDataGrid.Rows[indexOfRow][1];
+           //dataRow["tiCompanyName"] = dataTableOfDataGrid.Rows[indexOfRow][0];
+           tableOfSelectedTickers.Rows.Add(dataRow);
+         }
+         indexOfRow++;
+       }
+       return tableOfSelectedTickers;
+     }
  
  	}