[Quantproject-developers] QuantProject/b5_Presentation/Reporting/WindowsForm Report.cs,1.15,1.16

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

Update of /cvsroot/quantproject/QuantProject/b5_Presentation/Reporting/WindowsForm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12281/b5_Presentation/Reporting/WindowsForm

Modified Files:
	Report.cs 
Log Message:
Restored previous code: OptimizationOutput has been deleted from Account. SaveGenomes MenuItem has been deleted from Report. RunEfficientPortfolio now archives Genomes as previously. 


Index: Report.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantProject/b5_Presentation/Reporting/WindowsForm/Report.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Report.cs	1 Aug 2005 22:27:31 -0000	1.15
--- Report.cs	3 Aug 2005 18:55:10 -0000	1.16
***************
*** 47,51 ****
  		private System.Windows.Forms.MenuItem saveReport;
      private System.Windows.Forms.MenuItem saveTransactions;
-     private System.Windows.Forms.MenuItem saveGenomes;
      private SaveFileDialog saveFileDialog;
  
--- 47,50 ----
***************
*** 92,98 ****
        this.saveTransactions.Text = "Save Transactions";
  			
-       this.saveGenomes = new MenuItem();
-       this.saveGenomes.Text = "Save Genomes";
- 
  			this.file = new MenuItem();
  			this.file.Text = "File";
--- 91,94 ----
***************
*** 103,113 ****
  			                             {this.saveAccount,
  			                             	this.saveReport,
!                                     this.saveTransactions,
!                                     this.saveGenomes});
  			this.Menu = this.mainMenu;
  			this.saveAccount.Click += new System.EventHandler(this.saveAccount_Click);
  			this.saveReport.Click += new System.EventHandler(this.saveReport_Click);
  			this.saveTransactions.Click += new System.EventHandler(this.saveTransactions_Click);
- 		  this.saveGenomes.Click += new System.EventHandler(this.saveGenomes_Click);
  		}
  		
--- 99,107 ----
  			                             {this.saveAccount,
  			                             	this.saveReport,
!                                     this.saveTransactions});
  			this.Menu = this.mainMenu;
  			this.saveAccount.Click += new System.EventHandler(this.saveAccount_Click);
  			this.saveReport.Click += new System.EventHandler(this.saveReport_Click);
  			this.saveTransactions.Click += new System.EventHandler(this.saveTransactions_Click);
  		}
  		
***************
*** 177,181 ****
      }
  		
!     #region save account or report or transactions or genomes
      
      private void saveAccount_Click(object sender, System.EventArgs e)
--- 171,175 ----
      }
  		
!     #region save account or report or transactions
      
      private void saveAccount_Click(object sender, System.EventArgs e)
***************
*** 195,203 ****
      }
      
-     private void saveGenomes_Click(object sender, System.EventArgs e)
-     {
-       this.saveObject((MenuItem)sender);
-     }
-     
      private void saveObject_setSaveFileDialog(MenuItem sender)
      {
--- 189,192 ----
***************
*** 225,235 ****
          this.saveFileDialog.DefaultExt = "qPt";
        }
!       else if(sender.Text.EndsWith("Genomes"))
!         //else the text property of the menu item sender contains at the end
!         // the word "Genomes"; so it will be saved an OptimizationOutput
!         //containing a GenomeRepresentation
!       { 
!         this.saveFileDialog.DefaultExt = "bgn";
!       }
        this.saveFileDialog.AddExtension = true;
        this.saveFileDialog.CreatePrompt = true;
--- 214,218 ----
          this.saveFileDialog.DefaultExt = "qPt";
        }
!       
        this.saveFileDialog.AddExtension = true;
        this.saveFileDialog.CreatePrompt = true;
***************
*** 259,265 ****
          QuantProject.ADT.FileManaging.ObjectArchiver.Archive(this.account.Transactions,
            this.saveFileDialog.FileName);
-       else if(((SaveFileDialog)sender).Title.EndsWith("Genomes"))
-         QuantProject.ADT.FileManaging.ObjectArchiver.Archive(this.account.OptimizationOutput,
-                                                              this.saveFileDialog.FileName);
      }
  
--- 242,245 ----