Changeset 3008


Ignore:
Timestamp:
03/12/10 09:47:50 (12 years ago)
Author:
epitzer
Message:

adaptation to HL 3.3 (#842)

Location:
trunk/sources/HeuristicLab.Operators.Programmable/3.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

    r2994 r3008  
    4444  [Creatable("Test")]
    4545  [StorableClass(StorableClassType.MarkedOnly)] 
    46   public class ProgrammableOperator : Operator {
     46  public class ProgrammableOperator : Operator, IParameterizedNamedItem {
    4747
    4848    #region Fields & Properties
     49
     50    public new IObservableKeyedCollection<string, IParameter> Parameters {
     51      get { return base.Parameters; }
     52    }
    4953
    5054    private MethodInfo executeMethod;
     
    7680
    7781    [Storable]
    78     private IEnumerable<string> _persistedAssemblyNames {
     82    private List<string> _persistedAssemblyNames {
    7983      get {
    80         return Assemblies.Keys.Select(a => a.FullName);
     84        return Assemblies.Keys.Select(a => a.FullName).ToList();
    8185      }
    8286      set {
     
    106110        return true;
    107111      }
    108     }
     112    }   
    109113
    110114    #endregion
     
    168172      Assemblies = defaultAssemblyDict;
    169173      Plugins = defaultPluginDict;
    170       namespaces = new HashSet<string>(DiscoverNamespaces());
     174      namespaces = new HashSet<string>(DiscoverNamespaces());     
    171175      Parameters.ItemsAdded += (s, a) => OnSignatureChanged(s, a);
    172176      Parameters.ItemsRemoved += (s, a) => OnSignatureChanged(s, a);
  • trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.Designer.cs

    r2917 r3008  
    8686      tabPage2.Name = "tabPage2";
    8787      tabPage2.Padding = new System.Windows.Forms.Padding(3);
    88       tabPage2.Size = new System.Drawing.Size(977, 593);
     88      tabPage2.Size = new System.Drawing.Size(977, 619);
    8989      tabPage2.TabIndex = 1;
    9090      tabPage2.Text = "Code";
     
    106106      //
    107107      this.splitContainer1.Panel2.Controls.Add(this.codeEditor);
    108       this.splitContainer1.Size = new System.Drawing.Size(971, 587);
     108      this.splitContainer1.Size = new System.Drawing.Size(971, 613);
    109109      this.splitContainer1.SplitterDistance = 254;
    110110      this.splitContainer1.TabIndex = 0;
     
    126126      //
    127127      this.splitContainer2.Panel2.Controls.Add(this.namespacesTreeView);
    128       this.splitContainer2.Size = new System.Drawing.Size(248, 552);
    129       this.splitContainer2.SplitterDistance = 276;
     128      this.splitContainer2.Size = new System.Drawing.Size(248, 578);
     129      this.splitContainer2.SplitterDistance = 289;
    130130      this.splitContainer2.TabIndex = 2;
    131131      //
     
    136136      this.assembliesTreeView.Location = new System.Drawing.Point(0, 0);
    137137      this.assembliesTreeView.Name = "assembliesTreeView";
    138       this.assembliesTreeView.Size = new System.Drawing.Size(248, 276);
     138      this.assembliesTreeView.Size = new System.Drawing.Size(248, 289);
    139139      this.assembliesTreeView.TabIndex = 0;
    140140      this.assembliesTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.assembliesTreeView_AfterCheck);
     
    147147      this.namespacesTreeView.Name = "namespacesTreeView";
    148148      this.namespacesTreeView.PathSeparator = ".";
    149       this.namespacesTreeView.Size = new System.Drawing.Size(248, 272);
     149      this.namespacesTreeView.Size = new System.Drawing.Size(248, 285);
    150150      this.namespacesTreeView.TabIndex = 0;
    151151      this.namespacesTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.namespacesTreeView_AfterCheck);
     
    155155      this.showCodeButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
    156156                  | System.Windows.Forms.AnchorStyles.Right)));
    157       this.showCodeButton.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
    158       this.showCodeButton.Cursor = System.Windows.Forms.Cursors.Hand;
    159       this.showCodeButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
    160       this.showCodeButton.Location = new System.Drawing.Point(65, 561);
     157      this.showCodeButton.Location = new System.Drawing.Point(65, 587);
    161158      this.showCodeButton.Name = "showCodeButton";
    162159      this.showCodeButton.Size = new System.Drawing.Size(186, 23);
    163160      this.showCodeButton.TabIndex = 0;
    164       this.showCodeButton.Text = "&Show Generated Code";
     161      this.showCodeButton.Text = "&Show Generated Code ...";
    165162      this.showCodeButton.UseVisualStyleBackColor = false;
    166163      this.showCodeButton.Click += new System.EventHandler(this.showCodeButton_Click);
     
    169166      //
    170167      this.compileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    171       this.compileButton.Location = new System.Drawing.Point(3, 561);
     168      this.compileButton.Location = new System.Drawing.Point(3, 587);
    172169      this.compileButton.Name = "compileButton";
    173170      this.compileButton.Size = new System.Drawing.Size(56, 23);
     
    183180      this.codeEditor.Name = "codeEditor";
    184181      this.codeEditor.Prefix = "";
    185       this.codeEditor.Size = new System.Drawing.Size(713, 587);
     182      this.codeEditor.Size = new System.Drawing.Size(713, 613);
    186183      this.codeEditor.Suffix = "";
    187184      this.codeEditor.TabIndex = 0;
  • trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.cs

    r2917 r3008  
    7878        descriptionTextBox.Enabled = false;
    7979        assembliesTreeView.Nodes.Clear();
     80        parameterCollectionView1.Content = null;
    8081      } else {
    8182        codeEditor.Enabled = true;
     
    9798        codeEditor.ScrollAfterPrefix();
    9899        codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors, "ProgrammableOperator");
     100        showCodeButton.Enabled =
     101          ProgrammableOperator.CompilationUnitCode != null &&
     102          ProgrammableOperator.CompilationUnitCode.Length > 0;
     103        parameterCollectionView1.Content = ProgrammableOperator.Parameters;       
    99104      }
    100105    }
  • trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperatorView.resx

    r2917 r3008  
    121121    <value>107, 17</value>
    122122  </metadata>
     123  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     124    <value>107, 17</value>
     125  </metadata>
    123126  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124127    <value>17, 17</value>
Note: See TracChangeset for help on using the changeset viewer.