Changeset 7221


Ignore:
Timestamp:
12/21/11 16:20:18 (11 years ago)
Author:
ascheibe
Message:

#1611

  • switched VisualPropertiesDialog to non-resizeable
  • corrected space between textboxes and made them also anchor to the right
  • the name of the chart can now be changed
Location:
trunk/sources
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

    r7126 r7221  
    223223      if (Content.VisualProperties.TitleFont != null) chart.Titles[0].Font = Content.VisualProperties.TitleFont;
    224224      if (!Content.VisualProperties.TitleColor.IsEmpty) chart.Titles[0].ForeColor = Content.VisualProperties.TitleColor;
     225      chart.Titles[0].Text = Content.VisualProperties.Title;
    225226
    226227      if (Content.VisualProperties.AxisTitleFont != null) area.AxisX.TitleFont = Content.VisualProperties.AxisTitleFont;
  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.Designer.cs

    r6342 r7221  
    7878      this.axisTabControl = new System.Windows.Forms.TabControl();
    7979      this.mainTabPage = new System.Windows.Forms.TabPage();
     80      this.titleTextBox = new System.Windows.Forms.TextBox();
     81      this.label15 = new System.Windows.Forms.Label();
    8082      this.axisFontLabel = new System.Windows.Forms.Label();
    8183      this.titleFontLabel = new System.Windows.Forms.Label();
     
    145147      this.yAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
    146148      this.yAxisPrimaryTitleTextBox.Name = "yAxisPrimaryTitleTextBox";
    147       this.yAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(221, 20);
     149      this.yAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
    148150      this.yAxisPrimaryTitleTextBox.TabIndex = 1;
    149151      this.yAxisPrimaryTitleTextBox.Validated += new System.EventHandler(this.yPrimaryTitleTextBox_Validated);
     
    155157      this.yAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
    156158      this.yAxisSecondaryTitleTextBox.Name = "yAxisSecondaryTitleTextBox";
    157       this.yAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(243, 20);
     159      this.yAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
    158160      this.yAxisSecondaryTitleTextBox.TabIndex = 1;
    159161      this.yAxisSecondaryTitleTextBox.Validated += new System.EventHandler(this.ySecondaryTitleTextBox_Validated);
     
    170172      // xAxisPrimaryGroupBox
    171173      //
     174      this.xAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     175                  | System.Windows.Forms.AnchorStyles.Right)));
    172176      this.xAxisPrimaryGroupBox.Controls.Add(this.label12);
    173177      this.xAxisPrimaryGroupBox.Controls.Add(this.label9);
     
    186190      //
    187191      this.label12.AutoSize = true;
    188       this.label12.Location = new System.Drawing.Point(4, 77);
     192      this.label12.Location = new System.Drawing.Point(4, 78);
    189193      this.label12.Name = "label12";
    190194      this.label12.Size = new System.Drawing.Size(54, 13);
     
    207211      this.xAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
    208212      this.xAxisPrimaryTitleTextBox.Name = "xAxisPrimaryTitleTextBox";
    209       this.xAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(221, 20);
     213      this.xAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
    210214      this.xAxisPrimaryTitleTextBox.TabIndex = 1;
    211215      this.xAxisPrimaryTitleTextBox.Validated += new System.EventHandler(this.xPrimaryTitleTextBox_Validated);
     
    222226      // xAxisPrimaryMaximumPanel
    223227      //
     228      this.xAxisPrimaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     229                  | System.Windows.Forms.AnchorStyles.Right)));
    224230      this.xAxisPrimaryMaximumPanel.Controls.Add(this.xAxisPrimaryMaximumFixedTextBox);
    225231      this.xAxisPrimaryMaximumPanel.Controls.Add(this.xAxisPrimaryMaximumFixedRadioButton);
    226232      this.xAxisPrimaryMaximumPanel.Controls.Add(this.xAxisPrimaryMaximumAutoRadioButton);
    227       this.xAxisPrimaryMaximumPanel.Location = new System.Drawing.Point(63, 71);
     233      this.xAxisPrimaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
    228234      this.xAxisPrimaryMaximumPanel.Name = "xAxisPrimaryMaximumPanel";
    229235      this.xAxisPrimaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
     
    232238      // xAxisPrimaryMaximumFixedTextBox
    233239      //
     240      this.xAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     241                  | System.Windows.Forms.AnchorStyles.Right)));
    234242      this.xAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    235243      this.xAxisPrimaryMaximumFixedTextBox.Name = "xAxisPrimaryMaximumFixedTextBox";
    236       this.xAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     244      this.xAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    237245      this.xAxisPrimaryMaximumFixedTextBox.TabIndex = 2;
    238246      this.xAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMaximumFixedTextBox_Validating);
     
    264272      // xAxisPrimaryMinimumPanel
    265273      //
     274      this.xAxisPrimaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     275                  | System.Windows.Forms.AnchorStyles.Right)));
    266276      this.xAxisPrimaryMinimumPanel.Controls.Add(this.xAxisPrimaryMinimumFixedTextBox);
    267277      this.xAxisPrimaryMinimumPanel.Controls.Add(this.xAxisPrimaryMinimumFixedRadioButton);
     
    274284      // xAxisPrimaryMinimumFixedTextBox
    275285      //
     286      this.xAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     287                  | System.Windows.Forms.AnchorStyles.Right)));
    276288      this.xAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    277289      this.xAxisPrimaryMinimumFixedTextBox.Name = "xAxisPrimaryMinimumFixedTextBox";
    278       this.xAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     290      this.xAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    279291      this.xAxisPrimaryMinimumFixedTextBox.TabIndex = 2;
    280292      this.xAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisPrimaryMinimumFixedTextBox_Validating);
     
    306318      // xAxisSecondaryGroupBox
    307319      //
     320      this.xAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     321                  | System.Windows.Forms.AnchorStyles.Right)));
    308322      this.xAxisSecondaryGroupBox.Controls.Add(this.label10);
    309323      this.xAxisSecondaryGroupBox.Controls.Add(this.xAxisSecondaryTitleTextBox);
     
    334348      this.xAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(63, 23);
    335349      this.xAxisSecondaryTitleTextBox.Name = "xAxisSecondaryTitleTextBox";
    336       this.xAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(221, 20);
     350      this.xAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(242, 20);
    337351      this.xAxisSecondaryTitleTextBox.TabIndex = 1;
    338352      this.xAxisSecondaryTitleTextBox.Validated += new System.EventHandler(this.xSecondaryTitleTextBox_Validated);
     
    341355      //
    342356      this.label5.AutoSize = true;
    343       this.label5.Location = new System.Drawing.Point(4, 77);
     357      this.label5.Location = new System.Drawing.Point(4, 78);
    344358      this.label5.Name = "label5";
    345359      this.label5.Size = new System.Drawing.Size(54, 13);
     
    358372      // xAxisSecondaryMaximumPanel
    359373      //
     374      this.xAxisSecondaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     375                  | System.Windows.Forms.AnchorStyles.Right)));
    360376      this.xAxisSecondaryMaximumPanel.Controls.Add(this.xAxisSecondaryMaximumFixedTextBox);
    361377      this.xAxisSecondaryMaximumPanel.Controls.Add(this.xAxisSecondaryMaximumFixedRadioButton);
    362378      this.xAxisSecondaryMaximumPanel.Controls.Add(this.xAxisSecondaryMaximumAutoRadioButton);
    363       this.xAxisSecondaryMaximumPanel.Location = new System.Drawing.Point(63, 71);
     379      this.xAxisSecondaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
    364380      this.xAxisSecondaryMaximumPanel.Name = "xAxisSecondaryMaximumPanel";
    365381      this.xAxisSecondaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
     
    368384      // xAxisSecondaryMaximumFixedTextBox
    369385      //
     386      this.xAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     387                  | System.Windows.Forms.AnchorStyles.Right)));
    370388      this.xAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    371389      this.xAxisSecondaryMaximumFixedTextBox.Name = "xAxisSecondaryMaximumFixedTextBox";
    372       this.xAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     390      this.xAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    373391      this.xAxisSecondaryMaximumFixedTextBox.TabIndex = 2;
    374392      this.xAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMaximumFixedTextBox_Validating);
     
    400418      // xAxisSecondaryMinimumPanel
    401419      //
     420      this.xAxisSecondaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     421                  | System.Windows.Forms.AnchorStyles.Right)));
    402422      this.xAxisSecondaryMinimumPanel.Controls.Add(this.xAxisSecondaryMinimumFixedTextBox);
    403423      this.xAxisSecondaryMinimumPanel.Controls.Add(this.xAxisSecondaryMinimumFixedRadioButton);
     
    410430      // xAxisSecondaryMinimumFixedTextBox
    411431      //
     432      this.xAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     433                  | System.Windows.Forms.AnchorStyles.Right)));
    412434      this.xAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    413435      this.xAxisSecondaryMinimumFixedTextBox.Name = "xAxisSecondaryMinimumFixedTextBox";
    414       this.xAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     436      this.xAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    415437      this.xAxisSecondaryMinimumFixedTextBox.TabIndex = 2;
    416438      this.xAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.xAxisSecondaryMinimumFixedTextBox_Validating);
     
    456478      // mainTabPage
    457479      //
     480      this.mainTabPage.Controls.Add(this.titleTextBox);
     481      this.mainTabPage.Controls.Add(this.label15);
    458482      this.mainTabPage.Controls.Add(this.axisFontLabel);
    459483      this.mainTabPage.Controls.Add(this.titleFontLabel);
     
    469493      this.mainTabPage.UseVisualStyleBackColor = true;
    470494      //
     495      // titleTextBox
     496      //
     497      this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     498                  | System.Windows.Forms.AnchorStyles.Right)));
     499      this.titleTextBox.Location = new System.Drawing.Point(72, 5);
     500      this.titleTextBox.Name = "titleTextBox";
     501      this.titleTextBox.Size = new System.Drawing.Size(253, 20);
     502      this.titleTextBox.TabIndex = 4;
     503      this.titleTextBox.Validated += new System.EventHandler(this.titleTextBox_Validated);
     504      //
     505      // label15
     506      //
     507      this.label15.AutoSize = true;
     508      this.label15.Location = new System.Drawing.Point(12, 8);
     509      this.label15.Name = "label15";
     510      this.label15.Size = new System.Drawing.Size(30, 13);
     511      this.label15.TabIndex = 3;
     512      this.label15.Text = "Title:";
     513      //
    471514      // axisFontLabel
    472515      //
    473516      this.axisFontLabel.AutoSize = true;
    474       this.axisFontLabel.Location = new System.Drawing.Point(101, 44);
     517      this.axisFontLabel.Location = new System.Drawing.Point(104, 65);
    475518      this.axisFontLabel.Name = "axisFontLabel";
    476519      this.axisFontLabel.Size = new System.Drawing.Size(13, 13);
     
    481524      //
    482525      this.titleFontLabel.AutoSize = true;
    483       this.titleFontLabel.Location = new System.Drawing.Point(101, 15);
     526      this.titleFontLabel.Location = new System.Drawing.Point(104, 36);
    484527      this.titleFontLabel.Name = "titleFontLabel";
    485528      this.titleFontLabel.Size = new System.Drawing.Size(13, 13);
     
    489532      // axisFontButton
    490533      //
    491       this.axisFontButton.Location = new System.Drawing.Point(69, 39);
     534      this.axisFontButton.Location = new System.Drawing.Point(72, 60);
    492535      this.axisFontButton.Name = "axisFontButton";
    493536      this.axisFontButton.Size = new System.Drawing.Size(26, 23);
     
    500543      //
    501544      this.label3.AutoSize = true;
    502       this.label3.Location = new System.Drawing.Point(9, 44);
     545      this.label3.Location = new System.Drawing.Point(12, 65);
    503546      this.label3.Name = "label3";
    504547      this.label3.Size = new System.Drawing.Size(53, 13);
     
    508551      // titleFontButton
    509552      //
    510       this.titleFontButton.Location = new System.Drawing.Point(69, 10);
     553      this.titleFontButton.Location = new System.Drawing.Point(72, 31);
    511554      this.titleFontButton.Name = "titleFontButton";
    512555      this.titleFontButton.Size = new System.Drawing.Size(26, 23);
     
    519562      //
    520563      this.label2.AutoSize = true;
    521       this.label2.Location = new System.Drawing.Point(9, 15);
     564      this.label2.Location = new System.Drawing.Point(12, 36);
    522565      this.label2.Name = "label2";
    523566      this.label2.Size = new System.Drawing.Size(54, 13);
     
    551594      // yAxisSecondaryGroupBox
    552595      //
     596      this.yAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     597                  | System.Windows.Forms.AnchorStyles.Right)));
    553598      this.yAxisSecondaryGroupBox.Controls.Add(this.yAxisSecondaryTitleTextBox);
    554599      this.yAxisSecondaryGroupBox.Controls.Add(this.label4);
     
    567612      //
    568613      this.label13.AutoSize = true;
    569       this.label13.Location = new System.Drawing.Point(4, 77);
     614      this.label13.Location = new System.Drawing.Point(4, 78);
    570615      this.label13.Name = "label13";
    571616      this.label13.Size = new System.Drawing.Size(54, 13);
     
    584629      // yAxisSecondaryMaximumPanel
    585630      //
     631      this.yAxisSecondaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     632                  | System.Windows.Forms.AnchorStyles.Right)));
    586633      this.yAxisSecondaryMaximumPanel.Controls.Add(this.yAxisSecondaryMaximumFixedTextBox);
    587634      this.yAxisSecondaryMaximumPanel.Controls.Add(this.yAxisSecondaryMaximumFixedRadioButton);
    588635      this.yAxisSecondaryMaximumPanel.Controls.Add(this.yAxisSecondaryMaximumAutoRadioButton);
    589       this.yAxisSecondaryMaximumPanel.Location = new System.Drawing.Point(63, 71);
     636      this.yAxisSecondaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
    590637      this.yAxisSecondaryMaximumPanel.Name = "yAxisSecondaryMaximumPanel";
    591638      this.yAxisSecondaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
     
    594641      // yAxisSecondaryMaximumFixedTextBox
    595642      //
     643      this.yAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     644                  | System.Windows.Forms.AnchorStyles.Right)));
    596645      this.yAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    597646      this.yAxisSecondaryMaximumFixedTextBox.Name = "yAxisSecondaryMaximumFixedTextBox";
    598       this.yAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     647      this.yAxisSecondaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    599648      this.yAxisSecondaryMaximumFixedTextBox.TabIndex = 2;
    600649      this.yAxisSecondaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMaximumFixedTextBox_Validating);
     
    626675      // yAxisSecondaryMinimumPanel
    627676      //
     677      this.yAxisSecondaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     678                  | System.Windows.Forms.AnchorStyles.Right)));
    628679      this.yAxisSecondaryMinimumPanel.Controls.Add(this.yAxisSecondaryMinimumFixedTextBox);
    629680      this.yAxisSecondaryMinimumPanel.Controls.Add(this.yAxisSecondaryMinimumFixedRadioButton);
     
    636687      // yAxisSecondaryMinimumFixedTextBox
    637688      //
     689      this.yAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     690                  | System.Windows.Forms.AnchorStyles.Right)));
    638691      this.yAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    639692      this.yAxisSecondaryMinimumFixedTextBox.Name = "yAxisSecondaryMinimumFixedTextBox";
    640       this.yAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     693      this.yAxisSecondaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    641694      this.yAxisSecondaryMinimumFixedTextBox.TabIndex = 2;
    642695      this.yAxisSecondaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisSecondaryMinimumFixedTextBox_Validating);
     
    668721      // yAxisPrimaryGroupBox
    669722      //
     723      this.yAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     724                  | System.Windows.Forms.AnchorStyles.Right)));
    670725      this.yAxisPrimaryGroupBox.Controls.Add(this.label7);
    671726      this.yAxisPrimaryGroupBox.Controls.Add(this.yAxisPrimaryTitleTextBox);
     
    684739      //
    685740      this.label7.AutoSize = true;
    686       this.label7.Location = new System.Drawing.Point(4, 77);
     741      this.label7.Location = new System.Drawing.Point(4, 78);
    687742      this.label7.Name = "label7";
    688743      this.label7.Size = new System.Drawing.Size(54, 13);
     
    701756      // yAxisPrimaryMaximumPanel
    702757      //
     758      this.yAxisPrimaryMaximumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     759                  | System.Windows.Forms.AnchorStyles.Right)));
    703760      this.yAxisPrimaryMaximumPanel.Controls.Add(this.yAxisPrimaryMaximumFixedTextBox);
    704761      this.yAxisPrimaryMaximumPanel.Controls.Add(this.yAxisPrimaryMaximumFixedRadioButton);
    705762      this.yAxisPrimaryMaximumPanel.Controls.Add(this.yAxisPrimaryMaximumAutoRadioButton);
    706       this.yAxisPrimaryMaximumPanel.Location = new System.Drawing.Point(63, 71);
     763      this.yAxisPrimaryMaximumPanel.Location = new System.Drawing.Point(63, 72);
    707764      this.yAxisPrimaryMaximumPanel.Name = "yAxisPrimaryMaximumPanel";
    708765      this.yAxisPrimaryMaximumPanel.Size = new System.Drawing.Size(245, 25);
     
    711768      // yAxisPrimaryMaximumFixedTextBox
    712769      //
     770      this.yAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     771                  | System.Windows.Forms.AnchorStyles.Right)));
    713772      this.yAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    714773      this.yAxisPrimaryMaximumFixedTextBox.Name = "yAxisPrimaryMaximumFixedTextBox";
    715       this.yAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     774      this.yAxisPrimaryMaximumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    716775      this.yAxisPrimaryMaximumFixedTextBox.TabIndex = 2;
    717776      this.yAxisPrimaryMaximumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMaximumFixedTextBox_Validating);
     
    743802      // yAxisPrimaryMinimumPanel
    744803      //
     804      this.yAxisPrimaryMinimumPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     805                  | System.Windows.Forms.AnchorStyles.Right)));
    745806      this.yAxisPrimaryMinimumPanel.Controls.Add(this.yAxisPrimaryMinimumFixedTextBox);
    746807      this.yAxisPrimaryMinimumPanel.Controls.Add(this.yAxisPrimaryMinimumFixedRadioButton);
     
    753814      // yAxisPrimaryMinimumFixedTextBox
    754815      //
     816      this.yAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     817                  | System.Windows.Forms.AnchorStyles.Right)));
    755818      this.yAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(126, 2);
    756819      this.yAxisPrimaryMinimumFixedTextBox.Name = "yAxisPrimaryMinimumFixedTextBox";
    757       this.yAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(95, 20);
     820      this.yAxisPrimaryMinimumFixedTextBox.Size = new System.Drawing.Size(116, 20);
    758821      this.yAxisPrimaryMinimumFixedTextBox.TabIndex = 2;
    759822      this.yAxisPrimaryMinimumFixedTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.yAxisPrimaryMinimumFixedTextBox_Validating);
     
    900963    private System.Windows.Forms.Label titleFontLabel;
    901964    private System.Windows.Forms.FontDialog axisFontDialog;
     965    private System.Windows.Forms.Label label15;
     966    private System.Windows.Forms.TextBox titleTextBox;
    902967  }
    903968}
  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs

    r6342 r7221  
    5050          titleFontLabel.Text = "(  )";
    5151          axisFontLabel.Text = "(  )";
     52          titleTextBox.Text = string.Empty;
    5253
    5354          xAxisPrimaryTitleTextBox.Text = string.Empty;
     
    8384          titleFontLabel.Text = "( " + FormatFont(Content.TitleFont) + " )";
    8485          axisFontLabel.Text = "( " + FormatFont(Content.AxisTitleFont) + " )";
     86          titleTextBox.Text = Content.Title;
    8587
    8688          xAxisPrimaryTitleTextBox.Text = Content.XAxisTitle;
     
    114116          yAxisSecondaryMaximumFixedTextBox.Text = Content.SecondYAxisMaximumFixedValue.ToString();
    115117        }
    116       } finally { SuppressEvents = false; }
     118      }
     119      finally { SuppressEvents = false; }
    117120      SetEnabledStateOfControls();
    118121    }
     
    314317          Content.XAxisMinimumAuto = xAxisPrimaryMinimumAutoRadioButton.Checked;
    315318          if (Content.XAxisMinimumAuto) xAxisPrimaryMinimumFixedTextBox.Text = double.NaN.ToString();
    316         } finally { SuppressEvents = false; }
     319        }
     320        finally { SuppressEvents = false; }
    317321        SetEnabledStateOfControls();
    318322      }
     
    325329          Content.XAxisMaximumAuto = xAxisPrimaryMaximumAutoRadioButton.Checked;
    326330          if (Content.XAxisMaximumAuto) xAxisPrimaryMaximumFixedTextBox.Text = double.NaN.ToString();
    327         } finally { SuppressEvents = false; }
     331        }
     332        finally { SuppressEvents = false; }
    328333        SetEnabledStateOfControls();
    329334      }
     
    336341          Content.SecondXAxisMinimumAuto = xAxisSecondaryMinimumAutoRadioButton.Checked;
    337342          if (Content.SecondXAxisMinimumAuto) xAxisSecondaryMinimumFixedTextBox.Text = double.NaN.ToString();
    338         } finally { SuppressEvents = false; }
     343        }
     344        finally { SuppressEvents = false; }
    339345        SetEnabledStateOfControls();
    340346      }
     
    347353          Content.SecondXAxisMaximumAuto = xAxisSecondaryMaximumAutoRadioButton.Checked;
    348354          if (Content.SecondXAxisMaximumAuto) xAxisSecondaryMaximumFixedTextBox.Text = double.NaN.ToString();
    349         } finally { SuppressEvents = false; }
     355        }
     356        finally { SuppressEvents = false; }
    350357        SetEnabledStateOfControls();
    351358      }
     
    358365          Content.YAxisMinimumAuto = yAxisPrimaryMinimumAutoRadioButton.Checked;
    359366          if (Content.YAxisMinimumAuto) yAxisPrimaryMinimumFixedTextBox.Text = double.NaN.ToString();
    360         } finally { SuppressEvents = false; }
     367        }
     368        finally { SuppressEvents = false; }
    361369        SetEnabledStateOfControls();
    362370      }
     
    369377          Content.YAxisMaximumAuto = yAxisPrimaryMaximumAutoRadioButton.Checked;
    370378          if (Content.YAxisMaximumAuto) yAxisPrimaryMaximumFixedTextBox.Text = double.NaN.ToString();
    371         } finally { SuppressEvents = false; }
     379        }
     380        finally { SuppressEvents = false; }
    372381        SetEnabledStateOfControls();
    373382      }
     
    380389          Content.SecondYAxisMinimumAuto = yAxisSecondaryMinimumAutoRadioButton.Checked;
    381390          if (Content.SecondYAxisMinimumAuto) yAxisSecondaryMinimumFixedTextBox.Text = double.NaN.ToString();
    382         } finally { SuppressEvents = false; }
     391        }
     392        finally { SuppressEvents = false; }
    383393        SetEnabledStateOfControls();
    384394      }
     
    391401          Content.SecondYAxisMaximumAuto = yAxisSecondaryMaximumAutoRadioButton.Checked;
    392402          if (Content.SecondYAxisMaximumAuto) yAxisSecondaryMaximumFixedTextBox.Text = double.NaN.ToString();
    393         } finally { SuppressEvents = false; }
     403        }
     404        finally { SuppressEvents = false; }
    394405        SetEnabledStateOfControls();
    395406      }
     
    415426      }
    416427    }
     428
     429    private void titleTextBox_Validated(object sender, System.EventArgs e) {
     430      if (!SuppressEvents && Content != null) {
     431        Content.Title = titleTextBox.Text;
     432      }
     433    }
    417434    #endregion
    418435
  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs

    r7216 r7221  
    185185      this.chartTabPage.Name = "chartTabPage";
    186186      this.chartTabPage.Padding = new System.Windows.Forms.Padding(3);
    187       this.chartTabPage.Size = new System.Drawing.Size(453, 348);
     187      this.chartTabPage.Size = new System.Drawing.Size(456, 353);
    188188      this.chartTabPage.TabIndex = 1;
    189189      this.chartTabPage.Text = "Chart";
     
    196196      this.dataTableVisualPropertiesControl.Location = new System.Drawing.Point(3, 3);
    197197      this.dataTableVisualPropertiesControl.Name = "dataTableVisualPropertiesControl";
    198       this.dataTableVisualPropertiesControl.Size = new System.Drawing.Size(447, 342);
     198      this.dataTableVisualPropertiesControl.Size = new System.Drawing.Size(186, 68);
    199199      this.dataTableVisualPropertiesControl.TabIndex = 0;
    200200      //
     
    209209      this.Controls.Add(this.cancelButton);
    210210      this.Controls.Add(this.okButton);
     211      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
     212      this.MaximizeBox = false;
     213      this.MinimizeBox = false;
    211214      this.Name = "DataTableVisualPropertiesDialog";
    212215      this.ShowIcon = false;
     216      this.ShowInTaskbar = false;
    213217      this.Text = "Customize Visual Properties";
    214218      this.tabControl.ResumeLayout(false);
  • trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

    r7201 r7221  
    9595      VisualProperties = new DataTableVisualProperties();
    9696      rows = new NamedItemCollection<DataRow>();
     97      visualProperties.Title = name;
    9798      this.RegisterRowsEvents();
    9899    }
     
    101102      VisualProperties = new DataTableVisualProperties();
    102103      rows = new NamedItemCollection<DataRow>();
     104      visualProperties.Title = name;
    103105      this.RegisterRowsEvents();
    104106    }
  • trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

    r6676 r7221  
    5252      }
    5353    }
     54    private string title;
     55    public string Title {
     56      get { return title; }
     57      set {
     58        if (title != value) {
     59          title = value;
     60          OnPropertyChanged("Title");
     61        }
     62      }
     63    }
    5464    private Font axisTitleFont;
    5565    public Font AxisTitleFont {
     
    315325      get { return titleColor; }
    316326      set { titleColor = value; }
     327    }
     328    [Storable(Name = "Title")]
     329    private string StorableTitle {
     330      get { return title; }
     331      set { title = value; }
    317332    }
    318333    [Storable(Name = "AxisTitleFont")]
     
    436451      if (original.axisTitleFont != null)
    437452        this.axisTitleFont = (Font)original.axisTitleFont.Clone();
     453      this.title = original.title;
    438454      this.xAxisTitle = original.xAxisTitle;
    439455      this.yAxisTitle = original.yAxisTitle;
     
    458474    }
    459475    public DataTableVisualProperties() {
    460       titleColor = Color.Black;
    461       axisTitleColor = Color.Black;
     476      this.titleColor = Color.Black;
     477      this.axisTitleColor = Color.Black;
     478      this.title = string.Empty;
    462479      this.xAxisTitle = string.Empty;
    463480      this.yAxisTitle = string.Empty;
Note: See TracChangeset for help on using the changeset viewer.