Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Data.Views
- Timestamp:
- 07/08/16 14:40:02 (8 years ago)
- Location:
- branches/crossvalidation-2434
- Files:
-
- 2 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/crossvalidation-2434
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Data.Views
- Property svn:mergeinfo changed
/stable/HeuristicLab.Data.Views merged: 13316 /trunk/sources/HeuristicLab.Data.Views (added) merged: 12983,13186,13321,13397,13425,13570,13695
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
/stable/HeuristicLab.Data.Views/3.3 merged: 13316 /trunk/sources/HeuristicLab.Data.Views/3.3 (added) merged: 12983,13186,13321,13397,13425,13570,13695
- Property svn:mergeinfo changed
-
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.cs
r12151 r14029 69 69 } 70 70 71 p rotectedoverride void UpdateColumnHeaders() {71 public override void UpdateColumnHeaders() { 72 72 base.UpdateColumnHeaders(); 73 73 if (columnVisibility != null && Content != null && columnVisibility.Count() == dataGridView.ColumnCount) { … … 79 79 } 80 80 } 81 p rotectedoverride void UpdateRowHeaders() {81 public override void UpdateRowHeaders() { 82 82 if (Content == null) return; 83 83 if (rowVisibility != null && rowVisibility.Count() != dataGridView.RowCount) return; -
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj
r12682 r14029 189 189 <DependentUpon>BoolValueView.cs</DependentUpon> 190 190 </Compile> 191 191 <Compile Include="BoolMatrixView.cs"> 192 192 <SubType>UserControl</SubType> 193 193 </Compile> -
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3/Plugin.cs.frame
r12753 r14029 29 29 /// Plugin class for HeuristicLab.Data.Views plugin. 30 30 /// </summary> 31 [Plugin("HeuristicLab.Data.Views", "3.3.1 2.$WCREV$")]31 [Plugin("HeuristicLab.Data.Views", "3.3.13.$WCREV$")] 32 32 [PluginFile("HeuristicLab.Data.Views-3.3.dll", PluginFileType.Assembly)] 33 33 [PluginDependency("HeuristicLab.Common", "3.3")] -
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3/Properties/AssemblyInfo.cs.frame
r12753 r14029 54 54 // by using the '*' as shown below: 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3.1 2.$WCREV$")]56 [assembly: AssemblyFileVersion("3.3.13.$WCREV$")] -
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs
r12012 r14029 80 80 lengthTextBox.Enabled = Content != null; 81 81 dataGridView.Enabled = Content != null; 82 lengthTextBox.ReadOnly = ReadOnly ;82 lengthTextBox.ReadOnly = ReadOnly || (Content != null && !Content.Resizable); 83 83 dataGridView.ReadOnly = ReadOnly; 84 84 } … … 103 103 } 104 104 105 p rotectedvirtual void UpdateRowHeaders() {105 public virtual void UpdateRowHeaders() { 106 106 int i = 0; 107 107 foreach (string elementName in Content.ElementNames) { -
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs
r12676 r14029 160 160 } 161 161 162 p rotectedvirtual void UpdateColumnHeaders() {162 public virtual void UpdateColumnHeaders() { 163 163 HashSet<string> invisibleColumnNames = new HashSet<string>(dataGridView.Columns.OfType<DataGridViewColumn>() 164 164 .Where(c => !c.Visible && !string.IsNullOrEmpty(c.HeaderText)).Select(c => c.HeaderText)); … … 172 172 } 173 173 } 174 p rotectedvirtual void UpdateRowHeaders() {174 public virtual void UpdateRowHeaders() { 175 175 int index = dataGridView.FirstDisplayedScrollingRowIndex; 176 176 if (index == -1) index = 0; … … 383 383 ClearSorting(); 384 384 } 385 pr ivatestring[,] SplitClipboardString(string clipboardText) {385 protected string[,] SplitClipboardString(string clipboardText) { 386 386 if (clipboardText.EndsWith(Environment.NewLine)) 387 387 clipboardText = clipboardText.Remove(clipboardText.Length - Environment.NewLine.Length); //remove last newline constant -
branches/crossvalidation-2434/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.Designer.cs
r12012 r14029 63 63 this.valueTextBox.Location = new System.Drawing.Point(17, 0); 64 64 this.valueTextBox.Name = "valueTextBox"; 65 this.valueTextBox.Size = new System.Drawing.Size(13 5, 20);65 this.valueTextBox.Size = new System.Drawing.Size(132, 20); 66 66 this.valueTextBox.TabIndex = 2; 67 67 this.valueTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.valueTextBox_KeyDown);
Note: See TracChangeset
for help on using the changeset viewer.