Code cleanups - simplify / remove unused

ghormann · Feb 2, 2024 · 1a67222 · 1a67222
1 parent 2ad4a23
commit 1a67222
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 12 deletions.
diff --git a/xLights/models/ArchesModel.cpp b/xLights/models/ArchesModel.cpp
@@ -644,15 +644,9 @@ void ArchesModel::ImportXlightsModel(wxXmlNode* root, xLightsFrame* xlights, flo
         wxString psp = root->GetAttribute("PixelSpacing");
         wxString ls = root->GetAttribute("LayerSizes");
         wxString h = root->GetAttribute("Hollow");
-        wxString zz = root->GetAttribute("ZigZag");
+        wxString zz = root->GetAttribute("ZigZag", "true");
 
         // Add any model version conversion logic here
-
-        if (zz == "")
-        {
-            zz = "true";
-        }
-
         // Source version will be the program version that created the custom model
 
         SetProperty("parm1", p1);

diff --git a/xLights/models/ArchesModel.h b/xLights/models/ArchesModel.h
@@ -23,7 +23,6 @@ class ArchesModel : public ModelWithScreenLocation<ThreePointScreenLocation>
         virtual void InitRenderBufferNodes(const std::string &type, const std::string &camera, const std::string &transform,
                                            std::vector<NodeBaseClassPtr> &Nodes, int &BufferWi, int &BufferHi, int stagger, bool deep = false) const override;
         virtual int GetNumPhysicalStrings() const override { return 1; }
-        virtual bool StrandsZigZagOnString() const override { return zigzag; }
 
         virtual int GetLightsPerNode() const override { return parm3; } // default to one unless a model supports this
         virtual void AddTypeProperties(wxPropertyGridInterface* grid, OutputManager* outputManager) override;

diff --git a/xLights/models/MatrixModel.h b/xLights/models/MatrixModel.h
@@ -19,8 +19,6 @@ class MatrixModel : public ModelWithScreenLocation<BoxedScreenLocation>
         virtual ~MatrixModel();
         virtual int GetNumStrands() const override;
 
-        virtual bool StrandsZigZagOnString() const override { return true; }
-
         bool SupportsChangingStringCount() const override{ return true; };
         bool ChangeStringCount(long count, std::string& message) override;
         virtual bool SupportsXlightsModel() override { return true; }

diff --git a/xLights/models/Model.h b/xLights/models/Model.h
@@ -199,7 +199,6 @@ class Model : public BaseObject
 
     static const std::vector<std::string> DEFAULT_BUFFER_STYLES;
 
-    virtual bool StrandsZigZagOnString() const { return false; };
     int GetDefaultBufferWi() const { return BufferWi; }
     int GetDefaultBufferHt() const { return BufferHt; }
     virtual bool IsDMXModel() const { return false; }

diff --git a/xLights/models/SpinnerModel.h b/xLights/models/SpinnerModel.h
@@ -19,7 +19,6 @@ class SpinnerModel : public ModelWithScreenLocation<BoxedScreenLocation>
         virtual ~SpinnerModel();
         virtual int GetNumStrands() const override; 
 
-        virtual bool StrandsZigZagOnString() const override { return true;};
         virtual int NodesPerString() const override;
 
         virtual void AddTypeProperties(wxPropertyGridInterface* grid, OutputManager* outputManager) override;