paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-07 12:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Adds the possibility to force a text encoding when reading files, and fixes some other minor issues

Browse Source 
git-svn-id: trunk@39609 -
This commit is contained in:
sekelsenmat 2012-12-21 09:41:59 +00:00
parent 1c8239c45a
commit f6091734fe
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/fpvectorial/dxfvectorialreader.pas
View File

@ -730,9 +730,13 @@ begin
end
else if CurToken.StrValue = '$DWGCODEPAGE' then
begin
CurToken := TDXFToken(ATokens.Items[i+1]);
lStr := CurToken.StrValue;
if lStr = 'ANSI_1252' then ENCODING := 'CP1252';
// if we are forcing an encoding, don't use the value from the HEADER
if ADoc.ForcedEncodingOnRead = '' then
begin
CurToken := TDXFToken(ATokens.Items[i+1]);
lStr := CurToken.StrValue;
if lStr = 'ANSI_1252' then ENCODING := 'CP1252';
end;
Inc(i);
end;
@ -1926,7 +1930,7 @@ end;
function TvDXFVectorialReader.ConvertDXFStringToUTF8(AStr: string): string;
begin
if ENCODING = 'UTF-8' then
if (ENCODING = 'UTF-8') or (ENCODING = '') then
begin
Result := AStr;
Exit;
@ -1951,10 +1955,6 @@ begin
FPointSeparator.DecimalSeparator := '.';
FPointSeparator.ThousandSeparator := '#';// disable the thousand separator
// Default HEADER data
ANGBASE := 0.0; // Starts pointing to the right / east
ANGDIR := 0; // counter-clock wise
Tokenizer := TDXFTokenizer.Create;
end;
@ -1976,8 +1976,13 @@ var
CurToken, CurTokenFirstChild: TDXFToken;
lPage: TvVectorialPage;
begin
// Start with default header values
ENCODING := 'UTF-8';
// Default HEADER data
ANGBASE := 0.0; // Starts pointing to the right / east
ANGDIR := 0; // counter-clock wise
// The default encoding of DXF files if a ($DWGCODEPAGE) header is not present
// See http://www.gdal.org/ogr/drv_dxf.html
if AData.ForcedEncodingOnRead <> '' then ENCODING := AData.ForcedEncodingOnRead
else ENCODING := 'cp1252';
Tokenizer.ReadFromStrings(AStrings);
@ -1997,6 +2002,9 @@ begin
else if CurTokenFirstChild.StrValue = 'ENTITIES' then
ReadENTITIES(CurToken.Childs, lPage, AData);
end;
// Update properties from the document
AData.Encoding := ENCODING;
end;
initialization

6
components/fpvectorial/fpvectorial.pas
View File

@ -564,10 +564,12 @@ type
public
Width, Height: Double; // in millimeters
Name: string;
Encoding: string; // The encoding on which to save the file, if empty UTF-8 will be utilized. This value is filled when reading
ForcedEncodingOnRead: string; // if empty, no encoding will be forced when reading, but it can be set to a LazUtils compatible value
// User-Interface information
ZoomLevel: Double; // 1 = 100%
{ Selection fields }
SelectedvElement: TvEntity;
SelectedElement: TvEntity;
{ Base methods }
constructor Create; virtual;
destructor Destroy; override;
@ -2649,7 +2651,7 @@ begin
if Result <> vfrNotFound then
begin
Owner.SelectedvElement := lEntity;
Owner.SelectedElement := lEntity;
Exit;
end;
end;