Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/23/14 11:42:51 (11 years ago)
Author:
aesterer
Message:

Changed content icons. Copied data table view and removed title.

Location:
branches/DataPreprocessing
Files:
8 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

    r10763 r10771  
    8383    </Compile>
    8484    <Compile Include="DataPreprocessorStarter.cs" />
     85    <Compile Include="PreprocessingDataTableView.cs">
     86      <SubType>UserControl</SubType>
     87    </Compile>
     88    <Compile Include="PreprocessingDataTableView.Designer.cs">
     89      <DependentUpon>PreprocessingDataTableView.cs</DependentUpon>
     90    </Compile>
    8591    <Compile Include="FilterView.cs">
    8692      <SubType>UserControl</SubType>
    … …  
    125131    <Compile Include="PreprocessingCheckedItemListView.Designer.cs">
    126132      <DependentUpon>PreprocessingCheckedItemListView.cs</DependentUpon>
    127     </Compile>
    128     <Compile Include="PreprocessingDataTableView.cs">
    129       <SubType>UserControl</SubType>
    130     </Compile>
    131     <Compile Include="PreprocessingDataTableView.Designer.cs">
    132       <DependentUpon>PreprocessingDataTableView.cs</DependentUpon>
    133133    </Compile>
    134134    <Compile Include="Properties\AssemblyInfo.cs" />

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HistogramView.Designer.cs

    r10736 r10771  
    4343      //
    4444      this.allInOneCheckBox.AutoSize = true;
    45       this.allInOneCheckBox.Checked = true;
    46       this.allInOneCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
    4745      this.allInOneCheckBox.Location = new System.Drawing.Point(6, 19);
    4846      this.allInOneCheckBox.Name = "allInOneCheckBox";

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HistogramView.cs

    r10736 r10771  
    1616      chartType = DataRowVisualProperties.DataRowChartType.Histogram;
    1717      chartTitle = HISTOGRAM_CHART_TITLE;
     18      allInOneMode = false;
    1819    }
    1920

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.Designer.cs

    r10717 r10771  
    4646    /// </summary>
    4747    private void InitializeComponent() {
    48       this.dataTableView = new HeuristicLab.Analysis.Views.DataTableView();
     48      this.dataTableView = new HeuristicLab.Analysis.Views.PreprocessingDataTableView();
    4949      this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
    5050      this.checkedItemList = new HeuristicLab.DataPreprocessing.Views.PreprocessingCheckedItemListView();
    … …  
    108108
    109109    private PreprocessingCheckedItemListView checkedItemList;
    110     private Analysis.Views.DataTableView dataTableView;
     110    private Analysis.Views.PreprocessingDataTableView dataTableView;
    111111    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
    112112  }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.cs

    r10741 r10771  
    282282          }
    283283
    284           DataTableView dataView = new DataTableView();
     284          PreprocessingDataTableView dataView = new PreprocessingDataTableView();
    285285          enumerator.MoveNext();
    286286          DataTable d = enumerator.Current;

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.Designer.cs

    r10761 r10771  
    2121
    2222namespace HeuristicLab.Analysis.Views {
    23   partial class DataTableView {
     23  partial class PreprocessingDataTableView {
    2424    /// <summary>
    2525    /// Required designer variable.
    … …  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.components = new System.ComponentModel.Container();
    4748      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    4849      System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    … …  
    5051      System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
    5152      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
    52       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5353      ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
    5454      this.SuspendLayout();
    5555      //
    56       // nameTextBox
    57       //
    58       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    59       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    60       this.nameTextBox.Location = new System.Drawing.Point(55, 0);
    61       this.nameTextBox.Size = new System.Drawing.Size(279, 20);
    62       //
    63       // infoLabel
    64       //
    65       this.infoLabel.Location = new System.Drawing.Point(340, 3);
    66       //
    6756      // chart
    6857      //
    69       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    70                   | System.Windows.Forms.AnchorStyles.Left)
    71                   | System.Windows.Forms.AnchorStyles.Right)));
     58      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     59            | System.Windows.Forms.AnchorStyles.Left)
     60            | System.Windows.Forms.AnchorStyles.Right)));
    7261      this.chart.BorderlineColor = System.Drawing.Color.Black;
    7362      this.chart.BorderlineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Solid;
    … …  
    8372      legend1.Name = "Default";
    8473      this.chart.Legends.Add(legend1);
    85       this.chart.Location = new System.Drawing.Point(0, 26);
     74      this.chart.Location = new System.Drawing.Point(0, 3);
    8675      this.chart.Name = "chart";
    8776      series1.ChartArea = "Default";
    … …  
    8978      series1.Name = "Default";
    9079      this.chart.Series.Add(series1);
    91       this.chart.Size = new System.Drawing.Size(359, 248);
     80      this.chart.Size = new System.Drawing.Size(359, 271);
    9281      this.chart.TabIndex = 3;
    9382      this.chart.Text = "chart";
    … …  
    9584      title1.Name = "Default";
    9685      title1.Text = "Title";
     86      title1.Visible = false;
    9787      this.chart.Titles.Add(title1);
    9888      this.chart.CustomizeLegend += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CustomizeLegendEventArgs>(this.chart_CustomizeLegend);
    … …  
    10090      this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
    10191      //
    102       // DataTableView
     92      // PreprocessingDataTableView
    10393      //
    104       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    10594      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    10695      this.Controls.Add(this.chart);
    107       this.Name = "DataTableView";
     96      this.Name = "PreprocessingDataTableView";
    10897      this.Size = new System.Drawing.Size(359, 274);
    109       this.Controls.SetChildIndex(this.infoLabel, 0);
    110       this.Controls.SetChildIndex(this.chart, 0);
    111       this.Controls.SetChildIndex(this.nameLabel, 0);
    112       this.Controls.SetChildIndex(this.nameTextBox, 0);
    113       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    11498      ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
    11599      this.ResumeLayout(false);
    116       this.PerformLayout();
    117100
    118101    }

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs

    r10761 r10771  
    3131
    3232namespace HeuristicLab.Analysis.Views {
    33   [View("DataTable View")]
    34   [Content(typeof(DataTable), true)]
    35   public partial class DataTableView : NamedItemView, IConfigureableView {
     33  [View("Preprocessing DataTable View")]
     34  [Content(typeof(DataTable), false)]
     35  public partial class PreprocessingDataTableView : ItemView, IConfigureableView {
    3636    protected List<Series> invisibleSeries;
    3737    protected Dictionary<IObservableList<double>, DataRow> valuesRowsTable;
    … …  
    4242    }
    4343
    44     public DataTableView() {
     44    public PreprocessingDataTableView() {
    4545      InitializeComponent();
    4646      valuesRowsTable = new Dictionary<IObservableList<double>, DataRow>();
    … …  
    9595      base.OnContentChanged();
    9696      invisibleSeries.Clear();
    97       chart.Titles[0].Text = string.Empty;
     97      //chart.Titles[0].Text = string.Empty;
    9898      chart.ChartAreas[0].AxisX.Title = string.Empty;
    9999      chart.ChartAreas[0].AxisY.Title = string.Empty;
    … …  
    101101      chart.Series.Clear();
    102102      if (Content != null) {
    103         chart.Titles[0].Text = Content.Name;
     103        //chart.Titles[0].Text = Content.Name;
    104104        AddDataRows(Content.Rows);
    105105        ConfigureChartArea(chart.ChartAreas[0]);
    … …  
    281281    #region Event Handlers
    282282    #region Content Event Handlers
    283     protected override void Content_NameChanged(object sender, EventArgs e) {
    284       if (InvokeRequired)
    285         Invoke(new EventHandler(Content_NameChanged), sender, e);
    286       else {
    287         chart.Titles[0].Text = Content.Name;
    288         base.Content_NameChanged(sender, e);
    289       }
    290     }
    291283    private void Content_VisualPropertiesChanged(object sender, EventArgs e) {
    292284      if (InvokeRequired)

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/HistogramContent.cs

    r10658 r10771  
    3737
    3838    public static new Image StaticItemImage {
    39       get { return HeuristicLab.Common.Resources.VSImageLibrary.PieChart; }
     39      get { return HeuristicLab.Common.Resources.VSImageLibrary.Statistics; }
    4040    }
    4141

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs

    r10709 r10771  
    3939
    4040    public static new Image StaticItemImage {
    41       get { return HeuristicLab.Common.Resources.VSImageLibrary.PieChart; }
     41      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
    4242    }
    4343

  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsContent.cs

    r10614 r10771  
    4242
    4343    public static new Image StaticItemImage {
    44       get { return HeuristicLab.Common.Resources.VSImageLibrary.Statistics; }
     44      get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
    4545    }
    4646
Note: See TracChangeset for help on using the changeset viewer.