Changeset d9cd8ae in git


Ignore:
Timestamp:
14/01/14 03:23:54 (6 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
a57af18
Parents:
d959ab2
Message:

src/img.c,src/mainfrm.cc: Although these are often referred to as
"CMAP .XYZ files", it seems that actually, the extension .XYZ isn't
used, rather .SHT (shot variant, produced by CMAP v16 and later),
.UNA (unadjusted) and .ADJ (adjusted) extensions are. Since we've
long checked for .XYZ, we continue to do so in case anyone is
relying on it, but also check for the other extensions.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd959ab2 rd9cd8ae  
     1Tue Jan 14 03:22:54 GMT 2014  Olly Betts <olly@survex.com>
     2
     3        * src/img.c,src/mainfrm.cc: Although these are often referred to as
     4          "CMAP .XYZ files", it seems that actually, the extension .XYZ isn't
     5          used, rather .SHT (shot variant, produced by CMAP v16 and later),
     6          .UNA (unadjusted) and .ADJ (adjusted) extensions are.  Since we've
     7          long checked for .XYZ, we continue to do so in case anyone is
     8          relying on it, but also check for the other extensions.
     9
    110Tue Jan 14 03:20:03 GMT 2014  Olly Betts <olly@survex.com>
    211
  • src/img.c

    rd959ab2 rd9cd8ae  
    285285#define EXT_PLT "plt"
    286286#define EXT_PLF "plf"
    287 #define EXT_XYZ "xyz"
    288287
    289288/* Attempt to string paste to ensure we are passed a literal string */
     
    550549   }
    551550
    552    if (has_ext(fnm, len, EXT_XYZ)) {
     551   /* Although these are often referred to as "CMAP .XYZ files", it seems
     552    * that actually, the extension .XYZ isn't used, rather .SHT (shot
     553    * variant, produced by CMAP v16 and later), .UNA (unadjusted) and
     554    * .ADJ (adjusted) extensions are.  Since img has long checked for
     555    * .XYZ, we continue to do so in case anyone is relying on it.
     556    */
     557   if (has_ext(fnm, len, "sht") ||
     558       has_ext(fnm, len, "adj") ||
     559       has_ext(fnm, len, "una") ||
     560       has_ext(fnm, len, "xyz")) {
    553561      char *line;
    554562xyz_file:
     
    21242132         return img_LABEL;
    21252133      } else {
    2126          /* Shot variant */
     2134         /* Shot variant (VERSION_CMAP_SHOT) */
    21272135         char old[8], new_[8];
    21282136         if (len < 61) {
  • src/mainfrm.cc

    rd959ab2 rd9cd8ae  
    17831783#else
    17841784    wxString filetypes;
    1785     filetypes.Printf(wxT("%s|*.3d;*.svx;*.plt;*.plf;*.dat;*.mak;*.xyz"
    1786                      CASE("*.3D;*.SVX;*.PLT;*.PLF;*.DAT;*.MAK;*.XYZ")
     1785    filetypes.Printf(wxT("%s|*.3d;*.svx;*.plt;*.plf;*.dat;*.mak;*.adj;*.sht;*.una;*.xyz"
     1786                     CASE("*.3D;*.SVX;*.PLT;*.PLF;*.DAT;*.MAK;*.ADJ;*.SHT;*.UNA;*.XYZ")
    17871787                     "|%s|*.3d"CASE("*.3D")
    17881788                     "|%s|*.svx"CASE("*.SVX")
    17891789                     "|%s|*.plt;*.plf"CASE("*.PLT;*.PLF")
    17901790                     "|%s|*.dat;*.mak"CASE("*.DAT;*.MAK")
    1791                      "|%s|*.xyz"CASE("*.XYZ")
     1791                     "|%s|*.adj;*.sht;*.una;*.xyz"CASE("*.ADJ;*.SHT;*.UNA;*.XYZ")
    17921792                     "|%s|%s"),
    17931793                     wmsg(/*All survey files*/229).c_str(),
Note: See TracChangeset for help on using the changeset viewer.