Change GUI always to draw information sets fully

Previously, the GUI allowed information set drawing to be turned off entirely,
or to only be drawn for nodes at the same level.

After much reflection, these options do not seem like good ideas given
the standard way games are drawn.  Further, we hope to improve
tree layout in the near future.

Therefore, we are withdrawing this feature, and all information set connections
will be rendered.

Author: tturocy

ChangeLog

@@ -1,5 +1,12 @@
 # Changelog
 
+## [16.5.0] - unreleased
+
+### Changed
+- In the graphical interface, removed option to configure information set link drawing; information sets
+  are always drawn and indicators are always drawn if an information set spans multiple levels.
+
+
 ## [16.4.0] - 2025-09-05
 
 ### General

src/gui/dlefglayout.cc

@@ -210,15 +210,11 @@ gbtLayoutBranchesPanel::gbtLayoutBranchesPanel(wxWindow *p_parent, const gbtStyl
 
 class gbtLayoutInfosetsPanel : public wxPanel {
 private:
-  wxChoice *m_infosetConnect, *m_infosetJoin;
+  wxChoice *m_infosetJoin;
 
 public:
   gbtLayoutInfosetsPanel(wxWindow *p_parent, const gbtStyle &);
 
-  InfosetConnectStyle GetInfosetConnect() const
-  {
-    return static_cast<InfosetConnectStyle>(m_infosetConnect->GetSelection());
-  }
   InfosetJoinStyle GetInfosetJoin() const
   {
     return static_cast<InfosetJoinStyle>(m_infosetJoin->GetSelection());
@@ -234,15 +230,6 @@ gbtLayoutInfosetsPanel::gbtLayoutInfosetsPanel(wxWindow *p_parent, const gbtStyl
 
   auto *styleSizer = new wxFlexGridSizer(2);
 
-  styleSizer->Add(new wxStaticText(this, wxID_STATIC, _("Connect members of information sets")), 0,
-                  wxALL | wxALIGN_CENTER_VERTICAL, 5);
-  wxString connectChoices[] = {_("invisibly (don't draw indicators)"),
-                               _("only when on the same level"), _("regardless of level")};
-  m_infosetConnect =
-      new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 3, connectChoices);
-  m_infosetConnect->SetSelection(p_settings.GetInfosetConnect());
-  styleSizer->Add(m_infosetConnect, 0, wxALL, 5);
-
   styleSizer->Add(new wxStaticText(this, wxID_STATIC, _("Draw information set connections")), 0,
                   wxALL | wxALIGN_CENTER_VERTICAL, 5);
   wxString joinChoices[] = {_("using lines"), _("using bubbles")};
@@ -309,7 +296,6 @@ void gbtLayoutDialog::GetSettings(gbtStyle &p_settings)
   p_settings.SetBranchLabels(branches->GetBranchLabels());
 
   auto *infosets = dynamic_cast<gbtLayoutInfosetsPanel *>(m_notebook->GetPage(2));
-  p_settings.SetInfosetConnect(infosets->GetInfosetConnect());
   p_settings.SetInfosetJoin(infosets->GetInfosetJoin());
 }
 

src/gui/efglayout.cc

@@ -598,7 +598,6 @@ void gbtTreeLayout::ComputeOffsets(const GameNode &p_node, const BehaviorSupport
 std::shared_ptr<gbtNodeEntry>
 gbtTreeLayout::ComputeNextInInfoset(const std::shared_ptr<gbtNodeEntry> &p_entry)
 {
-  const auto infosetConnectStyle = m_doc->GetStyle().GetInfosetConnect();
   const auto infoset = p_entry->m_node->GetInfoset();
   if (!infoset) {
     // For terminal nodes, the next in information set is always the next terminal node,
@@ -616,8 +615,7 @@ gbtTreeLayout::ComputeNextInInfoset(const std::shared_ptr<gbtNodeEntry> &p_entry
       std::find(infoset->GetMembers().begin(), infoset->GetMembers().end(), p_entry->m_node));
   while (member != infoset->GetMembers().end()) {
     auto member_entry = GetNodeEntry(*member);
-    if (member_entry != nullptr && (p_entry->m_level == member_entry->m_level ||
-                                    infosetConnectStyle == GBT_INFOSET_CONNECT_ALL)) {
+    if (member_entry != nullptr && p_entry->m_level == member_entry->m_level) {
       return member_entry;
     }
     ++member;
@@ -714,12 +712,10 @@ void gbtTreeLayout::Layout(const BehaviorSupportProfile &p_support)
 
   m_infosetSublevels.clear();
   m_numSublevels = std::vector<int>(m_maxLevel + 1);
-  if (m_doc->GetStyle().GetInfosetConnect() != GBT_INFOSET_CONNECT_NONE) {
-    for (auto entry : m_nodeList) {
-      ComputeSublevel(entry);
-    }
-    ComputeNodeDepths();
+  for (auto entry : m_nodeList) {
+    ComputeSublevel(entry);
   }
+  ComputeNodeDepths();
 
   ComputeRenderedParents();
   GenerateLabels();
@@ -780,13 +776,11 @@ void gbtTreeLayout::RenderSubtree(wxDC &p_dc, bool p_noHints) const
     if (entry->GetChildNumber() == 1) {
       DrawNode(p_dc, parentEntry, m_doc->GetSelectNode(), p_noHints);
 
-      if (m_doc->GetStyle().GetInfosetConnect() != GBT_INFOSET_CONNECT_NONE &&
-          parentEntry->GetNextMember()) {
+      if (parentEntry->GetNextMember()) {
         const int nextX = parentEntry->GetNextMember()->m_x;
         const int nextY = parentEntry->GetNextMember()->m_y;
 
-        if ((m_doc->GetStyle().GetInfosetConnect() != GBT_INFOSET_CONNECT_SAMELEVEL) ||
-            parentEntry->m_x == nextX) {
+        if (parentEntry->m_x == nextX) {
 #ifdef __WXGTK__
           // A problem with using styled pens and user scaling on wxGTK
           p_dc.SetPen(wxPen(m_doc->GetStyle().GetPlayerColor(parentEntry->m_node->GetPlayer()), 1,

src/gui/style.cc

@@ -82,7 +82,6 @@ void gbtStyle::SetDefaults()
   m_tineLength = 20;
   m_branchStyle = GBT_BRANCH_STYLE_FORKTINE;
   m_branchLabels = GBT_BRANCH_LABEL_ORIENT_HORIZONTAL;
-  m_infosetConnect = GBT_INFOSET_CONNECT_ALL;
   m_infosetJoin = GBT_INFOSET_JOIN_CIRCLES;
   m_nodeAboveLabel = GBT_NODE_LABEL_LABEL;
   m_nodeBelowLabel = GBT_NODE_LABEL_ISETID;
@@ -198,8 +197,7 @@ std::string gbtStyle::GetLayoutXML() const
   const std::string branchLabels[] = {"horizontal", "rotated"};
   s << "labels=\"" << branchLabels[m_branchLabels] << "\"/>\n";
 
-  const std::string infosetConnect[] = {"none", "same", "all"};
-  s << "<infosets connect=\"" << infosetConnect[m_infosetConnect] << "\" ";
+  s << "<infosets ";
   const std::string infosetStyle[] = {"lines", "circles"};
   s << "style=\"" << infosetStyle[m_infosetJoin] << "\"/>\n";
 
@@ -302,24 +300,8 @@ void gbtStyle::SetLayoutXML(TiXmlNode *p_node)
     }
   }
 
-  TiXmlNode *infosets = p_node->FirstChild("infosets");
-  if (infosets) {
-    const char *connect = infosets->ToElement()->Attribute("connect");
-    if (connect) {
-      const std::string s = connect;
-      if (s == "none") {
-        m_infosetConnect = GBT_INFOSET_CONNECT_NONE;
-      }
-      else if (s == "same") {
-        m_infosetConnect = GBT_INFOSET_CONNECT_SAMELEVEL;
-      }
-      else if (s == "all") {
-        m_infosetConnect = GBT_INFOSET_CONNECT_ALL;
-      }
-    }
-
-    const char *style = infosets->ToElement()->Attribute("style");
-    if (style) {
+  if (TiXmlNode *infosets = p_node->FirstChild("infosets")) {
+    if (const char *style = infosets->ToElement()->Attribute("style")) {
       const std::string s = style;
       if (s == "lines") {
         m_infosetJoin = GBT_INFOSET_JOIN_LINES;

src/gui/style.h

@@ -84,7 +84,6 @@ class gbtStyle {
   BranchLabelOrientationStyle m_branchLabels{GBT_BRANCH_LABEL_ORIENT_HORIZONTAL};
 
   // Information set styling
-  InfosetConnectStyle m_infosetConnect{GBT_INFOSET_CONNECT_ALL};
   InfosetJoinStyle m_infosetJoin{GBT_INFOSET_JOIN_CIRCLES};
 
   // Legend styling
@@ -146,10 +145,6 @@ class gbtStyle {
   BranchLabelOrientationStyle GetBranchLabels() const { return m_branchLabels; }
   void SetBranchLabels(BranchLabelOrientationStyle p_labels) { m_branchLabels = p_labels; }
 
-  // Information set styling
-  InfosetConnectStyle GetInfosetConnect() const { return m_infosetConnect; }
-  void SetInfosetConnect(InfosetConnectStyle p_connect) { m_infosetConnect = p_connect; }
-
   InfosetJoinStyle GetInfosetJoin() const { return m_infosetJoin; }
   void SetInfosetJoin(InfosetJoinStyle p_join) { m_infosetJoin = p_join; }