Changeset d7b53e3 in git

Timestamp:

06/03/15 03:28:26 (5 years ago)

Author:

Olly Betts <olly@…>

Branches:

line_contents, master, stereo, travis-osx

Children:

0e81a88

Parents:

bfd5706

git-author:

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

git-committer:

Olly Betts <olly@…> (06/03/15 03:28:26)

Message:

lib/icons/Makefile.am,lib/icons/log.xpm,lib/survex.pot,src/: Add a
menu item and toolbar button to show the cavern log window if the
currently shown survey data was processed by aven. Reported by
Hugh St Lawrence in #47, and by Dave Clucas and others previously on
the list.

Files:

• ChangeLog (modified) (1 diff)
• lib/icons/Makefile.am (modified) (1 diff)
• lib/icons/log.xpm (added)
• lib/survex.pot (modified) (2 diffs)
• src/cavernlog.cc (modified) (4 diffs)
• src/cavernlog.h (modified) (1 diff)
• src/mainfrm.cc (modified) (14 diffs)
• src/mainfrm.h (modified) (6 diffs)

ChangeLog

@@ +1 @@
+Fri Mar 06 03:24:54 GMT 2015  Olly Betts <olly@survex.com>
+
+        * lib/icons/Makefile.am,lib/icons/log.xpm,lib/survex.pot,src/: Add a
+          menu item and toolbar button to show the cavern log window if the
+          currently shown survey data was processed by aven.  Reported by
+          Hugh St Lawrence in #47, and by Dave Clucas and others previously on
+          the list.
+
 Fri Mar 06 01:24:57 GMT 2015  Olly Betts <olly@survex.com>
 

lib/icons/Makefile.am

@@ -3 +3 @@
 xpm_files = \
         aven.xpm \
+        log.xpm \
         open.xpm \
         open_pres.xpm \

lib/survex.pot

@@ -1654 +1654 @@
 #: n:269
 msgid "[SURVEY_FILE]"
-msgstr ""
-
-#. TRANSLATORS: Aven menu items.  An “&” goes before the letter of any
-#. accelerator key.
-#.
-#. The string "\t" separates the menu text and any accelerator key.
-#.
-#. "File" menu.  The accelerators must be different within this group.
-#. c.f. 201, 380, 381.
-#: ../src/mainfrm.cc:795
-#: n:220
-msgid "&Open…\tCtrl+O"
 msgstr ""
 
@@ -2655 +2643 @@
 msgstr ""
 
+#. TRANSLATORS: Aven menu items.  An “&” goes before the letter of any
+#. accelerator key.
+#.
+#. The string "\t" separates the menu text and any accelerator key.
+#.
+#. "File" menu.  The accelerators must be different within this group.
+#. c.f. 201, 380, 381.
+#: ../src/mainfrm.cc:795
+#: n:220
+msgid "&Open…\tCtrl+O"
+msgstr ""
+
+#: ../src/mainfrm.cc:796
+#: n:144
+msgid "Show &Log"
+msgstr ""
+
 #: ../src/mainfrm.cc:798
 #: n:380

src/cavernlog.cc

@@ -89 +89 @@
 }
 
-CavernLogWindow::CavernLogWindow(MainFrm * mainfrm_, wxWindow * parent)
-    : wxHtmlWindow(parent), mainfrm(mainfrm_)
+CavernLogWindow::CavernLogWindow(MainFrm * mainfrm_, const wxString & survey_, wxWindow * parent)
+    : wxHtmlWindow(parent), mainfrm(mainfrm_), init_done(false), survey(survey_)
 {
     int fsize = parent->GetFont().GetPointSize();
@@ -460 +460 @@
         return -1;
     }
-    if (link_count) {
-        AppendToPage(wxString::Format(wxT("<avenbutton id=1234 name=\"%s\">"),
-                                      wmsg(/*Reprocess*/184).c_str()));
-        AppendToPage(wxString::Format(wxT("<avenbutton default id=%d>"), (int)wxID_OK));
-        Update();
-    }
+    AppendToPage(wxString::Format(wxT("<avenbutton id=1234 name=\"%s\">"),
+                                  wmsg(/*Reprocess*/184).c_str()));
+    AppendToPage(wxString::Format(wxT("<avenbutton default id=%d>"), (int)wxID_OK));
+    Update();
+    init_done = false;
     return link_count;
 }
