- Timestamp:
- 03/05/13 16:37:17 (12 years ago)
- Location:
- branches/ImprovingStringConvertibleMatrix
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ImprovingStringConvertibleMatrix
-
Property
svn:ignore
set to
*.suo
-
Property
svn:ignore
set to
-
branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj
r8833 r9286 41 41 <DebugType>full</DebugType> 42 42 <Optimize>false</Optimize> 43 <OutputPath> $(SolutionDir)\bin\</OutputPath>43 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <ErrorReport>prompt</ErrorReport> … … 50 50 <DebugType>pdbonly</DebugType> 51 51 <Optimize>true</Optimize> 52 <OutputPath> $(SolutionDir)\bin\</OutputPath>52 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 53 53 <DefineConstants>TRACE</DefineConstants> 54 54 <ErrorReport>prompt</ErrorReport> … … 60 60 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> 61 61 <DebugSymbols>true</DebugSymbols> 62 <OutputPath> $(SolutionDir)\bin\</OutputPath>62 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 63 63 <DefineConstants>DEBUG;TRACE</DefineConstants> 64 64 <DebugType>full</DebugType> … … 68 68 </PropertyGroup> 69 69 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> 70 <OutputPath> $(SolutionDir)\bin\</OutputPath>70 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 71 71 <DefineConstants>TRACE</DefineConstants> 72 72 <DocumentationFile> … … 80 80 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 81 81 <DebugSymbols>true</DebugSymbols> 82 <OutputPath> $(SolutionDir)\bin\</OutputPath>82 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 83 83 <DefineConstants>DEBUG;TRACE</DefineConstants> 84 84 <DebugType>full</DebugType> … … 88 88 </PropertyGroup> 89 89 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 90 <OutputPath> $(SolutionDir)\bin\</OutputPath>90 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 91 91 <DefineConstants>TRACE</DefineConstants> 92 92 <DocumentationFile> … … 99 99 </PropertyGroup> 100 100 <ItemGroup> 101 <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 102 <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 103 <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 104 <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 105 <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 106 <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" /> 101 107 <Reference Include="System" /> 102 108 <Reference Include="System.Core"> … … 190 196 </ItemGroup> 191 197 <ItemGroup> 192 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">193 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>194 <Name>HeuristicLab.Common-3.3</Name>195 <Private>False</Private>196 </ProjectReference>197 <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">198 <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>199 <Name>HeuristicLab.Core.Views-3.3</Name>200 <Private>False</Private>201 </ProjectReference>202 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">203 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>204 <Name>HeuristicLab.Core-3.3</Name>205 <Private>False</Private>206 </ProjectReference>207 198 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 208 199 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> 209 200 <Name>HeuristicLab.Data-3.3</Name> 210 <Private>False</Private>211 </ProjectReference>212 <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">213 <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>214 <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>215 <Private>False</Private>216 </ProjectReference>217 <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">218 <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>219 <Name>HeuristicLab.MainForm-3.3</Name>220 <Private>False</Private>221 </ProjectReference>222 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">223 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>224 <Name>HeuristicLab.PluginInfrastructure-3.3</Name>225 201 <Private>False</Private> 226 202 </ProjectReference> -
branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs
r8833 r9286 87 87 88 88 protected override void DeregisterContentEvents() { 89 Content.Item Changed -= new EventHandler<EventArgs<int, int>>(Content_ItemChanged);89 Content.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged); 90 90 Content.Reset -= new EventHandler(Content_Reset); 91 91 Content.ColumnNamesChanged -= new EventHandler(Content_ColumnNamesChanged); … … 95 95 protected override void RegisterContentEvents() { 96 96 base.RegisterContentEvents(); 97 Content.Item Changed += new EventHandler<EventArgs<int, int>>(Content_ItemChanged);97 Content.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged); 98 98 Content.Reset += new EventHandler(Content_Reset); 99 99 Content.ColumnNamesChanged += new EventHandler(Content_ColumnNamesChanged); … … 200 200 UpdateColumnHeaders(); 201 201 } 202 private void Content_ItemChanged(object sender, EventArgs< int, int> e) {202 private void Content_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) { 203 203 if (InvokeRequired) 204 Invoke(new EventHandler<EventArgs<int, int>>(Content_ItemChanged), sender, e); 205 else 206 dataGridView.InvalidateCell(e.Value2, e.Value); 204 Invoke(new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged), sender, e); 205 else { 206 foreach (var pos in e.Value) { 207 dataGridView.InvalidateCell(pos.Column, pos.Row); 208 } 209 } 207 210 } 208 211 private void Content_Reset(object sender, EventArgs e) { … … 373 376 if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex; 374 377 378 List<RowColumnValue> setValues = new List<RowColumnValue>(values.GetLength(0) * values.GetLength(1)); 375 379 for (int row = 0; row < values.GetLength(1); row++) { 376 380 for (int col = 0; col < values.GetLength(0); col++) { 377 Content.SetValue(values[col, row], row + rowIndex, col + columnIndex); 378 } 379 } 381 setValues.Add(new RowColumnValue(new Position(row + rowIndex, col + columnIndex), values[col, row])); 382 //Content.SetValue(values[col, row], row + rowIndex, col + columnIndex); 383 } 384 } 385 Content.SetValue(setValues); 380 386 ClearSorting(); 381 387 } … … 542 548 foreach (DataGridViewCell cell in dataGridView.SelectedCells) { 543 549 double value; 544 if ( !double.TryParse(cell.Value.ToString(), out value)) return;550 if (cell.Value == null || !double.TryParse(cell.Value.ToString(), out value)) return; 545 551 selectedValues.Add(value); 546 552 }
Note: See TracChangeset
for help on using the changeset viewer.