Skip to content

Commit da6f044

Browse files
Awkward-imAwkward-im
committed
fmImageset: added selection frame/mouse click
rgscan small changes SQLCP: changed db structure/ interface
1 parent b9aea1f commit da6f044

20 files changed

Lines changed: 1206 additions & 3647 deletions

‎Addons/logging.pas‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
interface
66

77
type
8-
TLogOnAdd = function (var adata:string ):integer of object;
8+
TLogOnAdd = function (var adata:AnsiString ):integer of object;
99
TLogOnAddWide = function (var adata:UnicodeString ):integer of object;
1010
TLogOnAddBinary = function (var abuf:PByte; var asize:integer):integer of object;
1111

@@ -31,7 +31,7 @@ interface
3131
procedure AddData (adata:pointer; asize:integer);
3232
procedure AddValue(adata:int64 ; asize:integer);
3333

34-
procedure SaveToFile(const afile:string='rglog.txt');
34+
procedure SaveToFile(const afile:AnsiString='rglog.txt');
3535

3636
property Log :PByte read FLog;
3737
property size:cardinal read FSize;
@@ -44,22 +44,22 @@ interface
4444
FOnAdd:TLogOnAdd;
4545
FReserve:AnsiString;
4646

47-
function GetText():string;
47+
function GetText():AnsiString;
4848
procedure AddText(const atext:PAnsiChar);
4949

5050
public
5151
procedure Init;
5252
procedure Clear;
5353

54-
procedure Reserve (astr:string);
54+
procedure Reserve (astr:AnsiString);
5555
procedure Reserve (astr:PAnsiChar);
5656
procedure ReserveWide(astr:PWideChar);
57-
procedure Add(const afile:string; aline:integer; const astr:string);
58-
procedure Add(const astr:string);
57+
procedure Add(const afile:AnsiString; aline:integer; const astr:AnsiString);
58+
procedure Add(const astr:AnsiString);
5959
procedure AddWide(astr:PWideChar);
60-
procedure Continue(const astr:string);
60+
procedure Continue(const astr:AnsiString);
6161

62-
property Text:string read GetText;
62+
property Text:AnsiString read GetText;
6363
property OnAdd:TLogOnAdd read FOnAdd write FOnAdd;
6464
end;
6565

@@ -155,7 +155,7 @@ procedure TBaseLog.AddValue(adata:int64; asize:integer);
155155
AddData(@adata,asize);
156156
end;
157157

158-
procedure TBaseLog.SaveToFile(const afile:string='rglog.txt');
158+
procedure TBaseLog.SaveToFile(const afile:AnsiString='rglog.txt');
159159
var
160160
f:file of byte;
161161
begin
@@ -213,13 +213,13 @@ procedure TLog.AddText(const atext:PAnsiChar);
213213
Inc(FSize,2);
214214
end;
215215

216-
procedure TLog.Continue(const astr:string);
216+
procedure TLog.Continue(const astr:AnsiString);
217217
begin
218218
if FSize>0 then dec(FSize,2);
219-
AddText(pointer(astr));
219+
AddText(PAnsiChar(astr));
220220
end;
221221

222-
procedure TLog.Add(const astr:string);
222+
procedure TLog.Add(const astr:AnsiString);
223223
var
224224
ls:AnsiString;
225225
begin
@@ -237,12 +237,12 @@ procedure TLog.Add(const astr:string);
237237
exit;
238238
end;
239239

240-
AddText(Pointer(ls));
240+
AddText(PAnsiChar(ls));
241241
end;
242242

243-
procedure TLog.Add(const afile:string; aline:integer; const astr:string);
243+
procedure TLog.Add(const afile:AnsiString; aline:integer; const astr:AnsiString);
244244
var
245-
ls:string;
245+
ls:AnsiString;
246246
begin
247247
Str(aline,ls);
248248
Add(afile+' ('+ls+'): '+astr);
@@ -254,7 +254,7 @@ procedure TLog.AddWide(astr:PWideChar);
254254
end;
255255

256256

257-
procedure TLog.Reserve(astr:string);
257+
procedure TLog.Reserve(astr:AnsiString);
258258
begin
259259
FReserve:=astr;
260260
end;
@@ -266,10 +266,10 @@ procedure TLog.Reserve(astr:PAnsiChar);
266266

267267
procedure TLog.ReserveWide(astr:PWideChar);
268268
begin
269-
Reserve(pointer(UTF8Encode(UnicodeString(astr))));
269+
Reserve(PAnsiChar(UTF8Encode(UnicodeString(astr))));
270270
end;
271271

272-
function TLog.GetText:string;
272+
function TLog.GetText:AnsiString;
273273
begin
274274
result:=PAnsiChar(FLog);
275275
end;
@@ -318,7 +318,7 @@ procedure TLogWide.AddText(const atext:PWideChar);
318318
procedure TLogWide.Continue(const astr:UnicodeString);
319319
begin
320320
if FSize>0 then dec(FSize,4);
321-
AddText(pointer(astr));
321+
AddText(PUnicodeChar(astr));
322322
end;
323323

