[Quantproject-developers] QuantProject/b5_Presentation/Reporting/WindowsForm SummaryTabPage.cs,1.1,1
Brought to you by:
glauco_1
Menu
▾
▴
[Quantproject-developers] QuantProject/b5_Presentation/Reporting/WindowsForm SummaryTabPage.cs,1.1,1.2
|
From: Glauco S. <gla...@us...> - 2004-08-06 13:48:44
|
Update of /cvsroot/quantproject/QuantProject/b5_Presentation/Reporting/WindowsForm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31961/b5_Presentation/Reporting/WindowsForm Modified Files: SummaryTabPage.cs Log Message: The SummaryTabPage has been fixed. Index: SummaryTabPage.cs =================================================================== RCS file: /cvsroot/quantproject/QuantProject/b5_Presentation/Reporting/WindowsForm/SummaryTabPage.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SummaryTabPage.cs 1 Aug 2004 00:25:12 -0000 1.1 --- SummaryTabPage.cs 6 Aug 2004 13:48:35 -0000 1.2 *************** *** 34,40 **** public class SummaryTabPage : TabPage { ! // private int currentLabel; private int xForLabels = 17; ! private int labelsWidth = 150; private int yStart = 17; private int yStep = 25; --- 34,44 ---- public class SummaryTabPage : TabPage { ! // constant values for label's placement ! private int labelRows = 8; private int xForLabels = 17; ! private int textLabelsWidth = 180; ! private int valueLablesWidth = 50; ! private int textToValueLabelSpacing = 8; ! private int valueToTextLabelSpacing = 50; private int yStart = 17; private int yStep = 25; *************** *** 75,79 **** private Point getPointForTextLabel( int labelPosition ) { ! return new Point( xForLabels , yStart + labelPosition * yStep ); } private void addTextLabel( Label label , string name , string text ) --- 79,95 ---- private Point getPointForTextLabel( int labelPosition ) { ! int x,y; ! if ( labelPosition < this.labelRows ) ! { ! x = this.xForLabels; ! y = this.yStart + labelPosition * this.yStep; ! } ! else ! { ! x = this.xForLabels + this.textLabelsWidth + this.textToValueLabelSpacing + ! this.valueLablesWidth + this.valueToTextLabelSpacing; ! y = this.yStart + ( labelPosition - this.labelRows ) * this.yStep; ! } ! return new Point( x , y ); } private void addTextLabel( Label label , string name , string text ) *************** *** 82,86 **** // label.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; label.Location = getPointForTextLabel( ( this.Controls.Count - 1 ) / 2 ); ! label.Width = this.labelsWidth; label.Name = name; label.Text = text; --- 98,102 ---- // label.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; label.Location = getPointForTextLabel( ( this.Controls.Count - 1 ) / 2 ); ! label.Width = this.textLabelsWidth; label.Name = name; label.Text = text; *************** *** 92,103 **** // label.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; label.Location = getPointForValueLabel( ( this.Controls.Count / 2 ) - 1 ); label.Name = name; ! label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; } private Point getPointForValueLabel( int labelPosition ) { ! return new Point( xForLabels + labelsWidth + 3 , ! yStart + labelPosition * yStep ); } private void myInitializeComponent() --- 108,121 ---- // label.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; label.Location = getPointForValueLabel( ( this.Controls.Count / 2 ) - 1 ); + label.Width = this.valueLablesWidth; label.Name = name; ! label.TextAlign = System.Drawing.ContentAlignment.MiddleRight; } private Point getPointForValueLabel( int labelPosition ) { ! Point point = getPointForTextLabel( labelPosition ); ! point.X += this.textLabelsWidth + this.textToValueLabelSpacing; ! return point; } private void myInitializeComponent() *************** *** 146,150 **** // this.addTextLabel( lblReturnOnAccount , "lblReturnOnAccount" , ! "Return on account:" ); // // lblValReturnOnAccount --- 164,168 ---- // this.addTextLabel( lblReturnOnAccount , "lblReturnOnAccount" , ! "Return on account (%):" ); // // lblValReturnOnAccount *************** *** 155,159 **** // this.addTextLabel( lblBuyAndHoldPercReturn , "lblBuyAndHoldPercReturn" , ! "Buy & hold % return:" ); // // lblValBuyAndHoldPercReturn --- 173,177 ---- // this.addTextLabel( lblBuyAndHoldPercReturn , "lblBuyAndHoldPercReturn" , ! "Buy and hold % return:" ); // // lblValBuyAndHoldPercReturn *************** *** 199,203 **** // lblAverageTradePercReturn // ! this.addTextLabel( lblNumberWinningTrades , "lblNumberWinningTrades" , "Average trade % return:" ); // --- 217,221 ---- // lblAverageTradePercReturn // ! this.addTextLabel( this.lblAverageTradePercReturn , "lblAverageTradePercReturn" , "Average trade % return:" ); // *************** *** 208,213 **** // lblLargestWinningTrade // ! this.addTextLabel( lblNumberWinningTrades , "lblNumberWinningTrades" , ! "Largest winning trade:" ); // // lblValLargestWinningTrade --- 226,231 ---- // lblLargestWinningTrade // ! this.addTextLabel( lblLargestWinningTrade , "lblNumberWinningTrades" , ! "Largest winning trade (%):" ); // // lblValLargestWinningTrade *************** *** 217,221 **** // lblLargestLosingTrade // ! this.addTextLabel( lblNumberWinningTrades , "lblNumberWinningTrades" , "Largest losing trade:" ); // --- 235,239 ---- // lblLargestLosingTrade // ! this.addTextLabel( lblLargestLosingTrade , "lblNumberWinningTrades" , "Largest losing trade:" ); // *************** *** 270,303 **** } - private void addControls() - { - // this.Controls.Add( this.lblValTotalNetProfit ); - // this.Controls.Add( this.lblReturnOnAccount ); - // this.Controls.Add( this.lblValReturnOnAccount ); - this.Controls.Add( this.lblBuyAndHoldPercReturn ); - this.Controls.Add( this.lblValBuyAndHoldPercReturn ); - this.Controls.Add( this.lblAnnualSystemPercReturn ); - this.Controls.Add( this.lblValAnnualSystemPercReturn ); - this.Controls.Add( this.lblMaxEquityDrawDown ); - this.Controls.Add( this.lblValMaxEquityDrawDown ); - this.Controls.Add( this.lblTotalNumberOfShortTrades ); - this.Controls.Add( this.lblValTotalNumberOfTrades ); - this.Controls.Add( this.lblAverageTradePercReturn ); - this.Controls.Add( this.lblValAverageTradePercReturn ); - this.Controls.Add( this.lblLargestWinningTrade ); - this.Controls.Add( this.lblValLargestWinningTrade ); - this.Controls.Add( this.lblLargestLosingTrade ); - this.Controls.Add( this.lblValLargestLosingTrade ); - this.Controls.Add( this.lblTotalNumberOfLongTrades ); - this.Controls.Add( this.lblValTotalNumberOfLongTrades ); - this.Controls.Add( this.lblNumberWinningLongTrades ); - this.Controls.Add( this.lblValNumberWinningLongTrades ); - this.Controls.Add( this.lblAverageLongTradePercReturn ); - this.Controls.Add( this.lblValAverageLongTradePercReturn ); - this.Controls.Add( this.lblTotalNumberOfShortTrades ); - this.Controls.Add( this.lblValTotalNumberOfTrades ); - this.Controls.Add( this.lblNumberWinningShortTrades ); - this.Controls.Add( this.lblValNumberWinningShortTrades ); - } private void setSummaryValues() { --- 288,291 ---- *************** *** 314,317 **** --- 302,307 ---- this.lblValTotalNumberOfTrades.Text = FormatProvider.ConvertToStringWithTwoDecimals( this.accountReport.Summary.TotalNumberOfTrades ); + this.lblValNumberWinningTrades.Text = + FormatProvider.ConvertToStringWithTwoDecimals( this.accountReport.Summary.NumberWinningTrades ); this.lblValAverageTradePercReturn.Text = FormatProvider.ConvertToStringWithTwoDecimals( this.accountReport.Summary.AverageTradePercentageReturn ); *************** *** 328,331 **** --- 318,323 ---- this.lblValTotalNumberOfShortTrades.Text = FormatProvider.ConvertToStringWithTwoDecimals( this.accountReport.Summary.TotalNumberOfShortTrades ); + this.lblValNumberWinningShortTrades.Text = + FormatProvider.ConvertToStringWithTwoDecimals( this.accountReport.Summary.NumberWinningShortTrades ); } public SummaryTabPage( AccountReport accountReport ) *************** *** 333,337 **** this.accountReport = accountReport; this.myInitializeComponent(); - this.addControls(); this.Text = "Summary"; this.setSummaryValues(); --- 325,328 ---- |
