Changeset 565


Ignore:
Timestamp:
Sep 23, 2009, 2:47:43 PM (12 years ago)
Author:
Matthäus Wander
Message:

Comparator:

  • review and minor cleanup
  • added ComparatorTmp to demonstrate defect #82
Location:
trunk
Files:
7 added
4 edited

Legend:

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

    r538 r565  
    7070        }
    7171
    72         [PropertyInfo(Direction.InputData, "Input one", "Input one.", "", true, true, DisplayLevel.Beginner, QuickWatchFormat.Text, null)]
     72        [PropertyInfo(Direction.InputData, "Input one", "Input one.", "", true, false, DisplayLevel.Beginner, QuickWatchFormat.Text, null)]
    7373        public object InputOne
    7474        {
     
    8686        }
    8787
    88         [PropertyInfo(Direction.InputData, "Input two", "Input two.", "", true, true, DisplayLevel.Beginner, QuickWatchFormat.Text, null)]
     88        [PropertyInfo(Direction.InputData, "Input two", "Input two.", "", true, false, DisplayLevel.Beginner, QuickWatchFormat.Text, null)]
    8989        public object InputTwo
    9090        {
     
    254254
    255255                        }
     256                    //if operator is <=
    256257                    case 4:
    257258                        {
     
    307308
    308309                        }
    309 
     310                    //if operator is >=
    310311                    case 5:
    311312                        {
  • trunk/CrypPlugins/Comparators/ComparatorsSettings.cs

    r513 r565  
    2727namespace Cryptool.Plugins.Comparators
    2828{
    29     class ComparatorsSettings : ISettings
     29    public class ComparatorsSettings : ISettings
    3030    {
    3131        #region private variables
     
    4141            set
    4242            {
    43                 if ((int)value != this.comparator)
     43                if (value != this.comparator)
    4444                {
    45                     this.comparator = (int)value;
     45                    this.comparator = value;
    4646                    OnPropertyChanged("Comparator");
    4747                    HasChanges = true;
    4848
    49                     switch (comparator)
    50                     {
    51                         case 0:
    52                             ChangePluginIcon(0);
    53                             break;
    54                         case 1:
    55                             ChangePluginIcon(1);
    56                             break;
    57                         case 2:
    58                             ChangePluginIcon(2);
    59                             break;
    60                         case 3:
    61                             ChangePluginIcon(3);
    62                             break;
    63                         case 4:
    64                             ChangePluginIcon(4);
    65                             break;
    66                         case 5:
    67                             ChangePluginIcon(5);
    68                             break;
    69                     }
     49                    ChangePluginIcon(comparator);
    7050                }
    7151            }
     
    9373        }
    9474        public event StatusChangedEventHandler OnPluginStatusChanged;
    95         private void ChangePluginIcon(int Icon)
     75        private void ChangePluginIcon(int iconIndex)
    9676        {
    97             if (OnPluginStatusChanged != null) OnPluginStatusChanged(null, new StatusEventArgs(StatusChangedMode.ImageUpdate, Icon));
     77            if (OnPluginStatusChanged != null) OnPluginStatusChanged(null, new StatusEventArgs(StatusChangedMode.ImageUpdate, iconIndex));
    9878        }
    9979        #endregion
  • trunk/CrypPlugins/Comparators/Properties/AssemblyInfo.cs

    r488 r565  
    3333// übernehmen, indem Sie "*" eingeben:
    3434// [assembly: AssemblyVersion("1.0.*")]
    35 [assembly: AssemblyVersion("1.0.0.0")]
    36 [assembly: AssemblyFileVersion("1.0.0.0")]
     35[assembly: AssemblyVersion("2.0.*")]
     36//[assembly: AssemblyFileVersion("1.0.0.0")]
  • trunk/CrypTool 2.0.sln

    r553 r565  
    155155Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDES", "CrypPlugins\SDES\SDES.csproj", "{68FF3A1A-16F7-4657-B79F-5A12F884F442}"
    156156EndProject
    157 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSA", "CrypPlugins\RSA\RSA.csproj", "{3B8E9238-C7DB-4450-A254-3E4DC3964B1A}"
     157Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSA", "CrypPlugins\RSA\RSA.csproj", "{B682CEB4-86F6-4C0D-918C-232C82E75673}"
    158158EndProject
    159159Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuadraticSieve", "CrypPlugins\QuadraticSieve\QuadraticSieve.csproj", "{D71E93D0-27FE-41AA-8F15-0EE959DB4342}"
     
    883883                {68FF3A1A-16F7-4657-B79F-5A12F884F442}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
    884884                {68FF3A1A-16F7-4657-B79F-5A12F884F442}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    885                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Debug|.NET.ActiveCfg = Debug|Any CPU
    886                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    887                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
    888                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    889                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    890                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Release|.NET.ActiveCfg = Release|Any CPU
    891                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    892                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Release|Any CPU.Build.0 = Release|Any CPU
    893                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
    894                 {3B8E9238-C7DB-4450-A254-3E4DC3964B1A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     885                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Debug|.NET.ActiveCfg = Debug|Any CPU
     886                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     887                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Debug|Any CPU.Build.0 = Debug|Any CPU
     888                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     889                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     890                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Release|.NET.ActiveCfg = Release|Any CPU
     891                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Release|Any CPU.ActiveCfg = Release|Any CPU
     892                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Release|Any CPU.Build.0 = Release|Any CPU
     893                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     894                {B682CEB4-86F6-4C0D-918C-232C82E75673}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    895895                {D71E93D0-27FE-41AA-8F15-0EE959DB4342}.Debug|.NET.ActiveCfg = Debug|Any CPU
    896896                {D71E93D0-27FE-41AA-8F15-0EE959DB4342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Note: See TracChangeset for help on using the changeset viewer.