Skip to content

Commit deed932

Browse files
beNativebeNative
committed
WIP
1 parent 148c09a commit deed932

21 files changed

+252
-114
lines changed

‎Bin/Win32/settings.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"DebugMode": false,
3-
"EmitLogMessages": false,
3+
"EmitLogMessages": true,
44
"FormSettings": {
5-
"Left": 416,
6-
"Top": 47,
7-
"Width": 1969,
8-
"Height": 1074,
5+
"Left": 870,
6+
"Top": 220,
7+
"Width": 1169,
8+
"Height": 802,
99
"FormStyle": 0,
1010
"WindowState": 0
1111
},
@@ -18,11 +18,11 @@
1818
"SmartTimeStamps": true,
1919
"HorizontalPanelPositions": [
2020
0.264720942140297,
21-
0.666666666666667,
21+
0.697309417040359,
2222
1
2323
],
2424
"LeftVerticalPanelPositions": [
25-
0.204301075268817,
25+
0.204040404040404,
2626
1
2727
]
2828
},
@@ -34,10 +34,10 @@
3434
"PollingInterval": 100
3535
},
3636
"ZmqSettings": {
37-
"Enabled": false,
37+
"Enabled": true,
3838
"PollingInterval": 100,
3939
"PollingTimeout": 10,
40-
"Endpoints": ""
40+
"Endpoints": "New=tcp://SBVCTITPOA8:5555\r\n"
4141
},
4242
"FileSystemSettings": {
4343
"Enabled": false,
@@ -207,7 +207,7 @@
207207
"Level": 1
208208
},
209209
{
210-
"Alias": "Olijf",
210+
"Alias": "",
211211
"Color": 32896,
212212
"Level": 2
213213
},
@@ -222,7 +222,7 @@
222222
"Level": 4
223223
},
224224
{
225-
"Alias": "vsvcsvs",
225+
"Alias": "",
226226
"Color": 65535,
227227
"Level": 5
228228
},
@@ -267,7 +267,7 @@
267267
"Level": 13
268268
},
269269
{
270-
"Alias": "halle",
270+
"Alias": "",
271271
"Color": 65535,
272272
"Level": 14
273273
},

‎LogBroker.MainForm.dfm

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,21 @@ object frmMain: TfrmMain
5252
TabOrder = 0
5353
Text = '5555'
5454
end
55-
object tsIPC: TToggleSwitch
56-
Left = 32
57-
Top = 4
58-
Width = 50
59-
Height = 20
60-
ShowStateCaption = False
61-
TabOrder = 1
62-
TabStop = False
63-
OnClick = tsIPCClick
64-
end
6555
object chkIPCAutoPort: TCheckBox
6656
Left = 194
6757
Top = 7
6858
Width = 41
6959
Height = 17
7060
Hint = 'Auto assign TCP port for IPC messages'
7161
Caption = 'Auto'
72-
TabOrder = 2
62+
TabOrder = 1
7363
OnClick = chkIPCAutoPortClick
7464
end
65+
object tsIPC: TToggleSwitch
66+
Left = 27
67+
Top = 4
68+
Width = 54
69+
Height = 20
70+
TabOrder = 2
71+
end
7572
end

‎LogBroker.MainForm.pas

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
interface
2020

2121
uses
22-
Winapi.Windows, Winapi.Messages,
23-
System.SysUtils, System.Variants, System.Classes,
24-
Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.WinXCtrls,
22+
Winapi.Windows,
23+
System.SysUtils, System.Classes,
24+
Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.WinXCtrls,
2525
Vcl.StdCtrls, Vcl.ExtCtrls,
2626

27-
ZeroMQ.API, ZeroMQ,
27+
ZeroMQ,
2828

29-
DDuce.Logger.Channels.Zmq, DDuce.Logger.Interfaces, DDuce.Winipc.Server;
29+
DDuce.Winipc.Server;
3030

3131
type
3232
TfrmMain = class(TForm)
@@ -220,7 +220,7 @@ procedure TfrmMain.SaveSettings;
220220
begin
221221
Settings.WriteBool('', 'IPCAutoPort', chkIPCAutoPort.Checked);
222222
Settings.WriteString('', 'IPCPort', edtIPCPort.Text);
223-
Settings.WriteBool('', 'IPCEnabled', tsIPC.State = tssOn);
223+
//Settings.WriteBool('', 'IPCEnabled', tsIPC.State = tssOn);
224224
end;
225225
{$ENDREGION}
226226

