Remove wxPlotCtrl and dependencies.

Author: tturocy

Makefile.am

@@ -496,28 +496,6 @@ gambit_SOURCES = \
 	src/labenski/src/range.cpp \
 	src/labenski/src/spinctld.cpp \
 	src/labenski/src/toggle.cpp \
-	src/labenski/src/fparser.cpp \
-	src/labenski/src/fparser.hh \
-	src/labenski/src/fourier.c \
-	src/labenski/src/lm_lsqr.cpp \
-	src/labenski/src/plotctrl.cpp \
-	src/labenski/src/plotcurv.cpp \
-	src/labenski/src/plotdata.cpp \
-	src/labenski/src/plotdraw.cpp \
-	src/labenski/src/plotfunc.cpp \
-	src/labenski/src/plotmark.cpp \
-	src/labenski/src/plotprnt.cpp \
-	src/labenski/include/wx/plotctrl/fourier.h \
-	src/labenski/include/wx/plotctrl/fparser.h \
-	src/labenski/include/wx/plotctrl/lm_lsqr.h \
-	src/labenski/include/wx/plotctrl/plotctrl.h \
-	src/labenski/include/wx/plotctrl/plotcurv.h \
-	src/labenski/include/wx/plotctrl/plotdata.h \
-	src/labenski/include/wx/plotctrl/plotdefs.h \
-	src/labenski/include/wx/plotctrl/plotdraw.h \
-	src/labenski/include/wx/plotctrl/plotfunc.h \
-	src/labenski/include/wx/plotctrl/plotmark.h \
-	src/labenski/include/wx/plotctrl/plotprnt.h \
 	src/labenski/include/wx/sheet/pairarr.h \
 	src/labenski/include/wx/sheet/sheetatr.h \
 	src/labenski/include/wx/sheet/sheetdef.h \

src/gui/dlnfglogit.cc

@@ -30,11 +30,8 @@
 #include <wx/txtstrm.h>
 #include <wx/tokenzr.h>
 #include <wx/process.h>
-#include <wx/print.h>
 
 #include "wx/sheet/sheet.h"
-#include "wx/plotctrl/plotctrl.h"
-#include "wx/wxthings/spinctld.h" // for wxSpinCtrlDbl
 
 #include "gamedoc.h"
 #include "menuconst.h" // for tool IDs
@@ -246,80 +243,6 @@ LogitBranchDialog::LogitBranchDialog(wxWindow *p_parent, GameDocument *p_doc,
   CenterOnParent();
 }
 
-//========================================================================
-//                      class gbtLogitPlotCtrl
-//========================================================================
-
-class gbtLogitPlotCtrl : public wxPlotCtrl {
-  double m_scaleFactor{1.0};
-
-  /// Overriding x (lambda) axis labeling
-  void CalcXAxisTickPositions() override;
-
-public:
-  gbtLogitPlotCtrl(wxWindow *p_parent, GameDocument *p_doc);
-
-  double LambdaToX(double p_lambda) const
-  {
-    return m_scaleFactor * p_lambda / (1.0 + m_scaleFactor * p_lambda);
-  }
-  double XToLambda(double p_x) const { return p_x / (m_scaleFactor * (1.0 - p_x)); }
-
-  void SetScaleFactor(double p_scale) { m_scaleFactor = p_scale; }
-};
-
-gbtLogitPlotCtrl::gbtLogitPlotCtrl(wxWindow *p_parent, GameDocument *p_doc) : wxPlotCtrl(p_parent)
-{
-  SetAxisLabelColour(*wxBLUE);
-  const wxFont labelFont(8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
-  SetAxisLabelFont(labelFont);
-  SetAxisColour(*wxBLUE);
-  SetAxisFont(labelFont);
-  SetDrawSymbols(false);
-
-  // SetAxisFont resets the width of the y-axis labels, assuming
-  // a fairly long label.
-  int x = 6, y = 12, descent = 0, leading = 0;
-  GetTextExtent(wxT("0.88"), &x, &y, &descent, &leading, &labelFont);
-  m_y_axis_text_width = x + leading;
-
-  SetXAxisLabel(wxT("Lambda"));
-  SetShowXAxisLabel(true);
-  SetYAxisLabel(wxT("Probability"));
-  SetShowYAxisLabel(true);
-
-  SetShowKey(true);
-
-  m_xAxisTick_step = 0.2;
-  SetViewRect(wxRect2DDouble(0, 0, 1, 1));
-}
-
-//
-// This differs from the wxPlotWindow original only by the use of
-// XToLambda() to construct the tick labels.
-//
-void gbtLogitPlotCtrl::CalcXAxisTickPositions()
-{
-  double current = ceil(m_viewRect.GetLeft() / m_xAxisTick_step) * m_xAxisTick_step;
-  m_xAxisTicks.Clear();
-  m_xAxisTickLabels.Clear();
-  const int windowWidth = GetPlotAreaRect().width;
-  for (int i = 0; i < m_xAxisTick_count; i++) {
-    if (!IsFinite(current, wxT("axis label is not finite"))) {
-      return;
-    }
-
-    int const x = GetClientCoordFromPlotX(current);
-
-    if ((x >= -1) && (x < windowWidth + 2)) {
-      m_xAxisTicks.Add(x);
-      m_xAxisTickLabels.Add(wxString::Format(m_xAxisTickFormat.c_str(), XToLambda(current)));
-    }
-
-    current += m_xAxisTick_step;
-  }
-}
-
 //========================================================================
 //                     class LogitPlotStrategyList
 //========================================================================
@@ -427,125 +350,6 @@ void LogitPlotStrategyList::OnLeftUp(wxSheetEvent &p_event)
   p_event.Skip();
 }
 
