Changeset 1522


Ignore:
Timestamp:
May 28, 2010, 1:06:04 AM (12 years ago)
Author:
Sven Rech
Message:

some quadratic sieve presentation stuff for peer2peer (nothing visible yet)

Location:
trunk/CrypPlugins/QuadraticSieve
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/QuadraticSieve/QuadraticSieve.cs

    r1521 r1522  
    2121using Cryptool.PluginBase;
    2222using Cryptool.PluginBase.IO;
    23 using QuadraticSieve;
    2423using Cryptool.PluginBase.Miscellaneous;
    2524using System.ComponentModel;
  • trunk/CrypPlugins/QuadraticSieve/QuadraticSieve.csproj

    r1521 r1522  
    109109    <Compile Include="FactorManager.cs" />
    110110    <Compile Include="PeerToPeer.cs" />
     111    <Compile Include="ProgressYields.xaml.cs">
     112      <DependentUpon>ProgressYields.xaml</DependentUpon>
     113    </Compile>
    111114    <Compile Include="Properties\AssemblyInfo.cs" />
    112115    <Compile Include="QuadraticSieve.cs" />
     
    137140      <SubType>Designer</SubType>
    138141    </Resource>
     142    <Page Include="ProgressYields.xaml">
     143      <SubType>Designer</SubType>
     144      <Generator>MSBuild:Compile</Generator>
     145    </Page>
    139146    <Page Include="QuadraticSievePresentation.xaml">
    140147      <SubType>Designer</SubType>
  • trunk/CrypPlugins/QuadraticSieve/QuadraticSievePresentation.xaml

    r1510 r1522  
    1 <UserControl x:Class="QuadraticSieve.QuadraticSievePresentation"
     1<UserControl x:Class="Cryptool.Plugins.QuadraticSieve.QuadraticSievePresentation"
    22    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    33    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     
    2727        <TextBox Name="endTime" Grid.Row="1" Grid.Column="1" TextAlignment="Center" IsReadOnly="True" TextWrapping="WrapWithOverflow" BorderThickness="1" Margin="1" BorderBrush="AliceBlue" />
    2828        <ListBox Grid.Row="2" Grid.ColumnSpan="2" Name="factorList" Canvas.Left="1" Canvas.Top="50" Height="150" Width="233" />
    29         <Label Grid.Row="3" Grid.ColumnSpan="2" Content="" HorizontalAlignment="Left" Name="factorInfo" VerticalAlignment="Top" />
    30         <Label Grid.Row="4" Grid.ColumnSpan="2" Content="" HorizontalAlignment="Left" Name="relationsInfo" VerticalAlignment="Top" />
     29        <Label Grid.Row="3" Grid.ColumnSpan="2" Content="" HorizontalAlignment="Left" Name="factorInfo" VerticalAlignment="Top" /> 
     30       
     31        <Expander Grid.Row="4" Grid.ColumnSpan="2" Header="Peer2Peer informations" Name="peer2peerExpander" VerticalAlignment="Top" Expanded="peer2peerExpander_Expanded">
     32            <Grid>
     33                <Grid.RowDefinitions>
     34                    <RowDefinition />
     35                    <RowDefinition />
     36                </Grid.RowDefinitions>
     37                <Grid.ColumnDefinitions>
     38                    <ColumnDefinition />
     39                </Grid.ColumnDefinitions>
     40
     41                <Label Grid.Row="1" Content="" HorizontalAlignment="Stretch" Name="relationsInfo" VerticalAlignment="Bottom" />
     42            </Grid>               
     43        </Expander>
     44       
    3145        <TextBox Name="logging" Grid.Row="5" Grid.ColumnSpan="2" TextAlignment="Left" IsReadOnly="True" TextWrapping="WrapWithOverflow" BorderThickness="1" Margin="1" BorderBrush="AliceBlue" />       
    3246        </Grid>       
  • trunk/CrypPlugins/QuadraticSieve/QuadraticSievePresentation.xaml.cs

    r1464 r1522  
    1313using System.Windows.Shapes;
    1414
    15 namespace QuadraticSieve
     15namespace Cryptool.Plugins.QuadraticSieve
    1616{
    17 
    18 
    1917    /// <summary>
    2018    /// Interaction logic for QuadraticSievePresentation.xaml
     
    2220    public partial class QuadraticSievePresentation : UserControl
    2321    {
     22        private ProgressYields progressYields = new ProgressYields();
     23        public ProgressYields ProgressYields
     24        {
     25            get { return progressYields; }
     26        }
    2427
    2528        public QuadraticSievePresentation()
     
    2730            InitializeComponent();           
    2831            SizeChanged += sizeChanged;
     32
     33            Grid grid = ((Grid)peer2peerExpander.Content);
     34            Grid.SetRow(progressYields, 0);
     35            grid.Children.Add(progressYields);
    2936        }
    3037
     
    3441                                                       this.ActualHeight / this.Grid.ActualHeight);
    3542        }
     43
     44        private void peer2peerExpander_Expanded(object sender, RoutedEventArgs e)
     45        {
     46            //TODO: Refresh here
     47        }
    3648    }
    3749}
  • trunk/CrypPlugins/QuadraticSieve/QuadraticSieveSettings.cs

    r1503 r1522  
    2525using System.Windows;
    2626
    27 namespace QuadraticSieve
     27namespace Cryptool.Plugins.QuadraticSieve
    2828{
    2929    class QuadraticSieveSettings : ISettings
Note: See TracChangeset for help on using the changeset viewer.