‎LogBroker.dpr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
program LogBroker;
2-
1+
{$SetPEFlags 1} // strip relocation info
32

3+
program LogBroker;
44

55
{$R *.dres}
66

‎LogBroker.dproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,16 @@
8383
<DCC_RemoteDebug>true</DCC_RemoteDebug>
8484
</PropertyGroup>
8585
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
86-
<DCC_RemoteDebug>false</DCC_RemoteDebug>
8786
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
8887
<Icon_MainIcon>LogBroker_Icon.ico</Icon_MainIcon>
8988
<AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
9089
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
9190
<DCC_ExeOutput>.\Bin\$(Platform)</DCC_ExeOutput>
91+
<DCC_Optimize>true</DCC_Optimize>
92+
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
93+
<DCC_DebugInfoInTds>true</DCC_DebugInfoInTds>
94+
<DCC_RangeChecking>true</DCC_RangeChecking>
95+
<DCC_MapFile>3</DCC_MapFile>
9296
</PropertyGroup>
9397
<PropertyGroup Condition="'$(Cfg_2)'!=''">
9498
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>

‎LogViewer.Dashboard.View.dfm

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,14 @@ object frmDashboard: TfrmDashboard
5858
TabOrder = 0
5959
object tsWinIpc: TKTabSheet
6060
Caption = 'WinIPC'
61+
ExplicitWidth = 0
62+
ExplicitHeight = 0
6163
object lblWinIPC: TLabel
6264
AlignWithMargins = True
6365
Left = 3
6466
Top = 28
65-
Width = 308
66-
Height = 588
67+
Width = 307
68+
Height = 221
6769
Align = alClient
6870
Caption =
6971
'Messages are exchanged between the source application and LogVie' +
@@ -82,8 +84,6 @@ object frmDashboard: TfrmDashboard
8284
ParentFont = False
8385
Transparent = True
8486
WordWrap = True
85-
ExplicitWidth = 307
86-
ExplicitHeight = 221
8787
end
8888
object pnlWinIPCTitle: TPanel
8989
Left = 0
@@ -106,12 +106,14 @@ object frmDashboard: TfrmDashboard
106106
end
107107
object tsWinOds: TKTabSheet
108108
Caption = 'WinODS'
109+
ExplicitWidth = 0
110+
ExplicitHeight = 0
109111
object lblWinods: TLabel
110112
AlignWithMargins = True
111113
Left = 3
112114
Top = 28
113115
Width = 308
114-
Height = 588
116+
Height = 374
115117
Align = alClient
116118
Caption =
117119
'This receiver captures messages from any local applicatiion that' +
@@ -136,7 +138,6 @@ object frmDashboard: TfrmDashboard
136138
ParentFont = False
137139
Transparent = True
138140
WordWrap = True
139-
ExplicitHeight = 374
140141
end
141142
object pnlWinodsTitle: TPanel
142143
Left = 0
@@ -255,6 +256,8 @@ object frmDashboard: TfrmDashboard
255256
end
256257
object tsFileSystem: TKTabSheet
257258
Caption = 'FileSystem'
259+
ExplicitWidth = 0
260+
ExplicitHeight = 0
258261
object pnlFileSystemTitle: TPanel
259262
Left = 0
260263
Top = 0
@@ -285,6 +288,8 @@ object frmDashboard: TfrmDashboard
285288
end
286289
object tsComPort: TKTabSheet
287290
Caption = 'COM port'
291+
ExplicitWidth = 0
292+
ExplicitHeight = 0
288293
object pnlComPorts: TPanel
289294
Left = 0
290295
Top = 25

