Changeset 0e81a88 in git

Timestamp:

06/03/15 04:00:44 (5 years ago)

Author:

Olly Betts <olly@…>

Branches:

line_contents, master, stereo, travis-osx

Children:

bbed692

Parents:

d7b53e3

git-author:

Olly Betts <olly@…> (06/03/15 03:56:50)

git-committer:

Olly Betts <olly@…> (06/03/15 04:00:44)

Message:

lib/survex.pot,src/cavernlog.cc,src/cavernlog.h: Add "Save Log"
button to Aven's cavern log window.

Files:

• ChangeLog (modified) (1 diff)
• lib/survex.pot (modified) (2 diffs)
• src/cavernlog.cc (modified) (5 diffs)
• src/cavernlog.h (modified) (4 diffs)

ChangeLog

@@ +1 @@
+Fri Mar 06 03:56:13 GMT 2015  Olly Betts <olly@survex.com>
+
+        * lib/survex.pot,src/cavernlog.cc,src/cavernlog.h: Add "Save Log"
+          button to Aven's cavern log window.
+
 Fri Mar 06 03:24:54 GMT 2015  Olly Betts <olly@survex.com>
 

lib/survex.pot

@@ -1236 +1236 @@
 
 #. TRANSLATORS: Label for button in aven’s cavern log window which
+#. allows the user to save the log to a file.
+#: ../src/cavernlog.cc:450
+#: n:446
+msgid "Save Log"
+msgstr ""
+
+#. TRANSLATORS: Label for button in aven’s cavern log window which
 #. causes the survey data to be reprocessed.
 #: ../src/cavernlog.cc:453
@@ -1557 +1564 @@
 #: n:445
 msgid "JSON files"
+msgstr ""
+
+#. TRANSLATORS: Log files from running cavern (extension .log)
+#: ../src/cavernlog.cc:508
+#: n:447
+msgid "Log files"
 msgstr ""
 

src/cavernlog.cc

@@ -41 +41 @@
 #include <unistd.h>
 
-enum { LOG_REPROCESS = 1234 };
+enum { LOG_REPROCESS = 1234, LOG_SAVE = 1235 };
 
 BEGIN_EVENT_TABLE(CavernLogWindow, wxHtmlWindow)
     EVT_BUTTON(LOG_REPROCESS, CavernLogWindow::OnReprocess)
+    EVT_BUTTON(LOG_SAVE, CavernLogWindow::OnSave)
     EVT_BUTTON(wxID_OK, CavernLogWindow::OnOK)
 END_EVENT_TABLE()
@@ -185 +186 @@
     SetFocus();
     filename = file;
+
+    log_txt.resize(0);
 
 #ifdef __WXMSW__
@@ -292 +295 @@
             break;
         }
+        log_txt.append((const char *)end, r);
         end += r;
 
@@ -446 +450 @@
 abort:
 
+    /* TRANSLATORS: Label for button in aven’s cavern log window which
+     * allows the user to save the log to a file. */
+    AppendToPage(wxString::Format(wxT("<avenbutton id=%d name=\"%s\">"),
+                                  (int)LOG_SAVE,
+                                  wmsg(/*Save Log*/446).c_str()));
     int retval = pclose(cavern_out);
     if (retval) {
@@ -486 +495 @@
 
 void
+CavernLogWindow::OnSave(wxCommandEvent &)
+{
+    wxString filelog(filename, 0, filename.length() - 3);
+    filelog += wxT("log");
+    AvenAllowOnTop ontop(mainfrm);
+#ifdef __WXMOTIF__
+    wxString ext(wxT("*.log"));
+#else
+    /* TRANSLATORS: Log files from cavern (extension .log) */
+    wxString ext = wmsg(/*Log files*/447);
+    ext += wxT("|*.log");
+#endif
+    wxFileDialog dlg(this, wmsg(/*Select an output filename*/319),
+                     wxString(), filelog, ext,
+                     wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+    if (dlg.ShowModal() != wxID_OK) return;
+    filelog = dlg.GetPath();
+#ifdef __WXMSW__
+    FILE * fh_log = _wfopen(filelog.fn_str(), L"w");
+#else
+    FILE * fh_log = fopen(filelog.mb_str(), "w");
+#endif
+    if (!fh_log) {
+        wxGetApp().ReportError(wxString::Format(wmsg(/*Error writing to file “%s”*/110), filelog.c_str()));
+        return;
+    }
+    fwrite(log_txt.data(), log_txt.size(), 1, fh_log);
+    fclose(fh_log);
+}
+
+void
 CavernLogWindow::OnOK(wxCommandEvent &)
 {

src/cavernlog.h

@@ -2 +2 @@
  * Run cavern inside an Aven window
  *
- * Copyright (C) 2005,2006,2010 Olly Betts
+ * Copyright (C) 2005,2006,2010,2015 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 #include <wx/html/htmlwin.h>
 
+#include <string>
+
 class MainFrm;
 
@@ -35 +37 @@
 
     wxString survey;
+
+    std::string log_txt;
 
   public:
@@ -50 +54 @@
     void OnReprocess(wxCommandEvent &);
 
+    void OnSave(wxCommandEvent &);
+
     void OnOK(wxCommandEvent &);