-//========================================================================
-//                       class LogitPlotPanel
-//========================================================================
-
-class LogitPlotPanel final : public wxPanel {
-  GameDocument *m_doc;
-  LogitMixedBranch m_branch;
-  LogitPlotStrategyList *m_plotStrategies;
-  gbtLogitPlotCtrl *m_plotCtrl;
-
-  // Event handlers
-  void OnChangeStrategies(wxSheetEvent &) { Plot(); }
-
-public:
-  LogitPlotPanel(wxWindow *p_parent, GameDocument *p_doc);
-
-  void AddProfile(const wxString &p_text) { m_branch.AddProfile(p_text); }
-
-  void SetScaleFactor(double p_scale);
-  void FitZoom();
-  void Plot();
-
-  LogitMixedBranch &GetBranch() { return m_branch; }
-  wxPlotCtrl *GetPlotCtrl() const { return m_plotCtrl; }
-};
-
-LogitPlotPanel::LogitPlotPanel(wxWindow *p_parent, GameDocument *p_doc)
-  : wxPanel(p_parent, wxID_ANY), m_doc(p_doc), m_branch(p_doc),
-    m_plotStrategies(new LogitPlotStrategyList(this, p_doc)),
-    m_plotCtrl(new gbtLogitPlotCtrl(this, p_doc))
-{
-  m_plotCtrl->SetSizeHints(wxSize(600, 400));
-
-  auto *playerSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Show strategies"));
-  playerSizer->Add(m_plotStrategies, 1, wxALL | wxEXPAND, 5);
-
-  auto *sizer = new wxBoxSizer(wxHORIZONTAL);
-  sizer->Add(playerSizer, 0, wxALL | wxEXPAND, 5);
-  sizer->Add(m_plotCtrl, 0, wxALL, 5);
-
-  Connect(m_plotStrategies->GetId(), wxEVT_SHEET_CELL_LEFT_UP,
-          (wxObjectEventFunction) reinterpret_cast<wxEventFunction>(wxStaticCastEvent(
-              wxSheetEventFunction,
-              static_cast<wxSheetEventFunction>(&LogitPlotPanel::OnChangeStrategies))));
-
-  SetSizer(sizer);
-  wxWindowBase::Layout();
-}
-
-void LogitPlotPanel::Plot()
-{
-  if (m_branch.NumPoints() == 0) {
-    return;
-  }
-
-  m_plotCtrl->DeleteCurve(-1);
-
-  for (int st = 1; st <= m_doc->GetGame()->GetStrategies().size(); st++) {
-    if (!m_plotStrategies->IsStrategyShown(st)) {
-      continue;
-    }
-
-    auto *curve = new wxPlotData(m_branch.NumPoints());
-
-    const GameStrategy strategy = m_doc->GetGame()->GetStrategy(st);
-    const GamePlayer player = strategy->GetPlayer();
-
-    curve->SetFilename(wxString(player->GetLabel().c_str(), *wxConvCurrent) + wxT(":") +
-                       wxString(strategy->GetLabel().c_str(), *wxConvCurrent));
-
-    for (int i = 0; i < m_branch.NumPoints(); i++) {
-      curve->SetValue(i, m_plotCtrl->LambdaToX(m_branch.GetLambda(i + 1)),
-                      m_branch.GetProfile(i + 1)[st]);
-    }
-
-    curve->SetPen(wxPLOTPEN_NORMAL,
-                  wxPen(m_doc->GetStyle().GetPlayerColor(player), 1, wxPENSTYLE_SOLID));
-
-    m_plotCtrl->AddCurve(curve, false);
-  }
-}
-
-void LogitPlotPanel::SetScaleFactor(double p_scale)
-{
-  m_plotCtrl->SetScaleFactor(p_scale);
-  Plot();
-}
-
-void LogitPlotPanel::FitZoom() { m_plotCtrl->MakeCurveVisible(-1); }
-
-//========================================================================
-//                       class LogitPrintout
-//========================================================================
-
-class LogitPrintout : public wxPrintout {
-  wxPlotCtrl *m_plot;
-
-public:
-  LogitPrintout(wxPlotCtrl *p_plot, const wxString &p_label) : wxPrintout(p_label), m_plot(p_plot)
-  {
-  }
-  ~LogitPrintout() override = default;
-
-  bool OnPrintPage(int) override
-  {
-    const wxSize size = GetDC()->GetSize();
-    m_plot->DrawWholePlot(GetDC(), wxRect(50, 50, size.GetWidth() - 100, size.GetHeight() - 100));
-    return true;
-  }
-  bool HasPage(int page) override { return (page <= 1); }
-  void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) override
-  {
-    *minPage = 1;
-    *maxPage = 1;
-    *selPageFrom = 1;
-    *selPageTo = 1;
-  }
-};
-
 //========================================================================
 //                      class LogitMixedDialog
 //========================================================================
