Changes in / [20:30]


Ignore:
Location:
/trunk
Files:
14 added
15 edited

Legend:

Unmodified
Added
Removed
  • /trunk/CrypPlugins/PKCS5

    • Property svn:ignore set to
      [Bb]in
      obj
      [Dd]ebug
      [Rr]elease
      *.user
      *.aps
      *.eto
  • /trunk/CrypPlugins/Playfair/PlayfairSettings.cs

    r20 r30  
    275275        public string Key
    276276        {
    277             get { return key.ToUpper();}
     277            get
     278            {
     279              if (key != null)
     280                return key.ToUpper();
     281              else
     282                return null;
     283            }
    278284            set
    279285            {
  • /trunk/CrypPlugins/Primes/Primes/Resources/lang/WpfControls/Primetest/Primetest.Designer.cs

    r20 r30  
    350350       
    351351        /// <summary>
     352        ///   Looks up a localized string similar to Sieb des Atkin.
     353        /// </summary>
     354        public static string test_soa {
     355            get {
     356                return ResourceManager.GetString("test_soa", resourceCulture);
     357            }
     358        }
     359       
     360        /// <summary>
    352361        ///   Looks up a localized string similar to Sieb des Eratosthenes.
    353362        /// </summary>
  • /trunk/CrypPlugins/Primes/Primes/Resources/lang/WpfControls/Primetest/Primetest.resx

    r20 r30  
    214214    <value>Der Miller/Rabin-Test</value>
    215215  </data>
     216  <data name="test_soa" xml:space="preserve">
     217    <value>Sieb des Atkin</value>
     218  </data>
    216219  <data name="test_soe" xml:space="preserve">
    217220    <value>Sieb des Eratosthenes</value>
  • /trunk/CrypPlugins/Primes/Primes/WpfControls/Primegeneration/SieveOfAtkin/Numbergrid.xaml

    r20 r30  
    1515      <ColumnDefinition Width="46"/>
    1616      <ColumnDefinition Width="*"/>
    17 
    1817    </Grid.ColumnDefinitions>
    19     <Grid Grid.Row="2" Grid.Column="0" Margin="5">
     18    <Grid Grid.Column="0" Margin="5">
    2019      <Grid.RowDefinitions>
    2120        <RowDefinition Height="32"/>
     
    3938        </Button.LayoutTransform>
    4039      </Button>
     40    </Grid>
    4141
    42     </Grid>
    43     <!--
    44     <Grid Grid.Column="0" >
    45       <Grid.RowDefinitions>
    46         <RowDefinition Height="32"/>
    47         <RowDefinition Height="32"/>
    48         <RowDefinition Height="0*"/>
    49         <RowDefinition Height="9"/>
    50         <RowDefinition Height="23*" />
    51         <RowDefinition Height="32"/>
    52 
    53       </Grid.RowDefinitions>
    54       <Button Template="{StaticResource  doublearrowbtntmpl}" Grid.Row="0" IsEnabled="False" Name="btnCompleteBack" Visibility="Hidden" Click="btnBack_Click" >
    55       </Button>
    56       <Button Template="{StaticResource  simplearrowbtntmpl}" Grid.Row="1" IsEnabled="False" Name="btnBack" Visibility="Hidden" Click="btnBack_Click"/>
    57       <Button Template="{StaticResource  simplearrowbtntmpl}" Grid.Row="3" IsEnabled="False" HorizontalAlignment="Left" Name="btnForward" Visibility="Hidden" Click="btnForward_Click" Margin="0,0,0,13" Grid.RowSpan="3" Width="4">
    58         <Button.LayoutTransform>
    59           <RotateTransform Angle="180"/>
    60         </Button.LayoutTransform>
    61       </Button>
    62       <Button Template="{StaticResource  doublearrowbtntmpl}" Grid.Row="5" IsEnabled="False" Name="btnCompleteForward" Visibility="Hidden" Click="btnForward_Click">
    63         <Button.LayoutTransform>
    64           <RotateTransform Angle="180"/>
    65         </Button.LayoutTransform>
    66       </Button>
    67     </Grid>
    68 -->
    6942    <Border BorderBrush="Black" BorderThickness="1" Name="border" Grid.Column="1">
    7043      <Grid Name="numbergrid" MouseWheel="numbergrid_MouseWheel">
  • /trunk/CrypPlugins/Primes/Primes/WpfControls/Primegeneration/SieveOfAtkin/SieveOfAtkin.xaml

    r20 r30  
    1010      <ColumnDefinition Width="0.5*"/>
    1111    </Grid.ColumnDefinitions>
    12       <this:Numbergrid x:Name="numbergrid" Grid.Column="0" MinWidth="400" MinHeight="400" Margin="10"/>
     12      <this:Numbergrid x:Name="numbergrid" Grid.Column="0" MinWidth="400" Margin="10"/>
    1313    <comps:LogControl x:Name="log" Grid.Column="1" Margin="10"/>
    1414  </Grid>
  • /trunk/CrypPlugins/Primes/Primes/WpfControls/Primegeneration/SieveOfAtkin/SieveOfAtkinControl.xaml

    r20 r30  
    1111      <RowDefinition Height="*"/>
    1212    </Grid.RowDefinitions>
    13     <GroupBox Grid.Row="0" Header="{x:Static lang:PrimesGeneration.soa_generateprimesto}">
     13<!--
     14      <GroupBox Grid.Row="0" Header="{x:Static lang:PrimesGeneration.soa_generateprimesto}">
    1415      <comps:InputSingleControl x:Name="isc" InputRangeControlType="Horizontal"  FreeTextboxWidth="200" ShowCalcInput="False"/>
    1516      </GroupBox>
     17      -->
    1618    <this:SieveOfAtkin x:Name="soa" Grid.Row="1"/>
    1719  </Grid>
  • /trunk/CrypPlugins/Primes/Primes/WpfControls/Primegeneration/SieveOfAtkin/SieveOfAtkinControl.xaml.cs

    r20 r30  
    219219using LibGmpWrapper;
    220220using Primes.WpfControls.Components;
     221using Primes.WpfControls.Primetest;
    221222
    222223namespace Primes.WpfControls.Primegeneration.SieveOfAtkin
     
    225226  /// Interaction logic for SieveOfAtkinControl.xaml
    226227  /// </summary>
    227   public partial class SieveOfAtkinControl : UserControl, IPrimeMethodDivision
     228  public partial class SieveOfAtkinControl : UserControl, IPrimeTest
    228229  {
    229230    public SieveOfAtkinControl()
     
    231232      InitializeComponent();
    232233      InitInputSingleControl();
    233       soa.Cancel += new Primes.Library.VoidDelegate(soa_Stop);
    234       soa.Start += new Primes.Library.VoidDelegate(soa_Start);
    235       soa.Stop += new Primes.Library.VoidDelegate(soa_Stop);
     234      soa.Cancel += new Primes.Library.VoidDelegate(FireCancelEvent);
     235      soa.Start += new Primes.Library.VoidDelegate(FireStartEvent);
     236      soa.Stop += new Primes.Library.VoidDelegate(FireStopEvent);
    236237    }
    237238
    238239    private void InitInputSingleControl()
    239240    {
    240       isc.Execute += new Primes.WpfControls.Components.ExecuteSingleDelegate(isc_Execute);
    241       isc.Cancel += new Primes.Library.VoidDelegate(isc_Cancel);
    242 
    243       InputValidator<GmpBigInteger> iv = new InputValidator<GmpBigInteger>();
    244       iv.Validator = new BigIntegerMinValueMaxValueValidator(null,GmpBigInteger.Seven,GmpBigInteger.ValueOf(10000));
    245 
    246       isc.AddInputValidator(InputSingleControl.Free, iv);
    247     }
    248     void soa_Stop()
    249     {
    250       isc.UnLockControls();
    251     }
    252 
    253     void soa_Start()
    254     {
    255       isc.LockControls();
    256     }
    257 
    258     void isc_Cancel()
     241
     242      //InputValidator<GmpBigInteger> iv = new InputValidator<GmpBigInteger>();
     243      //iv.Validator = new BigIntegerMinValueMaxValueValidator(null,GmpBigInteger.Seven,GmpBigInteger.ValueOf(10000));
     244
     245      //isc.AddInputValidator(InputSingleControl.Free, iv);
     246    }
     247
     248
     249    #region IPrimeMethodDivision Members
     250
     251    public void Dispose()
     252    {
     253      CancelExecute();
     254    }
     255
     256    public void Init()
     257    {
     258    }
     259
     260    public void SetTab(int i)
     261    {
     262    }
     263
     264    #endregion
     265
     266    #region IPrimeTest Members
     267
     268    public IValidator<GmpBigInteger> Validator
     269    {
     270      get { return new BigIntegerMinValueMaxValueValidator(null, GmpBigInteger.Seven, GmpBigInteger.ValueOf(10000)); }
     271    }
     272
     273    #endregion
     274
     275    #region IPrimeVisualization Members
     276
     277    public event Primes.Library.VoidDelegate Start;
     278
     279    private void FireStartEvent()
     280    {
     281      if (Start != null) Start();
     282    }
     283    public event Primes.Library.VoidDelegate Stop;
     284    private void FireStopEvent()
     285    {
     286      if (Stop != null) Stop();
     287    }
     288
     289    public event Primes.Library.VoidDelegate Cancel;
     290    private void FireCancelEvent()
     291    {
     292      if (Cancel != null) Cancel();
     293    }
     294
     295    public event Primes.Library.CallbackDelegateGetInteger ForceGetInteger;
     296    private void FireForceGetInteger()
     297    {
     298      if (ForceGetInteger != null) ForceGetInteger(new Primes.Library.ExecuteIntegerDelegate(Execute));
     299    }
     300
     301    public event Primes.Library.CallbackDelegateGetInteger ForceGetIntegerInterval;
     302    private void FireForceGetIntegerInterval()
     303    {
     304      if (ForceGetIntegerInterval != null) ForceGetIntegerInterval(new Primes.Library.ExecuteIntegerDelegate(Execute));
     305    }
     306
     307    public void Execute(GmpBigInteger value)
     308    {
     309      soa.Execute(value);
     310    }
     311
     312    public void CancelExecute()
    259313    {
    260314      soa.CancelSieve();
    261     }
    262 
    263     void isc_Execute(LibGmpWrapper.GmpBigInteger value)
    264     {
    265       soa.Execute(value);
    266315     
    267316    }
    268317
    269     #region IPrimeMethodDivision Members
    270 
    271     public void Dispose()
    272     {
    273       isc_Cancel();
    274     }
    275 
    276     public void Init()
    277     {
    278     }
    279 
    280     public void SetTab(int i)
    281     {
     318    public void Execute(GmpBigInteger from, GmpBigInteger to)
     319    {
     320     
    282321    }
    283322
  • /trunk/CrypPlugins/Primes/Primes/WpfControls/PrimesDistribution/Numberline/NumberlineControl.xaml

    r20 r30  
    208208      <RowDefinition Height="*" />
    209209    </Grid.RowDefinitions>
    210     <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,10" Text="{x:Static lang:Distribution.numberline_header}">
     210    <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,0" Text="{x:Static lang:Distribution.numberline_header}">
    211211      </TextBlock>
    212212
     
    280280      </Button>
    281281    </Grid>
    282     <TextBlock Grid.Row="2" TextWrapping="Wrap" Margin="0,0,0,10" Text="{x:Static lang:Distribution.numberline_maxinterval}">
     282    <TextBlock Grid.Row="2" TextWrapping="Wrap" Margin="0,10,0,10" Text="{x:Static lang:Distribution.numberline_maxinterval}">
    283283      </TextBlock>
    284284
     
    314314      </Canvas>
    315315
    316      
     316
    317317    </Grid>
    318318    <StackPanel Grid.Row="2" Margin="0,14,0,0">
     
    344344          Canvas.Left="0" Canvas.Top="0"
    345345          VerticalAlignment="Center"/>
    346        
     346
    347347        <Polygon Grid.Column="2" Points="0,0, 15,0, 7.5,10" Fill="Blue" Stroke="Black" StrokeThickness="0.5" ToolTip="von" VerticalAlignment="Center" Width="0"/>
    348348        <Grid Grid.Column="3" Name="pnlScrollButtons">
     
    355355          </Grid.ColumnDefinitions>
    356356          <Button Grid.Column="0" Cursor="Hand" Template="{StaticResource leftscrollbutton}" Height="30" Width="30" HorizontalAlignment="Left" Name="btnScrollLeft" MouseEnter="btnScroll_MouseEnter" MouseLeave="btnScrollRight_MouseLeave" ToolTip="{x:Static lang:Distribution.numberline_tooltipscrollleft}">
    357           <Button.Resources>
    358             <Style  TargetType="{x:Type Button}">
    359               <Setter Property="Background" Value="WhiteSmoke" />
    360             </Style>
    361           </Button.Resources>
    362         </Button>
    363         <Button Grid.Column="1" Cursor="Hand" Template="{StaticResource leftscrollfastbutton}" Height="30" Width="30" HorizontalAlignment="Left" Name="btnScrollLeft_Fast" MouseEnter="btnScroll_MouseEnter" MouseLeave="btnScrollRight_MouseLeave" ToolTip="{x:Static lang:Distribution.numberline_tooltipscrollleft}">
    364           <Button.Resources>
    365             <Style  TargetType="{x:Type Button}">
    366               <Setter Property="Background" Value="WhiteSmoke" />
    367             </Style>
    368           </Button.Resources>
    369         </Button>
     357            <Button.Resources>
     358              <Style  TargetType="{x:Type Button}">
     359                <Setter Property="Background" Value="WhiteSmoke" />
     360              </Style>
     361            </Button.Resources>
     362          </Button>
     363          <Button Grid.Column="1" Cursor="Hand" Template="{StaticResource leftscrollfastbutton}" Height="30" Width="30" HorizontalAlignment="Left" Name="btnScrollLeft_Fast" MouseEnter="btnScroll_MouseEnter" MouseLeave="btnScrollRight_MouseLeave" ToolTip="{x:Static lang:Distribution.numberline_tooltipscrollleft}">
     364            <Button.Resources>
     365              <Style  TargetType="{x:Type Button}">
     366                <Setter Property="Background" Value="WhiteSmoke" />
     367              </Style>
     368            </Button.Resources>
     369          </Button>
    370370          <StackPanel Grid.Column="2">
    371371            <TextBlock HorizontalAlignment="Center" Text="{x:Static lang:Distribution.numberline_pointsdisplayed}"></TextBlock>
     
    374374
    375375          <Button Cursor="Hand" Template="{StaticResource rightscrollbutton}" Height="30" Width="30" Grid.Column="3" Name="btnScrollRight" MouseEnter="btnScroll_MouseEnter" MouseLeave="btnScrollRight_MouseLeave" ToolTip="{x:Static lang:Distribution.numberline_tooltipscrollright}">
    376           <Button.Resources>
    377             <Style  TargetType="{x:Type Button}">
    378               <Setter Property="Background" Value="WhiteSmoke" />
    379             </Style>
    380           </Button.Resources>
    381         </Button>
    382         <Button Cursor="Hand" Template="{StaticResource rightscrollfastbutton}" Height="30" Width="30" Grid.Column="4" Name="btnScrollRight_Fast" MouseEnter="btnScroll_MouseEnter" MouseLeave="btnScrollRight_MouseLeave" ToolTip="{x:Static lang:Distribution.numberline_tooltipscrollright}">
    383           <Button.Resources>
    384             <Style  TargetType="{x:Type Button}">
    385               <Setter Property="Background" Value="WhiteSmoke" />
    386             </Style>
    387           </Button.Resources>
    388         </Button>
     376            <Button.Resources>
     377              <Style  TargetType="{x:Type Button}">
     378                <Setter Property="Background" Value="WhiteSmoke" />
     379              </Style>
     380            </Button.Resources>
     381          </Button>
     382          <Button Cursor="Hand" Template="{StaticResource rightscrollfastbutton}" Height="30" Width="30" Grid.Column="4" Name="btnScrollRight_Fast" MouseEnter="btnScroll_MouseEnter" MouseLeave="btnScrollRight_MouseLeave" ToolTip="{x:Static lang:Distribution.numberline_tooltipscrollright}">
     383            <Button.Resources>
     384              <Style  TargetType="{x:Type Button}">
     385                <Setter Property="Background" Value="WhiteSmoke" />
     386              </Style>
     387            </Button.Resources>
     388          </Button>
    389389        </Grid>
    390390        <Label Grid.Column="4" VerticalAlignment="Center" Content="{x:Static lang:Distribution.numberline_to}"></Label>
     
    412412
    413413      <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="pnlContent" MinWidth="500" >
    414        
    415           <Grid Margin="7,7,0,0">
    416             <Grid.RowDefinitions>
    417               <RowDefinition Height="Auto" />
    418               <RowDefinition Height="Auto" />
    419               <RowDefinition Height="Auto" />
    420               <RowDefinition Height="Auto" />
    421               <RowDefinition Height="Auto" />
    422               <RowDefinition Height="Auto" />
    423               <RowDefinition Height="Auto" />
    424               <RowDefinition Height="Auto" />
    425               <RowDefinition Height="Auto" />
    426               <RowDefinition Height="Auto" />
    427               <RowDefinition Height="Auto" />
    428               <RowDefinition Height="Auto" />
    429               <RowDefinition Height="Auto" />
    430             </Grid.RowDefinitions>
    431               <Grid Grid.Row="1" >
    432                 <Grid.ColumnDefinitions>
    433                   <ColumnDefinition Width="Auto" />
    434                   <ColumnDefinition Width="Auto" />
    435                   <ColumnDefinition Width="*" />
    436                 </Grid.ColumnDefinitions>
    437                 <TextBlock Text="{x:Static lang:Distribution.numberline_actualnumber}" Grid.Column="0" VerticalAlignment="Center"  />
     414
     415        <Grid Margin="7,7,0,0">
     416          <Grid.RowDefinitions>
     417            <RowDefinition Height="Auto" />
     418            <RowDefinition Height="Auto" />
     419            <RowDefinition Height="Auto" />
     420            <RowDefinition Height="Auto" />
     421            <RowDefinition Height="Auto" />
     422            <RowDefinition Height="Auto" />
     423            <RowDefinition Height="Auto" />
     424            <RowDefinition Height="Auto" />
     425            <RowDefinition Height="Auto" />
     426            <RowDefinition Height="Auto" />
     427            <RowDefinition Height="Auto" />
     428            <RowDefinition Height="Auto" />
     429            <RowDefinition Height="Auto" />
     430          </Grid.RowDefinitions>
     431          <Grid Grid.Row="1" >
     432            <Grid.ColumnDefinitions>
     433              <ColumnDefinition Width="Auto" />
     434              <ColumnDefinition Width="Auto" />
     435              <ColumnDefinition Width="*" />
     436            </Grid.ColumnDefinitions>
     437            <TextBlock Text="{x:Static lang:Distribution.numberline_actualnumber}" Grid.Column="0" VerticalAlignment="Center"  />
    438438                <TextBlock Name="lblActualNumber" Grid.Column="1" TextWrapping="Wrap" FontWeight="Bold" FontSize="15" MaxWidth="100" VerticalAlignment="Center"/>
    439439                <TextBlock Name="lblActualNumberInfo" Grid.Column="2" MaxWidth="100" HorizontalAlignment="Left" VerticalAlignment="Center"/>
    440440              </Grid>
    441             <DockPanel Grid.Row="3">
    442               <TextBlock Margin="5" Text="{x:Static lang:Distribution.numberline_numberofprimes}"></TextBlock>
    443               <TextBlock Margin="5" Name="lblInfoCountPrimes"></TextBlock>
    444             </DockPanel>
    445             <DockPanel Grid.Row="2" Name="pnlNextPrimes" Grid.ColumnSpan="3" Margin="0,0,0,20">
     441          <DockPanel Grid.Row="3">
     442            <TextBlock Margin="5" Text="{x:Static lang:Distribution.numberline_numberofprimes}"></TextBlock>
     443            <TextBlock Margin="5" Name="lblInfoCountPrimes"></TextBlock>
     444          </DockPanel>
     445          <DockPanel Grid.Row="2" Name="pnlNextPrimes" Grid.ColumnSpan="3" Margin="0,0,0,20">
    446446            <TextBlock  Text="{x:Static lang:Distribution.numberline_priorprime}" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,10,0" MaxWidth="150" VerticalAlignment="Center"/>
    447447            <TextBlock Name="lblPriorPrime" TextWrapping="Wrap" FontWeight="Bold" FontSize="15" HorizontalAlignment="Left" MaxWidth="150" />
     
    449449            <TextBlock Name="lblNextPrime" TextWrapping="Wrap" FontWeight="Bold" FontSize="15" HorizontalAlignment="Left" MaxWidth="150"/>
    450450      </DockPanel>
    451             <StackPanel Grid.Row="0" Name="pnlCountPrimes" Grid.ColumnSpan="3" Margin="0,0,0,10">
    452               <DockPanel>
    453                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" MinWidth="100" Name="lblInfoCountPrimesInterval" Text="{x:Static lang:Distribution.numberline_headercoutprimes}"></TextBlock>
    454                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpCountPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0" MinWidth="100"/>
    455               </DockPanel>
    456               <DockPanel>
    457                 <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_countprimespin}"></TextBlock>
    458                 <TextBlock HorizontalAlignment="Left" Name="lblCountPrimesPi" TextWrapping="Wrap"></TextBlock>
    459               </DockPanel>
    460               <DockPanel Margin="0,7,0,0">
    461                 <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_countprimesgauss}"></TextBlock>
    462                 <TextBlock HorizontalAlignment="Left" Name="lblCountPrimesGauss" TextWrapping="Wrap"></TextBlock>
    463 
    464               </DockPanel>
    465             </StackPanel>
    466             <StackPanel Grid.Row="4" Grid.ColumnSpan="3" Margin="0,0,0,7">
    467               <DockPanel>
    468                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_factorization}"></TextBlock>
    469                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpFactorize" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
    470                 <TextBlock Name="lblCalcFactorizationInfo" Margin="0,0,0,0" Visibility="Hidden" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_calculating}"></TextBlock>
    471                 <TextBlock Name="lblCalcFactorization" Margin="0,0,0,0" TextWrapping="Wrap" ></TextBlock>
    472               </DockPanel>
    473               <TextBlock HorizontalAlignment="Left" Name="lblFactors" TextWrapping="Wrap"></TextBlock>
    474             </StackPanel>
    475             <StackPanel Grid.Row="5" Grid.ColumnSpan="3" Margin="0,0,0,7" >
    476               <DockPanel>
    477                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_goldbach}"></TextBlock>
    478                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpGoldbach" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
    479                 <TextBlock TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_goldbachinfo}" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Name="lblGoldbachInfoCalc" Cursor="Hand" Foreground="Blue"></TextBlock>
    480               </DockPanel>
    481               <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Name="gbGoldbach">
    482                 <Grid>
    483                   <Grid.RowDefinitions>
    484                     <RowDefinition Height="Auto"/>
    485 
    486                     <RowDefinition Height="100"/>
    487                   </Grid.RowDefinitions>
    488                   <TextBlock Name="lblCalcGoldbachInfo" Margin="0,0,0,0" Visibility="Hidden" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_calculating}"></TextBlock>
    489                   <comps:LogControl Grid.Row="1" x:Name="logGoldbach" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
    490                 </Grid>
    491               </GroupBox>
    492             </StackPanel>
    493             <StackPanel Grid.Row="6" Grid.ColumnSpan="3" Margin="0,0,0,7" >
    494               <DockPanel>
    495                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_eulerphi}"></TextBlock>
    496                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpEulerPhi" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
    497                 <TextBlock Name="lblCalcEulerPhiInfo" Margin="0,0,0,0" Visibility="Hidden" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
     451          <StackPanel Grid.Row="0" Name="pnlCountPrimes" Grid.ColumnSpan="3" Margin="0,0,0,10">
     452            <DockPanel>
     453              <TextBlock FontWeight="Bold" TextWrapping="Wrap" MinWidth="100" Name="lblInfoCountPrimesInterval" Text="{x:Static lang:Distribution.numberline_headercoutprimes}"></TextBlock>
     454              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpCountPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0" MinWidth="100"/>
     455            </DockPanel>
     456            <DockPanel>
     457              <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_countprimespin}"></TextBlock>
     458              <TextBlock HorizontalAlignment="Left" Name="lblCountPrimesPi" TextWrapping="Wrap"></TextBlock>
     459            </DockPanel>
     460            <DockPanel Margin="0,7,0,0">
     461              <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_countprimesgauss}"></TextBlock>
     462              <TextBlock HorizontalAlignment="Left" Name="lblCountPrimesGauss" TextWrapping="Wrap"></TextBlock>
     463
     464            </DockPanel>
     465          </StackPanel>
     466          <StackPanel Grid.Row="4" Grid.ColumnSpan="3" Margin="0,0,0,7">
     467            <DockPanel>
     468              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_factorization}"></TextBlock>
     469              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpFactorize" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
     470              <TextBlock Name="lblCalcFactorizationInfo" Margin="0,0,0,0" Visibility="Hidden" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_calculating}"></TextBlock>
     471              <TextBlock Name="lblCalcFactorization" Margin="0,0,0,0" TextWrapping="Wrap" ></TextBlock>
     472            </DockPanel>
     473            <TextBlock HorizontalAlignment="Left" Name="lblFactors" TextWrapping="Wrap"></TextBlock>
     474          </StackPanel>
     475          <StackPanel Grid.Row="5" Grid.ColumnSpan="3" Margin="0,0,0,7" >
     476            <DockPanel>
     477              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_goldbach}"></TextBlock>
     478              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpGoldbach" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
     479              <TextBlock TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_goldbachinfo}" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Name="lblGoldbachInfoCalc" Cursor="Hand" Foreground="Blue"></TextBlock>
     480            </DockPanel>
     481            <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Name="gbGoldbach">
     482              <Grid>
     483                <Grid.RowDefinitions>
     484                  <RowDefinition Height="Auto"/>
     485
     486                  <RowDefinition Height="100"/>
     487                </Grid.RowDefinitions>
     488                <TextBlock Name="lblCalcGoldbachInfo" Margin="0,0,0,0" Visibility="Hidden" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_calculating}"></TextBlock>
     489                <comps:LogControl Grid.Row="1" x:Name="logGoldbach" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
     490              </Grid>
     491            </GroupBox>
     492          </StackPanel>
     493          <StackPanel Grid.Row="6" Grid.ColumnSpan="3" Margin="0,0,0,7" >
     494            <DockPanel>
     495              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_eulerphi}"></TextBlock>
     496              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpEulerPhi" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
     497              <TextBlock Name="lblCalcEulerPhiInfo" Margin="0,0,0,0" Visibility="Hidden" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
    498498                 
    499499                </TextBlock>
    500500
    501               </DockPanel>
    502               <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbEulerPhi">
    503                 <Grid>
    504                   <Grid.RowDefinitions>
    505 
    506                     <RowDefinition Height="100"/>
    507                   </Grid.RowDefinitions>
    508                   <comps:LogControl Grid.Row="0" x:Name="logEulerPhi" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
    509                 </Grid>
    510               </GroupBox>
    511             </StackPanel>
    512             <StackPanel Grid.Row="7" Grid.ColumnSpan="3" Margin="0,0,0,7" >
    513               <DockPanel>
    514                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_divcount}" ></TextBlock>
    515                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpTau" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
    516                 <TextBlock Name="lblCalcTauInfo" Margin="0,0,0,0" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
     501            </DockPanel>
     502            <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbEulerPhi">
     503              <Grid>
     504                <Grid.RowDefinitions>
     505
     506                  <RowDefinition Height="100"/>
     507                </Grid.RowDefinitions>
     508                <comps:LogControl Grid.Row="0" x:Name="logEulerPhi" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
     509              </Grid>
     510            </GroupBox>
     511          </StackPanel>
     512          <StackPanel Grid.Row="7" Grid.ColumnSpan="3" Margin="0,0,0,7" >
     513            <DockPanel>
     514              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_divcount}" ></TextBlock>
     515              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpTau" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
     516              <TextBlock Name="lblCalcTauInfo" Margin="0,0,0,0" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
    517517                 
    518518                </TextBlock>
    519519
    520               </DockPanel>
    521               <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbTau">
    522                 <Grid>
    523                   <Grid.RowDefinitions>
    524 
    525                     <RowDefinition Height="100"/>
    526                   </Grid.RowDefinitions>
    527                   <comps:LogControl Grid.Row="0" x:Name="logTau" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
    528                 </Grid>
    529               </GroupBox>
    530             </StackPanel>
    531             <StackPanel Grid.Row="8" Grid.ColumnSpan="3" Margin="0,0,0,7" >
    532               <DockPanel>
    533                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_divsum}"></TextBlock>
    534                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpRho" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
    535                 <TextBlock Name="lblCalcRhoInfo" Margin="0,0,0,0" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
     520            </DockPanel>
     521            <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbTau">
     522              <Grid>
     523                <Grid.RowDefinitions>
     524
     525                  <RowDefinition Height="100"/>
     526                </Grid.RowDefinitions>
     527                <comps:LogControl Grid.Row="0" x:Name="logTau" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
     528              </Grid>
     529            </GroupBox>
     530          </StackPanel>
     531          <StackPanel Grid.Row="8" Grid.ColumnSpan="3" Margin="0,0,0,7" >
     532            <DockPanel>
     533              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_divsum}"></TextBlock>
     534              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpRho" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
     535              <TextBlock Name="lblCalcRhoInfo" Margin="0,0,0,0" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
    536536                 
    537537                </TextBlock>
    538538
    539               </DockPanel>
    540               <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbRho">
    541                 <Grid>
    542                   <Grid.RowDefinitions>
    543 
    544                     <RowDefinition Height="100"/>
    545                   </Grid.RowDefinitions>
    546                   <comps:LogControl Grid.Row="0" x:Name="logRho" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
    547                 </Grid>
    548               </GroupBox>
    549             </StackPanel>
    550             <StackPanel Grid.Row="9" Grid.ColumnSpan="3" Margin="0,0,0,7" >
    551               <DockPanel>
    552                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_eulerphisum}"></TextBlock>
    553                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpDivSum" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
    554                 <TextBlock Name="lblCalcDividerSum" Margin="0,0,0,0" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
     539            </DockPanel>
     540            <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbRho">
     541              <Grid>
     542                <Grid.RowDefinitions>
     543
     544                  <RowDefinition Height="100"/>
     545                </Grid.RowDefinitions>
     546                <comps:LogControl Grid.Row="0" x:Name="logRho" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
     547              </Grid>
     548            </GroupBox>
     549          </StackPanel>
     550          <StackPanel Grid.Row="9" Grid.ColumnSpan="3" Margin="0,0,0,7" >
     551            <DockPanel>
     552              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_eulerphisum}"></TextBlock>
     553              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpDivSum" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
     554              <TextBlock Name="lblCalcDividerSum" Margin="0,0,0,0" TextWrapping="Wrap" MouseLeftButtonDown="lblCalcInfo_MouseLeftButtonDown" Cursor="Hand" Foreground="Blue">
    555555                 
    556556                </TextBlock>
    557557
    558               </DockPanel>
    559               <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbDivSum">
    560                 <Grid>
    561                   <Grid.RowDefinitions>
    562 
    563                     <RowDefinition Height="100"/>
    564                   </Grid.RowDefinitions>
    565                   <comps:LogControl Grid.Row="0" x:Name="logDivSum" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
    566                 </Grid>
    567               </GroupBox>
    568             </StackPanel>
    569             <StackPanel Name="pnlTwinPrimes" Grid.ColumnSpan="3" Grid.Row="10" Margin="0,0,0,7">
    570               <DockPanel>
    571                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" MinWidth="100" Text="{x:Static lang:Distribution.numberline_twinprime}"></TextBlock>
    572                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpTwinPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0" />
    573               </DockPanel>
    574 
    575               <DockPanel>
    576                 <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,7,0" Text="{x:Static lang:Distribution.numberline_priortwinprime}"></TextBlock>
    577                 <TextBlock HorizontalAlignment="Left" Name="lblPriorTwinPrime" TextWrapping="Wrap" ></TextBlock>
    578                 <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Margin="5,0,7,0" Text="{x:Static lang:Distribution.numberline_nexttwinprime}"></TextBlock>
    579                 <TextBlock HorizontalAlignment="Left" Name="lblNextTwinPrime" TextWrapping="Wrap" ></TextBlock>
    580               </DockPanel>
    581               <TextBlock Name="lblTwinPrimes" Visibility="Collapsed" TextWrapping="Wrap"></TextBlock>
    582             </StackPanel>
    583             <StackPanel Name="pnlQuadrupletPrimes" Grid.ColumnSpan="3" Visibility="Collapsed" Grid.Row="11" Margin="0,0,0,10">
    584               <DockPanel>
    585                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_quadtuplet}"></TextBlock>
    586                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpQuadrupletPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
    587               </DockPanel>
    588               <TextBlock Name="lblQuadrupletPrimes" TextWrapping="Wrap"></TextBlock>
    589             </StackPanel>
    590             <StackPanel Name="pnlSixTupletPrimes" Grid.ColumnSpan="3" Visibility="Collapsed" Grid.Row="12">
    591               <DockPanel>
    592                 <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_sixtuplet}"></TextBlock>
    593                 <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpSixTupletPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown"  Margin="0,0,4,0"/>
    594               </DockPanel>
    595               <TextBlock Name="lblSixTupletPrimes" TextWrapping="Wrap"></TextBlock>
    596             </StackPanel>
    597           </Grid>
     558            </DockPanel>
     559            <GroupBox Header="{x:Static lang:Distribution.numberline_progress}" Visibility="Collapsed" Name="gbDivSum">
     560              <Grid>
     561                <Grid.RowDefinitions>
     562
     563                  <RowDefinition Height="100"/>
     564                </Grid.RowDefinitions>
     565                <comps:LogControl Grid.Row="0" x:Name="logDivSum" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Title=""/>
     566              </Grid>
     567            </GroupBox>
     568          </StackPanel>
     569          <StackPanel Name="pnlTwinPrimes" Grid.ColumnSpan="3" Grid.Row="10" Margin="0,0,0,7">
     570            <DockPanel>
     571              <TextBlock FontWeight="Bold" TextWrapping="Wrap" MinWidth="100" Text="{x:Static lang:Distribution.numberline_twinprime}"></TextBlock>
     572              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpTwinPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0" />
     573            </DockPanel>
     574
     575            <DockPanel>
     576              <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Margin="0,0,7,0" Text="{x:Static lang:Distribution.numberline_priortwinprime}"></TextBlock>
     577              <TextBlock HorizontalAlignment="Left" Name="lblPriorTwinPrime" TextWrapping="Wrap" ></TextBlock>
     578              <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Margin="5,0,7,0" Text="{x:Static lang:Distribution.numberline_nexttwinprime}"></TextBlock>
     579              <TextBlock HorizontalAlignment="Left" Name="lblNextTwinPrime" TextWrapping="Wrap" ></TextBlock>
     580            </DockPanel>
     581            <TextBlock Name="lblTwinPrimes" Visibility="Collapsed" TextWrapping="Wrap"></TextBlock>
     582          </StackPanel>
     583          <StackPanel Name="pnlQuadrupletPrimes" Grid.ColumnSpan="3" Visibility="Collapsed" Grid.Row="11" Margin="0,0,0,10">
     584            <DockPanel>
     585              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_quadtuplet}"></TextBlock>
     586              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpQuadrupletPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown" Margin="0,0,4,0"/>
     587            </DockPanel>
     588            <TextBlock Name="lblQuadrupletPrimes" TextWrapping="Wrap"></TextBlock>
     589          </StackPanel>
     590          <StackPanel Name="pnlSixTupletPrimes" Grid.ColumnSpan="3" Visibility="Collapsed" Grid.Row="12">
     591            <DockPanel>
     592              <TextBlock FontWeight="Bold" TextWrapping="Wrap" Text="{x:Static lang:Distribution.numberline_sixtuplet}"></TextBlock>
     593              <Image Cursor="Hand" Source="../../../Resources/icons/help.png" Width="16" Height="16" Name="btnHelpSixTupletPrimes" HorizontalAlignment="Left"  MouseLeftButtonDown="btnHelp_MouseLeftButtonDown"  Margin="0,0,4,0"/>
     594            </DockPanel>
     595            <TextBlock Name="lblSixTupletPrimes" TextWrapping="Wrap"></TextBlock>
     596          </StackPanel>
     597        </Grid>
    598598
    599599
  • /trunk/CrypPlugins/Primes/Primes/WpfControls/Primetest/PrimetestControl.xaml

    r20 r30  
    66             xmlns:millerrabin="clr-namespace:Primes.WpfControls.Primetest.MillerRabin"
    77             xmlns:fermat="clr-namespace:Primes.WpfControls.Primetest.TestOfFermat"
     8             xmlns:soa="clr-namespace:Primes.WpfControls.Primegeneration.SieveOfAtkin"
    89             xmlns:comps="clr-namespace:Primes.WpfControls.Components"
    910             xmlns:lang="clr-namespace:Primes.Resources.lang.WpfControls.Primetest"
     
    5354        <millerrabin:MillerRabinControl x:Name="millerrabin"  VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
    5455      </comps:HelpTabItem>
    55     </TabControl>
     56        <comps:HelpTabItem Header="{x:Static lang:Primetest.test_soa}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" x:Name="tabItemSoa" HelpButtonClick="TabItem_HelpButtonClick" >
     57          <soa:SieveOfAtkinControl x:Name="soa"  VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
     58        </comps:HelpTabItem>
     59      </TabControl>
    5660
    5761
  • /trunk/CrypPlugins/Primes/Primes/WpfControls/Primetest/PrimetestControl.xaml.cs

    r20 r30  
    1 /*                              Apache License
     1
     2/*                              Apache License
    23                           Version 2.0, January 2004
    34                        http://www.apache.org/licenses/
     
    335336        else if (tbctrl.SelectedItem == tabItemMillerRabin)
    336337          return millerrabin;
     338        else if (tbctrl.SelectedItem == tabItemSoa)
     339          return soa;
    337340        else return null;
    338341      }
     
    399402        OnlineHelp.OnlineHelpAccess.ShowOnlineHelp(Primes.OnlineHelp.OnlineHelpActions.Primetest_MillerRabin);
    400403      }
     404      else if (sender == tabItemSoa)
     405      {
     406        OnlineHelp.OnlineHelpAccess.ShowOnlineHelp(Primes.OnlineHelp.OnlineHelpActions.Generation_SieveOfAtkin);
     407      }
     408
    401409    }
    402410  }
  • /trunk/CrypPlugins/Primes/Primes/WpfVisualization/Navigation/Navigation.xaml

    r20 r30  
    3737          <x:Static Member="lang:Navigation.qs"></x:Static>
    3838          </Hyperlink>
     39
    3940      </TreeViewItem>
    4041      <TreeViewItem Header="{x:Static lang:Navigation.primetest}" IsExpanded="True" Expanded="TreeViewItem_Expanded" Collapsed="TreeViewItem_Expanded">
     
    4445        <Hyperlink Name="lnkTestMillerRabin" Click="lnk_Click">
    4546          <x:Static Member="lang:Navigation.millerrabin"></x:Static></Hyperlink>
     47        <Hyperlink Name="lnkSieveOfAtkin" Click="lnk_Click">
     48          <x:Static Member="lang:Navigation.sieveofatkin"></x:Static>
     49
     50        </Hyperlink>
     51
    4652      </TreeViewItem>
    4753      <Hyperlink Name="lnkGenPrimes" Click="lnk_Click">
    4854        <x:Static Member="lang:Navigation.genprimes"></x:Static>
    4955        </Hyperlink>
    50       <Hyperlink Name="lnkSieveOfAtkin" Click="lnk_Click">
    51         <x:Static Member="lang:Navigation.sieveofatkin"></x:Static>
    52        
    53       </Hyperlink>
    5456
    5557      <TreeViewItem Header="{x:Static lang:Navigation.distribution}" IsExpanded="True" Expanded="TreeViewItem_Expanded" Collapsed="TreeViewItem_Expanded">
  • /trunk/CrypPlugins/Primes/Primes/WpfVisualization/PrimesControl.xaml.cs

    r20 r30  
    360360          break;
    361361        case NavigationCommandType.SieveOfAtkin:
    362           if (m_SieveOfAtkinControl == null) m_SieveOfAtkinControl = new SieveOfAtkinControl();
    363           SetUserControl(m_SieveOfAtkinControl);
     362          if (m_PrimetestControl == null) m_PrimetestControl = new PrimetestControl();
     363
     364          //if (m_SieveOfAtkinControl == null) m_SieveOfAtkinControl = new SieveOfAtkinControl();
     365          SetUserControl(m_PrimetestControl,3);
    364366          break;
    365367
  • /trunk/CrypPlugins/Primes/PrimesStandalone.sln

    r20 r30  
    77EndProject
    88Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primes.Standalone", "Primes.Standalone\Primes.Standalone.csproj", "{BF52E371-532E-49B1-81D0-0F0E6657C147}"
     9EndProject
     10Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypCore", "..\..\CrypCore\CrypCore.csproj", "{FF5D473C-0716-4D3E-9078-2EBD979F94C6}"
     11EndProject
     12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypUiPluginBase", "..\..\CrypUiPluginBase\CrypUiPluginBase.csproj", "{928CF4D4-3967-41C7-9962-BA9FB40FAD9A}"
    913EndProject
    1014Global
     
    2630                {BF52E371-532E-49B1-81D0-0F0E6657C147}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2731                {BF52E371-532E-49B1-81D0-0F0E6657C147}.Release|Any CPU.Build.0 = Release|Any CPU
     32                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     33                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     34                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     35                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|Any CPU.Build.0 = Release|Any CPU
     36                {928CF4D4-3967-41C7-9962-BA9FB40FAD9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     37                {928CF4D4-3967-41C7-9962-BA9FB40FAD9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     38                {928CF4D4-3967-41C7-9962-BA9FB40FAD9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
     39                {928CF4D4-3967-41C7-9962-BA9FB40FAD9A}.Release|Any CPU.Build.0 = Release|Any CPU
    2840        EndGlobalSection
    2941        GlobalSection(SolutionProperties) = preSolution
  • /trunk/CrypTool 2.0.sln

    r20 r30  
    9393EndProject
    9494Project("{8BC9CEB9-8B4A-11D0-8D11-00A0C91BC942}") = "CrypWin.exe", "CrypWin\bin\Debug\CrypWin.exe", "{4106F971-1A59-4900-871A-25FC4699BD85}"
     95EndProject
     96Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKCS5", "CrypPlugins\PKCS5\PKCS5.csproj", "{80200C92-77FC-4508-B520-D51530BE2608}"
    9597EndProject
    9698Global
     
    560562                {4106F971-1A59-4900-871A-25FC4699BD85}.Release|Any CPU.ActiveCfg = Debug
    561563                {4106F971-1A59-4900-871A-25FC4699BD85}.Release|Mixed Platforms.ActiveCfg = Debug
     564                {80200C92-77FC-4508-B520-D51530BE2608}.Debug|.NET.ActiveCfg = Debug|Any CPU
     565                {80200C92-77FC-4508-B520-D51530BE2608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     566                {80200C92-77FC-4508-B520-D51530BE2608}.Debug|Any CPU.Build.0 = Debug|Any CPU
     567                {80200C92-77FC-4508-B520-D51530BE2608}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     568                {80200C92-77FC-4508-B520-D51530BE2608}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     569                {80200C92-77FC-4508-B520-D51530BE2608}.Release|.NET.ActiveCfg = Release|Any CPU
     570                {80200C92-77FC-4508-B520-D51530BE2608}.Release|Any CPU.ActiveCfg = Release|Any CPU
     571                {80200C92-77FC-4508-B520-D51530BE2608}.Release|Any CPU.Build.0 = Release|Any CPU
     572                {80200C92-77FC-4508-B520-D51530BE2608}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     573                {80200C92-77FC-4508-B520-D51530BE2608}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    562574        EndGlobalSection
    563575        GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.