Changeset 5582 for branches/DataAnalysis Refactoring

Timestamp:

03/01/11 17:00:33 (14 years ago)

Author:

mkommend

Message:

#1418: Added IFixedValueParameter.

Location:

branches/DataAnalysis Refactoring

Files:

• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Core/3.3/Interfaces/IFixedValueParameter.cs (added)
• HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs (modified) (3 diffs)
• HeuristicLab.Parameters/3.3/FixedValueParameter.cs (added)
• HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -20 +20 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <PublishUrl>http://localhost/HeuristicLab.Core/</PublishUrl>
     <Install>true</Install>
@@ -145 +146 @@
     <Compile Include="Constraints\TypeCompatibilityConstraint.cs" />
     <Compile Include="Interfaces\IMultiOperator.cs" />
+    <Compile Include="Interfaces\IFixedValueParameter.cs" />
     <Compile Include="OperatorExecutionException.cs" />
     <Compile Include="Interfaces\IScopeTreeLookupParameter.cs" />

branches/DataAnalysis Refactoring/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

@@ -103 +103 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      setValueButton.Enabled = Content != null && !ReadOnly;
-      clearValueButton.Enabled = Content != null && Content.Value != null && !(Content is ValueParameter<T>) && !ReadOnly;
+      setValueButton.Enabled = Content != null && !(Content is IFixedValueParameter) && !ReadOnly;
+      clearValueButton.Enabled = Content != null && Content.Value != null && !(Content is IFixedValueParameter) && !ReadOnly;
       showInRunCheckBox.Enabled = Content != null && !ReadOnly;
     }
@@ -113 +113 @@
       else {
         SetDataTypeTextBoxText();
-        clearValueButton.Enabled = Content != null && Content.Value != null && !(Content is ValueParameter<T>) && !ReadOnly;
+        setValueButton.Enabled = Content != null && !(Content is IFixedValueParameter) && !ReadOnly;
+        clearValueButton.Enabled = Content != null && Content.Value != null && !(Content is IFixedValueParameter<T>) && !ReadOnly;
         valueViewHost.ViewType = null;
         valueViewHost.Content = Content != null ? Content.Value : null;
@@ -148 +149 @@
     protected virtual void valueGroupBox_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
+      if (Content is IFixedValueParameter) return;
+
       Type type = e.Data.GetData("Type") as Type;
       if (!ReadOnly && (type != null) && (Content.DataType.IsAssignableFrom(type))) {

branches/DataAnalysis Refactoring/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Parameters-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -112 +113 @@
     <None Include="HeuristicLabParametersPlugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />
+    <Compile Include="FixedValueParameter.cs" />
     <Compile Include="OptionalConstrainedValueParameter.cs" />
     <Compile Include="ScopeTreeLookupParameter.cs" />