‎LogViewer.Dashboard.View.pas

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ procedure TfrmDashboard.FTreeViewGetImageIndex(Sender: TBaseVirtualTree;
564564
begin
565565
DN := Sender.GetNodeData<TDashboardNode>(Node);
566566
LReceiver := DN.Data.Receiver;
567-
if (DN.Level = 0) and (Kind in [ikNormal, ikSelected]) then
567+
if (DN.Level = 0) and (Column = 0) and (Kind in [ikNormal, ikSelected]) then
568568
begin
569569
if LReceiver = FZmqReceiver then
570570
begin
@@ -602,7 +602,7 @@ procedure TfrmDashboard.FTreeViewGetText(Sender: TBaseVirtualTree;
602602
function DateTimeToText(ADateTime: TDateTime): string;
603603
begin
604604
if Double(ADateTime).SpecialType = fsZero then
605-
Result := ''
605+
Result := ' '
606606
else
607607
Result := DateTimeToStr(ADateTime);
608608
end;
@@ -634,9 +634,19 @@ procedure TfrmDashboard.FTreeViewGetText(Sender: TBaseVirtualTree;
634634
else if Column = COLUMN_SOURCEID then
635635
CellText := LSubscriber.SourceId.ToString
636636
else if Column = COLUMN_MESSAGECOUNT then
637-
CellText := LSubscriber.MessageCount.ToString
637+
begin
638+
if LSubscriber.MessageCount > 0 then
639+
CellText := LSubscriber.MessageCount.ToString
640+
else
641+
CellText := ' ';
642+
end
638643
else if Column = COLUMN_BYTES_RECEIVED then
639-
CellText := FormatBytes(LSubscriber.BytesReceived)
644+
begin
645+
if LSubscriber.BytesReceived > 0 then
646+
CellText := FormatBytes(LSubscriber.BytesReceived)
647+
else
648+
CellText := ' ';
649+
end
640650
else if Column = COLUMN_TIMESTAMP_FIRST then
641651
CellText := DateTimeToText(LSubscriber.TimeStampFirst)
642652
else if Column = COLUMN_TIMESTAMP_LAST then
@@ -1076,7 +1086,7 @@ procedure TfrmDashboard.InitializeTreeView;
10761086
begin
10771087
MaxWidth := 90;
10781088
MinWidth := 90;
1079-
Options := [coAllowClick, coEnabled, coParentBidiMode, coShowDropMark,
1089+
Options := [coAllowClick, coEnabled, coParentBidiMode,
10801090
coVisible, coAllowFocus];
10811091
Position := COLUMN_MESSAGECOUNT;
10821092
Width := 90;
@@ -1087,7 +1097,7 @@ procedure TfrmDashboard.InitializeTreeView;
10871097
begin
10881098
MaxWidth := 80;
10891099
MinWidth := 80;
1090-
Options := [coAllowClick, coEnabled, coParentBidiMode, coShowDropMark,
1100+
Options := [coAllowClick, coEnabled, coParentBidiMode,
10911101
coVisible, coAllowFocus];
10921102
Position := COLUMN_BYTES_RECEIVED;
10931103
Width := 80;
@@ -1098,8 +1108,8 @@ procedure TfrmDashboard.InitializeTreeView;
10981108
begin
10991109
MaxWidth := 120;
11001110
MinWidth := 120;
1101-
Options := [coAllowClick, coEnabled, coParentBidiMode, coShowDropMark,
1102-
coVisible, coAllowFocus];
1111+
Options := [coAllowClick, coEnabled, coParentBidiMode, coVisible,
1112+
coAllowFocus];
11031113
Position := COLUMN_TIMESTAMP_FIRST;
11041114
Width := 120;
11051115
Text := STimeStampFirst;
@@ -1108,14 +1118,14 @@ procedure TfrmDashboard.InitializeTreeView;
11081118
begin
11091119
MaxWidth := 120;
11101120
MinWidth := 120;
1111-
Options := [coAllowClick, coEnabled, coParentBidiMode, coShowDropMark,
1121+
Options := [coAllowClick, coEnabled, coParentBidiMode,
11121122
coVisible, coAllowFocus];
11131123
Position := COLUMN_TIMESTAMP_LAST;
11141124
Width := 120;
11151125
Text := STimeStampLast;
11161126
end;
11171127
Header.MainColumn := 0;
1118-
TreeOptions.AutoOptions := TreeOptions.AutoOptions + [toAutoSpanColumns];
1128+
TreeOptions.AutoOptions := TreeOptions.AutoOptions + [toAutoSpanColumns];
11191129
TreeOptions.PaintOptions := TreeOptions.PaintOptions + [toShowTreeLines];
11201130
end;
11211131
FTreeView.Header.AutoSizeIndex := 0;

0 commit comments

Comments
 (0)