Added Include/Exclude filters to dispatchers

Author: vincentparrett

demos/Fmx/Main.fmx

@@ -2,8 +2,8 @@ object Form2: TForm2
   Left = 0
   Top = 0
   Caption = 'Form2'
-  ClientHeight = 432
-  ClientWidth = 923
+  ClientHeight = 479
+  ClientWidth = 935
   FormFactor.Width = 320
   FormFactor.Height = 480
   FormFactor.Devices = [Desktop]
@@ -15,25 +15,17 @@ object Form2: TForm2
     Size.Width = 433.000000000000000000
     Size.Height = 297.000000000000000000
     Size.PlatformDefault = False
-    inherited LogMemo: TMemo
-      Viewport.Width = 381.000000000000000000
-      Viewport.Height = 229.000000000000000000
-    end
   end
   inline rx2: TFrame1
     Position.X = 472.000000000000000000
     Position.Y = 16.000000000000000000
     Size.Width = 431.000000000000000000
     Size.Height = 297.000000000000000000
     Size.PlatformDefault = False
-    inherited LogMemo: TMemo
-      Viewport.Width = 381.000000000000000000
-      Viewport.Height = 229.000000000000000000
-    end
   end
   object helloButton: TButton
     Position.X = 40.000000000000000000
-    Position.Y = 328.000000000000000000
+    Position.Y = 344.000000000000000000
     Size.Width = 137.000000000000000000
     Size.Height = 22.000000000000000000
     Size.PlatformDefault = False
@@ -43,7 +35,7 @@ object Form2: TForm2
   end
   object goodbyeButton: TButton
     Position.X = 216.000000000000000000
-    Position.Y = 328.000000000000000000
+    Position.Y = 344.000000000000000000
     Size.Width = 137.000000000000000000
     Size.Height = 22.000000000000000000
     Size.PlatformDefault = False
@@ -53,7 +45,7 @@ object Form2: TForm2
   end
   object thdSendButton: TButton
     Position.X = 40.000000000000000000
-    Position.Y = 368.000000000000000000
+    Position.Y = 384.000000000000000000
     Size.Width = 209.000000000000000000
     Size.Height = 22.000000000000000000
     Size.PlatformDefault = False
@@ -63,7 +55,7 @@ object Form2: TForm2
   end
   object Button1: TButton
     Position.X = 416.000000000000000000
-    Position.Y = 328.000000000000000000
+    Position.Y = 344.000000000000000000
     Size.Width = 177.000000000000000000
     Size.Height = 22.000000000000000000
     Size.PlatformDefault = False
@@ -74,8 +66,15 @@ object Form2: TForm2
   object chkAsync: TCheckBox
     IsChecked = True
     Position.X = 272.000000000000000000
-    Position.Y = 371.000000000000000000
+    Position.Y = 387.000000000000000000
     TabOrder = 6
     Text = 'Async'
   end
+  object chkExclude: TCheckBox
+    Position.X = 272.000000000000000000
+    Position.Y = 312.000000000000000000
+    TabOrder = 7
+    Text = 'Exclude Goodbye'
+    OnChange = chkExcludeChange
+  end
 end

demos/Fmx/Main.pas

@@ -5,8 +5,8 @@ interface
 uses
   System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants,
   FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs,
-  VSoft.Messaging, FMX.Controls.Presentation, FMX.ScrollBox, FMX.Memo,
-  MsgDemoFMXFrame, MsgDemoMessages, FMX.StdCtrls;
+  VSoft.Messaging, FMX.Controls.Presentation, FMX.Memo,
+  MsgDemoFMXFrame, FMX.StdCtrls;
 
 type
   TForm2 = class(TForm)
@@ -17,11 +17,13 @@   TForm2 = class(TForm)
     thdSendButton: TButton;
     Button1: TButton;
     chkAsync: TCheckBox;
+    chkExclude: TCheckBox;
     procedure FormCreate(Sender: TObject);
     procedure helloButtonClick(Sender: TObject);
     procedure goodbyeButtonClick(Sender: TObject);
     procedure thdSendButtonClick(Sender: TObject);
     procedure Button1Click(Sender: TObject);
+    procedure chkExcludeChange(Sender: TObject);
   private
     { Private declarations }
     FChannel : IMessageChannel;
@@ -34,6 +36,9 @@   TForm2 = class(TForm)
 
 implementation
 
+uses
+  MsgDemoMessages;
+
 {$R *.fmx}
 
 procedure TForm2.Button1Click(Sender: TObject);
@@ -44,6 +49,14 @@ procedure TForm2.Button1Click(Sender: TObject);
   FChannel.Queue.SendMessage(msg);
 end;
 
+procedure TForm2.chkExcludeChange(Sender: TObject);
+begin
+  if chkExclude.IsChecked then
+    rx1.SetExcludeFilter([DEMO_MSG_GOODBYE])
+  else
+    rx1.SetExcludeFilter([]);
+end;
+
 procedure TForm2.FormCreate(Sender: TObject);
 begin
   FChannel := TMessageChannelFactory.CreateChannel;

demos/Fmx/MsgDemoFMXFrame.fmx

@@ -2,17 +2,15 @@ object Frame1: TFrame1
   Size.Width = 431.000000000000000000
   Size.Height = 292.000000000000000000
   Size.PlatformDefault = False
+  TabOrder = 0
   object LogMemo: TMemo
     Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
-    DataDetectorTypes = []
     Position.X = 32.000000000000000000
     Position.Y = 24.000000000000000000
     Size.Width = 385.000000000000000000
     Size.Height = 233.000000000000000000
     Size.PlatformDefault = False
     TabOrder = 0