@@ -473 +472 @@
 {
     SetPage(wxString());
-    if (process(filename) == 0) {
+    int result = process(filename);
+    if (result < 0) return;
+    mainfrm->AddToFileHistory(filename);
+    wxString file3d(filename, 0, filename.length() - 3);
+    file3d.append(wxT("3d"));
+    if (!mainfrm->LoadData(file3d, survey)) {
+        return;
+    }
+    if (result == 0) {
         OnOK(e);
     }
@@ -481 +488 @@
 CavernLogWindow::OnOK(wxCommandEvent &)
 {
-    mainfrm->InitialiseAfterLoad(filename);
-}
+    if (init_done) {
+        mainfrm->HideLog(this);
+    } else {
+        mainfrm->InitialiseAfterLoad(filename);
+        init_done = true;
+    }
+}

src/cavernlog.h

@@ -32 +32 @@
     MainFrm * mainfrm;
 
+    bool init_done;
+
+    wxString survey;
+
   public:
-    CavernLogWindow(MainFrm * mainfrm_, wxWindow * parent);
+    CavernLogWindow(MainFrm * mainfrm_, const wxString & survey_, wxWindow * parent);
 
     /** Process survey data in file.

src/mainfrm.cc

@@ -61 +61 @@
 #define static static const
 #include "../lib/icons/aven.xpm"
+#include "../lib/icons/log.xpm"
 #include "../lib/icons/open.xpm"
 #include "../lib/icons/open_pres.xpm"
@@ -516 +517 @@
 
     EVT_MENU(wxID_OPEN, MainFrm::OnOpen)
+    EVT_MENU(menu_FILE_LOG, MainFrm::OnShowLog)
     EVT_MENU(wxID_PRINT, MainFrm::OnPrint)
     EVT_MENU(menu_FILE_PAGE_SETUP, MainFrm::OnPageSetup)
@@ -613 +615 @@
     EVT_MENU(wxID_ABOUT, MainFrm::OnAbout)
 
+    EVT_UPDATE_UI(menu_FILE_LOG, MainFrm::OnShowLogUpdate)
     EVT_UPDATE_UI(wxID_PRINT, MainFrm::OnPrintUpdate)
     EVT_UPDATE_UI(menu_FILE_SCREENSHOT, MainFrm::OnScreenshotUpdate)
@@ -737 +740 @@
     wxFrame(NULL, 101, title, pos, size, wxDEFAULT_FRAME_STYLE),
     m_SashPosition(-1),
-    m_Gfx(NULL), m_NumEntrances(0), m_NumFixedPts(0), m_NumExportedPts(0),
+    m_Gfx(NULL), m_Log(NULL),
+    m_NumEntrances(0), m_NumFixedPts(0), m_NumExportedPts(0),
     m_NumHighlighted(0),
     m_HasUndergroundLegs(false), m_HasSplays(false), m_HasSurfaceLegs(false),
@@ -794 +798 @@
      * c.f. 201, 380, 381. */
     filemenu->Append(wxID_OPEN, wmsg(/*&Open…\tCtrl+O*/220));
+    filemenu->Append(menu_FILE_LOG, wmsg(/*Show &Log*/144));
     filemenu->AppendSeparator();
     // wxID_PRINT stock label lacks the ellipses
@@ -997 +1002 @@
     toolbar->AddTool(wxID_OPEN, wxT("Open"), TOOL(open), wxT("Open a survey file for viewing"));
     toolbar->AddTool(menu_PRES_OPEN, wxT("Open presentation"), TOOL(open_pres), wxT("Open a presentation"));
+    toolbar->AddTool(menu_FILE_LOG, wxT("View log"), TOOL(log), wxT("View log from processing survey data"));
     toolbar->AddSeparator();
     toolbar->AddCheckTool(menu_ROTATION_TOGGLE, wxT("Toggle rotation"), TOOL(rotation), wxNullBitmap, wxT("Toggle rotation"));
@@ -1493 +1499 @@
     SetTitle(m_Title + " - "APP_NAME);
 
+    // Sort the labels ready for filling the tree.
+    m_Labels.sort(LabelCmp(separator));
+
+    // Fill the tree of stations and prefixes.
+    FillTree(wxFileNameFromPath(file));
+
+    // Sort labels so that entrances are displayed in preference,
+    // then fixed points, then exported points, then other points.
+    //
+    // Also sort by leaf name so that we'll tend to choose labels
+    // from different surveys, rather than labels from surveys which
+    // are earlier in the list.
+    m_Labels.sort(LabelPlotCmp(separator));
+
+    if (!m_FindBox->GetValue().empty()) {
+        // Highlight any stations matching the current search.
+        DoFind();
+    }
+
     return true;
 }
@@ -1567 +1592 @@
 #endif
 
