Ignore:
Timestamp:
Dec 16, 2009, 9:09:13 PM (12 years ago)
Author:
Thomas Schmid
Message:
  • changed startup: MainWindow is hidden when splash screen is shown
  • fixed #94
  • new bins
Location:
trunk/CrypPlugins/Concatenate
Files:
2 edited

Legend:

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

    r419 r1025  
    351351          switch (settings.CurrentDataType)
    352352          {
     353            #region CryptoolStream
    353354            case ConcatenateSettings.DataTypes.CryptoolStream:
    354355              CryptoolStream stream1 = val1 as CryptoolStream;
    355356              CryptoolStream stream2 = val2 as CryptoolStream;
    356357              CryptoolStream returnStream = new CryptoolStream();
    357               returnStream.OpenWrite(this.GetPluginInfoAttribute().Caption);
    358 
     358              returnStream.OpenWrite();
    359359              byte[] byteValues = new byte[1024];
    360360              int byteRead;
     
    384384              }
    385385              returnStream.Close();
     386              stream1.Position = 0;
     387              stream2.Position = 0;
    386388              setOutputInternal(outputOne, returnStream);
    387389              break;
     390            #endregion
     391            #region String
    388392            case ConcatenateSettings.DataTypes.String:
    389393              setOutputInternal(outputOne, (val1 as string) + (val2 as string));
    390394              break;
     395            #endregion
     396            #region ByteArray
    391397            case ConcatenateSettings.DataTypes.ByteArray:
    392398              byte[] arrReturn = new byte[(val1 as byte[]).Length + (val2 as byte[]).Length];
     
    395401              setOutputInternal(outputOne, arrReturn);
    396402              break;
     403            #endregion
     404            #region Boolean
    397405            case ConcatenateSettings.DataTypes.Boolean:
    398406              Nullable<bool> boolValue = ((bool)val1) && ((bool)val2);
    399407              setOutputInternal(outputOne, boolValue);
    400408              break;
     409            #endregion
     410            #region Integer
    401411            case ConcatenateSettings.DataTypes.Integer:
    402412              int? intValue = ((int)val1) + ((int)val2);
    403413              setOutputInternal(outputOne, intValue);
    404414              break;
     415            #endregion
    405416            default:
    406417              break;
     
    427438        {
    428439          DicDynamicProperties[propertyKey].Value = value;
    429           if (value is CryptoolStream) listCryptoolStreamsOut.Add((CryptoolStream)value);
     440          if (value is CryptoolStream)
     441            listCryptoolStreamsOut.Add((CryptoolStream)value);
    430442          OnPropertyChanged(propertyKey);
    431443        }
  • trunk/CrypPlugins/Concatenate/Concatenate.csproj

    r4 r1025  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>9.0.21022</ProductVersion>
     6    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{71F1475B-53C4-4188-A01D-30DA4F63B77F}</ProjectGuid>
     
    2424    <ErrorReport>prompt</ErrorReport>
    2525    <WarningLevel>4</WarningLevel>
     26    <PlatformTarget>x86</PlatformTarget>
    2627  </PropertyGroup>
    2728  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Note: See TracChangeset for help on using the changeset viewer.