Ignore:
Timestamp:
09/13/13 14:42:38 (8 years ago)
Author:
bburlacu
Message:

#1772: Merged changes from the trunk and other branches. Added new ExtendedSymbolicExpressionTreeCanvas control for the visual exploration of tree genealogies. Reorganized some files and folders.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/HeuristicLab.EvolutionaryTracking.Views-3.4.csproj

    r9835 r9963  
    109109  </ItemGroup>
    110110  <ItemGroup>
     111    <Compile Include="AncestryLayoutAdapter.cs" />
     112    <Compile Include="ExtendedSymbolicExpressionTreeCanvas.cs">
     113      <SubType>UserControl</SubType>
     114    </Compile>
    111115    <Compile Include="FrequentFragmentsDialog.cs">
    112116      <SubType>Form</SubType>
     
    133137      <DependentUpon>GenealogyGraphView.cs</DependentUpon>
    134138    </Compile>
    135     <Compile Include="Karyogram.cs">
    136       <SubType>UserControl</SubType>
    137     </Compile>
    138     <Compile Include="Karyogram.Designer.cs">
    139       <DependentUpon>Karyogram.cs</DependentUpon>
    140     </Compile>
    141139    <Compile Include="LineageExplorerView.cs">
    142140      <SubType>UserControl</SubType>
     
    146144    </Compile>
    147145    <Compile Include="Plugin.cs" />
     146    <Compile Include="Primitives\LabeledEllipse.cs" />
     147    <Compile Include="Primitives\LabeledRectangle.cs" />
     148    <Compile Include="Primitives\PrimitiveGroup.cs" />
    148149    <Compile Include="Properties\AssemblyInfo.cs" />
    149150    <Compile Include="Properties\Resources.Designer.cs">
     
    182183  </ItemGroup>
    183184  <ItemGroup>
    184     <EmbeddedResource Include="FrequentFragmentsDialog.resx">
    185       <DependentUpon>FrequentFragmentsDialog.cs</DependentUpon>
    186     </EmbeddedResource>
    187     <EmbeddedResource Include="GenealogyGraphDialog.resx">
    188       <DependentUpon>GenealogyGraphDialog.cs</DependentUpon>
    189     </EmbeddedResource>
    190     <EmbeddedResource Include="GenealogyGraphView.resx">
    191       <DependentUpon>GenealogyGraphView.cs</DependentUpon>
    192     </EmbeddedResource>
    193     <EmbeddedResource Include="LineageExplorerView.resx">
    194       <DependentUpon>LineageExplorerView.cs</DependentUpon>
    195     </EmbeddedResource>
    196185    <EmbeddedResource Include="Properties\Resources.resx">
    197186      <Generator>ResXFileCodeGenerator</Generator>
Note: See TracChangeset for help on using the changeset viewer.