Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/24/13 19:47:32 (11 years ago)
Author:
ascheibe
Message:

#2031

  • added documentation for chart analysis view
  • some ui improvements
Location:
branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ChartAnalysisView.cs

    r9713 r9749  
    314314      }
    315315    }
     316
     317    private void infoLabel_DoubleClick(object sender, EventArgs e) {
     318      using (InfoBox dialog = new InfoBox("Description of Chart Analysis", typeof(StatisticalTestingView).Namespace + ".InfoResources.ChartAnalysisInfo.rtf")) {
     319        dialog.ShowDialog(this);
     320      }
     321    }
    316322  }
    317323}

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ChartAnalysisView.designer.cs

    r9713 r9749  
    3434    /// </summary>
    3535    private void InitializeComponent() {
     36      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChartAnalysisView));
    3637      this.fittingComboBox = new System.Windows.Forms.ComboBox();
    3738      this.addValuesButton = new System.Windows.Forms.Button();
    … …  
    4243      this.dataTableComboBox = new System.Windows.Forms.ComboBox();
    4344      this.stringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
     45      this.splitContainer = new System.Windows.Forms.SplitContainer();
     46      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
     47      this.infoLabel = new System.Windows.Forms.Label();
     48      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
     49      this.splitContainer.Panel1.SuspendLayout();
     50      this.splitContainer.Panel2.SuspendLayout();
     51      this.splitContainer.SuspendLayout();
     52      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
     53      this.splitContainer1.Panel1.SuspendLayout();
     54      this.splitContainer1.Panel2.SuspendLayout();
     55      this.splitContainer1.SuspendLayout();
    4456      this.SuspendLayout();
    4557      //
    4658      // fittingComboBox
    4759      //
    48       this.fittingComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
     60      this.fittingComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    4961      this.fittingComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    5062      this.fittingComboBox.FormattingEnabled = true;
    51       this.fittingComboBox.Location = new System.Drawing.Point(142, 359);
     63      this.fittingComboBox.Location = new System.Drawing.Point(271, 3);
    5264      this.fittingComboBox.Name = "fittingComboBox";
    5365      this.fittingComboBox.Size = new System.Drawing.Size(214, 21);
    … …  
    5668      // addValuesButton
    5769      //
    58       this.addValuesButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    59       this.addValuesButton.Location = new System.Drawing.Point(3, 357);
     70      this.addValuesButton.Location = new System.Drawing.Point(3, 3);
    6071      this.addValuesButton.Name = "addValuesButton";
    6172      this.addValuesButton.Size = new System.Drawing.Size(133, 23);
    … …  
    6778      // addLineToChart
    6879      //
    69       this.addLineToChart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    70       this.addLineToChart.Location = new System.Drawing.Point(362, 357);
     80      this.addLineToChart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     81      this.addLineToChart.Location = new System.Drawing.Point(491, 3);
    7182      this.addLineToChart.Name = "addLineToChart";
    72       this.addLineToChart.Size = new System.Drawing.Size(133, 23);
     83      this.addLineToChart.Size = new System.Drawing.Size(100, 23);
    7384      this.addLineToChart.TabIndex = 9;
    7485      this.addLineToChart.Text = "Fit Line to Chart";
    … …  
    8293      this.dataRowComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    8394      this.dataRowComboBox.FormattingEnabled = true;
    84       this.dataRowComboBox.Location = new System.Drawing.Point(71, 33);
     95      this.dataRowComboBox.Location = new System.Drawing.Point(70, 33);
    8596      this.dataRowComboBox.Name = "dataRowComboBox";
    86       this.dataRowComboBox.Size = new System.Drawing.Size(424, 21);
     97      this.dataRowComboBox.Size = new System.Drawing.Size(829, 21);
    8798      this.dataRowComboBox.TabIndex = 8;
    8899      this.dataRowComboBox.SelectedIndexChanged += new System.EventHandler(this.dataRowComboBox_SelectedIndexChanged);
    … …  
    91102      //
    92103      this.label2.AutoSize = true;
    93       this.label2.Location = new System.Drawing.Point(5, 36);
     104      this.label2.Location = new System.Drawing.Point(4, 36);
    94105      this.label2.Name = "label2";
    95106      this.label2.Size = new System.Drawing.Size(55, 13);
    … …  
    100111      //
    101112      this.label1.AutoSize = true;
    102       this.label1.Location = new System.Drawing.Point(5, 6);
     113      this.label1.Location = new System.Drawing.Point(4, 6);
    103114      this.label1.Name = "label1";
    104115      this.label1.Size = new System.Drawing.Size(60, 13);
    … …  
    112123      this.dataTableComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    113124      this.dataTableComboBox.FormattingEnabled = true;
    114       this.dataTableComboBox.Location = new System.Drawing.Point(71, 3);
     125      this.dataTableComboBox.Location = new System.Drawing.Point(70, 3);
    115126      this.dataTableComboBox.Name = "dataTableComboBox";
    116       this.dataTableComboBox.Size = new System.Drawing.Size(424, 21);
     127      this.dataTableComboBox.Size = new System.Drawing.Size(829, 21);
    117128      this.dataTableComboBox.TabIndex = 5;
    118129      this.dataTableComboBox.SelectedIndexChanged += new System.EventHandler(this.dataTableComboBox_SelectedIndexChanged);
    … …  
    125136      this.stringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
    126137      this.stringConvertibleMatrixView.Content = null;
    127       this.stringConvertibleMatrixView.Location = new System.Drawing.Point(3, 59);
     138      this.stringConvertibleMatrixView.Location = new System.Drawing.Point(3, 60);
    128139      this.stringConvertibleMatrixView.Name = "stringConvertibleMatrixView";
    129140      this.stringConvertibleMatrixView.ReadOnly = true;
    130141      this.stringConvertibleMatrixView.ShowRowsAndColumnsTextBox = true;
    131142      this.stringConvertibleMatrixView.ShowStatisticalInformation = true;
    132       this.stringConvertibleMatrixView.Size = new System.Drawing.Size(492, 294);
     143      this.stringConvertibleMatrixView.Size = new System.Drawing.Size(896, 417);
    133144      this.stringConvertibleMatrixView.TabIndex = 0;
    134145      //
     146      // splitContainer
     147      //
     148      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     149            | System.Windows.Forms.AnchorStyles.Left)
     150            | System.Windows.Forms.AnchorStyles.Right)));
     151      this.splitContainer.Location = new System.Drawing.Point(3, 3);
     152      this.splitContainer.Name = "splitContainer";
     153      //
     154      // splitContainer.Panel1
     155      //
     156      this.splitContainer.Panel1.Controls.Add(this.splitContainer1);
     157      this.splitContainer.Panel1.Controls.Add(this.stringConvertibleMatrixView);
     158      this.splitContainer.Panel1.Controls.Add(this.dataTableComboBox);
     159      this.splitContainer.Panel1.Controls.Add(this.label1);
     160      this.splitContainer.Panel1.Controls.Add(this.label2);
     161      this.splitContainer.Panel1.Controls.Add(this.dataRowComboBox);
     162      //
     163      // splitContainer.Panel2
     164      //
     165      this.splitContainer.Panel2.Controls.Add(this.infoLabel);
     166      this.splitContainer.Size = new System.Drawing.Size(938, 515);
     167      this.splitContainer.SplitterDistance = 902;
     168      this.splitContainer.TabIndex = 13;
     169      //
     170      // splitContainer1
     171      //
     172      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
     173            | System.Windows.Forms.AnchorStyles.Right)));
     174      this.splitContainer1.Location = new System.Drawing.Point(3, 483);
     175      this.splitContainer1.Name = "splitContainer1";
     176      //
     177      // splitContainer1.Panel1
     178      //
     179      this.splitContainer1.Panel1.Controls.Add(this.addValuesButton);
     180      //
     181      // splitContainer1.Panel2
     182      //
     183      this.splitContainer1.Panel2.Controls.Add(this.fittingComboBox);
     184      this.splitContainer1.Panel2.Controls.Add(this.addLineToChart);
     185      this.splitContainer1.Size = new System.Drawing.Size(896, 29);
     186      this.splitContainer1.SplitterDistance = 298;
     187      this.splitContainer1.TabIndex = 13;
     188      //
     189      // infoLabel
     190      //
     191      this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     192      this.infoLabel.Image = ((System.Drawing.Image)(resources.GetObject("infoLabel.Image")));
     193      this.infoLabel.Location = new System.Drawing.Point(13, 3);
     194      this.infoLabel.Name = "infoLabel";
     195      this.infoLabel.Size = new System.Drawing.Size(16, 16);
     196      this.infoLabel.TabIndex = 18;
     197      this.infoLabel.DoubleClick += new System.EventHandler(this.infoLabel_DoubleClick);
     198      //
    135199      // ChartAnalysisView
    136200      //
    137       this.Controls.Add(this.fittingComboBox);
    138       this.Controls.Add(this.addValuesButton);
    139       this.Controls.Add(this.addLineToChart);
    140       this.Controls.Add(this.dataRowComboBox);
    141       this.Controls.Add(this.label2);
    142       this.Controls.Add(this.label1);
    143       this.Controls.Add(this.dataTableComboBox);
    144       this.Controls.Add(this.stringConvertibleMatrixView);
     201      this.Controls.Add(this.splitContainer);
    145202      this.Name = "ChartAnalysisView";
    146       this.Size = new System.Drawing.Size(498, 385);
     203      this.Size = new System.Drawing.Size(944, 521);
     204      this.splitContainer.Panel1.ResumeLayout(false);
     205      this.splitContainer.Panel1.PerformLayout();
     206      this.splitContainer.Panel2.ResumeLayout(false);
     207      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
     208      this.splitContainer.ResumeLayout(false);
     209      this.splitContainer1.Panel1.ResumeLayout(false);
     210      this.splitContainer1.Panel2.ResumeLayout(false);
     211      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
     212      this.splitContainer1.ResumeLayout(false);
    147213      this.ResumeLayout(false);
    148       this.PerformLayout();
    149214
    150215    }
    … …  
    159224    private System.Windows.Forms.Button addValuesButton;
    160225    private System.Windows.Forms.ComboBox fittingComboBox;
     226    private System.Windows.Forms.SplitContainer splitContainer;
     227    private System.Windows.Forms.Label infoLabel;
     228    private System.Windows.Forms.SplitContainer splitContainer1;
    161229  }
    162230}

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/HeuristicLab.Analysis.Statistics-3.3.csproj

    r9742 r9749  
    161161  <ItemGroup>
    162162    <None Include="HeuristicLab.snk" />
     163    <EmbeddedResource Include="ChartAnalysisView.resx">
     164      <DependentUpon>ChartAnalysisView.cs</DependentUpon>
     165    </EmbeddedResource>
    163166    <EmbeddedResource Include="InfoResources\StatisticalTestsInfo.rtf" />
     167    <EmbeddedResource Include="InfoResources\ChartAnalysisInfo.rtf" />
    164168    <None Include="Plugin.cs.frame" />
    165169    <None Include="Properties\AssemblyInfo.cs.frame" />
    … …  
    175179  </ItemGroup>
    176180  <ItemGroup>
    177     <None Include="StatisticalTestsInfo.rtf" />
    178181    <None Include="VS2008ImageLibrary_Annotations_Default.png" />
    179182  </ItemGroup>

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

    r9742 r9749  
    188188      normalityLabel.Image = null;
    189189      groupCompLabel.Image = null;
     190      pairwiseLabel.Image = null;
    190191      pValTextBox.Text = string.Empty;
    191192      equalDistsTextBox.Text = string.Empty;
    … …  
    280281
    281282    private void infoLabel_DoubleClick(object sender, EventArgs e) {
    282       using (InfoBox dialog = new InfoBox("Description of statistical tests", typeof(StatisticalTestingView).Namespace + ".InfoResources.StatisticalTestsInfo.rtf")) {
     283      using (InfoBox dialog = new InfoBox("Description of Statistical Tests", typeof(StatisticalTestingView).Namespace + ".InfoResources.StatisticalTestsInfo.rtf")) {
    283284        dialog.ShowDialog(this);
    284285      }
    … …  
    321322      double ratio = ((double)cnt) / data.Length * 100.0;
    322323      equalDistsTextBox.Text = ratio.ToString() + " %";
     324
     325      if (cnt == 0) {
     326        pairwiseLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default;
     327      } else {
     328        pairwiseLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning;
     329      }
    323330    }
    324331  }

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.designer.cs

    r9742 r9749  
    6565      this.splitContainer3 = new System.Windows.Forms.SplitContainer();
    6666      this.pairwiseTestGroupBox = new System.Windows.Forms.GroupBox();
     67      this.pairwiseLabel = new System.Windows.Forms.Label();
    6768      this.label3 = new System.Windows.Forms.Label();
    6869      this.equalDistsTextBox = new System.Windows.Forms.TextBox();
    … …  
    103104      this.stringConvertibleMatrixView.ShowRowsAndColumnsTextBox = false;
    104105      this.stringConvertibleMatrixView.ShowStatisticalInformation = true;
    105       this.stringConvertibleMatrixView.Size = new System.Drawing.Size(644, 488);
     106      this.stringConvertibleMatrixView.Size = new System.Drawing.Size(644, 416);
    106107      this.stringConvertibleMatrixView.TabIndex = 0;
    107108      //
    … …  
    222223      // infoLabel
    223224      //
    224       this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
     225      this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    225226      this.infoLabel.Image = ((System.Drawing.Image)(resources.GetObject("infoLabel.Image")));
    226       this.infoLabel.Location = new System.Drawing.Point(240, 475);
     227      this.infoLabel.Location = new System.Drawing.Point(234, 3);
    227228      this.infoLabel.Name = "infoLabel";
    228229      this.infoLabel.Size = new System.Drawing.Size(16, 16);
    … …  
    272273      this.splitContainer3.Panel2.Controls.Add(this.normalityGroupBox);
    273274      this.splitContainer3.Panel2.Controls.Add(this.selectDataGroupBox);
    274       this.splitContainer3.Size = new System.Drawing.Size(913, 494);
     275      this.splitContainer3.Size = new System.Drawing.Size(913, 422);
    275276      this.splitContainer3.SplitterDistance = 650;
    276277      this.splitContainer3.TabIndex = 20;
    … …  
    280281      this.pairwiseTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    281282            | System.Windows.Forms.AnchorStyles.Right)));
     283      this.pairwiseTestGroupBox.Controls.Add(this.pairwiseLabel);
    282284      this.pairwiseTestGroupBox.Controls.Add(this.label3);
    283285      this.pairwiseTestGroupBox.Controls.Add(this.equalDistsTextBox);
    … …  
    286288      this.pairwiseTestGroupBox.Controls.Add(this.groupCompComboBox);
    287289      this.pairwiseTestGroupBox.Controls.Add(this.pairwiseTestButton);
    288       this.pairwiseTestGroupBox.Location = new System.Drawing.Point(3, 279);
     290      this.pairwiseTestGroupBox.Location = new System.Drawing.Point(3, 273);
    289291      this.pairwiseTestGroupBox.Name = "pairwiseTestGroupBox";
    290292      this.pairwiseTestGroupBox.Size = new System.Drawing.Size(253, 145);
    … …  
    292294      this.pairwiseTestGroupBox.TabStop = false;
    293295      this.pairwiseTestGroupBox.Text = "4. Pairwise Statistical Testing";
     296      //
     297      // pairwiseLabel
     298      //
     299      this.pairwiseLabel.AutoSize = true;
     300      this.pairwiseLabel.Location = new System.Drawing.Point(101, 57);
     301      this.pairwiseLabel.MaximumSize = new System.Drawing.Size(16, 16);
     302      this.pairwiseLabel.MinimumSize = new System.Drawing.Size(16, 16);
     303      this.pairwiseLabel.Name = "pairwiseLabel";
     304      this.pairwiseLabel.Size = new System.Drawing.Size(16, 16);
     305      this.pairwiseLabel.TabIndex = 18;
    294306      //
    295307      // label3
    … …  
    347359      this.allGroupTestGroupBox.Controls.Add(this.lblPVal);
    348360      this.allGroupTestGroupBox.Controls.Add(this.pValTextBox);
    349       this.allGroupTestGroupBox.Location = new System.Drawing.Point(3, 173);
     361      this.allGroupTestGroupBox.Location = new System.Drawing.Point(3, 189);
    350362      this.allGroupTestGroupBox.Name = "allGroupTestGroupBox";
    351       this.allGroupTestGroupBox.Size = new System.Drawing.Size(253, 100);
     363      this.allGroupTestGroupBox.Size = new System.Drawing.Size(253, 78);
    352364      this.allGroupTestGroupBox.TabIndex = 21;
    353365      this.allGroupTestGroupBox.TabStop = false;
    … …  
    371383      this.normalityGroupBox.Controls.Add(this.normalDistButton);
    372384      this.normalityGroupBox.Controls.Add(this.normalityDetails);
    373       this.normalityGroupBox.Location = new System.Drawing.Point(3, 91);
     385      this.normalityGroupBox.Location = new System.Drawing.Point(3, 107);
    374386      this.normalityGroupBox.Name = "normalityGroupBox";
    375387      this.normalityGroupBox.Size = new System.Drawing.Size(253, 76);
    … …  
    381393      //
    382394      this.normalityLabel.AutoSize = true;
    383       this.normalityLabel.Location = new System.Drawing.Point(116, 24);
     395      this.normalityLabel.Location = new System.Drawing.Point(104, 24);
    384396      this.normalityLabel.MaximumSize = new System.Drawing.Size(16, 16);
    385397      this.normalityLabel.MinimumSize = new System.Drawing.Size(16, 16);
    … …  
    393405            | System.Windows.Forms.AnchorStyles.Right)));
    394406      this.selectDataGroupBox.Controls.Add(this.splitContainer1);
    395       this.selectDataGroupBox.Location = new System.Drawing.Point(3, 6);
     407      this.selectDataGroupBox.Location = new System.Drawing.Point(3, 22);
    396408      this.selectDataGroupBox.Name = "selectDataGroupBox";
    397409      this.selectDataGroupBox.Size = new System.Drawing.Size(253, 79);
    … …  
    404416      this.Controls.Add(this.splitContainer3);
    405417      this.Name = "StatisticalTestingView";
    406       this.Size = new System.Drawing.Size(924, 500);
     418      this.Size = new System.Drawing.Size(924, 428);
    407419      this.contextMenuStrip1.ResumeLayout(false);
    408420      this.splitContainer1.Panel1.ResumeLayout(false);
    … …  
    456468    private System.Windows.Forms.Label label3;
    457469    private System.Windows.Forms.TextBox equalDistsTextBox;
     470    private System.Windows.Forms.Label pairwiseLabel;
    458471  }
    459472}

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.resx

    r9742 r9749  
    188188    <value>17, 17</value>
    189189  </metadata>
     190  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     191    <value>54</value>
     192  </metadata>
    190193</root>
Note: See TracChangeset for help on using the changeset viewer.