@@ -554,8 +358,6 @@ class LogitMixedDialog final : public wxDialog {
   GameDocument *m_doc;
   int m_pid{0};
   wxProcess *m_process{nullptr};
-  LogitPlotPanel *m_plot;
-  wxSpinCtrlDbl *m_scaler;
   wxToolBar *m_toolBar;
   wxStaticText *m_statusText;
   wxButton *m_stopButton, *m_okButton;
@@ -567,11 +369,6 @@ class LogitMixedDialog final : public wxDialog {
   void OnIdle(wxIdleEvent &);
   void OnEndProcess(wxProcessEvent &);
   void OnSave(wxCommandEvent &);
-  void OnPrint(wxCommandEvent &);
-
-  void OnChangeScale(wxSpinEvent &);
-  void OnZoomFit(wxCommandEvent &);
-  void OnViewData(wxCommandEvent &);
 
   void Start();
 
@@ -590,9 +387,6 @@ EVT_END_PROCESS(GBT_ID_PROCESS, LogitMixedDialog::OnEndProcess)
 EVT_IDLE(LogitMixedDialog::OnIdle)
 EVT_TIMER(GBT_ID_TIMER, LogitMixedDialog::OnTimer)
 EVT_MENU(wxID_SAVE, LogitMixedDialog::OnSave)
-EVT_MENU(wxID_PRINT, LogitMixedDialog::OnPrint)
-EVT_MENU(GBT_MENU_VIEW_ZOOMFIT, LogitMixedDialog::OnZoomFit)
-EVT_MENU(GBT_MENU_VIEW_DATA, LogitMixedDialog::OnViewData)
 END_EVENT_TABLE()
 
 #include "bitmaps/stop.xpm"
@@ -603,7 +397,7 @@ END_EVENT_TABLE()
 
 LogitMixedDialog::LogitMixedDialog(wxWindow *p_parent, GameDocument *p_doc)
   : wxDialog(p_parent, wxID_ANY, wxT("Compute quantal response equilibria"), wxDefaultPosition),
-    m_doc(p_doc), m_plot(new LogitPlotPanel(this, m_doc)), m_timer(this, GBT_ID_TIMER)
+    m_doc(p_doc), m_timer(this, GBT_ID_TIMER)
 {
   auto *sizer = new wxBoxSizer(wxVERTICAL);
 
@@ -648,20 +442,10 @@ LogitMixedDialog::LogitMixedDialog(wxWindow *p_parent, GameDocument *p_doc)
                      wxITEM_NORMAL, _("Show the whole graph"), _("Show the whole graph"));
 
   m_toolBar->AddControl(new wxStaticText(m_toolBar, wxID_STATIC, wxT("Graph scaling:")));
-  m_scaler = new wxSpinCtrlDbl(*m_toolBar, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0,
-                               0.1, 10.0, 1.0, 0.1);
-  m_toolBar->AddControl(m_scaler);
-  Connect(m_scaler->GetId(), wxEVT_COMMAND_SPINCTRL_UPDATED,
-          wxSpinEventHandler(LogitMixedDialog::OnChangeScale));
 
   m_toolBar->Realize();
   sizer->Add(m_toolBar, 0, wxALL | wxEXPAND, 5);
 
-  auto *midSizer = new wxBoxSizer(wxHORIZONTAL);
-  midSizer->Add(m_plot, 0, wxALL | wxALIGN_CENTER, 5);
-
-  sizer->Add(midSizer, 0, wxALL | wxALIGN_CENTER, 5);
-
   auto *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
   m_okButton = new wxButton(this, wxID_OK, wxT("OK"));
   buttonSizer->Add(m_okButton, 0, wxALL | wxALIGN_CENTER, 5);
@@ -729,7 +513,6 @@ void LogitMixedDialog::OnIdle(wxIdleEvent &p_event)
 
     wxString msg;
     msg << tis.ReadLine();
-    m_plot->AddProfile(msg);
     // m_mixedList->AddProfile(msg, false);
     m_output += msg;
     m_output += wxT("\n");
@@ -755,7 +538,6 @@ void LogitMixedDialog::OnEndProcess(wxProcessEvent &p_event)
     msg << tis.ReadLine();
 
     if (msg != wxT("")) {
-      m_plot->AddProfile(msg);
       // m_mixedList->AddProfile(msg, true);
       m_output += msg;
       m_output += wxT("\n");
@@ -774,7 +556,6 @@ void LogitMixedDialog::OnEndProcess(wxProcessEvent &p_event)
   m_okButton->Enable(true);
   m_toolBar->EnableTool(wxID_SAVE, true);
   m_toolBar->EnableTool(GBT_MENU_VIEW_DATA, true);
-  m_plot->Plot();
 }
 
 void LogitMixedDialog::OnStop(wxCommandEvent &)
@@ -803,35 +584,6 @@ void LogitMixedDialog::OnSave(wxCommandEvent &)
   }
 }
 
-void LogitMixedDialog::OnPrint(wxCommandEvent &)
-{
-  wxPrintDialogData data;
-  wxPrinter printer(&data);
-
-  wxPrintout *printout = new LogitPrintout(m_plot->GetPlotCtrl(), wxT("Logit correspondence"));
-
-  if (!printer.Print(this, printout, true)) {
-    if (wxPrinter::GetLastError() == wxPRINTER_ERROR) {
-      wxMessageBox(_("There was an error in printing"), _("Error"), wxOK);
-    }
-    // Otherwise, user hit "cancel"; just be quiet and return.
-    return;
-  }
-}
-
-void LogitMixedDialog::OnChangeScale(wxSpinEvent &)
-{
-  m_plot->SetScaleFactor(m_scaler->GetValue());
-}
-
-void LogitMixedDialog::OnZoomFit(wxCommandEvent &) { m_plot->FitZoom(); }
-
-void LogitMixedDialog::OnViewData(wxCommandEvent &)
-{
-  LogitBranchDialog dialog(this, m_doc, m_plot->GetBranch());
-  dialog.ShowModal();
-}
-
 } // namespace
 
 //========================================================================