Changeset 9149

Timestamp:

01/11/13 17:28:51 (12 years ago)

Author:

abeham

Message:

#2002: fixed plotting of points when axis were set to logarithmic

Location:

branches/CMAES/HeuristicLab.Analysis.Views/3.3

Files:

• DataTableView.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views-3.3.csproj (modified) (3 diffs)

branches/CMAES/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -505 +505 @@
           break;
         default: {
+            bool yLogarithmic = series.YAxisType == AxisType.Primary
+                                  ? Content.VisualProperties.YAxisLogScale
+                                  : Content.VisualProperties.SecondYAxisLogScale;
+            bool xLogarithmic = series.XAxisType == AxisType.Primary
+                                  ? Content.VisualProperties.XAxisLogScale
+                                  : Content.VisualProperties.SecondXAxisLogScale;
             for (int i = 0; i < row.Values.Count; i++) {
               var value = row.Values[i];
-              DataPoint point = new DataPoint();
-              point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
-              if (IsInvalidValue(value))
+              var point = new DataPoint();
+              point.XValue = row.VisualProperties.StartIndexZero && !xLogarithmic ? i : i + 1;
+              if (IsInvalidValue(value) || (yLogarithmic && value <= 0))
                 point.IsEmpty = true;
               else

branches/CMAES/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -184 +184 @@
       <DependentUpon>ScatterPlotDataRowVisualPropertiesControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="ScatterPlotView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="ScatterPlotView.cs" />
     <Compile Include="ScatterPlotView.Designer.cs">
       <DependentUpon>ScatterPlotView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ScatterPlotHistoryView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="ScatterPlotHistoryView.cs" />
     <Compile Include="ScatterPlotHistoryView.Designer.cs">
       <DependentUpon>ScatterPlotHistoryView.cs</DependentUpon>
     </Compile>
     <None Include="Plugin.cs.frame" />
-    <Compile Include="AlleleFrequencyCollectionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="AlleleFrequencyCollectionView.cs" />
     <Compile Include="AlleleFrequencyCollectionView.Designer.cs">
       <DependentUpon>AlleleFrequencyCollectionView.cs</DependentUpon>
@@ -221 +215 @@
       <DependentUpon>DataTableVisualPropertiesDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="HeatMapHistoryView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="HeatMapHistoryView.cs" />
     <Compile Include="HeatMapHistoryView.Designer.cs">
       <DependentUpon>HeatMapHistoryView.cs</DependentUpon>
     </Compile>
-    <Compile Include="DataTableHistoryView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DataTableHistoryView.cs" />
     <Compile Include="DataTableHistoryView.Designer.cs">
       <DependentUpon>DataTableHistoryView.cs</DependentUpon>
     </Compile>
-    <Compile Include="HeatMapView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="HeatMapView.cs" />
     <Compile Include="HeatMapView.Designer.cs">
       <DependentUpon>HeatMapView.cs</DependentUpon>
     </Compile>
-    <Compile Include="AlleleFrequencyView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="AlleleFrequencyView.cs" />
     <Compile Include="AlleleFrequencyView.Designer.cs">
       <DependentUpon>AlleleFrequencyView.cs</DependentUpon>
     </Compile>
-    <Compile Include="AlleleFrequencyCollectionHistoryView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="AlleleFrequencyCollectionHistoryView.cs" />
     <Compile Include="AlleleFrequencyCollectionHistoryView.Designer.cs">
       <DependentUpon>AlleleFrequencyCollectionHistoryView.cs</DependentUpon>
@@ -253 +237 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DataTableView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="DataTableView.cs" />
     <Compile Include="DataTableView.Designer.cs">
       <DependentUpon>DataTableView.cs</DependentUpon>