Add sub-model alias to info panel #4473 (#4476)

* Add sub-model alias to info panel #4473 * more changes and fixed node list * removed unneeded function declaration
xLightsSequencer · Apr 13, 2024 · a70cbc4 · a70cbc4
1 parent 8cfd71c
commit a70cbc4
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/xLights/models/SubModel.cpp b/xLights/models/SubModel.cpp
@@ -51,7 +51,7 @@ SubModel::SubModel(Model* p, wxXmlNode* n) :
     _layout(n->GetAttribute("layout")),
     _type(n->GetAttribute("type", "ranges")),
     _bufferStyle(n->GetAttribute("bufferstyle", DEFAULT))
-{
+ {
 
     // copy change count from owning model ... otherwise we lose track of changes when the model is recreated
     changeCount = p->changeCount;
@@ -92,7 +92,11 @@ SubModel::SubModel(Model* p, wxXmlNode* n) :
             std::set<int> nodeIdx;
             while (n->HasAttribute(wxString::Format("line%d", line))) {
                 wxString nodes = n->GetAttribute(wxString::Format("line%d", line));
-                _properyGridDisplay = nodes + "," + _properyGridDisplay;
+                if (_properyGridDisplay == "") {
+                    _properyGridDisplay = nodes;
+                } else {
+                    _properyGridDisplay = _properyGridDisplay + "," + nodes;
+                }
                 wxStringTokenizer wtkz(nodes, ",");
                 while (wtkz.HasMoreTokens()) {
                     wxString valstr = wtkz.GetNextToken();
@@ -165,8 +169,11 @@ SubModel::SubModel(Model* p, wxXmlNode* n) :
             std::vector<int> nodeIndexes;
             while (n->HasAttribute(wxString::Format("line%d", line))) {
                 wxString nodes = n->GetAttribute(wxString::Format("line%d", line));
-                //logger_base.debug("    Line %d: %s", line, (const char*)nodes.c_str());
-                _properyGridDisplay = nodes + "," + _properyGridDisplay;
+                if (_properyGridDisplay == "") {
+                    _properyGridDisplay = nodes;
+                } else {
+                    _properyGridDisplay = _properyGridDisplay + "," + nodes;
+                }
                 wxStringTokenizer wtkz(nodes, ",");
                 while (wtkz.HasMoreTokens()) {
                     wxString valstr = wtkz.GetNextToken();
@@ -366,6 +373,24 @@ void SubModel::AddProperties(wxPropertyGridInterface* grid, OutputManager* outpu
         p->SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
         p->ChangeFlag(wxPG_PROP_READONLY, true);
     }
+    auto smaliases = parent->GetSubModel(this->GetName())->GetAliases();
+    if (smaliases.size() > 0) {
+        std::string sma;
+        std::string smacr;
+        for (const auto& it : smaliases) {
+            if (sma != "") {
+                sma += ", ";
+                smacr += "\n";
+            }
+            sma += it;
+            smacr += it;
+        }
+        p = grid->Append(new wxStringProperty("Sub-model Aliases", "SMA", sma));
+        p->SetHelpString(smacr);
+        p->SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
+        p->ChangeFlag(wxPG_PROP_READONLY, true);
+    }
+
 }
 
 static const std::string VERT_PER_STRAND("Vertical Per Strand");