Organizer: always offer "Import Calculation from Output File" (#97)

getFileMenu() added the import entry only when the selected tree node
was literally a "project" -- with a comment conceding the approach
("Hardwire the import entry, not sure if there is any better way to do
it"). So File showed just "Upload File..." and "Quit" unless the user
had happened to click a project first.

Reported from a live session: "Only see it if I select users, or andy,
and then click on File ... better to always have access to it". That is
right, and it matters more than it looks: importing externally run
output is the whole of #44 and half of #94, and the entry point was
effectively hidden.

Importing does not depend on what is selected, so it is now always
offered.

That change alone would have introduced a crash. CalcMgr::getContainer()
dereferences p_treeCtrl->getSelection() with no null check, which was
unreachable while the menu entry required a selected project and is not
any more. It now returns 0, which is the contract WxCalcImport already
expects -- it checks for it and reports "Can't access or write to the
specified parent project for the import", the right message for "you
have not said where to put it".

Not changed: Upload File is still offered for any collection. The same
report suggests it should appear only inside a job, which needs a
definition of "in a job" I would be guessing at; left on #97.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EFMUNbw2UpRPmgsqviAowb

Author: andy

src/apps/organizer/CalcMgr.C

@@ -2367,13 +2367,9 @@ void CalcMgr::getFileMenu(wxMenu & menu, WxResourceTreeItemData * itemData)
       menu.AppendSeparator();
     }
 
-    // Hardwire the import entry, not sure if there is any better way to do it
-    if (resType->getName() == "project") {
-      menu.Append(wxID_IMPORT, _("&Import Calculation from Output File..."),
-                  _T(""), wxITEM_NORMAL);
-      // menu.Append(wxID_EXPORT, _("Export"), _T(""), wxITEM_NORMAL);
-    }
-    
+    // (The import entry used to be added here, gated on the selected node
+    // being a "project". It is now added unconditionally below -- see there.)
+
     bool isCollection = p_treeCtrl->setExpandable(itemData);
     wxMenuItem * tmpMenuItem = new wxMenuItem(&menu,
             isCollection ? wxID_UPLOAD : wxID_DOWNLOAD,
@@ -2385,6 +2381,22 @@ void CalcMgr::getFileMenu(wxMenu & menu, WxResourceTreeItemData * itemData)
     menu.AppendSeparator();
   }
 
+  // Importing a calculation from an output file does not depend on what is
+  // selected, so it is always offered.
+  //
+  // It used to be added only when the selected node was literally a
+  // "project" -- with a comment conceding the approach ("Hardwire the
+  // import entry, not sure if there is any better way to do it"). The
+  // effect was that File showed just "Upload File..." and "Quit" unless
+  // the user happened to have clicked a project first, which made the
+  // entry point for importing externally run output (issues #44 and #94)
+  // very hard to find. Reported from a live session 2026-09-22: "Only see
+  // it if I select users, or andy, and then click on File ... better to
+  // always have access to it".
+  menu.Append(wxID_IMPORT, _("&Import Calculation from Output File..."),
+              _T(""), wxITEM_NORMAL);
+  menu.AppendSeparator();
+
   menu.Append(wxID_EXIT, _("&Quit\tCtrl+Q"), _T(""), wxITEM_NORMAL);
 }
 
@@ -4771,6 +4783,19 @@ TaskJob *CalcMgr::getContainer(const string& name)
   // get tree item data
   WxResourceTreeItemData *itemData = p_treeCtrl->getSelection();
 
+  // getSelection() returns 0 when nothing is selected, and this used to
+  // dereference it immediately. It was unreachable while the Import menu
+  // entry was only offered for a selected "project"; now that the entry is
+  // always offered (see getFileMenu), it is not.
+  //
+  // Returning 0 is the documented contract here: WxCalcImport checks for it
+  // and reports "Can't access or write to the specified parent project for
+  // the import", which is the right message for "you have not told me
+  // where to put it".
+  if (itemData == (WxResourceTreeItemData*)0) {
+    return ret;
+  }
+
   // make resource
   Resource *itemDataRes = itemData->getResource();
   Resource *childRes = 0;