Added option for SqueezeLog v2.0

Signed-off-by: Giuseppe Monteleone <[email protected]>
geppo12 · May 30, 2011 · cf2ab59 · cf2ab59
1 parent 71a1eed
commit cf2ab59
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/LogConsole/LogConsole.dproj b/LogConsole/LogConsole.dproj
@@ -123,7 +123,7 @@
 						<VersionInfo Name="MajorVer">0</VersionInfo>
 						<VersionInfo Name="MinorVer">4</VersionInfo>
 						<VersionInfo Name="Release">0</VersionInfo>
-						<VersionInfo Name="Build">72</VersionInfo>
+						<VersionInfo Name="Build">73</VersionInfo>
 						<VersionInfo Name="Debug">False</VersionInfo>
 						<VersionInfo Name="PreRelease">False</VersionInfo>
 						<VersionInfo Name="Special">False</VersionInfo>
@@ -135,7 +135,7 @@
 					<VersionInfoKeys>
 						<VersionInfoKeys Name="CompanyName"/>
 						<VersionInfoKeys Name="FileDescription"/>
-						<VersionInfoKeys Name="FileVersion">0.4.0.72</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">0.4.0.73</VersionInfoKeys>
 						<VersionInfoKeys Name="InternalName"/>
 						<VersionInfoKeys Name="LegalCopyright"/>
 						<VersionInfoKeys Name="LegalTrademarks"/>

diff --git a/LogConsole/LogConsole.res b/LogConsole/LogConsole.res
diff --git a/LogConsole/UMain.dfm b/LogConsole/UMain.dfm
@@ -230,6 +230,14 @@ object fmMain: TfmMain
         Height = 21
         TabOrder = 1
       end
+      object cbSqzLog20: TCheckBox
+        Left = 248
+        Top = 18
+        Width = 129
+        Height = 17
+        Caption = 'Tag Support (v 2.0)'
+        TabOrder = 3
+      end
     end
   end
   object cbFilterEnable: TCheckBox

diff --git a/LogConsole/UMain.pas b/LogConsole/UMain.pas
@@ -69,6 +69,7 @@   TfmMain = class(TForm)
     odSequence: TOpenDialog;
     lbSeqOutText: TListBox;
     btnMarkerEdit: TButton;
+    cbSqzLog20: TCheckBox;
     procedure btnSeqCancelClick(Sender: TObject);
     procedure btnFilterEditClick(Sender: TObject);
     procedure btnMarkerEditClick(Sender: TObject);
@@ -195,7 +196,7 @@ procedure TfmMain.FormCreate(Sender: TObject);
   FSequenceEngine.OnOutText := seqPrint;
 
   // initialize log processor engine
-  FSqzLogProcessor := TSqzLogNetHandler.Create;
+  FSqzLogProcessor := TSqzLogNetHandler.Create(TNCTOptions.Instance.SqueezeLogV20);
   FSqzLogProcessor.OnPrint := print;
 
   FFileList := TFileNamesList.Create;
@@ -477,6 +478,7 @@ procedure TfmMain.setupOptions;
   with TNCTOptions.Instance do begin
     SqueezeLogMask := StrToIntDef(eSqzLogMask.Text,SqueezeLogMask);
     SqueezeLogId   := StrToIntDef(eSqzLogID.Text,SqueezeLogId);
+    SqueezeLogV20  := cbSqzLog20.Checked;
     NodeMask := StrToIntDef(eNodeMask.Text,NodeMask);
     FSqzLogProcessor.NodeMask := NodeMask;
 end;
@@ -487,6 +489,7 @@ procedure TfmMain.showOptions;
   with TNCTOptions.Instance do begin
     eSqzLogMask.Text := Format('0x%.8X',[SqueezeLogMask]);
     eSqzLogID.Text   := Format('0x%.8X',[SqueezeLogId]);
+    cbSqzLog20.Checked := SqueezeLogV20;
     eNodeMask.Text   := Format('0x%.8X',[NodeMask]);
 end;
 end;

diff --git a/LogConsole/UOptions.pas b/LogConsole/UOptions.pas
@@ -41,6 +41,7 @@   TNCTOptions = class
     public
     SqueezeLogId: Cardinal;
     SqueezeLogMask: Cardinal;
+    SqueezeLogV20: Boolean;
     NodeMask: Cardinal;
     class constructor CreateInstance;
     class destructor DestroyInstance;
@@ -69,12 +70,14 @@ implementation
   kIniOptions    = 'Options';
   // keys
   kIniSqzLogId   = 'SqueezeLogId';
+  kIniSqzLogV20  = 'SqueezeLogV20';
   kIniSqzLogMask = 'SqueezeLogMask';
   kIniNodeMask   = 'NodeMask';
 
 procedure TNCTOptions.loadDefaults;
 begin
   SqueezeLogId   := $FE0000;
+  SqueezeLogV20  := false;
   SqueezeLogMask := $FFC000;
   NodeMask       := $3FFF;
 end;
@@ -85,6 +88,7 @@ procedure TNCTOptions.loadFromFile(AFile: string);
 begin
   LIniFile     := TIniFile.Create(AFile);
   SqueezeLogId := LIniFile.ReadInteger(kIniOptions,kIniSqzLogId,SqueezeLogId);
+  SqueezeLogV20 := LIniFile.ReadBool(kIniOptions,kIniSqzLogV20,SqueezeLogV20);
   SqueezeLogMask := LIniFile.ReadInteger(kIniOptions,kIniSqzLogMask,SqueezeLogMask);
   NodeMask     := LIniFile.ReadInteger(kIniOptions,kIniNodeMask,NodeMask);
   LIniFile.Free;
@@ -96,6 +100,7 @@ procedure TNCTOptions.saveToFile(AFile: string);
 begin
   LIniFile := TIniFile.Create(AFile);
   LIniFile.WriteInteger(kIniOptions,kIniSqzLogId,SqueezeLogId);
+  LIniFile.WriteBool(kIniOptions,kIniSqzLogV20,SqueezeLogV20);
   LIniFile.WriteInteger(kIniOptions,kIniSqzLogMask,SqueezeLogMask);
   LIniFile.WriteInteger(kIniOptions,kIniNodeMask,NodeMask);
   LIniFile.Free;

diff --git a/LogConsole/USqzLogCore.pas b/LogConsole/USqzLogCore.pas
@@ -203,7 +203,7 @@   TSqzLogNetHandler = class
     function findNode(ANodeId: Integer): TSqzLogHandler;
     procedure print(ANodeId: Integer; AClass: TSqzLogClass; ATitle: string);
     public
-    constructor Create(AProtoV2: Boolean = false);
+    constructor Create(AProtoV2: Boolean);
     destructor Destroy; override;
     procedure AddNode(ANodeId: Integer);
 {$IFDEF USE_PRINTER_OBJ}