xLightsSequencer · cybercop23 · Apr 30, 2024 · May 8, 2024 · May 8, 2024 · May 8, 2024
diff --git a/xLights/ColorManager.h b/xLights/ColorManager.h
@@ -158,6 +158,8 @@ class ColorManager
             { ColorManager::ColorNames::COLOR_TEXT_UNSELECTED, "TextUnselected", "Unselected Text", xlLIGHT_GREY, ColorManager::ColorCategory::COLOR_CAT_LAYOUT_TAB },
             { ColorManager::ColorNames::COLOR_TEXT_HIGHLIGHTED, "TextHighlighted", "Highlighted Text", xlBLUE, ColorManager::ColorCategory::COLOR_CAT_LAYOUT_TAB }
         };
+        std::map<std::string, xlColor> GetColors() { return colors; }
+        std::map<std::string, xlColor> GetDefaultColors() { return colors_default; }
 
     protected:
 

diff --git a/xLights/CustomModelDialog.cpp b/xLights/CustomModelDialog.cpp
@@ -48,6 +48,7 @@
 #include "outputs/TwinklyOutput.h"
 #include "Discovery.h"
 #include "outputs/OutputManager.h"
+#include "string.h"
 
 //(*IdInit(CustomModelDialog)
 const long CustomModelDialog::ID_SPINCTRL1 = wxNewId();
@@ -586,6 +587,7 @@ void CustomModelDialog::Setup(CustomModel* m)
     lightness = m->GetCustomLightness();
     SliderCustomLightness->SetValue(lightness);
     std::string data = m->GetCustomData();