-void MainFrm::FillTree()
+void MainFrm::FillTree(const wxString & root_name)
 {
     // Create the root of the tree.
-    wxTreeItemId treeroot = m_Tree->AddRoot(wxFileNameFromPath(m_File));
+    wxTreeItemId treeroot = m_Tree->AddRoot(root_name);
 
     // Fill the tree of stations and prefixes.
@@ -1773 +1798 @@
         ext.MakeLower();
         if (ext == wxT("svx") || ext == wxT("dat") || ext == wxT("mak")) {
-            CavernLogWindow * log = new CavernLogWindow(this, m_Splitter);
+            CavernLogWindow * log = new CavernLogWindow(this, survey, m_Splitter);
             wxWindow * win = m_Splitter->GetWindow1();
             m_Splitter->ReplaceWindow(win, log);
@@ -1804 +1829 @@
     AddToFileHistory(file);
     InitialiseAfterLoad(file);
+
+    // If aven is showing the log for a .svx file and you load a .3d file, then
+    // at this point m_Log will be the log window for the .svx file, so destroy
+    // it - it should never legitimately be set if we get here.
+    if (m_Log) {
+        m_Log->Destroy();
+        m_Log = NULL;
+    }
 }
 
@@ -1828 +1861 @@
         m_File = file;
 
-    // Sort the labels ready for filling the tree.
-    m_Labels.sort(LabelCmp(separator));
-
-    // Fill the tree of stations and prefixes.
-    FillTree();
-
-    // Sort labels so that entrances are displayed in preference,
-    // then fixed points, then exported points, then other points.
-    //
-    // Also sort by leaf name so that we'll tend to choose labels
-    // from different surveys, rather than labels from surveys which
-    // are earlier in the list.
-    m_Labels.sort(LabelPlotCmp(separator));
-
-    if (!m_FindBox->GetValue().empty()) {
-        // Highlight any stations matching the current search.
-        DoFind();
-    }
-
     wxWindow * win = NULL;
     if (m_Splitter->GetWindow2() == NULL) {
@@ -1860 +1874 @@
 
     m_Gfx->Initialise(same_file);
+
+    if (win) {
+        // FIXME: check it actually is the log window!
+        if (m_Log && m_Log != win)
+            m_Log->Destroy();
+        m_Log = win;
+        m_Log->Show(false);
+    }
+
     if (!IsFullScreen()) {
         m_Notebook->Show(true);
@@ -1866 +1889 @@
     m_Gfx->Show(true);
     m_Gfx->SetFocus();
-
-    if (win) win->Destroy();
+}
+
+void MainFrm::HideLog(wxWindow * log_window)
+{
+    if (!IsFullScreen()) {
+        m_Splitter->SplitVertically(m_Notebook, m_Gfx, m_SashPosition);
+    }
+
+    m_Log = log_window;
+    m_Log->Show(false);
+
+    if (!IsFullScreen()) {
+        m_Notebook->Show(true);
+    }
+
+    m_Gfx->Show(true);
+    m_Gfx->SetFocus();
 }
 
@@ -1934 +1972 @@
 }
 
+void MainFrm::OnShowLog(wxCommandEvent&)
+{
+    if (!m_Log) return;
+    wxWindow * win = m_Splitter->GetWindow1();
+    m_Splitter->ReplaceWindow(win, m_Log);
+    if (m_Splitter->IsSplit()) {
+        m_SashPosition = m_Splitter->GetSashPosition(); // save width of panel
+        m_Splitter->Unsplit();
+    }
+    m_Log->Show(true);
+    m_Log->SetFocus();
+    m_Log = NULL;
+}
+
 void MainFrm::OnScreenshot(wxCommandEvent&)
 {

src/mainfrm.h

@@ -55 +55 @@
 
 enum {
-    menu_FILE_PAGE_SETUP = 1000,
+    menu_FILE_LOG = 1000,
+    menu_FILE_PAGE_SETUP,
     menu_FILE_SCREENSHOT,
     menu_FILE_EXPORT,
@@ -189 +190 @@
     bool complete_dateinfo;
     GfxCore* m_Gfx;
+    wxWindow* m_Log;
     GUIControl* m_Control;
     int m_NumEntrances;
@@ -222 +224 @@
 #endif
 
-    void FillTree();
+    void FillTree(const wxString & root_name);
     bool ProcessSVXFile(const wxString & file);
-    bool LoadData(const wxString& file, const wxString& prefix);
 //    void FixLRUD(traverse & centreline);
     void CentreDataset(const Vector3 & vmin);
@@ -234 +235 @@
     void UpdateStatusBar();
 
-    void AddToFileHistory(const wxString & file);
-
 public:
     MainFrm(const wxString& title, const wxPoint& pos, const wxSize& size);
 
+    // public for CavernLog.
+    bool LoadData(const wxString& file, const wxString& prefix);
+    void AddToFileHistory(const wxString & file);
+
     void InitialiseAfterLoad(const wxString & file);
+    void OnShowLog(wxCommandEvent& event);
 
     void OnMRUFile(wxCommandEvent& event);
@@ -268 +272 @@
 
     void OnOpen(wxCommandEvent& event);
+    void HideLog(wxWindow * log_window);
     void OnScreenshot(wxCommandEvent& event);
     void OnScreenshotUpdate(wxUpdateUIEvent& event);
@@ -304 +309 @@
     }
 
+    void OnShowLogUpdate(wxUpdateUIEvent &ui) { ui.Enable(m_Log != NULL); }
     void OnPrintUpdate(wxUpdateUIEvent &ui) { ui.Enable(!m_File.empty()); }
     void OnExportUpdate(wxUpdateUIEvent &ui) { ui.Enable(!m_File.empty()); }