Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/05/11 13:59:23 (13 years ago)
Author:
gkronber
Message:

#1623 extended Savitzky-Golay filter command to support the calculation of smoothed derivatives of time series.

Location:
branches/HeuristicLab.DataImporter
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DataImporter

    • Property svn:ignore

      •  

        old new  
        11*.suo
         2_ReSharper.HeuristicLab.DataImporter

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/View/FilterSavitzkyGolayCommandView.Designer.cs

    r6134 r6706  
    5151      this.label3 = new System.Windows.Forms.Label();
    5252      this.numOrder = new System.Windows.Forms.NumericUpDown();
     53      this.numOrderOfDerivative = new System.Windows.Forms.NumericUpDown();
     54      this.label4 = new System.Windows.Forms.Label();
    5355      ((System.ComponentModel.ISupportInitialize)(this.numWindowLeft)).BeginInit();
    5456      ((System.ComponentModel.ISupportInitialize)(this.numWindowRight)).BeginInit();
    5557      ((System.ComponentModel.ISupportInitialize)(this.numOrder)).BeginInit();
     58      ((System.ComponentModel.ISupportInitialize)(this.numOrderOfDerivative)).BeginInit();
    5659      this.SuspendLayout();
    5760      //
    … …  
    7174      this.numWindowLeft.Name = "numWindowLeft";
    7275      this.numWindowLeft.Size = new System.Drawing.Size(120, 20);
    73       this.numWindowLeft.TabIndex = 0;
     76      this.numWindowLeft.TabIndex = 1;
    7477      this.numWindowLeft.Value = new decimal(new int[] {
    7578            4,
    … …  
    8588      this.label1.Name = "label1";
    8689      this.label1.Size = new System.Drawing.Size(101, 13);
    87       this.label1.TabIndex = 1;
     90      this.label1.TabIndex = 0;
    8891      this.label1.Text = "Window start offset:";
    8992      //
    … …  
    9497      this.label2.Name = "label2";
    9598      this.label2.Size = new System.Drawing.Size(99, 13);
    96       this.label2.TabIndex = 3;
     99      this.label2.TabIndex = 2;
    97100      this.label2.Text = "Window end offset:";
    98101      //
    … …  
    107110      this.numWindowRight.Name = "numWindowRight";
    108111      this.numWindowRight.Size = new System.Drawing.Size(120, 20);
    109       this.numWindowRight.TabIndex = 2;
     112      this.numWindowRight.TabIndex = 3;
    110113      this.numWindowRight.Value = new decimal(new int[] {
    111114            4,
    … …  
    118121      //
    119122      this.label3.AutoSize = true;
    120       this.label3.Location = new System.Drawing.Point(8, 62);
     123      this.label3.Location = new System.Drawing.Point(9, 89);
    121124      this.label3.Name = "label3";
    122       this.label3.Size = new System.Drawing.Size(36, 13);
    123       this.label3.TabIndex = 4;
    124       this.label3.Text = "Order:";
     125      this.label3.Size = new System.Drawing.Size(100, 13);
     126      this.label3.TabIndex = 6;
     127      this.label3.Text = "Order of polynomial:";
    125128      //
    126129      // numOrder
    127130      //
    128       this.numOrder.Location = new System.Drawing.Point(115, 60);
     131      this.numOrder.Location = new System.Drawing.Point(115, 87);
    129132      this.numOrder.Maximum = new decimal(new int[] {
    130133            8,
    … …  
    134137      this.numOrder.Name = "numOrder";
    135138      this.numOrder.Size = new System.Drawing.Size(120, 20);
    136       this.numOrder.TabIndex = 5;
     139      this.numOrder.TabIndex = 7;
    137140      this.numOrder.Value = new decimal(new int[] {
    138141            2,
    … …  
    142145      this.numOrder.ValueChanged += new System.EventHandler(this.numOrder_ValueChanged);
    143146      //
     147      // numOrderOfDerivative
     148      //
     149      this.numOrderOfDerivative.Location = new System.Drawing.Point(115, 60);
     150      this.numOrderOfDerivative.Maximum = new decimal(new int[] {
     151            3,
     152            0,
     153            0,
     154            0});
     155      this.numOrderOfDerivative.Name = "numOrderOfDerivative";
     156      this.numOrderOfDerivative.Size = new System.Drawing.Size(120, 20);
     157      this.numOrderOfDerivative.TabIndex = 5;
     158      this.numOrderOfDerivative.ValueChanged += new System.EventHandler(this.numOrderOfDerivative_ValueChanged);
     159      //
     160      // label4
     161      //
     162      this.label4.AutoSize = true;
     163      this.label4.Location = new System.Drawing.Point(8, 62);
     164      this.label4.Name = "label4";
     165      this.label4.Size = new System.Drawing.Size(97, 13);
     166      this.label4.TabIndex = 4;
     167      this.label4.Text = "Order of derivative:";
     168      //
    144169      // FilterSavitzkyGolayCommandView
    145170      //
    146171      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    147172      this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
     173      this.Controls.Add(this.numOrderOfDerivative);
     174      this.Controls.Add(this.label4);
    148175      this.Controls.Add(this.numOrder);
    149176      this.Controls.Add(this.label3);
    … …  
    154181      this.Name = "FilterSavitzkyGolayCommandView";
    155182      this.Padding = new System.Windows.Forms.Padding(5);
    156       this.Size = new System.Drawing.Size(244, 98);
     183      this.Size = new System.Drawing.Size(246, 117);
    157184      ((System.ComponentModel.ISupportInitialize)(this.numWindowLeft)).EndInit();
    158185      ((System.ComponentModel.ISupportInitialize)(this.numWindowRight)).EndInit();
    159186      ((System.ComponentModel.ISupportInitialize)(this.numOrder)).EndInit();
     187      ((System.ComponentModel.ISupportInitialize)(this.numOrderOfDerivative)).EndInit();
    160188      this.ResumeLayout(false);
    161189      this.PerformLayout();
    … …  
    170198    private System.Windows.Forms.Label label3;
    171199    private System.Windows.Forms.NumericUpDown numOrder;
     200    private System.Windows.Forms.NumericUpDown numOrderOfDerivative;
     201    private System.Windows.Forms.Label label4;
    172202  }
    173203}

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/View/FilterSavitzkyGolayCommandView.cs

    r6134 r6706  
    5353      get { return this.Command.Order; }
    5454    }
     55    public int OrderOfDerivative {
     56      get { return this.Command.OrderOfDerivative; }
     57    }
    5558
    5659    private void numWindowLeft_ValueChanged(object sender, System.EventArgs e) {
    … …  
    6265    }
    6366
     67    private void numOrder_ValueChanged(object sender, EventArgs e) {
     68      this.UpdateCommand();
     69    }
     70
     71    private void numOrderOfDerivative_ValueChanged(object sender, EventArgs e) {
     72      this.UpdateCommand();
     73    }
     74
    6475    private void UpdateCommand() {
    6576      if (Command != null) {
    … …  
    6778        this.Command.WindowRight = (int)this.numWindowRight.Value;
    6879        this.Command.Order = (int)this.numOrder.Value;
     80        this.Command.OrderOfDerivative = (int) this.numOrderOfDerivative.Value;
    6981      }
    70     }
    71 
    72     private void numOrder_ValueChanged(object sender, EventArgs e) {
    73       this.UpdateCommand();
    7482    }
    7583  }
Note: See TracChangeset for help on using the changeset viewer.