Changeset 1fe107a in git


Ignore:
Timestamp:
02/03/15 07:13:16 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
d2ed5a8
Parents:
ce77e4f
Message:

src/: Add JSON export.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rce77e4f r1fe107a  
     1Mon Mar 02 07:13:01 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * src/: Add JSON export.
     4
    15Mon Mar 02 07:11:53 GMT 2015  Olly Betts <olly@survex.com>
    26
  • src/Makefile.am

    rce77e4f r1fe107a  
    77 osdepend.h ostypes.h out.h readval.h str.h useful.h validate.h whichos.h\
    88 glbitmapfont.h guicontrol.h gla.h gpx.h moviemaker.h exportfilter.h hpgl.h\
    9  cavernlog.h aboutdlg.h aven.h avenpal.h gfxcore.h log.h mainfrm.h\
     9 cavernlog.h aboutdlg.h aven.h avenpal.h gfxcore.h json.h log.h mainfrm.h\
    1010 vector3.h wx.h aventypes.h aventreectrl.h export.h printwx.h avenprcore.h\
    1111 img2aven.h
     
    4242 gfxcore.cc mainfrm.cc vector3.cc aboutdlg.cc useful.c cmdline.c z_getopt.c \
    4343 getopt1.c namecompare.cc aventreectrl.cc export.cc guicontrol.cc gla-gl.cc \
    44  glbitmapfont.cc gpx.cc kml.cc log.cc moviemaker.cc hpgl.cc cavernlog.cc \
     44 glbitmapfont.cc gpx.cc json.cc kml.cc log.cc moviemaker.cc hpgl.cc cavernlog.cc \
    4545 brotatemask.xbm brotate.xbm handmask.xbm hand.xbm \
    4646 rotatemask.xbm rotate.xbm vrotatemask.xbm vrotate.xbm \
  • src/export.cc

    rce77e4f r1fe107a  
    3434#include "gpx.h"
    3535#include "hpgl.h"
     36#include "json.h"
    3637#include "kml.h"
    3738#include "mainfrm.h"
     
    11851186           // factor = POINTS_PER_MM * 1000.0 / scale;
    11861187           break;
     1188       case FMT_JSON:
     1189           filt = new JSON;
     1190           break;
    11871191       case FMT_KML:
    11881192           filt = new KML(input_projection);
  • src/export.h

    rce77e4f r1fe107a  
    3535    FMT_GPX,
    3636    FMT_HPGL,
     37    FMT_JSON,
    3738    FMT_KML,
    3839    FMT_PLT,
  • src/printwx.cc

    rce77e4f r1fe107a  
    232232    wxT("GPX"),
    233233    wxT("HPGL"),
     234    wxT("JSON"),
    234235    wxT("KML"),
    235236    wxT("Plot"),
     
    254255    LABELS|LEGS|SURF|ENTS|FIXES|EXPORTS|PROJ|EXPORT_3D,
    255256    LABELS|LEGS|SURF|STNS|CENTRED,
     257    LEGS|CENTRED|EXPORT_3D,
    256258    LABELS|ENTS|FIXES|EXPORTS|PROJ|EXPORT_3D,
    257259    LABELS|LEGS|SURF,
     
    265267    ".gpx",
    266268    ".hpgl",
     269    ".json",
    267270    ".kml",
    268271    ".plt",
     
    279282     * mechanism. */
    280283    /*HPGL for plotters*/414,
     284    /*JSON files*/445,
    281285    /*KML files*/444,
    282286    /* TRANSLATORS: "Compass" and "Carto" are the names of software packages,
Note: See TracChangeset for help on using the changeset viewer.