-    Viewport.Width = 381.000000000000000000
-    Viewport.Height = 229.000000000000000000
   end
   object ProgressBar1: TProgressBar
     Orientation = Horizontal

demos/Fmx/MsgDemoFMXFrame.pas

@@ -5,7 +5,7 @@ interface
 uses
   System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants, 
   FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls,
-  FMX.Controls.Presentation, FMX.ScrollBox, FMX.Memo, VSoft.Messaging, MsgDemoMessages;
+  FMX.Controls.Presentation, FMX.Memo, VSoft.Messaging, MsgDemoMessages, FMX.Layouts;
 
 type
   TFrame1 = class(TFrame)
@@ -21,6 +21,7 @@   TFrame1 = class(TFrame)
   public
     { Public declarations }
     procedure Init(const channel : IMessageChannel);
+    procedure SetExcludeFilter(const filter : TArray<Cardinal>);
     constructor Create(AOwner: TComponent); override;
     destructor Destroy;override;
   end;
@@ -70,4 +71,9 @@ procedure TFrame1.Progress(var msg: TProgressMessage);
   ProgressBar1.Value := msg.Progress;
 end;
 
+procedure TFrame1.SetExcludeFilter(const filter: TArray<Cardinal>);
+begin
+  FDispatcher.ExcludeFilter := filter;
+end;
+
 end.

demos/Vcl/MsgDemoMainForm.dfm

@@ -52,7 +52,7 @@ object Form2: TForm2
   end
   object helloButton: TButton
     Left = 16
-    Top = 248
+    Top = 280
     Width = 105
     Height = 25
     Caption = 'Say Hello'
@@ -61,7 +61,7 @@ object Form2: TForm2
   end
   object goodbyeButton: TButton
     Left = 191
-    Top = 248
+    Top = 280
     Width = 106
     Height = 25
     Caption = 'Say GoodBye'
@@ -70,7 +70,7 @@ object Form2: TForm2
   end
   object thrdSendButton: TButton
     Left = 16
-    Top = 288
+    Top = 320
     Width = 156
     Height = 25
     Caption = 'PostMessage from Thread'
@@ -79,7 +79,7 @@ object Form2: TForm2
   end
   object sayHelloSyncButton: TButton
     Left = 328
-    Top = 248
+    Top = 280
     Width = 137
     Height = 25
     Caption = 'Say Hello Sync'
@@ -88,12 +88,21 @@ object Form2: TForm2
   end
   object chkAsync: TCheckBox
     Left = 191
-    Top = 292
+    Top = 324
     Width = 97
     Height = 17
     Caption = 'Async'
     Checked = True
     State = cbChecked
     TabOrder = 6
   end
+  object chkExclude: TCheckBox
+    Left = 191
+    Top = 239
+    Width = 129
+    Height = 17
+    Caption = 'Exclude Goodbye'
+    TabOrder = 7
+    OnClick = chkExcludeClick
+  end
 end

demos/Vcl/MsgDemoMainForm.pas

@@ -16,11 +16,13 @@   TForm2 = class(TForm)
     thrdSendButton: TButton;
     sayHelloSyncButton: TButton;
     chkAsync: TCheckBox;
+    chkExclude: TCheckBox;
     procedure FormCreate(Sender: TObject);
     procedure helloButtonClick(Sender: TObject);
     procedure goodbyeButtonClick(Sender: TObject);
     procedure thrdSendButtonClick(Sender: TObject);
     procedure sayHelloSyncButtonClick(Sender: TObject);
+    procedure chkExcludeClick(Sender: TObject);
   private
     FChannel : IMessageChannel;
   public
@@ -37,6 +39,14 @@ implementation
 uses
   MsgDemoMessages;
 
+procedure TForm2.chkExcludeClick(Sender: TObject);
+begin
+  if chkExclude.Checked then
+    rx1.SetExcludeFilter([DEMO_MSG_GOODBYE])
+  else
+    rx1.SetExcludeFilter([]);
+end;
+
 procedure TForm2.FormCreate(Sender: TObject);
 begin
   FChannel := TMessageChannelFactory.CreateChannel;

demos/Vcl/MsgFrame.pas

@@ -22,6 +22,7 @@   TMsgRecieverFrame = class(TFrame)
   public
     { Public declarations }
     procedure Init(const channel : IMessageChannel);
+    procedure SetExcludeFilter(const filter : TArray<Cardinal>);
     constructor Create(AOwner: TComponent); override;
     destructor Destroy;override;
   end;
@@ -35,8 +36,9 @@ implementation
 constructor TMsgRecieverFrame.Create(AOwner: TComponent);
 begin
   inherited;
-  FDispatcher := TMessageDispatcherFactory.CreateUIDispatcher; //note it's  a UI message dispatcher, it will use Synchronize
-  FDispatcher.Target := Self; //Dispatch the messages to this object.
+  //either pass in the target for the messages, or set the Target Property.
+  FDispatcher := TMessageDispatcherFactory.CreateUIDispatcher(self); //note it's  a UI message dispatcher, it will use Synchronize
+//  FDispatcher.Target := Self; //Dispatch the messages to this object.
 
 end;
 
@@ -69,4 +71,9 @@ procedure TMsgRecieverFrame.Progress(var msg: TProgressMessage);
 
 end;
 
+procedure TMsgRecieverFrame.SetExcludeFilter(const filter: TArray<Cardinal>);
+begin
+  FDispatcher.ExcludeFilter := filter;
+end;
+
 end.