+    bool _hasCM2 = m->hasCM2();
 
     if (background_image != "" && FileExists(background_image)) {
         bkg_image = new wxImage(background_image);
@@ -605,29 +607,50 @@ void CustomModelDialog::Setup(CustomModel* m)
         }
     }
     else {
-        wxArrayString layers = wxSplit(data, '|');
-        for (auto layer = 0; layer < layers.size(); layer++) {
-            AddPage();
-            //ResizeCustomGrid();
-            auto grid = GetLayerGrid(layer);
-            wxArrayString rows = wxSplit(layers[layer], ';');
-            //grid->AppendRows(rows.size() - 1);
-
-            for (auto row = 0; row < rows.size(); row++) {
-                wxArrayString cols = wxSplit(rows[row], ',');
-                //if (row == 0) {
-                //    grid->AppendCols(cols.size() - 1);
-                //}
-                for (auto col = 0; col < cols.size(); col++) {
-                    wxString value = cols[col];
-                    if (!value.IsEmpty() && value != "0") {
-                        grid->SetCellValue(row, col, value);
+        if (_hasCM2) {
+            wxArrayString layers = wxSplit(data, '|');
+            wxArrayString ctrllayers = wxSplit(layers[0], ',');
+            int type = std::stoi(ctrllayers[0].ToStdString());
+            int node = 1;
+            int step = (type == 1 ? 2 : 3);
+            for (auto layer = 1; layer < layers.size(); layer++) {
+                AddPage();
+                // ResizeCustomGrid();
+                auto grid = GetLayerGrid(layer-1);
+                wxArrayString data = wxSplit(layers[layer], ',');
+                for (auto d = 0; d < data.size();d+=step){
+                    if (type == 1) {
+                        grid->SetCellValue(std::stoi(data[d].ToStdString()), std::stoi(data[d + 1].ToStdString()), std::to_string(node));
+                        node++;
+                    } else {
+                        grid->SetCellValue(std::stoi(data[d].ToStdString()), std::stoi(data[d + 1].ToStdString()), data[d + 2]);
                     }
                 }
+
+                wxFont font = grid->GetDefaultCellFont();
+                SetGridSizeForFont(font);
             }
+        } else {
+            wxArrayString layers = wxSplit(data, '|');
+            for (auto layer = 0; layer < layers.size(); layer++) {
+                AddPage();
+                // ResizeCustomGrid();
+                auto grid = GetLayerGrid(layer);
+                wxArrayString rows = wxSplit(layers[layer], ';');
+
+                for (auto row = 0; row < rows.size(); row++) {
+                    wxArrayString cols = wxSplit(rows[row], ',');
+                    for (auto col = 0; col < cols.size(); col++) {
+                        wxString value = cols[col];
+                        if (!value.IsEmpty() && value != "0") {
+                            grid->SetCellValue(row, col, value);
+                        }
+                    }
+                }
 
-            wxFont font = grid->GetDefaultCellFont();
-            SetGridSizeForFont(font);
+                wxFont font = grid->GetDefaultCellFont();
+                SetGridSizeForFont(font);
+            }
         }
     }
 

diff --git a/xLights/LayoutGroup.h b/xLights/LayoutGroup.h
@@ -21,6 +21,7 @@ class PreviewPane;
 class LayoutGroup : public wxObject
 {
     public:
+        LayoutGroup();
         LayoutGroup(const std::string & name, xLightsFrame* xl, wxXmlNode *node);
         virtual ~LayoutGroup();
 

diff --git a/xLights/LayoutPanel.cpp b/xLights/LayoutPanel.cpp
@@ -4952,7 +4952,7 @@ void LayoutPanel::OnPreviewModelPopup(wxCommandEvent& event)
             return;
         if (md->SupportsVisitors()) {
             XmlSerializer serializer;
-            serializer.SerializeAndSaveModel(*md);
+            serializer.SerializeAndSaveModel(*md, xlights);
         } else {
             md->ExportXlightsModel();
         }
@@ -7489,7 +7489,7 @@ void LayoutPanel::OnModelsPopup(wxCommandEvent& event) {
             return;
         if (md->SupportsVisitors()) {
             XmlSerializer serializer;
-            serializer.SerializeAndSaveModel(*md);
+            serializer.SerializeAndSaveModel(*md, xlights);
         } else {
             md->ExportXlightsModel();
         }

diff --git a/xLights/models/ArchesModel.h b/xLights/models/ArchesModel.h
@@ -41,9 +41,10 @@ class ArchesModel : public ModelWithScreenLocation<ThreePointScreenLocation>
         bool GetZigZag() const { return zigzag; }
         int GetHollow() const { return _hollow; }
         int GetGap() const { return _gap; }
+        int GetArc() const { return arc; }
 
-        //virtual bool SupportsVisitors() override {return true;}
-        //void Accept(BaseObjectVisitor &visitor) const override { return visitor.Visit(*this); }
+        virtual bool SupportsVisitors() override {return true;}
+        void Accept(BaseObjectVisitor &visitor) const override { return visitor.Visit(*this); }
 
     protected:
         virtual void InitModel() override;

diff --git a/xLights/models/BaseObjectVisitor.h b/xLights/models/BaseObjectVisitor.h
@@ -11,12 +11,44 @@
  **************************************************************/
 
 class ArchesModel;
+class CandyCaneModel;
+class ChannelBlockModel;
+class CircleModel;
+class CubeModel;
+class CustomModel;
+class ImageModel;
+class IciclesModel;
+class MatrixModel;
+class SingleLineModel;
+class PolyLineModel;
+class SphereModel;
+class SpinnerModel;
+class StarModel;
+class TreeModel;
+class WindowFrameModel;
+class WreathModel;
 class DmxMovingHeadAdv;
 
-struct BaseObjectVisitor
-{
-    virtual void Visit(const ArchesModel &arch) = 0;
-    virtual void Visit(const DmxMovingHeadAdv &moving_head) = 0;
+struct BaseObjectVisitor {
+    virtual void Visit(const ArchesModel& arch) = 0;
+    virtual void Visit(const CandyCaneModel& cc) = 0;
+    virtual void Visit(const ChannelBlockModel& channelblock) = 0;
+    virtual void Visit(const CircleModel& circle) = 0;
+    virtual void Visit(const CubeModel& cube) = 0;
+    virtual void Visit(const CustomModel& custom) = 0;
+    virtual void Visit(const ImageModel& image) = 0;
+    virtual void Visit(const IciclesModel& icicles) = 0;
+    virtual void Visit(const MatrixModel& matrix) = 0;
+    virtual void Visit(const SingleLineModel& singleline) = 0;
+    virtual void Visit(const PolyLineModel& polyline) = 0;
+    virtual void Visit(const SphereModel& sphere) = 0;
+    virtual void Visit(const SpinnerModel& spinner) = 0;
+    virtual void Visit(const StarModel& start) = 0;
+    virtual void Visit(const TreeModel& tree) = 0;
+    virtual void Visit(const WindowFrameModel& window) = 0;
+    virtual void Visit(const WreathModel& wreath) = 0;
+    virtual void Visit(const DmxMovingHeadAdv& moving_head) = 0;
 
-    virtual ~BaseObjectVisitor() {}
-};
+    virtual ~BaseObjectVisitor() {
+    }
+};
diff --git a/xLights/models/CandyCaneModel.cpp b/xLights/models/CandyCaneModel.cpp
@@ -364,6 +364,8 @@ static void rotate_point(float cx,float cy, float angle, float &x, float &y)
     y = ynew + cy;
 }
 
+void CandyCaneModel::ExportXlightsModel() {}
+
 void CandyCaneModel::SetCaneCoord() {
 
     static log4cpp::Category& logger_base = log4cpp::Category::getInstance(std::string("log_base"));

diff --git a/xLights/models/CandyCaneModel.h b/xLights/models/CandyCaneModel.h
@@ -27,11 +27,20 @@ class CandyCaneModel : public ModelWithScreenLocation<ThreePointScreenLocation>
         virtual void AddTypeProperties(wxPropertyGridInterface* grid, OutputManager* outputManager) override;
         virtual void UpdateTypeProperties(wxPropertyGridInterface* grid) override;
         virtual int OnPropertyGridChange(wxPropertyGridInterface *grid, wxPropertyGridEvent& event) override;
+        virtual bool SupportsXlightsModel() override { return true; }
+        virtual void ExportXlightsModel() override;
         virtual bool SupportsExportAsCustom() const override { return true; }
         virtual bool SupportsWiringView() const override { return true; }
         virtual std::string GetDimension() const override;
         virtual void AddDimensionProperties(wxPropertyGridInterface* grid) override;
 
+        virtual bool SupportsVisitors() override { return true; }
+        void Accept(BaseObjectVisitor& visitor) const override { return visitor.Visit(*this); }
+        bool IsReverse() const { return _reverse; }
+        bool IsSticks() const { return _sticks; }
+        bool HasAlternateNodes() const { return _alternateNodes; }
+        float GetCandyCaneHeight() const { return _caneheight; }
+
     protected:
         virtual void InitModel() override;
         virtual int MapToNodeIndex(int strand, int node) const override;

diff --git a/xLights/models/ChannelBlockModel.cpp b/xLights/models/ChannelBlockModel.cpp
@@ -243,3 +243,13 @@ int ChannelBlockModel::GetNumStrands() const {
 int ChannelBlockModel::CalcCannelsPerString() {
 	return GetNodeChannelCount(StringType);
 }
+void ChannelBlockModel::ExportXlightsModel() {}
+
+std::vector<std::string> ChannelBlockModel::GetChannelProperies() const {
+    std::vector<std::string> channelPropColour;
+    for (auto i = 0; i < GetNumStrands(); i++) {
+        wxString nm = ChanColorAttrName(i);
+        channelPropColour.push_back(ModelXml->GetAttribute("ChannelProperties." + nm).ToStdString());
+    }
+    return channelPropColour;
+}
diff --git a/xLights/models/ChannelBlockModel.h b/xLights/models/ChannelBlockModel.h
@@ -32,6 +32,12 @@ class ChannelBlockModel : public ModelWithScreenLocation<TwoPointScreenLocation>
         virtual int GetNumPhysicalStrings() const override { return 1; }
         virtual bool SupportsExportAsCustom() const override { return false; }
         virtual bool SupportsWiringView() const override { return false; }
+        virtual bool SupportsXlightsModel() override { return true; }
+        virtual void ExportXlightsModel() override;
+        std::vector<std::string> GetChannelProperies() const;
+
+        virtual bool SupportsVisitors() override { return true; }
+        void Accept(BaseObjectVisitor& visitor) const override { return visitor.Visit(*this); }
 
     protected:
         virtual void InitModel() override;

diff --git a/xLights/models/CircleModel.h b/xLights/models/CircleModel.h
@@ -35,6 +35,10 @@ class CircleModel : public ModelWithScreenLocation<BoxedScreenLocation>
         virtual bool ModelSupportsLayerSizes() const override { return true; }
         virtual void OnLayerSizesChange(bool countChanged) override;
 
+        virtual bool SupportsVisitors() override { return true; }
+        void Accept(BaseObjectVisitor& visitor) const override { return visitor.Visit(*this); }
+        bool IsInsideOut() const { return insideOut; }
+
     protected:
         virtual void InitModel() override;
 

diff --git a/xLights/models/CubeModel.cpp b/xLights/models/CubeModel.cpp
@@ -384,6 +384,22 @@ std::string CubeModel::GetStartLocation() const
     return ModelXml->GetAttribute("Start", "") + " " + ModelXml->GetAttribute("Style", "");
 }
 
+std::string CubeModel::GetStrandStart() const {
+    return ModelXml->GetAttribute("Start", "");
+}
+
+std::string CubeModel::GetStrandStyle() const {
+    return ModelXml->GetAttribute("Style", "");
+}
+
+std::string CubeModel::GetStrandPerLine() const {
+    return ModelXml->GetAttribute("StrandPerLine", "");
+}
+
+std::string CubeModel::GetStrandPerLayer() const {
+    return ModelXml->GetAttribute("StrandPerLayer", "");
+}
+
 std::vector<std::tuple<int, int, int>> CubeModel::BuildCube() const
 {
     static log4cpp::Category &logger_base = log4cpp::Category::getInstance(std::string("log_base"));

diff --git a/xLights/models/CubeModel.h b/xLights/models/CubeModel.h
@@ -33,21 +33,23 @@ class CubeModel : public ModelWithScreenLocation<BoxedScreenLocation>
         virtual int GetNumStrands() const override { return _strands; };
         virtual int MapToNodeIndex(int strand, int node) const override;
         virtual void ExportAsCustomXModel3D() const override;
-        virtual bool SupportsExportAsCustom3D() const override
-        {
-            return true;
-        }
-        virtual bool SupportsExportAsCustom() const override
-        {
-            return false;
-        }
+        virtual bool SupportsExportAsCustom3D() const override { return true; }
+        virtual bool SupportsExportAsCustom() const override { return false; }
         virtual int NodesPerString() const override;
 
         virtual std::string ChannelLayoutHtml(OutputManager * outputManager) override;
 
         virtual void AddTypeProperties(wxPropertyGridInterface* grid, OutputManager* outputManager) override;
         virtual int OnPropertyGridChange(wxPropertyGridInterface *grid, wxPropertyGridEvent& event) override;
 
+        virtual bool SupportsVisitors() override { return true; }
+        void Accept(BaseObjectVisitor& visitor) const override { return visitor.Visit(*this); }
+
+        std::string GetStrandStyle() const;
+        std::string GetStrandPerLine() const;
+        std::string GetStrandPerLayer() const;
+        std::string GetStrandStart() const;
+
     protected:
         int GetStartIndex() const;
         int GetStyleIndex() const;