Offsets now being computed from the generic layout.

Author: tturocy

src/gui/dlefglayout.cc

@@ -115,8 +115,8 @@ LayoutNodesPanel::LayoutNodesPanel(wxWindow *p_parent, const TreeRenderConfig &p
   constexpr int Y_SPACING_MAX = 60;
 
   m_terminalSpacing = new wxSpinCtrl(
-      this, wxID_ANY, wxString::Format(_T("%d"), p_settings.TerminalSpacing()), wxDefaultPosition,
-      wxDefaultSize, wxSP_ARROW_KEYS, Y_SPACING_MIN, Y_SPACING_MAX);
+      this, wxID_ANY, wxString::Format(_T("%d"), p_settings.GetTerminalSpacing()),
+      wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, Y_SPACING_MIN, Y_SPACING_MAX);
   gridSizer->Add(m_terminalSpacing, 1, wxEXPAND | wxALL, 5);
 
   sizeSizer->Add(gridSizer, 1, wxALL | wxEXPAND, 5);

src/gui/efglayout.cc

@@ -560,41 +560,6 @@ GameNode TreeLayout::NextSameLevel(const GameNode &p_node) const
   return nullptr;
 }
 
-void TreeLayout::ComputeOffsets(const GameNode &p_node, const BehaviorSupportProfile &p_support,
-                                int &p_ycoord)
-{
-  const auto &settings = m_doc->GetStyle();
-
-  const auto entry = GetNodeEntry(p_node);
-  if (m_doc->GetStyle().RootReachable() && p_node->GetInfoset() &&
-      !p_node->GetInfoset()->GetPlayer()->IsChance()) {
-    const auto actions = p_support.GetActions(p_node->GetInfoset());
-    for (const auto &action : actions) {
-      ComputeOffsets(p_node->GetChild(action), p_support, p_ycoord);
-    }
-    entry->m_y = (GetNodeEntry(p_node->GetChild(actions.front()))->m_y +
-                  GetNodeEntry(p_node->GetChild(actions.back()))->m_y) /
-                 2;
-  }
-  else if (!p_node->IsTerminal()) {
-    const auto actions = p_node->GetInfoset()->GetActions();
-    for (const auto &action : actions) {
-      const auto child = p_node->GetChild(action);
-      ComputeOffsets(child, p_support, p_ycoord);
-      if (!p_node->GetPlayer()->IsChance() && !p_support.Contains(action)) {
-        GetNodeEntry(child)->m_inSupport = false;
-      }
-    }
-    entry->m_y = (GetNodeEntry(p_node->GetChild(actions.front()))->m_y +
-                  GetNodeEntry(p_node->GetChild(actions.back()))->m_y) /
-                 2;
-  }
-  else {
-    entry->m_y = p_ycoord;
-    p_ycoord += settings.TerminalSpacing();
-  }
-}
-
 std::shared_ptr<NodeEntry>
 TreeLayout::ComputeNextInInfoset(const std::shared_ptr<NodeEntry> &p_entry) const
 {
@@ -691,17 +656,17 @@ void TreeLayout::Layout(const BehaviorSupportProfile &p_support)
     BuildNodeList(p_support);
   }
 
-  int maxy = c_topMargin;
-  ComputeOffsets(m_doc->GetGame()->GetRoot(), p_support, maxy);
-  m_maxY = maxy + c_bottomMargin;
-
   auto layout = Gambit::Layout(m_doc->GetGame());
   layout.LayoutTree(p_support);
 
+  const auto spacing = m_doc->GetStyle().GetTerminalSpacing();
   for (auto [node, entry] : layout.GetNodeMap()) {
     m_nodeMap[node]->m_level = entry->m_level;
     m_nodeMap[node]->m_sublevel = entry->m_sublevel;
+    m_nodeMap[node]->m_y = entry->m_offset * spacing + c_topMargin;
   }
+  m_maxY =
+      c_topMargin + c_bottomMargin + spacing * (layout.GetMaxOffset() - layout.GetMinOffset());
   ComputeNodeDepths(layout);
 
   ComputeRenderedParents();

src/gui/efglayout.h

@@ -116,8 +116,6 @@ class TreeLayout final : public GameView {
 
   void BuildNodeList(const GameNode &, const BehaviorSupportProfile &);
 
-  /// (Recursively) compute the y-offsets of all nodes
-  void ComputeOffsets(const GameNode &, const BehaviorSupportProfile &, int &);
   /// Based on node levels and information set sublevels, compute the depth
   /// (X coordinate) of all nodes
   void ComputeNodeDepths(const Gambit::Layout &) const;

src/gui/layout.cc

@@ -75,8 +75,8 @@ void Layout::LayoutTree(const BehaviorSupportProfile &p_support)
   m_numSublevels.clear();
   m_infosetSublevels.clear();
 
-  double ycoord = 0;
-  LayoutSubtree(m_game->GetRoot(), p_support, 0, ycoord);
+  m_maxOffset = 0;
+  LayoutSubtree(m_game->GetRoot(), p_support, 0, m_maxOffset);
 }
 
 } // namespace Gambit

src/gui/layout.h

@@ -43,7 +43,7 @@ class Layout {
   std::vector<int> m_numSublevels;
   std::map<std::pair<int, GameInfoset>, int> m_infosetSublevels;
 
-  float m_maxOffset{0};
+  double m_maxOffset{0};
 
   void LayoutSubtree(const GameNode &, const BehaviorSupportProfile &, int, double &);
 
@@ -55,8 +55,8 @@ class Layout {
 
   const std::map<GameNode, std::shared_ptr<LayoutEntry>> &GetNodeMap() const { return m_nodeMap; }
   const std::vector<int> &GetNumSublevels() const { return m_numSublevels; }
-  float GetMinOffset() const { return 0; }
-  float GetMaxOffset() const { return m_maxOffset; }
+  double GetMinOffset() const { return 0; }
+  double GetMaxOffset() const { return m_maxOffset; }
 };
 } // namespace Gambit
 #endif // GAMBIT_LAYOUT_H

src/gui/style.h

@@ -109,7 +109,7 @@ class TreeRenderConfig {
   int GetNodeSize() const { return m_nodeSize; }
   void SetNodeSize(int p_nodeSize) { m_nodeSize = p_nodeSize; }
 
-  int TerminalSpacing() const { return m_terminalSpacing; }
+  int GetTerminalSpacing() const { return m_terminalSpacing; }
   void SetTerminalSpacing(int p_spacing) { m_terminalSpacing = p_spacing; }
 
   NodeTokenStyle GetChanceToken() const { return m_chanceToken; }