324324
procedure TLogWide.Add(const astr:UnicodeString);
@@ -339,7 +339,7 @@ procedure TLogWide.Add(const astr:UnicodeString);
339339
exit;
340340
end;
341341

342-
AddText(Pointer(ls));
342+
AddText(PUnicodeChar(ls));
343343
end;
344344

345345
procedure TLogWide.Add(const afile:UnicodeString; aline:integer; const astr:UnicodeString);

‎RGDB/db_common.inc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ function IsColumnExists(db:PSQLite3; const aTable,aColumn:AnsiString):boolean;
55

66
function ExecSQLQuery (db:PSQLite3; const aSQL:AnsiString):boolean;
77
function ExecuteDirect(db:PSQLite3; const aSQL:AnsiString ):boolean;
8-
function ExecuteDirect(db:PSQLite3; const aSQL, aparam :AnsiString ):boolean;
8+
function ExecuteDirect(db:PSQLite3; const aSQL:AnsiString; aparam :PAnsiChar ):boolean;
99
function ExecuteDirect(db:PSQLite3; const aSQL:AnsiString; aparam :PUnicodeChar ):boolean;
1010
function ExecuteDirect(db:PSQLite3; const aSQL:AnsiString; aparam,aparam2:PUnicodeChar ):boolean;
1111
function ExecuteDirect(db:PSQLite3; const aSQL:AnsiString; const aparams:array of const):boolean;
1212

1313
function GetLastId(db:PSQLite3):integer; overload;
1414
function GetLastId(db:PSQLite3; const atable,anid:AnsiString):integer; overload;
1515

16-
function CopyToFile (db:PSQLite3; afname:PChar):integer;
17-
function CopyFromFile(db:PSQLite3; afname:PChar):integer;
16+
function CopyToFile (db:PSQLite3; afname:PAnsiChar):integer;
17+
function CopyFromFile(db:PSQLite3; afname:PAnsiChar):integer;
1818

1919
function OpenDatabase(var db:PSQLite3; const aname:AnsiString):boolean;
2020
procedure CloseDatabase(db:PSQLite3);
@@ -27,7 +27,7 @@ function ReturnText (db:PSQLite3; const aSQL:AnsiString):string;
2727

2828
function GetIntValue(db:PSQLite3; const atable, afield, acond:string):integer;
2929
function ReturnInt (db:PSQLite3; const aSQL:AnsiString ):integer;
30-
function ReturnInt (db:PSQLite3; const aSQL, aparam :AnsiString ):integer;
30+
function ReturnInt (db:PSQLite3; const aSQL:AnsiString; aparam :PAnsiChar ):integer;
3131
function ReturnInt (db:PSQLite3; const aSQL:AnsiString; aparam :PUnicodeChar ):integer;
3232
function ReturnInt (db:PSQLite3; const aSQL:AnsiString; aparam,aparam2:PUnicodeChar ):integer;
3333
function ReturnInt (db:PSQLite3; const aSQL:AnsiString; const aparams:array of const):integer;
@@ -50,7 +50,7 @@ begin
5050
vtQWord : res:=sqlite3_bind_int64 (vm,i+1,aparams[i].VInt64^);
5151
vtExtended : res:=sqlite3_bind_double(vm,i+1,aparams[i].VExtended^);
5252

