- Timestamp:
- 07/18/14 12:35:00 (10 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 1 deleted
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll11 10 HeuristicLab 3.3.5.1.ReSharper.user 12 11 HeuristicLab 3.3.6.0.ReSharper.user 13 12 HeuristicLab.4.5.resharper.user 14 13 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development16 14 HeuristicLab.resharper.user 17 15 ProtoGen.exe … … 19 17 _ReSharper.HeuristicLab 20 18 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests22 19 _ReSharper.HeuristicLab.ExtLibs 23 20 bin 24 21 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo deleted
-
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/BoolValueView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/BoolValueView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/ColumnsVisibilityDialog.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/ColumnsVisibilityDialog.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/ComparisonView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/ComparisonView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/DoubleRangeView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/DoubleRangeView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj
r11202 r11203 133 133 <DependentUpon>IntRangeView.cs</DependentUpon> 134 134 </Compile> 135 <Compile Include="Path Views\DirectoryValueView.cs">136 <SubType>UserControl</SubType>137 </Compile>138 <Compile Include="Path Views\DirectoryValueView.Designer.cs">139 <DependentUpon>DirectoryValueView.cs</DependentUpon>140 </Compile>141 <Compile Include="Path Views\FileValueView.cs">142 <SubType>UserControl</SubType>143 </Compile>144 <Compile Include="Path Views\FileValueView.Designer.cs">145 <DependentUpon>FileValueView.cs</DependentUpon>146 </Compile>147 <Compile Include="Path Views\TextFileView.cs">148 <SubType>UserControl</SubType>149 </Compile>150 <Compile Include="Path Views\TextFileView.Designer.cs">151 <DependentUpon>TextFileView.cs</DependentUpon>152 </Compile>153 135 <Compile Include="Plugin.cs" /> 154 136 <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.cs"> … … 214 196 </ItemGroup> 215 197 <ItemGroup> 216 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">217 <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>218 <Name>HeuristicLab.Common.Resources-3.3</Name>219 <Private>False</Private>220 </ProjectReference>221 198 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 222 199 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/IntRangeView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/IntRangeView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/Plugin.cs.frame
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 /// Plugin class for HeuristicLab.Data.Views plugin. 30 30 /// </summary> 31 [Plugin("HeuristicLab.Data.Views", "3.3. 10.$WCREV$")]31 [Plugin("HeuristicLab.Data.Views", "3.3.7.$WCREV$")] 32 32 [PluginFile("HeuristicLab.Data.Views-3.3.dll", PluginFileType.Assembly)] 33 33 [PluginDependency("HeuristicLab.Common", "3.3")] 34 [PluginDependency("HeuristicLab.Common.Resources", "3.3")]35 34 [PluginDependency("HeuristicLab.Core", "3.3")] 36 35 [PluginDependency("HeuristicLab.Core.Views", "3.3")] -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/Properties/AssemblyInfo.cs.frame
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 4HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 54 54 // by using the '*' as shown below: 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3. 10.$WCREV$")]56 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 53 53 54 54 protected override void DeregisterContentEvents() { 55 Content.ElementNamesChanged -= new EventHandler(Content_ElementNamesChanged);56 55 Content.ItemChanged -= new EventHandler<EventArgs<int>>(Content_ItemChanged); 57 56 Content.Reset -= new EventHandler(Content_Reset); … … 63 62 Content.ItemChanged += new EventHandler<EventArgs<int>>(Content_ItemChanged); 64 63 Content.Reset += new EventHandler(Content_Reset); 65 Content.ElementNamesChanged += new EventHandler(Content_ElementNamesChanged);66 64 } 67 65 … … 98 96 dataGridView.Columns[0].Width = dataGridView.Columns[0].GetPreferredWidth(DataGridViewAutoSizeColumnMode.AllCells, true); 99 97 } 100 UpdateRowHeaders();101 dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);102 98 dataGridView.Enabled = true; 103 }104 105 protected virtual void UpdateRowHeaders() {106 int i = 0;107 foreach (string elementName in Content.ElementNames) {108 dataGridView.Rows[i].HeaderCell.Value = elementName;109 i++;110 }111 for (; i < dataGridView.RowCount; i++) {112 dataGridView.Rows[i].HeaderCell.Value = string.Empty;113 }114 }115 116 private void Content_ElementNamesChanged(object sender, EventArgs e) {117 if (InvokeRequired)118 Invoke(new EventHandler(Content_ElementNamesChanged), sender, e);119 else120 UpdateRowHeaders();121 99 } 122 100 … … 125 103 Invoke(new EventHandler<EventArgs<int>>(Content_ItemChanged), sender, e); 126 104 else { 127 // if a resize of the array occurs and some other class handles the event and provides default values128 //then the itemChanged will occur before the reset event. hence the check was added129 if (dataGridView.RowCount <= e.Value) return;130 105 dataGridView.Rows[e.Value].Cells[0].Value = Content.GetValue(e.Value); 131 106 Size size = dataGridView.Rows[e.Value].Cells[0].PreferredSize; -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixColumnVisibilityDialog.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixColumnVisibilityDialog.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixRowVisibilityDialog.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixRowVisibilityDialog.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 36 36 public partial class StringConvertibleMatrixView : AsynchronousContentView { 37 37 protected int[] virtualRowIndices; 38 pr otectedList<KeyValuePair<int, SortOrder>> sortedColumnIndices;38 private List<KeyValuePair<int, SortOrder>> sortedColumnIndices; 39 39 private RowComparer rowComparer; 40 40 … … 261 261 262 262 #region DataGridView Events 263 pr otected virtualvoid dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {263 private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) { 264 264 if (!dataGridView.ReadOnly) { 265 265 string errorMessage; … … 270 270 } 271 271 } 272 pr otected virtualvoid dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {272 private void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) { 273 273 if (!dataGridView.ReadOnly) { 274 274 string value = e.Value.ToString(); … … 340 340 341 341 for (int i = minRowIndex; i <= maxRowIndex; i++) { 342 if (!dataGridView.Rows[i].Visible) continue;343 344 342 int rowIndex = this.virtualRowIndices[i]; 345 343 if (addRowNames) { … … 364 362 } 365 363 366 pr otected virtualvoid PasteValuesToDataGridView() {364 private void PasteValuesToDataGridView() { 367 365 string[,] values = SplitClipboardString(Clipboard.GetText()); 368 366 int rowIndex = 0; … … 432 430 } 433 431 434 pr otectedvoid Sort() {432 private void Sort() { 435 433 virtualRowIndices = Sort(sortedColumnIndices); 436 434 UpdateSortGlyph(); … … 517 515 protected virtual void ShowHideColumns_Click(object sender, EventArgs e) { 518 516 new StringConvertibleMatrixColumnVisibilityDialog(this.dataGridView.Columns.Cast<DataGridViewColumn>()).ShowDialog(); 519 columnsTextBox.Text = dataGridView.Columns.GetColumnCount(DataGridViewElementStates.Visible).ToString();520 517 } 521 518 … … 542 539 } 543 540 544 pr otected virtualvoid dataGridView_SelectionChanged(object sender, EventArgs e) {541 private void dataGridView_SelectionChanged(object sender, EventArgs e) { 545 542 string stringFormat = "{0,20:0.0000}"; 546 543 statisticsTextBox.Text = string.Empty; -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixVisibilityDialog.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixVisibilityDialog.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueTupleView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueTupleView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.Designer.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 124 124 #endregion 125 125 126 pr otectedSystem.Windows.Forms.TextBox valueTextBox;127 pr otectedSystem.Windows.Forms.ErrorProvider errorProvider;128 pr otectedSystem.Windows.Forms.Label valueLabel;129 pr otectedSystem.Windows.Forms.SplitContainer splitContainer;126 private System.Windows.Forms.TextBox valueTextBox; 127 private System.Windows.Forms.ErrorProvider errorProvider; 128 private System.Windows.Forms.Label valueLabel; 129 private System.Windows.Forms.SplitContainer splitContainer; 130 130 } 131 131 } -
branches/HiveStatistics/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 78 78 } 79 79 80 pr otected virtualvoid Content_ValueChanged(object sender, EventArgs e) {80 private void Content_ValueChanged(object sender, EventArgs e) { 81 81 if (InvokeRequired) 82 82 Invoke(new EventHandler(Content_ValueChanged), sender, e); … … 85 85 } 86 86 87 pr otected virtualvoid valueTextBox_KeyDown(object sender, KeyEventArgs e) {87 private void valueTextBox_KeyDown(object sender, KeyEventArgs e) { 88 88 if ((e.KeyCode == Keys.Enter) || (e.KeyCode == Keys.Return)) 89 89 valueLabel.Select(); // select label to validate data … … 94 94 } 95 95 } 96 pr otected virtualvoid valueTextBox_Validating(object sender, CancelEventArgs e) {96 private void valueTextBox_Validating(object sender, CancelEventArgs e) { 97 97 if (ReadOnly) return; 98 98 string errorMessage; … … 103 103 } 104 104 } 105 pr otected virtualvoid valueTextBox_Validated(object sender, EventArgs e) {105 private void valueTextBox_Validated(object sender, EventArgs e) { 106 106 if (ReadOnly) return; 107 107 if (!Content.ReadOnly) Content.SetValue(valueTextBox.Text);
Note: See TracChangeset
for help on using the changeset viewer.