[Quantproject-developers] QuantDownloader/Downloader/TickerSelectors TickerGroupsViewer.cs,1.3,1.4 T

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/quantproject/QuantDownloader/Downloader/TickerSelectors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21454/Downloader/TickerSelectors

Modified Files:
	TickerGroupsViewer.cs TickerSelectorForm.cs TickerViewer.cs 
	TickerViewerMenu.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: TickerSelectorForm.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/TickerSelectors/TickerSelectorForm.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TickerSelectorForm.cs	20 Jun 2004 10:16:09 -0000	1.3
--- TickerSelectorForm.cs	27 Jun 2004 19:21:42 -0000	1.4
***************
*** 66,71 ****
        this.dataGrid1.ContextMenu = new TickerViewerMenu(this);
        //TODO: complete comboBox's code with all possible types of selections
!       this.comboBoxAvailableSelectionRules.Text = "Most liquid instrument";
!       this.comboBoxAvailableSelectionRules.Items.Add("Most liquid instrument");
  
    	}
--- 66,73 ----
        this.dataGrid1.ContextMenu = new TickerViewerMenu(this);
        //TODO: complete comboBox's code with all possible types of selections
!       this.comboBoxAvailableSelectionRules.Text = "Most liquid instruments";
!       this.comboBoxAvailableSelectionRules.Items.Add("Most liquid instruments");
!       this.comboBoxAvailableSelectionRules.Text = "Best performing instruments";
!       this.comboBoxAvailableSelectionRules.Items.Add("Best performing instruments");
  
    	}
***************
*** 294,301 ****
      // implementation of ITickerSelector interface
  
! 		public TickerDataTable GetTableOfSelectedTickers()
  		{
! 			DataTable dataTableOfDataGrid1 = (DataTable)this.dataGrid1.DataSource;
! 			TickerDataTable tableOfSelectedTickers = new TickerDataTable();
  			int indexOfRow = 0;
  			while(indexOfRow != dataTableOfDataGrid1.Rows.Count)
--- 296,305 ----
      // implementation of ITickerSelector interface
  
! 		public DataTable GetTableOfSelectedTickers()
  		{
! 			/*
!       DataTable dataTableOfDataGrid1 = (DataTable)this.dataGrid1.DataSource;
! 			DataTable tableOfSelectedTickers = new DataTable();
!       TickerDataTable.AddColumnsOfTickerTable(tableOfSelectedTickers);
  			int indexOfRow = 0;
  			while(indexOfRow != dataTableOfDataGrid1.Rows.Count)
***************
*** 304,314 ****
  				{
  					DataRow dataRow = tableOfSelectedTickers.NewRow(); 
! 					dataRow[0] = (string)dataTableOfDataGrid1.Rows[indexOfRow][0];
! 					dataRow[1] = (string)dataTableOfDataGrid1.Rows[indexOfRow][1];
  					tableOfSelectedTickers.Rows.Add(dataRow);
  				}
  				indexOfRow++;
! 			}
! 			return tableOfSelectedTickers;
  		}
  
--- 308,318 ----
  				{
  					DataRow dataRow = tableOfSelectedTickers.NewRow(); 
! 					dataRow["Ticker"] = (string)dataTableOfDataGrid1.Rows[indexOfRow][0];
! 					dataRow["CompanyName"] = (string)dataTableOfDataGrid1.Rows[indexOfRow][1];
  					tableOfSelectedTickers.Rows.Add(dataRow);
  				}
  				indexOfRow++;
! 			}*/
! 			return TickerSelector.GetTableOfManuallySelectedTickers(this.dataGrid1);
  		}
  
***************
*** 327,333 ****
      private void buttonSelectTickers_Click(object sender, System.EventArgs e)
      {
!         //TODO: complete code finding a way to construct the right 
!         // selection rule on the base of what selected by the user
!         SelectionRule rule = new SelectionRule(SelectionType.MostLiquid, this.textBoxGroupID.Text, 
                                              this.dateTimePickerFirstDate.Value,
                                              this.dateTimePickerLastDate.Value,
--- 331,335 ----
      private void buttonSelectTickers_Click(object sender, System.EventArgs e)
      {
!         SelectionRule rule = new SelectionRule(this.GetTypeOfRuleSelectedByUser(), this.textBoxGroupID.Text, 
                                              this.dateTimePickerFirstDate.Value,
                                              this.dateTimePickerLastDate.Value,
***************
*** 340,346 ****
          this.dataGrid1.DataSource = selector.GetTableOfSelectedTickers();
          this.dataGrid1.Refresh();
-                         
      }
  
  	}
  }
--- 342,357 ----
          this.dataGrid1.DataSource = selector.GetTableOfSelectedTickers();
          this.dataGrid1.Refresh();
      }
  
+     private SelectionType GetTypeOfRuleSelectedByUser()
+     {
+       SelectionType typeSelected = SelectionType.MostLiquid;
+       if(this.comboBoxAvailableSelectionRules.Text == "Most liquid instruments")
+         typeSelected = SelectionType.MostLiquid;      
+       else if (this.comboBoxAvailableSelectionRules.Text == "Best performing instruments")
+         typeSelected = SelectionType.BestPerformer;
+       return typeSelected;  
+     }    
+ 
  	}
  }

Index: TickerViewer.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/TickerSelectors/TickerViewer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TickerViewer.cs	25 Apr 2004 17:24:50 -0000	1.2
--- TickerViewer.cs	27 Jun 2004 19:21:42 -0000	1.3
***************
*** 420,427 ****
      // implementation of ITickerSelector interface
  
! 		public TickerDataTable GetTableOfSelectedTickers()
  		{
! 			DataTable dataTableOfDataGrid1 = (DataTable)this.dataGrid1.DataSource;
! 			TickerDataTable tableOfSelectedTickers = new TickerDataTable();
  			int indexOfRow = 0;
  			while(indexOfRow != dataTableOfDataGrid1.Rows.Count)
--- 420,429 ----
      // implementation of ITickerSelector interface
  
! 		public DataTable GetTableOfSelectedTickers()
  		{
! 			/*
!       DataTable dataTableOfDataGrid1 = (DataTable)this.dataGrid1.DataSource;
! 			DataTable tableOfSelectedTickers = new DataTable();
!       TickerDataTable.AddColumnsOfTickerTable(tableOfSelectedTickers);
  			int indexOfRow = 0;
  			while(indexOfRow != dataTableOfDataGrid1.Rows.Count)
***************
*** 430,440 ****
  				{
  					DataRow dataRow = tableOfSelectedTickers.NewRow(); 
! 					dataRow[0] = (string)dataTableOfDataGrid1.Rows[indexOfRow][0];
! 					dataRow[1] = (string)dataTableOfDataGrid1.Rows[indexOfRow][1];
  					tableOfSelectedTickers.Rows.Add(dataRow);
  				}
  				indexOfRow++;
! 			}
! 			return tableOfSelectedTickers;
  		}
  
--- 432,442 ----
  				{
  					DataRow dataRow = tableOfSelectedTickers.NewRow(); 
! 					dataRow["Ticker"] = (string)dataTableOfDataGrid1.Rows[indexOfRow][0];
! 					dataRow["CompanyName"] = (string)dataTableOfDataGrid1.Rows[indexOfRow][1];
  					tableOfSelectedTickers.Rows.Add(dataRow);
  				}
  				indexOfRow++;
! 			}*/
! 			return TickerSelector.GetTableOfManuallySelectedTickers(this.dataGrid1);
  		}
  

Index: TickerViewerMenu.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/TickerSelectors/TickerViewerMenu.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TickerViewerMenu.cs	20 Jun 2004 10:18:00 -0000	1.4
--- TickerViewerMenu.cs	27 Jun 2004 19:21:42 -0000	1.5
***************
*** 27,31 ****
  using QuantProject.Data.DataTables;
  using QuantProject.Data.Selectors;
! //using QuantProject.Applications.Downloader.TickerSelectors;
  
  namespace QuantProject.Applications.Downloader.TickerSelectors
--- 27,31 ----
  using QuantProject.Data.DataTables;
  using QuantProject.Data.Selectors;
! 
  
  namespace QuantProject.Applications.Downloader.TickerSelectors
***************
*** 85,89 ****
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       TickerDataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();
        
        if(tableOfSelectedTickers.Rows.Count == 0)
--- 85,89 ----
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       DataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();
        
        if(tableOfSelectedTickers.Rows.Count == 0)
***************
*** 101,105 ****
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       TickerDataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();      
        if(tableOfSelectedTickers.Rows.Count == 0)
        {
--- 101,105 ----
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       DataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();      
        if(tableOfSelectedTickers.Rows.Count == 0)
        {
***************
*** 117,121 ****
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       TickerDataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();      
        
        if(tableOfSelectedTickers.Rows.Count != 1)
--- 117,121 ----
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       DataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();      
        
        if(tableOfSelectedTickers.Rows.Count != 1)
***************
*** 136,140 ****
        Cursor.Current = Cursors.WaitCursor;
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       TickerDataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();
        string currentTicker;
        foreach(DataRow row in tableOfSelectedTickers.Rows)
--- 136,140 ----
        Cursor.Current = Cursors.WaitCursor;
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       DataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();
        string currentTicker;
        foreach(DataRow row in tableOfSelectedTickers.Rows)
***************
*** 150,154 ****
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       TickerDataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();      
        TickerSelectorForm selectorForm = new TickerSelectorForm(tableOfSelectedTickers);
        selectorForm.Show();
--- 150,154 ----
      {
        ITickerSelector iTickerSelector = (ITickerSelector)this.parentForm;
!       DataTable tableOfSelectedTickers = iTickerSelector.GetTableOfSelectedTickers();      
        TickerSelectorForm selectorForm = new TickerSelectorForm(tableOfSelectedTickers);
        selectorForm.Show();

Index: TickerGroupsViewer.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/TickerSelectors/TickerGroupsViewer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TickerGroupsViewer.cs	11 May 2004 22:06:41 -0000	1.3
--- TickerGroupsViewer.cs	27 Jun 2004 19:21:42 -0000	1.4
***************
*** 161,177 ****
  
  		private void addTickerToTable(DataTable tableToFill, string tickerID,
! 										string tickerDescription)
  		{
! 			try
! 			{
! 				DataRow newRow = tableToFill.NewRow();
! 				newRow[0] = tickerID;
! 				newRow[1] = tickerDescription;
! 				tableToFill.Rows.Add(newRow);
! 			}
! 			catch(Exception ex)
! 			{
! 				string notUsed = ex.ToString();
! 			}
  		}
      // implementation of ITickerSelector interface
--- 161,170 ----
  
  		private void addTickerToTable(DataTable tableToFill, string tickerID,
! 										              string tickerDescription)
  		{
!       DataRow newRow = tableToFill.NewRow();
!       newRow["tiTicker"] = tickerID;
!       newRow["tiCompanyName"] = tickerDescription;
!       tableToFill.Rows.Add(newRow);
  		}
      // implementation of ITickerSelector interface
***************
*** 184,190 ****
      }    
  
! 		public TickerDataTable GetTableOfSelectedTickers()
  		{
! 			TickerDataTable tableOfSelectedTickers = new TickerDataTable();
        
        foreach(ListViewItem item in this.listViewGroupsAndTickers.SelectedItems)
--- 177,184 ----
      }    
  
! 		public DataTable GetTableOfSelectedTickers()
  		{
! 			DataTable tableOfSelectedTickers = new DataTable();
!       TickerDataTable.AddColumnsOfTickerTable(tableOfSelectedTickers);
        
        foreach(ListViewItem item in this.listViewGroupsAndTickers.SelectedItems)
***************
*** 201,205 ****
  				// so it stands for a group of tickers
  				{
! 					//TODO: add method to retrieve 
            MessageBox.Show("NOT IMPLEMENTED YET");  
  				}
--- 195,199 ----
  				// so it stands for a group of tickers
  				{
! 					///TODO: add method to retrieve 
            MessageBox.Show("NOT IMPLEMENTED YET");  
  				}
***************
*** 718,722 ****
      //implementation of ITickerReceiver interface for this object
  
!     public void ReceiveTickers(TickerDataTable tickers)
      {
        try
--- 712,716 ----
      //implementation of ITickerReceiver interface for this object
  
!     public void ReceiveTickers(DataTable tickers)
      {
        try

[Quantproject-developers] QuantDownloader/Downloader/TickerSelectors TickerGroupsViewer.cs,1.3,1.4 T

[Quantproject-developers] QuantDownloader/Downloader/TickerSelectors TickerGroupsViewer.cs,1.3,1.4 TickerSelectorForm.cs,1.3,1.4 TickerViewer.cs,1.2,1.3 TickerViewerMenu.cs,1.4,1.5