Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/05/13 16:37:17 (11 years ago)
Author:
sforsten
Message:

#2018:

  • added new methods to the interface IStringConvertibleMatrix as well as two structs. Also the event ItemChanged has been changed to ItemsChanged
  • class ValueTypeMatrix now implements IStringConvertibleMatrix instead of the classes which inherit from it
  • small changes have been applied to a lot of classes to correctly implement the changed interface IStringConvertibleMatrix
  • solution file, Build.cmd and PreBuildEvent.cmd have been added
Location:
branches/ImprovingStringConvertibleMatrix
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/ImprovingStringConvertibleMatrix

    • Property svn:ignore set to
      *.suo

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

    r8833 r9286  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    6060  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6161    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     62    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6363    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6464    <DebugType>full</DebugType>
    … …  
    6868  </PropertyGroup>
    6969  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    70     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     70    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7171    <DefineConstants>TRACE</DefineConstants>
    7272    <DocumentationFile>
    … …  
    8080  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    8181    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     82    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8383    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8484    <DebugType>full</DebugType>
    … …  
    8888  </PropertyGroup>
    8989  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    90     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     90    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9191    <DefineConstants>TRACE</DefineConstants>
    9292    <DocumentationFile>
    … …  
    9999  </PropertyGroup>
    100100  <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" />
    101107    <Reference Include="System" />
    102108    <Reference Include="System.Core">
    … …  
    190196  </ItemGroup>
    191197  <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>
    207198    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    208199      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    209200      <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>
    225201      <Private>False</Private>
    226202    </ProjectReference>

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

    r8833 r9286  
    8787
    8888    protected override void DeregisterContentEvents() {
    89       Content.ItemChanged -= new EventHandler<EventArgs<int, int>>(Content_ItemChanged);
     89      Content.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged);
    9090      Content.Reset -= new EventHandler(Content_Reset);
    9191      Content.ColumnNamesChanged -= new EventHandler(Content_ColumnNamesChanged);
    … …  
    9595    protected override void RegisterContentEvents() {
    9696      base.RegisterContentEvents();
    97       Content.ItemChanged += new EventHandler<EventArgs<int, int>>(Content_ItemChanged);
     97      Content.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged);
    9898      Content.Reset += new EventHandler(Content_Reset);
    9999      Content.ColumnNamesChanged += new EventHandler(Content_ColumnNamesChanged);
    … …  
    200200        UpdateColumnHeaders();
    201201    }
    202     private void Content_ItemChanged(object sender, EventArgs<int, int> e) {
     202    private void Content_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    203203      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      }
    207210    }
    208211    private void Content_Reset(object sender, EventArgs e) {
    … …  
    373376      if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex;
    374377
     378      List<RowColumnValue> setValues = new List<RowColumnValue>(values.GetLength(0) * values.GetLength(1));
    375379      for (int row = 0; row < values.GetLength(1); row++) {
    376380        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);
    380386      ClearSorting();
    381387    }
    … …  
    542548        foreach (DataGridViewCell cell in dataGridView.SelectedCells) {
    543549          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;
    545551          selectedValues.Add(value);
    546552        }
Note: See TracChangeset for help on using the changeset viewer.