53-
vtString : res:=sqlite3_bind_text (vm,i+1,PChar(aparams[i].VString)+1,
53+
vtString : res:=sqlite3_bind_text (vm,i+1,PAnsiChar(aparams[i].VString)+1,
5454
Length(aparams[i].VString^) ,SQLITE_STATIC);
5555
vtAnsiString : res:=sqlite3_bind_text (vm,i+1,aparams[i].VAnsiString ,-1,SQLITE_STATIC);
5656
vtPChar : res:=sqlite3_bind_text (vm,i+1,aparams[i].VPChar ,-1,SQLITE_STATIC);
@@ -131,14 +131,14 @@ begin
131131
end;
132132
end;
133133

134-
function ReturnInt(db:PSQLite3; const aSQL, aparam:AnsiString):integer;
134+
function ReturnInt(db:PSQLite3; const aSQL:AnsiString; aparam:PAnsiChar):integer;
135135
var
136136
vm:pointer;
137137
begin
138138
result:=-1;
139139
if sqlite3_prepare_v2(db, PAnsiChar(aSQL),-1, @vm, nil)=SQLITE_OK then
140140
begin
141-
if sqlite3_bind_text(vm,1,PAnsiChar(aparam),-1,SQLITE_STATIC)=SQLITE_OK then
141+
if sqlite3_bind_text(vm,1,aparam,-1,SQLITE_STATIC)=SQLITE_OK then
142142
begin
143143
if sqlite3_step(vm)=SQLITE_ROW then
144144
result:=sqlite3_column_int(vm,0);
@@ -225,7 +225,7 @@ end;
225225

226226
function ExecSQLQuery(db:PSQLite3; const aSQL:AnsiString):boolean;
227227
begin
228-
result:=sqlite3_exec(db,PChar(aSQL),nil,nil,nil)=SQLITE_OK;
228+
result:=sqlite3_exec(db,PAnsiChar(aSQL),nil,nil,nil)=SQLITE_OK;
229229
end;
230230

231231
function ExecuteDirect(db:PSQLite3; const aSQL:AnsiString):boolean;
@@ -241,14 +241,14 @@ begin
241241
result:=false;
242242
end;
243243

244-
function ExecuteDirect(db:PSQLite3; const aSQL,aparam:AnsiString):boolean;
244+
function ExecuteDirect(db:PSQLite3; const aSQL:AnsiString; aparam:PAnsiChar):boolean;
245245
var
246246
vm: Pointer;
247247
begin
248248
result:=false;
249249
if sqlite3_prepare_v2(db, PAnsiChar(aSQL), -1, @vm, nil)=SQLITE_OK then
250250
begin
251-
if sqlite3_bind_text(vm,1,PAnsiChar(aparam),-1,SQLITE_STATIC)=SQLITE_OK then
251+
if sqlite3_bind_text(vm,1,aparam,-1,SQLITE_STATIC)=SQLITE_OK then
252252
result:=sqlite3_step(vm)=SQLITE_DONE;
253253
sqlite3_finalize(vm);
254254
end;
@@ -308,7 +308,7 @@ end;
308308

309309
//----- Backup (copy) -----
310310

311-
function CopyToFile(db:PSQLite3; afname:PChar):integer;
311+
function CopyToFile(db:PSQLite3; afname:PAnsiChar):integer;
312312
var
313313
pFile :PSQLite3; // Database connection opened on zFilename
314314
pBackup:PSQLite3Backup; // Backup object used to copy data
@@ -327,7 +327,7 @@ begin
327327
sqlite3_close(pFile);
328328
end;
329329

330-
function CopyFromFile(db:PSQLite3; afname:PChar):integer;
330+
function CopyFromFile(db:PSQLite3; afname:PAnsiChar):integer;
331331
var
332332
pFile :PSQLite3; // Database connection opened on zFilename
333333
pBackup:PSQLite3Backup; // Backup object used to copy data

‎TL2Lib/forms/fmimageset.lfm‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
11
object FormImageset: TFormImageset
22
Left = 350
3-
Height = 447
3+
Height = 473
44
Top = 250
55
Width = 667
66
BorderStyle = bsNone
7-
ClientHeight = 447
7+
ClientHeight = 473
88
ClientWidth = 667
9+
LCLVersion = '4.99.0.0'
910
OnCreate = FormCreate
1011
OnDestroy = FormDestroy
1112
object Splitter1: TSplitter
1213
Left = 170
13-
Height = 447
14+
Height = 450
1415
Top = 0
1516
Width = 5
1617
end
1718
object imgTexture: TImage
1819
Left = 175
19-
Height = 447
20+
Height = 450
2021
Top = 0
2122
Width = 492
2223
Align = alClient
2324
Proportional = True
2425
Stretch = True
2526
Transparent = True
27+
OnMouseDown = imgTextureMouseDown
2628
end
2729
object pnlLeft: TPanel
2830
Left = 0
29-
Height = 447
31+
Height = 450
3032
Top = 0
3133
Width = 170
3234
Align = alLeft
33-
ClientHeight = 447
35+
ClientHeight = 450
3436
ClientWidth = 170
3537
ParentBackground = False
3638
ParentColor = False
3739
TabOrder = 1
3840
object lbImages: TListBox
3941
Left = 1
40-
Height = 253
42+
Height = 256
4143
Top = 1
4244
Width = 168
4345
Align = alClient
@@ -52,15 +54,15 @@ object FormImageset: TFormImageset
5254
Cursor = crVSplit
5355
Left = 1
5456
Height = 5
55-
Top = 254
57+
Top = 257
5658
Width = 168
5759
Align = alBottom
5860
ResizeAnchor = akBottom
5961
end
6062
object pnlSprite: TPanel
6163
Left = 1
6264
Height = 187
63-
Top = 259
65+
Top = 262
6466
Width = 168
6567
Align = alBottom
6668
ClientHeight = 187
@@ -89,6 +91,21 @@ object FormImageset: TFormImageset
8991
end
9092
end
9193
end
94+
object StatusBar: TStatusBar
95+
Left = 0
96+
Height = 23
97+
Top = 450
98+
Width = 667
99+
Panels = <
100+
item
101+
Width = 120
102+
end
103+
item
104+
Text = 'Ctrl-A to select all items in list, Ctrl-E to extract selected items'
105+
Width = 50
106+
end>
107+
SimplePanel = False
108+
end
92109
object mnuImgSet: TPopupMenu
93110
Left = 71
94111
Top = 134

0 commit comments

Comments
 (0)