Context Navigation

← Previous Change
Next Change →

Controls

Timestamp:

08/06/18 18:15:29 (6 years ago)

Author:

jkarder

Message:

#2839:

merged [15377-15681/trunk/sources] into branch
merged [15683-16056/trunk] into branch

Location:

branches/2839_HiveProjectManagement

Files:

: 12 edited

. (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityChart.Designer.cs (modified) (1 diff)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityChart.cs (modified) (1 diff)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityTrackbar.Designer.cs (modified) (1 diff)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityTrackbar.cs (modified) (1 diff)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DoubleLimitView.Designer.cs (modified) (1 diff)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DoubleLimitView.cs (modified) (1 diff)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/FactorPartialDependencePlot.cs (modified) (2 diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs (modified) (4 diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlotConfigurationDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlotConfigurationDialog.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2839_HiveProjectManagement

Property svn:mergeinfo changed

/stable	merged: 15587-15588
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054
/trunk/sources (added)	merged: 15383,15388,15390,15395-15398,15400,15402,15408-15409,15419,15427,15447-15448,15452,15461,15464,15478,15480-15481,15483,15486,15498-15499,15502,15505,15513,15517-15518,15532,15534,15545,15548,15551,15556,15560,15566,15581,15583,15589-15591,15594,15596,15598,15607,15610-15611,15619,15621-15623,15626,15637-15638,15645,15665,15667,15672-15674

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views

Property svn:mergeinfo changed

/stable/HeuristicLab.Problems.DataAnalysis.Views	merged: 15587
/trunk/HeuristicLab.Problems.DataAnalysis.Views (added)	merged: 15727-15729,15752-15753,15785,15787,15789-15790,15793,15796-15797,15799,15810,15818,15839,15845,15891,15998-15999,16015,16021
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views (added)	merged: 15395,15427,15486,15581,15583,15589,15626,15637-15638,15665,15667,15673-15674

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityChart.Designer.cs

r14099	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityChart.cs

r14826	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityTrackbar.Designer.cs

r14099	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DensityTrackbar.cs

r14099	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DoubleLimitView.Designer.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/DoubleLimitView.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/FactorPartialDependencePlot.cs

-                      r15222
+                      r16057
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
       // Configure axis
       chart.CustomizeAllChartAreas();
+      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
+      chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
+      chart.ChartAreas[0].CursorX.Interval = 0;
+      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
+      chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
+      chart.ChartAreas[0].CursorY.Interval = 0;
+      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = false;
+      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = false;
+      chart.ChartAreas[0].Axes.ToList().ForEach(x => { x.ScaleView.Zoomable = false; });
       Disposed += Control_Disposed;

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

-                      r15222
+                      r16057
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
       // Configure axis
       chart.CustomizeAllChartAreas();
+      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
+      chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
+      chart.ChartAreas[0].CursorX.Interval = 0;
+      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
+      chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
+      chart.ChartAreas[0].CursorY.Interval = 0;
+      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = false;
+      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = false;
+      chart.ChartAreas[0].Axes.ToList().ForEach(x => { x.ScaleView.Zoomable = false; });
       configToolStripMenuItem = new ToolStripMenuItem("Configuration");
 …
     private void RecalculateTrainingLimits(bool initializeAxisRanges) {
       trainingMin = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Min()).Max();
       trainingMax = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Max()).Min();
+      trainingMin = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Min()).Max();
+      trainingMax = solutions.Select(s => s.ProblemData.Dataset.GetDoubleValues(freeVariable, s.ProblemData.TrainingIndices).Where(x => !double.IsNaN(x)).Max()).Min();
       if (initializeAxisRanges) {
 …
     private void config_Click(object sender, EventArgs e) {
       configurationDialog.ShowDialog(this);
+      OnZoomChanged(this, EventArgs.Empty);
+    }

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlotConfigurationDialog.Designer.cs

r14852	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlotConfigurationDialog.cs

r14852	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16057 for branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls

Legend:

Download in other formats: