Changeset 9961
- Timestamp:
- 09/13/13 13:49:03 (11 years ago)
- Location:
- stable
- Files:
-
- 15 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 9714,9833,9841,9850,9949
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Data.Views/3.3
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Data.Views/3.3 merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Data.Views/3.3 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Data.Views/3.3 6917-7005 /branches/CloningRefactoring/HeuristicLab.Data.Views/3.3 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Data.Views/3.3 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data.Views/3.3 5815-6180 /branches/DataAnalysis/HeuristicLab.Data.Views/3.3 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Data.Views/3.3 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data.Views/3.3 5060 /branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data.Views/3.3 9669-9706 /branches/NET40/sources/HeuristicLab.Data.Views/3.3 5138-5162 /branches/ParallelEngine/HeuristicLab.Data.Views/3.3 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data.Views/3.3 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Data.Views/3.3 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Data.Views/3.3 6828 /branches/RuntimeOptimizer/HeuristicLab.Data.Views/3.3 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views/3.3 7787-8333 /branches/SlaveShutdown/HeuristicLab.Data.Views/3.3 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Data.Views/3.3 5370-5682 /branches/Trunk/HeuristicLab.Data.Views/3.3 6829-6865 /branches/UnloadJobs/HeuristicLab.Data.Views/3.3 9168-9215 /branches/VNS/HeuristicLab.Data.Views/3.3 5594-5752 /branches/histogram/HeuristicLab.Data.Views/3.3 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj
r9379 r9961 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> 135 153 <Compile Include="Plugin.cs" /> 136 154 <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.cs"> … … 196 214 </ItemGroup> 197 215 <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> 198 221 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 199 222 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> -
stable/HeuristicLab.Data.Views/3.3/Path Views/DirectoryValueView.Designer.cs
r9680 r9961 48 48 this.openButton = new System.Windows.Forms.Button(); 49 49 this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); 50 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 51 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); 52 this.splitContainer.Panel1.SuspendLayout(); 53 this.splitContainer.Panel2.SuspendLayout(); 54 this.splitContainer.SuspendLayout(); 50 this.stringConvertibleValueView = new HeuristicLab.Data.Views.StringConvertibleValueView(); 55 51 this.SuspendLayout(); 56 //57 // valueTextBox58 //59 this.errorProvider.SetIconAlignment(this.valueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);60 this.errorProvider.SetIconPadding(this.valueTextBox, 2);61 this.valueTextBox.Location = new System.Drawing.Point(17, 2);62 this.valueTextBox.Size = new System.Drawing.Size(87, 20);63 //64 // valueLabel65 //66 this.valueLabel.Location = new System.Drawing.Point(3, 5);67 this.valueLabel.Size = new System.Drawing.Size(52, 13);68 this.valueLabel.Text = "Directory:";69 //70 // splitContainer71 //72 //73 // splitContainer.Panel274 //75 this.splitContainer.Panel2.Controls.Add(this.openButton);76 this.splitContainer.Size = new System.Drawing.Size(194, 24);77 this.splitContainer.SplitterDistance = 56;78 52 // 79 53 // openButton … … 81 55 this.openButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 82 56 this.openButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open; 83 this.openButton.Location = new System.Drawing.Point(1 10, 0);57 this.openButton.Location = new System.Drawing.Point(167, 0); 84 58 this.openButton.Name = "openButton"; 85 59 this.openButton.Size = new System.Drawing.Size(24, 24); … … 88 62 this.openButton.Click += new System.EventHandler(this.openButton_Click); 89 63 // 64 // stringConvertibleValueView 65 // 66 this.stringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 67 | System.Windows.Forms.AnchorStyles.Right))); 68 this.stringConvertibleValueView.Caption = "StringConvertibleValue View"; 69 this.stringConvertibleValueView.Content = null; 70 this.stringConvertibleValueView.LabelVisible = true; 71 this.stringConvertibleValueView.Location = new System.Drawing.Point(4, 2); 72 this.stringConvertibleValueView.Name = "stringConvertibleValueView"; 73 this.stringConvertibleValueView.ReadOnly = false; 74 this.stringConvertibleValueView.Size = new System.Drawing.Size(157, 21); 75 this.stringConvertibleValueView.TabIndex = 4; 76 // 90 77 // DirectoryValueView 91 78 // 92 79 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 93 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 80 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 81 this.Controls.Add(this.stringConvertibleValueView); 82 this.Controls.Add(this.openButton); 94 83 this.Name = "DirectoryValueView"; 95 84 this.Size = new System.Drawing.Size(194, 24); 96 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();97 this.splitContainer.Panel1.ResumeLayout(false);98 this.splitContainer.Panel1.PerformLayout();99 this.splitContainer.Panel2.ResumeLayout(false);100 this.splitContainer.Panel2.PerformLayout();101 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();102 this.splitContainer.ResumeLayout(false);103 85 this.ResumeLayout(false); 104 86 … … 109 91 protected System.Windows.Forms.Button openButton; 110 92 protected System.Windows.Forms.FolderBrowserDialog folderBrowserDialog; 93 private StringConvertibleValueView stringConvertibleValueView; 111 94 112 95 } -
stable/HeuristicLab.Data.Views/3.3/Path Views/DirectoryValueView.cs
r9697 r9961 22 22 using System; 23 23 using System.Windows.Forms; 24 using HeuristicLab.Core.Views; 24 25 using HeuristicLab.MainForm; 25 26 … … 27 28 [View("DirectoryValueView")] 28 29 [Content(typeof(DirectoryValue), true)] 29 public partial class DirectoryValueView : StringConvertibleValueView {30 public partial class DirectoryValueView : ItemView { 30 31 public new DirectoryValue Content { 31 32 get { return (DirectoryValue)base.Content; } 32 33 set { base.Content = value; } 33 }34 35 public override bool ReadOnly {36 get {37 if ((Content != null) && Content.ReadOnly) return true;38 return base.ReadOnly;39 }40 set { base.ReadOnly = value; }41 34 } 42 35 … … 47 40 protected override void SetEnabledStateOfControls() { 48 41 base.SetEnabledStateOfControls(); 49 valueTextBox.Enabled = !Locked && !ReadOnly && Content != null;50 valueTextBox.ReadOnly = Locked || ReadOnly || Content == null;51 42 openButton.Enabled = !Locked && !ReadOnly && Content != null; 52 43 } … … 55 46 base.OnContentChanged(); 56 47 if (Content == null) { 57 valueTextBox.Text = string.Empty;48 stringConvertibleValueView.Content = null; 58 49 return; 59 50 } 60 51 61 valueTextBox.Text = Content.Value; 62 openButton.Enabled = !Content.ReadOnly; 52 stringConvertibleValueView.Content = Content.StringValue; 63 53 } 64 54 -
stable/HeuristicLab.Data.Views/3.3/Path Views/FileValueView.Designer.cs
r9680 r9961 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FileValueView));48 47 this.openButton = new System.Windows.Forms.Button(); 49 48 this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); 50 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 51 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); 52 this.splitContainer.Panel1.SuspendLayout(); 53 this.splitContainer.Panel2.SuspendLayout(); 54 this.splitContainer.SuspendLayout(); 49 this.stringConvertibleValueView = new HeuristicLab.Data.Views.StringConvertibleValueView(); 55 50 this.SuspendLayout(); 56 //57 // valueTextBox58 //59 this.errorProvider.SetIconAlignment(this.valueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);60 this.errorProvider.SetIconPadding(this.valueTextBox, 2);61 this.valueTextBox.Location = new System.Drawing.Point(17, 2);62 this.valueTextBox.Size = new System.Drawing.Size(116, 20);63 //64 // valueLabel65 //66 this.valueLabel.Location = new System.Drawing.Point(3, 5);67 this.valueLabel.Size = new System.Drawing.Size(26, 13);68 this.valueLabel.Text = "File:";69 //70 // splitContainer71 //72 //73 // splitContainer.Panel274 //75 this.splitContainer.Panel2.Controls.Add(this.openButton);76 this.splitContainer.Size = new System.Drawing.Size(194, 24);77 this.splitContainer.SplitterDistance = 27;78 51 // 79 52 // openButton … … 81 54 this.openButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 82 55 this.openButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open; 83 this.openButton.Location = new System.Drawing.Point(1 39, 0);56 this.openButton.Location = new System.Drawing.Point(167, 0); 84 57 this.openButton.Name = "openButton"; 85 58 this.openButton.Size = new System.Drawing.Size(24, 24); … … 88 61 this.openButton.Click += new System.EventHandler(this.openButton_Click); 89 62 // 63 // stringConvertibleValueView 64 // 65 this.stringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 66 | System.Windows.Forms.AnchorStyles.Right))); 67 this.stringConvertibleValueView.Caption = "StringConvertibleValue View"; 68 this.stringConvertibleValueView.Content = null; 69 this.stringConvertibleValueView.LabelVisible = true; 70 this.stringConvertibleValueView.Location = new System.Drawing.Point(4, 2); 71 this.stringConvertibleValueView.Name = "stringConvertibleValueView"; 72 this.stringConvertibleValueView.ReadOnly = false; 73 this.stringConvertibleValueView.Size = new System.Drawing.Size(157, 21); 74 this.stringConvertibleValueView.TabIndex = 0; 75 // 90 76 // FileValueView 91 77 // 92 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 93 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 78 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 79 this.Controls.Add(this.stringConvertibleValueView); 80 this.Controls.Add(this.openButton); 94 81 this.Name = "FileValueView"; 95 82 this.Size = new System.Drawing.Size(194, 24); 96 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();97 this.splitContainer.Panel1.ResumeLayout(false);98 this.splitContainer.Panel1.PerformLayout();99 this.splitContainer.Panel2.ResumeLayout(false);100 this.splitContainer.Panel2.PerformLayout();101 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();102 this.splitContainer.ResumeLayout(false);103 83 this.ResumeLayout(false); 104 84 … … 109 89 protected System.Windows.Forms.Button openButton; 110 90 protected System.Windows.Forms.OpenFileDialog openFileDialog; 91 protected StringConvertibleValueView stringConvertibleValueView; 111 92 } 112 93 } -
stable/HeuristicLab.Data.Views/3.3/Path Views/FileValueView.cs
r9697 r9961 22 22 using System; 23 23 using System.Windows.Forms; 24 using HeuristicLab.Core.Views; 24 25 using HeuristicLab.MainForm; 25 26 … … 27 28 [View("FileValueView")] 28 29 [Content(typeof(FileValue), true)] 29 public partial class FileValueView : StringConvertibleValueView {30 public partial class FileValueView : ItemView { 30 31 public new FileValue Content { 31 32 get { return (FileValue)base.Content; } 32 33 set { base.Content = value; } 33 }34 35 public override bool ReadOnly {36 get {37 if ((Content != null) && Content.ReadOnly) return true;38 return base.ReadOnly;39 }40 set { base.ReadOnly = value; }41 34 } 42 35 … … 45 38 } 46 39 47 protected override void RegisterContentEvents() {48 base.RegisterContentEvents();49 Content.FileOpenDialogFilterChanged += new EventHandler(Content_FileOpenDialogFilterChanged);50 }51 protected override void DeregisterContentEvents() {52 Content.FileOpenDialogFilterChanged -= new EventHandler(Content_FileOpenDialogFilterChanged);53 base.DeregisterContentEvents();54 }55 40 protected override void SetEnabledStateOfControls() { 56 41 base.SetEnabledStateOfControls(); 57 valueTextBox.Enabled = !Locked && !ReadOnly && Content != null;58 valueTextBox.ReadOnly = Locked || ReadOnly || Content == null;59 42 openButton.Enabled = !Locked && !ReadOnly && Content != null; 60 43 } … … 63 46 base.OnContentChanged(); 64 47 if (Content == null) { 65 valueTextBox.Text = string.Empty;48 stringConvertibleValueView.Content = null; 66 49 return; 67 50 } 68 51 69 valueTextBox.Text = Content.Value; 70 openButton.Enabled = !Content.ReadOnly; 71 openFileDialog.Filter = Content.FileDialogFilter; 72 } 73 74 protected virtual void Content_FileOpenDialogFilterChanged(object sender, EventArgs e) { 52 stringConvertibleValueView.Content = Content.StringValue; 75 53 openFileDialog.Filter = Content.FileDialogFilter; 76 54 } 77 55 78 56 protected virtual void openButton_Click(object sender, EventArgs e) { 57 openFileDialog.Filter = Content.FileDialogFilter; 79 58 if (openFileDialog.ShowDialog(this) != DialogResult.OK) return; 80 59 Content.Value = openFileDialog.FileName; -
stable/HeuristicLab.Data.Views/3.3/Path Views/TextFileView.cs
r9714 r9961 24 24 using System.IO; 25 25 using System.Windows.Forms; 26 using HeuristicLab.Core.Views;27 26 using HeuristicLab.MainForm; 27 using HeuristicLab.PluginInfrastructure; 28 28 29 29 namespace HeuristicLab.Data.Views { 30 30 [View("TextFileView")] 31 31 [Content(typeof(TextFileValue), true)] 32 public sealed partial class TextFileView : ItemView {33 private bool changedFileContent;34 private bool ChangedFileContent{35 get { return changedFileContent; }32 public sealed partial class TextFileView : FileValueView { 33 private bool fileContentChanged; 34 private bool FileContentChanged { 35 get { return fileContentChanged; } 36 36 set { 37 if ( changedFileContent!= value) {38 changedFileContent= value;39 On ChangedFileContent();37 if (fileContentChanged != value) { 38 fileContentChanged = value; 39 OnFileContentChanged(); 40 40 } 41 41 } … … 49 49 public TextFileView() { 50 50 InitializeComponent(); 51 changedFileContent= false;51 fileContentChanged = false; 52 52 } 53 53 54 54 protected override void RegisterContentEvents() { 55 55 base.RegisterContentEvents(); 56 Content.ValueChanged += Content_FilePathChanged; 57 Content.FileOpenDialogFilterChanged += Content_FileDialogFilterChanged; 56 Content.StringValue.ValueChanged += Content_FilePathChanged; 58 57 } 59 58 protected override void DeregisterContentEvents() { 60 Content.ValueChanged -= Content_FilePathChanged; 61 Content.FileOpenDialogFilterChanged -= Content_FileDialogFilterChanged; 59 Content.StringValue.ValueChanged -= Content_FilePathChanged; 62 60 fileSystemWatcher.EnableRaisingEvents = false; 63 61 base.DeregisterContentEvents(); … … 66 64 base.SetEnabledStateOfControls(); 67 65 textBox.ReadOnly = Locked || ReadOnly || Content == null; 68 saveButton.Enabled = !Locked && !ReadOnly && Content != null && ChangedFileContent;66 saveButton.Enabled = !Locked && !ReadOnly && Content != null && FileContentChanged; 69 67 70 68 if (Content != null && Content.Exists()) { … … 83 81 protected override void OnContentChanged() { 84 82 base.OnContentChanged(); 85 ChangedFileContent= false;83 FileContentChanged = false; 86 84 if (Content == null) { 87 fileValueView.Content = null;88 85 textBox.Text = string.Empty; 89 86 //mkommend: other properties of the file system watcher cannot be cleared (e.g., path) as this leads to an ArgumentException … … 91 88 return; 92 89 } 93 94 fileValueView.Content = Content;95 90 saveFileDialog.Filter = Content.FileDialogFilter; 96 91 UpdateTextBox(); … … 101 96 SetEnabledStateOfControls(); 102 97 } 103 private void Content_FileDialogFilterChanged(object sender, EventArgs e) {104 saveFileDialog.Filter = Content.FileDialogFilter;105 }106 98 107 99 private void textBox_TextChanged(object sender, EventArgs e) { 108 ChangedFileContent= fileText != textBox.Text;109 } 110 111 private void On ChangedFileContent() {100 FileContentChanged = fileText != textBox.Text; 101 } 102 103 private void OnFileContentChanged() { 112 104 SetEnabledStateOfControls(); 113 if (ChangedFileContent) { 114 textBox.ForeColor = Color.Red; 115 } else { 116 textBox.ForeColor = Color.Black; 117 } 105 textBox.ForeColor = FileContentChanged ? Color.Red : Color.Black; 118 106 } 119 107 … … 146 134 } else { 147 135 fileText = newContent; 148 ChangedFileContent= true;136 FileContentChanged = true; 149 137 } 150 138 } … … 185 173 WriteFile(path, textBox.Text); 186 174 Content.Value = path; 187 ChangedFileContent= false;175 FileContentChanged = false; 188 176 fileSystemWatcher.EnableRaisingEvents = true; 189 177 } … … 212 200 } 213 201 private void textBox_Validated(object sender, EventArgs e) { 214 if (! ChangedFileContent) return;202 if (!FileContentChanged) return; 215 203 string msg = string.Format("You have not saved the changes in the file \"{0}\" yet. Do you want to save the changes?", Content.Value); 216 204 var result = MessageBox.Show(this, msg, "Save changes?", MessageBoxButtons.YesNo, MessageBoxIcon.Information); … … 229 217 if (!File.Exists(path)) return null; 230 218 string fileContent = string.Empty; 231 using (FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read)) { 232 using (StreamReader streamReader = new StreamReader(fileStream)) { 233 fileContent = streamReader.ReadToEnd(); 234 } 219 try { 220 using (FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { 221 using (StreamReader streamReader = new StreamReader(fileStream)) { 222 fileContent = streamReader.ReadToEnd(); 223 } 224 } 225 } 226 catch (Exception e) { 227 ErrorHandling.ShowErrorDialog(e); 235 228 } 236 229 return fileContent; … … 238 231 239 232 private static void WriteFile(string path, string fileContent) { 240 using (FileStream fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Write)) { 241 using (StreamWriter streamWriter = new StreamWriter(fileStream)) { 242 streamWriter.Write(fileContent); 243 } 233 try { 234 using (FileStream fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None)) { 235 using (StreamWriter streamWriter = new StreamWriter(fileStream)) { 236 streamWriter.Write(fileContent); 237 } 238 } 239 } 240 catch (Exception e) { 241 ErrorHandling.ShowErrorDialog(e); 244 242 } 245 243 } -
stable/HeuristicLab.Data.Views/3.3/Plugin.cs.frame
r9462 r9961 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")] 34 35 [PluginDependency("HeuristicLab.Core", "3.3")] 35 36 [PluginDependency("HeuristicLab.Core.Views", "3.3")] -
stable/HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs
r9737 r9961 125 125 Invoke(new EventHandler<EventArgs<int>>(Content_ItemChanged), sender, e); 126 126 else { 127 // if a resize of the array occurs and some other class handles the event and provides default values 128 //then the itemChanged will occur before the reset event. hence the check was added 129 if (dataGridView.RowCount <= e.Value) return; 127 130 dataGridView.Rows[e.Value].Cells[0].Value = Content.GetValue(e.Value); 128 131 Size size = dataGridView.Rows[e.Value].Cells[0].PreferredSize; -
stable/HeuristicLab.Data/3.3
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Data/3.3 merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Data/3.3 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Data/3.3 6917-7005 /branches/CloningRefactoring/HeuristicLab.Data/3.3 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Data/3.3 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data/3.3 5815-6180 /branches/DataAnalysis/HeuristicLab.Data/3.3 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Data/3.3 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data/3.3 5060 /branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3 9668-9706 /branches/NET40/sources/HeuristicLab.Data/3.3 5138-5162 /branches/ParallelEngine/HeuristicLab.Data/3.3 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data/3.3 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Data/3.3 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Data/3.3 6828 /branches/RuntimeOptimizer/HeuristicLab.Data/3.3 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Data/3.3 7787-8333 /branches/SlaveShutdown/HeuristicLab.Data/3.3 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Data/3.3 5370-5682 /branches/Trunk/HeuristicLab.Data/3.3 6829-6865 /branches/UnloadJobs/HeuristicLab.Data/3.3 9168-9215 /branches/VNS/HeuristicLab.Data/3.3 5594-5752 /branches/histogram/HeuristicLab.Data/3.3 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj
r8600 r9961 117 117 <Compile Include="Comparison.cs" /> 118 118 <Compile Include="ComparisonType.cs" /> 119 <Compile Include="Path Types\DirectoryValue.cs" /> 120 <Compile Include="Path Types\FileValue.cs" /> 121 <Compile Include="Path Types\PathValue.cs" /> 122 <Compile Include="Path Types\TextFileValue.cs" /> 119 123 <Compile Include="PercentMatrix.cs" /> 120 124 <Compile Include="PercentArray.cs" /> … … 212 216 --> 213 217 <PropertyGroup> 214 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)218 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 215 219 set ProjectDir=$(ProjectDir) 216 220 set SolutionDir=$(SolutionDir) … … 219 223 call PreBuildEvent.cmd 220 224 </PreBuildEvent> 221 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">225 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 222 226 export ProjectDir=$(ProjectDir) 223 227 export SolutionDir=$(SolutionDir) -
stable/HeuristicLab.Data/3.3/Path Types/DirectoryValue.cs
r9680 r9961 39 39 40 40 public override bool Exists() { 41 return Directory.Exists( value);41 return Directory.Exists(Value); 42 42 } 43 43 } -
stable/HeuristicLab.Data/3.3/Path Types/FileValue.cs
r9680 r9961 20 20 #endregion 21 21 22 using System;23 22 using System.IO; 24 23 using HeuristicLab.Common; … … 37 36 if (fileDialogFilter != value) { 38 37 fileDialogFilter = value; 39 OnFileOpenDialogFilterChanged();40 38 } 41 39 } … … 58 56 59 57 public override bool Exists() { 60 return File.Exists(value); 61 } 62 63 public event EventHandler FileOpenDialogFilterChanged; 64 protected virtual void OnFileOpenDialogFilterChanged() { 65 var handler = FileOpenDialogFilterChanged; 66 if (handler != null) 67 handler(this, EventArgs.Empty); 58 return File.Exists(Value); 68 59 } 69 60 } -
stable/HeuristicLab.Data/3.3/Path Types/PathValue.cs
r9697 r9961 20 20 #endregion 21 21 22 23 22 using System.IO; 24 23 using HeuristicLab.Common; … … 29 28 [Item("PathValue", "Represents a path.")] 30 29 [StorableClass] 31 public abstract class PathValue : StringValue { 32 public override string Value { 33 get { return base.Value; } 30 public abstract class PathValue : Item { 31 32 [Storable] 33 private readonly StringValue stringValue = new StringValue(); 34 public StringValue StringValue { 35 get { return stringValue; } 36 } 37 38 public string Value { 39 get { return stringValue.Value; } 34 40 set { 35 41 if (value == null) value = string.Empty; 36 42 value = value.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); 37 base.Value = value;43 stringValue.Value = value; 38 44 } 39 45 } … … 41 47 [StorableConstructor] 42 48 protected PathValue(bool deserializing) : base(deserializing) { } 43 protected PathValue(PathValue original, Cloner cloner) : base(original, cloner) { } 49 protected PathValue(PathValue original, Cloner cloner) 50 : base(original, cloner) { 51 stringValue = cloner.Clone(original.stringValue); 52 } 44 53 45 protected PathValue() 46 : base(string.Empty) { } 54 protected PathValue() : base() { } 47 55 48 56 public abstract bool Exists();
Note: See TracChangeset
for help on using the changeset viewer.