1.1 --- a/Interface/Interface.cs	Sat Oct 25 13:35:11 2014 +0200
     1.2 +++ b/Interface/Interface.cs	Sun Oct 26 16:16:57 2014 +0100
     1.3 @@ -126,8 +126,14 @@
     1.4          public Bitmap Bitmap { get; set; }
     1.5  
     1.6          //
     1.7 -        public bool HasBitmap { get{ return Bitmap!=null;} }
     1.8 -
     1.9 +        public bool IsBitmap { get{ return Bitmap!=null;} }
    1.10 +        //
    1.11 +        public bool IsText { get { return Bitmap == null; } }
    1.12 +        //
    1.13 +        public bool IsSameLayout(DataField aField)
    1.14 +        {
    1.15 +            return (aField.ColumnSpan == ColumnSpan && aField.RowSpan == RowSpan);
    1.16 +        }
    1.17      }
    1.18  
    1.19      /// <summary>
    1.20 @@ -156,27 +162,19 @@
    1.21          void SetLayout(TableLayout aLayout);
    1.22  
    1.23          /// <summary>
    1.24 -        /// Put the given text in the given field on your display.
    1.25 -        /// Fields are often just lines of text.
    1.26 +        /// Set the given field on your display.
    1.27 +        /// Fields are often just lines of text or bitmaps.
    1.28          /// </summary>
    1.29          /// <param name="aTextFieldIndex"></param>
    1.30          [OperationContract(IsOneWay = true)]
    1.31 -        void SetText(DataField aField);
    1.32 +        void SetField(DataField aField);
    1.33  
    1.34          /// <summary>
    1.35 -        /// Allows a client to set multiple text fields at once.
    1.36 +        /// Allows a client to set multiple fields at once.
    1.37          /// </summary>
    1.38 -        /// <param name="aTexts"></param>
    1.39 +        /// <param name="aFields"></param>
    1.40          [OperationContract(IsOneWay = true)]
    1.41 -        void SetTexts(System.Collections.Generic.IList<DataField> aFields);
    1.42 -
    1.43 -        /// <summary>
    1.44 -        /// Put the given bitmap in the given field on your display.
    1.45 -        /// Fields are often just lines of text.
    1.46 -        /// </summary>
    1.47 -        /// <param name="aBitmapField"></param>
    1.48 -        [OperationContract(IsOneWay = true)]
    1.49 -        void SetBitmap(DataField aBitmapField);
    1.50 +        void SetFields(System.Collections.Generic.IList<DataField> aFields);
    1.51  
    1.52          /// <summary>
    1.53          /// Provides the number of clients currently connected