Added n3fjp mapping of custom fields

logbook/adif.cpp

@@ -333,7 +333,7 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri
                            , QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn
                            , QDateTime const& dateTimeOff, QString const& band, QString const& comments
                            , QString const& name, QString const& strDialFreq, QString const& m_myCall
-                           , QString const& m_myGrid, QString const& operator_call, QMap<QString, QString> const &additionalFields)
+                           , QString const& m_myGrid, QString const& operator_call, QMap<QString, QVariant> const &additionalFields)
 {
   QString t;
   t = "<call:" + QString::number(hisCall.length()) + ">" + hisCall;
@@ -365,7 +365,7 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri
               ">" + operator_call;
 
   foreach(auto key, additionalFields.keys()){
-      auto value = additionalFields[key];
+      auto value = additionalFields[key].toString();
       t += QString(" <%1:%2>%3").arg(key).arg(value.length()).arg(value);
   }
 

logbook/adif.h

@@ -13,6 +13,7 @@
 #include <QString>
 #include <QStringList>
 #include <QMultiHash>
+#include <QVariant>
 #else
 #include <QtGui>
 #endif
@@ -42,7 +43,7 @@ class ADIF
                                              , QString const& rptRcvd, QDateTime const& dateTimeOn, QDateTime const& dateTimeOff
                                              , QString const& band, QString const& comments, QString const& name
                                              , QString const& strDialFreq, QString const& m_myCall, QString const& m_myGrid
-                                             , QString const& operator_call, const QMap<QString, QString> &additionalFields);
+                                             , QString const& operator_call, const QMap<QString, QVariant> &additionalFields);
 
 
     struct QSO

logbook/logbook.h

@@ -13,6 +13,7 @@
 #include "countrydat.h"
 #include "countriesworked.h"
 #include "adif.h"
+#include "n3fjp.h"
 
 class QDir;
 

logbook/n3fjp.h

@@ -0,0 +1,82 @@
+#ifndef N3FJP_H
+#define N3FJP_H
+
+
+// Mapping between ADIF field to N3FJP field
+static const QMap<QString, QString> N3FJP_ADIF_MAP = {
+    {"AGE", "fldAge"},
+    //{"", "fldARCI"},
+    {"BAND", "fldBand"},
+    {"CALL", "fldCall"},
+    //{"", "fldCategory"},
+    {"CHECK", "fldCheck"},
+    {"CLASS", "fldClass"},
+    {"COMMENT", "fldComments"},
+    {"COMMENT_INTL", "fldComments"},
+    //{"", "fldComputerName"},
+    {"CONTEST_ID", "fldContestID"},
+    {"CONT", "fldContinent"},
+    {"DXCC", "fldCountryDXCC"},
+    //{"", "fldCountryWorked"},
+    {"COUNTRY", "fldCountyR"},
+    {"COUNTRY_INTL", "fldCountyR"},
+    {"MY_COUNTRY", "fldCountyS"},
+    {"MY_COUNTRY_INTL", "fldCountyS"},
+    {"CQZ", "fldCQZone"},
+    {"QSO_DATE", "fldDateStr"},
+    {"FISTS", "fldFists"},
+    {"FISTS_CC", "fldFists"},
+    {"FREQ", "fldFrequency"},
+    //{"", "fldFuture1"},
+    //{"", "fldFuture2"},
+    {"GRIDSQUARE", "fldGridR"},
+    {"MY_GRIDSQUARE", "fldGridS"},
+    //{"", "fldIARUZone"},
+    //{"", "fldInitials"},
+    {"IOTA", "fldIOTA"},
+    {"ITUZ", "fldITUZone"},
+    //{"", "fldLightHouse"},
+    {"MODE", "fldMode"},
+    {"CONTEST_ID", "fldModeContest"},
+    {"NAME", "fldNameR"},
+    {"NAME_INTL", "fldNameR"},
+    {"MY_NAME", "fldNameS"},
+    {"MY_NAME_INTL", "fldNameS"},
+    {"OPERATOR", "fldOperator"},
+    {"*1", "fldOther1"},
+    {"*2", "fldOther2"},
+    {"*3", "fldOther3"},
+    {"*4", "fldOther4"},
+    {"*5", "fldOther5"},
+    {"*6", "fldOther6"},
+    {"*7", "fldOther7"},
+    {"*8", "fldOther8"},
+    //{"", "fldPoints"},
+    {"RX_PWR", "fldPower"},
+    {"TX_PWR", "fldPower"},
+    {"PRECEDENCE", "fldPrecedence"},
+    {"PFX", "fldPrefix"},
+    {"PROP_MODE", "fldPropMode"},
+    {"QSL_RCVD_VIA", "fldQSLConfByR"},
+    {"QSL_SENT_VIA", "fldQSLConfByS"},
+    {"QSL_RCVD", "fldQSLR"},
+    {"QSL_SENT", "fldQSLS"},
+    {"QTH", "fldQTHGroup"},
+    {"QTH_INTL", "fldQTHGroup"},
+    {"RST_RCVD", "fldRstR"},
+    {"RST_SENT", "fldRstS"},
+    {"SAT_NAME", "fldSatName"},
+    {"ARRL_SECT", "fldSection"},
+    {"SRX", "fldSerialNoR"},
+    {"STX", "fldSerialNoS"},
+    {"SRX_STRING", "fldSPC"},
+    {"SRX", "fldSPCNum"},
+    {"STATE", "fldState"},
+    {"STATION_CALLSIGN", "fldStation"},
+    {"TEN_TEN", "fldTenTen"},
+    {"TIME_OFF", "fldTimeOffStr"},
+    {"TIME_ON", "fldTimeOnStr"},
+    //{"", "fldTransmitterID"},
+};
+
+#endif // N3FJP_H