Merge: Have -dp2trk and -csv2trk generate Trick10 trks

People who are writing tools to process Trick trk files
produced by koviz expect Trick10 trks.  This commit
changes the koviz generated trks from Trick07 to Trick10.

Bill M. wrote, "My preference is for all of the data we
provide to customers be in the Trick10 format".

Author: keithvetter

koviz/main.cpp

@@ -1621,7 +1621,7 @@ bool writeTrk(const QString& ftrk, const QString& timeName,
     TrickParameter timeParam;
     timeParam.setName(timeName);
     timeParam.setUnit("s");
-    timeParam.setType(TRICK_07_DOUBLE);
+    timeParam.setType(TRICK_10_DOUBLE);
     timeParam.setSize(sizeof(double));
     params << timeParam;
 
@@ -1671,7 +1671,7 @@ bool writeTrk(const QString& ftrk, const QString& timeName,
         TrickParameter p;
         p.setName(yParam);
         p.setUnit(c->y()->unit());
-        p.setType(TRICK_07_DOUBLE);
+        p.setType(TRICK_10_DOUBLE);
         p.setSize(sizeof(double));
 
         // Make params/curves lists (lazily mapping params to curves)
@@ -1995,7 +1995,7 @@ bool convert2trk(const QString& csvFileName, const QString& trkFileName)
                 p.setUnit(unitString);
             }
         }
-        p.setType(TRICK_07_DOUBLE);
+        p.setType(TRICK_10_DOUBLE);
         p.setSize(sizeof(double));
         params.append(p);
     }

libkoviz/datamodel_trick.cpp

@@ -222,7 +222,7 @@ void TrickModel::writeTrkHeader(QDataStream &out,
     // Trick-version-endian (10 bytes)
     //
     out.writeRawData("Trick-",6) ;
-    out.writeRawData("07",2) ;
+    out.writeRawData("10",2) ;
     out.writeRawData("-",1) ;
     out.writeRawData("L",1) ; // little endian