Changeset 70462c8 in git


Ignore:
Timestamp:
14/01/14 02:23:57 (6 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
1e5ac43
Parents:
ea69247
git-author:
Olly Betts <olly@…> (13/01/14 04:03:00)
git-committer:
Olly Betts <olly@…> (14/01/14 02:23:57)
Message:

src/: Pass the datestamp from the 3d file to the export code.

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rea69247 r70462c8  
     1Mon Jan 13 04:02:26 GMT 2014  Olly Betts <olly@survex.com>
     2
     3        * src/: Pass the datestamp from the 3d file to the export code.
     4
    15Mon Jan 13 04:00:54 GMT 2014  Olly Betts <olly@survex.com>
    26
  • src/export.cc

    rea69247 r70462c8  
    33 */
    44
    5 /* Copyright (C) 1994-2004,2005,2006,2008,2010,2011,2012,2013 Olly Betts
     5/* Copyright (C) 1994-2004,2005,2006,2008,2010,2011,2012,2013,2014 Olly Betts
    66 * Copyright (C) 2004 John Pybus (SVG Output code)
    77 *
     
    110110    const int * passes() const;
    111111    bool fopen(const char *fnm_out);
    112     void header(const char *);
     112    void header(const char *, const char *);
    113113    void line(const img_point *, const img_point *, bool, bool);
    114114    void label(const img_point *, const char *, bool, int);
     
    139139
    140140void
    141 DXF::header(const char *)
     141DXF::header(const char *, const char *)
    142142{
    143143   fprintf(fh, "0\nSECTION\n"
     
    373373    Skencil() { }
    374374    const int * passes() const;
    375     void header(const char *);
     375    void header(const char *, const char *);
    376376    void start_pass(int layer);
    377377    void line(const img_point *, const img_point *, bool, bool);
     
    389389
    390390void
    391 Skencil::header(const char *)
     391Skencil::header(const char *, const char *)
    392392{
    393393   fprintf(fh, "##Sketch 1 2\n"); /* File format version */
     
    528528    SVG() : to_close(NULL), close_g(false) { pending[0] = '\0'; }
    529529    const int * passes() const;
    530     void header(const char *);
     530    void header(const char *, const char *);
    531531    void start_pass(int layer);
    532532    void line(const img_point *, const img_point *, bool, bool);
     
    550550
    551551void
    552 SVG::header(const char *)
     552SVG::header(const char *, const char *)
    553553{
    554554   size_t i;
     
    709709    PLT() { }
    710710    const int * passes() const;
    711     void header(const char *);
     711    void header(const char *, const char *);
    712712    void line(const img_point *, const img_point *, bool, bool);
    713713    void label(const img_point *, const char *, bool, int);
     
    723723
    724724void
    725 PLT::header(const char *title)
     725PLT::header(const char *title, const char *)
    726726{
    727727   size_t i;
     
    804804  public:
    805805    EPS() { }
    806     void header(const char *);
     806    void header(const char *, const char *);
    807807    void line(const img_point *, const img_point *, bool, bool);
    808808    void label(const img_point *, const char *, bool, int);
     
    812812
    813813void
    814 EPS::header(const char *title)
     814EPS::header(const char *title, const char *)
    815815{
    816816   const char * fontname_labels = "helvetica"; // FIXME
     
    819819   fputs("%%Creator: Survex "VERSION" EPS Output Filter\n", fh);
    820820
    821    if (title && title[0]) fprintf(fh, "%%%%Title: %s\n", title);
     821   if (title && title[0])
     822       fprintf(fh, "%%%%Title: %s\n", title);
    822823
    823824   char buf[64];
     
    10921093
    10931094bool
    1094 Export(const wxString &fnm_out, const wxString &title, const MainFrm * mainfrm,
     1095Export(const wxString &fnm_out, const wxString &title,
     1096       const wxString &datestamp, const MainFrm * mainfrm,
    10951097       double pan, double tilt, int show_mask, export_format format,
    10961098       const char * input_projection,
     
    12531255
    12541256   /* Header */
    1255    filt->header(title.mb_str());
     1257   filt->header(title.mb_str(), datestamp.mb_str());
    12561258
    12571259   p1.x = p1.y = p1.z = 0; /* avoid compiler warning */
  • src/export.h

    rea69247 r70462c8  
    44 */
    55
    6 /* Copyright (C) 2004,2005,2012 Olly Betts
     6/* Copyright (C) 2004,2005,2012,2014 Olly Betts
    77 *
    88 * This program is free software; you can redistribute it and/or modify
     
    6060
    6161bool Export(const wxString &fnm_out, const wxString &title,
    62             const MainFrm * mainfrm, double pan, double tilt, int show_mask,
    63             export_format format, const char * input_projection,
     62            const wxString &datestamp, const MainFrm * mainfrm,
     63            double pan, double tilt, int show_mask, export_format format,
     64            const char * input_projection,
    6465            double grid_, double text_height_, double marker_size_);
    6566
  • src/exportfilter.h

    rea69247 r70462c8  
    44 */
    55
    6 /* Copyright (C) 2005,2012,2013 Olly Betts
     6/* Copyright (C) 2005,2012,2013,2014 Olly Betts
    77 *
    88 * This program is free software; you can redistribute it and/or modify
     
    4040        return (fh != NULL);
    4141    }
    42     virtual void header(const char *) { }
     42    virtual void header(const char *, const char *) { }
    4343    virtual void start_pass(int) { }
    4444    virtual void line(const img_point *, const img_point *, bool, bool) = 0;
  • src/gfxcore.cc

    rea69247 r70462c8  
    28892889
    28902890void
    2891 GfxCore::OnExport(const wxString &filename, const wxString &title)
     2891GfxCore::OnExport(const wxString &filename, const wxString &title,
     2892                  const wxString &datestamp)
    28922893{
    28932894    // Fill in "right_bearing" for each cross-section.
     
    29002901
    29012902    svxPrintDlg * p;
    2902     p = new svxPrintDlg(m_Parent, filename, title, wxString(),
     2903    p = new svxPrintDlg(m_Parent, filename, title, datestamp,
    29032904                        m_PanAngle, m_TiltAngle,
    29042905                        m_Names, m_Crosses, m_Legs, m_Surface, m_Tubes,
  • src/gfxcore.h

    rea69247 r70462c8  
    488488    void OnPrint(const wxString &filename, const wxString &title,
    489489                 const wxString &datestamp);
    490     void OnExport(const wxString &filename, const wxString &title);
     490    void OnExport(const wxString &filename, const wxString &title,
     491                  const wxString &datestamp);
    491492    void SetCursor(GfxCore::cursor new_cursor);
    492493    bool MeasuringLineActive() const;
  • src/gpx.cc

    rea69247 r70462c8  
    9696
    9797/* Initialise GPX routines. */
    98 void GPX::header(const char * title)
     98void GPX::header(const char * title, const char *)
    9999{
    100100    fputs(
  • src/gpx.h

    rea69247 r70462c8  
    33 */
    44
    5 /* Copyright (C) 2005,2013 Olly Betts
     5/* Copyright (C) 2005,2013,2014 Olly Betts
    66 *
    77 * This program is free software; you can redistribute it and/or modify
     
    3131    ~GPX();
    3232    const int * passes() const;
    33     void header(const char *);
     33    void header(const char *, const char *);
    3434    void line(const img_point *, const img_point *, bool, bool);
    3535    void label(const img_point *, const char *, bool, int);
  • src/hpgl.cc

    rea69247 r70462c8  
    22 * Export from Aven as HPGL.
    33 */
    4 /* Copyright (C) 1993-2003,2005,2010 Olly Betts
     4/* Copyright (C) 1993-2003,2005,2010,2014 Olly Betts
    55 *
    66 * This program is free software; you can redistribute it and/or modify
     
    4949/* Check if this line intersects the current page */
    5050/* Initialise HPGL routines. */
    51 void HPGL::header(const char *)
     51void HPGL::header(const char *, const char *)
    5252{
    5353   // FIXME: mm_across_page, mm_down_page, origin_in_centre, scale
  • src/hpgl.h

    rea69247 r70462c8  
    33 */
    44
    5 /* Copyright (C) 2005 Olly Betts
     5/* Copyright (C) 2005, 2014 Olly Betts
    66 *
    77 * This program is free software; you can redistribute it and/or modify
     
    2525  public:
    2626    HPGL() {}
    27     void header(const char *);
     27    void header(const char *, const char *);
    2828    void line(const img_point *, const img_point *, bool, bool);
    2929    void label(const img_point *, const char *, bool, int);
  • src/mainfrm.cc

    rea69247 r70462c8  
    18631863void MainFrm::OnExport(wxCommandEvent&)
    18641864{
    1865     m_Gfx->OnExport(m_File, m_Title);
     1865    m_Gfx->OnExport(m_File, m_Title, m_DateStamp);
    18661866}
    18671867
  • src/printwx.cc

    rea69247 r70462c8  
    11/* printwx.cc */
    22/* wxWidgets specific parts of Survex wxWidgets printing code */
    3 /* Copyright (C) 1993-2003,2004,2005,2006,2010,2011,2012,2013 Olly Betts
     3/* Copyright (C) 1993-2003,2004,2005,2006,2010,2011,2012,2013,2014 Olly Betts
    44 * Copyright (C) 2001,2004 Philip Underwood
    55 *
     
    575575        double marker_size = 0.8;
    576576
    577         if (!Export(dlg.GetPath(), m_layout.title, mainfrm,
     577        if (!Export(dlg.GetPath(), m_layout.title, m_layout.datestamp, mainfrm,
    578578                    m_layout.rot, m_layout.tilt, m_layout.show_mask,
    579579                    export_format(format_idx), input_projection.mb_str(),
Note: See TracChangeset for help on using the changeset viewer.