diff --git a/zlog/UExportHamlog.dfm b/zlog/UExportHamlog.dfm index d54aa6d8..fccb9450 100644 --- a/zlog/UExportHamlog.dfm +++ b/zlog/UExportHamlog.dfm @@ -3,8 +3,8 @@ object formExportHamlog: TformExportHamlog Top = 0 BorderStyle = bsDialog Caption = 'Export' - ClientHeight = 312 - ClientWidth = 390 + ClientHeight = 514 + ClientWidth = 372 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -13,128 +13,310 @@ object formExportHamlog: TformExportHamlog Font.Style = [] OldCreateOrder = False Position = poOwnerFormCenter + OnClose = FormClose OnCreate = FormCreate - OnShow = FormShow - DesignSize = ( - 390 - 312) PixelsPerInch = 96 TextHeight = 12 - object buttonOK: TButton - Left = 107 - Top = 282 - Width = 90 - Height = 25 - Anchors = [akLeft, akBottom] - Caption = 'OK' - ModalResult = 1 - TabOrder = 0 - end - object buttonCancel: TButton - Left = 203 - Top = 282 - Width = 90 - Height = 25 - Anchors = [akLeft, akBottom] - Cancel = True - Caption = 'Cancel' - ModalResult = 2 - TabOrder = 1 - end object GroupBox1: TGroupBox - Left = 8 - Top = 8 - Width = 373 - Height = 265 + Left = 0 + Top = 0 + Width = 372 + Height = 485 + Align = alClient Caption = 'HAMLOG'#20986#21147#35373#23450 - TabOrder = 2 + TabOrder = 0 + ExplicitLeft = 8 + ExplicitTop = 8 + ExplicitWidth = 373 + ExplicitHeight = 329 object groupRemarks1: TGroupBox Left = 12 Top = 24 Width = 349 - Height = 114 + Height = 130 Caption = 'Remarks1'#12398#20986#21147#20869#23481 TabOrder = 0 object radioRemarks1Opt1: TRadioButton - Left = 21 - Top = 26 + Left = 25 + Top = 49 Width = 60 Height = 13 Caption = #20837#21147 - TabOrder = 0 + TabOrder = 1 OnClick = radioRemarks1Opt1Click end object radioRemarks1Opt2: TRadioButton - Left = 21 - Top = 53 + Left = 25 + Top = 75 Width = 69 Height = 13 Caption = 'Operator' Checked = True - TabOrder = 2 + TabOrder = 3 TabStop = True OnClick = radioRemarks1Opt2Click end object radioRemarks1Opt3: TRadioButton - Left = 21 - Top = 82 + Left = 25 + Top = 101 Width = 69 Height = 13 Caption = 'Memo' - TabOrder = 3 + TabOrder = 4 OnClick = radioRemarks1Opt3Click end object editRemarks1Opt1: TMemo - Left = 96 - Top = 22 + Left = 100 + Top = 45 Width = 241 - Height = 21 - TabOrder = 1 + Height = 20 + TabOrder = 2 + end + object radioRemarks1Opt0: TRadioButton + Left = 25 + Top = 23 + Width = 92 + Height = 13 + Caption = #20309#12418#20986#12373#12394#12356 + TabOrder = 0 + OnClick = radioRemarks1Opt3Click end end object groupRemarks2: TGroupBox Left = 12 - Top = 143 + Top = 163 Width = 349 - Height = 114 + Height = 130 Caption = 'Remarks2'#12398#20986#21147#20869#23481 TabOrder = 1 object editRemarks2Opt1: TMemo Left = 96 - Top = 26 + Top = 46 Width = 241 - Height = 21 - TabOrder = 1 + Height = 20 + TabOrder = 2 end object radioRemarks2Opt1: TRadioButton Left = 25 - Top = 30 + Top = 49 Width = 56 Height = 13 Caption = #20837#21147 - TabOrder = 0 + TabOrder = 1 OnClick = radioRemarks2Opt1Click end object radioRemarks2Opt2: TRadioButton Left = 25 - Top = 57 + Top = 75 Width = 69 Height = 13 Caption = 'Operator' - TabOrder = 2 + TabOrder = 3 OnClick = radioRemarks2Opt2Click end object radioRemarks2Opt3: TRadioButton Left = 25 - Top = 84 + Top = 101 Width = 69 Height = 13 Caption = 'Memo' Checked = True - TabOrder = 3 + TabOrder = 4 TabStop = True OnClick = radioRemarks2Opt3Click end + object radioRemarks2Opt0: TRadioButton + Left = 25 + Top = 23 + Width = 92 + Height = 13 + Caption = #20309#12418#20986#12373#12394#12356 + TabOrder = 0 + OnClick = radioRemarks1Opt3Click + end + end + object groupQslMark: TGroupBox + Left = 12 + Top = 381 + Width = 170 + Height = 96 + Caption = 'QSL'#12510#12540#12463#12398#20986#21147#20869#23481 + TabOrder = 4 + object Label1: TLabel + Left = 25 + Top = 45 + Width = 46 + Height = 12 + Caption = 'PSE QSL' + end + object Label2: TLabel + Left = 25 + Top = 22 + Width = 79 + Height = 12 + Caption = #35373#23450#28961#12375'(None)' + end + object Label3: TLabel + Left = 25 + Top = 68 + Width = 41 + Height = 12 + Caption = 'NO QSL' + end + object editQslNone: TEdit + Left = 121 + Top = 19 + Width = 25 + Height = 20 + MaxLength = 1 + TabOrder = 0 + end + object editPseQsl: TEdit + Left = 121 + Top = 42 + Width = 25 + Height = 20 + MaxLength = 1 + TabOrder = 1 + Text = 'J' + end + object editNoQsl: TEdit + Left = 121 + Top = 65 + Width = 25 + Height = 20 + MaxLength = 1 + TabOrder = 2 + Text = 'N' + end + end + object groupCode: TGroupBox + Left = 12 + Top = 302 + Width = 170 + Height = 71 + Caption = #30456#25163#23616#12398#36939#29992#22320#12467#12540#12489 + TabOrder = 2 + object radioCodeOpt0: TRadioButton + Left = 25 + Top = 19 + Width = 92 + Height = 13 + Caption = #20309#12418#20986#12373#12394#12356 + Checked = True + TabOrder = 0 + TabStop = True + OnClick = radioRemarks1Opt3Click + end + object radioCodeOpt1: TRadioButton + Left = 25 + Top = 44 + Width = 92 + Height = 13 + Caption = #21463#20449#12490#12531#12496#12540 + TabOrder = 1 + OnClick = radioRemarks1Opt3Click + end + end + object groupName: TGroupBox + Left = 191 + Top = 302 + Width = 170 + Height = 71 + Caption = #30456#25163#23616#12398#21517#21069#12539#21517#31216 + TabOrder = 3 + object radioNameOpt0: TRadioButton + Left = 25 + Top = 19 + Width = 92 + Height = 13 + Caption = #20309#12418#20986#12373#12394#12356 + Checked = True + TabOrder = 0 + TabStop = True + OnClick = radioRemarks1Opt3Click + end + object radioNameOpt1: TRadioButton + Left = 25 + Top = 44 + Width = 92 + Height = 13 + Caption = #21463#20449#12490#12531#12496#12540 + TabOrder = 1 + OnClick = radioRemarks1Opt3Click + end + end + object groupTime: TGroupBox + Left = 191 + Top = 381 + Width = 170 + Height = 96 + Caption = #20132#20449#26178#20998#12398#20986#21147#20869#23481 + TabOrder = 5 + object radioTimeOpt0: TRadioButton + Left = 25 + Top = 19 + Width = 92 + Height = 13 + Caption = #12381#12398#12414#12414#20986#21147 + Checked = True + TabOrder = 0 + TabStop = True + OnClick = radioRemarks1Opt3Click + end + object radioTimeOpt1: TRadioButton + Left = 25 + Top = 42 + Width = 92 + Height = 13 + Caption = 'JST'#12395#32113#19968 + TabOrder = 1 + OnClick = radioRemarks1Opt3Click + end + object radioTimeOpt2: TRadioButton + Left = 25 + Top = 65 + Width = 92 + Height = 13 + Caption = 'UTC'#12395#32113#19968 + TabOrder = 2 + OnClick = radioRemarks1Opt3Click + end + end + end + object Panel1: TPanel + Left = 0 + Top = 485 + Width = 372 + Height = 29 + Align = alBottom + BevelOuter = bvNone + TabOrder = 1 + ExplicitTop = 428 + ExplicitWidth = 390 + DesignSize = ( + 372 + 29) + object buttonCancel: TButton + Left = 189 + Top = 1 + Width = 90 + Height = 25 + Anchors = [akLeft, akBottom] + Cancel = True + Caption = 'Cancel' + ModalResult = 2 + TabOrder = 0 + end + object buttonOK: TButton + Left = 93 + Top = 1 + Width = 90 + Height = 25 + Anchors = [akLeft, akBottom] + Caption = 'OK' + ModalResult = 1 + TabOrder = 1 end end end diff --git a/zlog/UExportHamlog.pas b/zlog/UExportHamlog.pas index 165c7462..be481bbf 100644 --- a/zlog/UExportHamlog.pas +++ b/zlog/UExportHamlog.pas @@ -4,7 +4,7 @@ interface uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics, - Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls; + Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls, System.IniFiles; type TformExportHamlog = class(TForm) @@ -21,26 +21,64 @@ TformExportHamlog = class(TForm) radioRemarks2Opt1: TRadioButton; radioRemarks2Opt2: TRadioButton; radioRemarks2Opt3: TRadioButton; + radioRemarks1Opt0: TRadioButton; + radioRemarks2Opt0: TRadioButton; + Panel1: TPanel; + groupQslMark: TGroupBox; + Label1: TLabel; + Label2: TLabel; + Label3: TLabel; + editQslNone: TEdit; + editPseQsl: TEdit; + editNoQsl: TEdit; + groupCode: TGroupBox; + radioCodeOpt0: TRadioButton; + radioCodeOpt1: TRadioButton; + groupName: TGroupBox; + radioNameOpt0: TRadioButton; + radioNameOpt1: TRadioButton; + groupTime: TGroupBox; + radioTimeOpt0: TRadioButton; + radioTimeOpt1: TRadioButton; + radioTimeOpt2: TRadioButton; procedure radioRemarks1Opt1Click(Sender: TObject); procedure radioRemarks1Opt2Click(Sender: TObject); procedure radioRemarks1Opt3Click(Sender: TObject); procedure FormCreate(Sender: TObject); - procedure FormShow(Sender: TObject); procedure radioRemarks2Opt1Click(Sender: TObject); procedure radioRemarks2Opt2Click(Sender: TObject); procedure radioRemarks2Opt3Click(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); private { Private 宣言 } function GetRemarks1Option(): Integer; + procedure SetRemarks1Option(v: Integer); function GetRemarks2Option(): Integer; + procedure SetRemarks2Option(v: Integer); function GetRemarks1(): string; + procedure SetRemarks1(v: string); function GetRemarks2(): string; + procedure SetRemarks2(v: string); + function GetCodeOption(): Integer; + procedure SetCodeOption(v: Integer); + function GetNameOption(): Integer; + procedure SetNameOption(v: Integer); + function GetTimeOption(): Integer; + procedure SetTimeOption(v: Integer); + function GetQslStateText(): string; + procedure SetQslStateText(v: string); + procedure Save(); + procedure Load(); public { Public 宣言 } - property Remarks1Option: Integer read GetRemarks1Option; - property Remarks2Option: Integer read GetRemarks2Option; - property Remarks1: string read GetRemarks1; - property Remarks2: string read GetRemarks2; + property Remarks1Option: Integer read GetRemarks1Option write SetRemarks1Option; + property Remarks2Option: Integer read GetRemarks2Option write SetRemarks2Option; + property Remarks1: string read GetRemarks1 write SetRemarks1; + property Remarks2: string read GetRemarks2 write SetRemarks2; + property CodeOption: Integer read GetCodeOption write SetCodeOption; + property NameOption: Integer read GetNameOption write SetNameOption; + property TimeOption: Integer read GetTimeOption write SetTimeOption; + property QslStateText: string read GetQslStateText write SetQslStateText; end; implementation @@ -49,14 +87,12 @@ implementation procedure TformExportHamlog.FormCreate(Sender: TObject); begin - radioRemarks1Opt2.Checked := True; - radioRemarks2Opt3.Checked := True; + Load(); end; -procedure TformExportHamlog.FormShow(Sender: TObject); +procedure TformExportHamlog.FormClose(Sender: TObject; var Action: TCloseAction); begin - radioRemarks1Opt2Click(nil); - radioRemarks2Opt3Click(nil); + Save(); end; procedure TformExportHamlog.radioRemarks1Opt1Click(Sender: TObject); @@ -94,26 +130,54 @@ procedure TformExportHamlog.radioRemarks2Opt3Click(Sender: TObject); function TformExportHamlog.GetRemarks1Option(): Integer; begin if radioRemarks1Opt1.Checked = True then begin - Result := 0; + Result := 1; end else if radioRemarks1Opt2.Checked = True then begin - Result := 1; + Result := 2; + end + else if radioRemarks1Opt3.Checked = True then begin + Result := 3; end else begin - Result := 2; + Result := 0; + end; +end; + +procedure TformExportHamlog.SetRemarks1Option(v: Integer); +begin + case v of + 0: radioRemarks1Opt0.Checked := True; + 1: radioRemarks1Opt1.Checked := True; + 2: radioRemarks1Opt2.Checked := True; + 3: radioRemarks1Opt3.Checked := True; + else radioRemarks1Opt0.Checked := True; end; end; function TformExportHamlog.GetRemarks2Option(): Integer; begin if radioRemarks2Opt1.Checked = True then begin - Result := 0; + Result := 1; end else if radioRemarks2Opt2.Checked = True then begin - Result := 1; + Result := 2; + end + else if radioRemarks2Opt3.Checked = True then begin + Result := 3; end else begin - Result := 2; + Result := 0; + end; +end; + +procedure TformExportHamlog.SetRemarks2Option(v: Integer); +begin + case v of + 0: radioRemarks2Opt0.Checked := True; + 1: radioRemarks2Opt1.Checked := True; + 2: radioRemarks2Opt2.Checked := True; + 3: radioRemarks2Opt3.Checked := True; + else radioRemarks2Opt0.Checked := True; end; end; @@ -122,9 +186,152 @@ function TformExportHamlog.GetRemarks1(): string; Result := editRemarks1Opt1.Text; end; +procedure TformExportHamlog.SetRemarks1(v: string); +begin + editRemarks1Opt1.Text := v; +end; + function TformExportHamlog.GetRemarks2(): string; begin Result := editRemarks2Opt1.Text; end; +procedure TformExportHamlog.SetRemarks2(v: string); +begin + editRemarks2Opt1.Text := v; +end; + +function TformExportHamlog.GetCodeOption(): Integer; +begin + if radioCodeOpt1.Checked = True then begin + Result := 1; + end + else begin + Result := 0; + end; +end; + +procedure TformExportHamlog.SetCodeOption(v: Integer); +begin + case v of + 0: radioCodeOpt0.Checked := True; + 1: radioCodeOpt1.Checked := True; + else radioCodeOpt0.Checked := True; + end; +end; + +function TformExportHamlog.GetNameOption(): Integer; +begin + if radioNameOpt1.Checked = True then begin + Result := 1; + end + else begin + Result := 0; + end; +end; + +procedure TformExportHamlog.SetNameOption(v: Integer); +begin + case v of + 0: radioNameOpt0.Checked := True; + 1: radioNameOpt1.Checked := True; + else radioNameOpt0.Checked := True; + end; +end; + +function TformExportHamlog.GetTimeOption(): Integer; +begin + if radioTimeOpt1.Checked = True then begin + Result := 1; + end + else if radioTimeOpt2.Checked = True then begin + Result := 2; + end + else begin + Result := 0; + end; +end; + +procedure TformExportHamlog.SetTimeOption(v: Integer); +begin + case v of + 0: radioTimeOpt0.Checked := True; + 1: radioTimeOpt1.Checked := True; + 2: radioTimeOpt2.Checked := True; + else radioTimeOpt0.Checked := True; + end; +end; + +function TformExportHamlog.GetQslStateText(): string; +var + text: string; +begin + if editQslNone.Text = '' then begin + text := text + ' '; + end + else begin + text := text + Copy(editQslNone.Text, 1, 1); + end; + + if editPseQsl.Text = '' then begin + text := text + 'J'; + end + else begin + text := text + Copy(editPseQsl.Text, 1, 1); + end; + + if editNoQsl.Text = '' then begin + text := text + 'N'; + end + else begin + text := text + Copy(editNoQsl.Text, 1, 1); + end; + + Result := text; +end; + +procedure TformExportHamlog.SetQslStateText(v: string); +begin + v := v + ' '; + editQslNone.Text := Trim(Copy(v, 1, 1)); + editPseQsl.Text := Trim(Copy(v, 2, 1)); + editNoQsl.Text := Trim(Copy(v, 3, 1)); +end; + +procedure TformExportHamlog.Save(); +var + ini: TIniFile; +begin + ini := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'hamlogexport.ini'); + try + ini.WriteInteger('OPTION', 'remarks1option', Remarks1Option); + ini.WriteString('OPTION', 'remarks1text', Remarks1); + ini.WriteInteger('OPTION', 'remarks2option', Remarks2Option); + ini.WriteString('OPTION', 'remarks2text', Remarks2); + ini.WriteInteger('OPTION', 'codeoption', CodeOption); + ini.WriteInteger('OPTION', 'nameoption', NameOption); + ini.WriteInteger('OPTION', 'timeoption', TimeOption); + finally + ini.Free(); + end; +end; + +procedure TformExportHamlog.Load(); +var + ini: TIniFile; +begin + ini := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'hamlogexport.ini'); + try + Remarks1Option := ini.ReadInteger('OPTION', 'remarks1option', 2); + Remarks1 := ini.ReadString('OPTION', 'remarks1text', ''); + Remarks2Option := ini.ReadInteger('OPTION', 'remarks2option', 3); + Remarks2 := ini.ReadString('OPTION', 'remarks2text', ''); + CodeOption := ini.ReadInteger('OPTION', 'codeoption', 0); + NameOption := ini.ReadInteger('OPTION', 'nameoption', 0); + TimeOption := ini.ReadInteger('OPTION', 'timeoption', 0); + finally + ini.Free(); + end; +end; + end. diff --git a/zlog/UzLogQSO.pas b/zlog/UzLogQSO.pas index f327f22e..333c3c2c 100644 --- a/zlog/UzLogQSO.pas +++ b/zlog/UzLogQSO.pas @@ -325,7 +325,7 @@ TLog = class(TObject) procedure SaveToFilezLogALL(Filename : string); procedure SaveToFileByTX(Filename : string); procedure SaveToFileByCabrillo(Filename: string); - procedure SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nRemarks2Option: Integer; strRemarks1: string; strRemarks2: string); + procedure SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nRemarks2Option: Integer; strRemarks1: string; strRemarks2: string; nCodeOption: Integer; nNameOption: Integer; nTimeOption: Integer; strQslStateText: string); {$ENDIF} function IsDupe(aQSO : TQSO) : Integer; function IsDupe2(aQSO : TQSO; index : Integer; var dupeindex : Integer) : Boolean; @@ -375,7 +375,7 @@ TLog = class(TObject) implementation uses - UzLogGlobal, UzLogExtension; + UzLogGlobal, UzLogExtension, Main; { TQSO } @@ -663,36 +663,42 @@ function TQSO.GetFreqStr(): string; function TQSO.GetMemoStr(): string; var strMemo: string; + + function AddStr(S1, S2: string): string; + begin + if S1 <> '' then begin + Result := S1 + ' '; + end; + Result := Result + S2; + end; begin strMemo := ''; + // QSL + if dmZLogGlobal.Settings._qsl_default <> FQslState then begin + case FQslState of + qsNone: strMemo := AddStr(strMemo, ''); + qsPseQsl: strMemo := AddStr(strMemo, MEMO_PSE_QSL); + qsNoQsl: strMemo := AddStr(strMemo, MEMO_NO_QSL); + end; + end; + if FForced = True then begin - strMemo := '*'; + strMemo := AddStr(strMemo, '*'); end; if FDupe = True then begin - if strMemo <> '' then begin - strMemo := strMemo + ' '; - end; - - strMemo := strMemo + MEMO_DUPE; + strMemo := AddStr(strMemo, MEMO_DUPE); end; if FFreq <> '' then begin - if strMemo <> '' then begin - strMemo := strMemo + ' '; - end; - - strMemo := strMemo + '(' + FFreq + ')'; + strMemo := AddStr(strMemo, '(' + FFreq + ')'); end; - strMemo := strMemo + FMemo; + strMemo := AddStr(strMemo, FMemo); if FQsyViolation = True then begin - if strMemo <> '' then begin - strMemo := strMemo + ' '; - end; - strMemo := strMemo + MEMO_QSY_VIOLATION; + strMemo := AddStr(strMemo, MEMO_QSY_VIOLATION); end; Result := strMemo; @@ -2257,7 +2263,11 @@ procedure TLog.SaveToFileByCabrillo(Filename: string); 　でもそれ以外の場合もある } {$IFNDEF ZSERVER} -procedure TLog.SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nRemarks2Option: Integer; strRemarks1: string; strRemarks2: string); +procedure TLog.SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nRemarks2Option: Integer; + strRemarks1: string; strRemarks2: string; + nCodeOption: Integer; nNameOption: Integer; + nTimeOption: Integer; + strQslStateText: string); var F: TextFile; i: Integer; @@ -2265,7 +2275,15 @@ procedure TLog.SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nR Q: TQSO; offsetmin: Integer; slCsv: TStringList; + strQslState: array[qsNone..qsNoQsl] of string; + strMulti: string; + newoffsetmin: Integer; + offsethour: Integer; begin + strQslState[qsNone] := Copy(strQslStateText, 1, 1); + strQslState[qsPseQsl] := Copy(strQslStateText, 2, 1); + strQslState[qsNoQsl] := Copy(strQslStateText, 3, 1); + slCsv := TStringList.Create(); slCsv.StrictDelimiter := True; try @@ -2273,10 +2291,45 @@ procedure TLog.SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nR ReWrite(F); offsetmin := FQsoList[0].RSTsent; + if offsetmin = _USEUTC then begin + offsethour := 0; + end + else begin + offsethour := offsetmin div 60; + end; for i := 1 to FQSOList.Count - 1 do begin Q := FQSOList[i]; + strMulti := MyContest.MultiForm.ExtractMulti(Q); + + case nTimeOption of + // そのまま出力 + 0: begin + newoffsetmin := offsetmin; + end; + + // JST統一 + 1: begin + if offsetmin = _USEUTC then begin + Q.Time := IncHour(Q.Time, offsethour); + end; + newoffsetmin := offsetmin; + end; + + // UTC統一 + 2: begin + if offsetmin <> _USEUTC then begin + Q.Time := IncHour(Q.Time, offsethour); + end; + newoffsetmin := _USEUTC; + end; + + else begin + newoffsetmin := offsetmin; + end; + end; + slCsv.Clear(); //1列目　コールサイン @@ -2287,7 +2340,7 @@ procedure TLog.SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nR //3列目　交信時分（HH:MM*）　※「*」にはJST…J・UTC…U strText := FormatDateTime('HH:MM', Q.Time); - if offsetmin = _USEUTC then begin + if newoffsetmin = _USEUTC then begin strText := strText + 'U'; end else begin @@ -2308,22 +2361,27 @@ procedure TLog.SaveToFileByHamlog(Filename: string; nRemarks1Option: Integer; nR slCsv.Add(Q.ModeStr); //8列目　相手局の運用地コード - slCsv.Add(''); + if nCodeOption = 1 then begin + slCsv.Add(strMulti); + end + else begin + slCsv.Add(''); + end; //9列目　相手局の運用地グリッドロケータ slCsv.Add(''); //10列目　QSLマーク　※取りあえず「J」を入れておけばOK - if Q.QslState = qsPseQsl then begin - slCsv.Add('J '); + slCsv.Add(strQslState[Q.QslState] + ' '); + + //11列目　相手局の名前・名称 + if nNameOption = 1 then begin + slCsv.Add(strMulti); end else begin - slCsv.Add('N '); + slCsv.Add(''); end; - //11列目　相手局の名前・名称 - slCsv.Add(''); - //12列目　相手局の運用地 slCsv.Add(''); diff --git a/zlog/main.pas b/zlog/main.pas index 8452184d..4b4af0ef 100644 --- a/zlog/main.pas +++ b/zlog/main.pas @@ -6039,7 +6039,7 @@ procedure TMainForm.Export1Click(Sender: TObject); if dlg.ShowModal() = mrCancel then begin Exit; end; - Log.SaveToFileByHamlog(f, dlg.Remarks1Option, dlg.Remarks2Option, dlg.Remarks1, dlg.Remarks2); + Log.SaveToFileByHamlog(f, dlg.Remarks1Option, dlg.Remarks2Option, dlg.Remarks1, dlg.Remarks2, dlg.CodeOption, dlg.NameOption, dlg.TimeOption, dlg.QslStateText); finally dlg.Release(); end;