Code Refactor

gieldid · Jan 19, 2022 · 03540b2 · 03540b2
1 parent d55dbbf
commit 03540b2
Show file tree

Hide file tree

Showing 11 changed files with 209 additions and 11 deletions.
diff --git a/DatawoodInfo.cs b/DatawoodInfo.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Drawing;
 
-namespace csvModule
+namespace DatawoodGH
 {
 	public class DatawoodInfo : GH_AssemblyInfo
 	{

diff --git a/Local/CsvCreator.cs b/Local/CsvCreator.cs
@@ -7,7 +7,7 @@
 using System.Globalization;
 using System.IO;
 
-namespace csvModule
+namespace DatawoodGH
 {
 	public class CsvCreator : LocalComponent
 	{

diff --git a/Local/DataWoodObject.cs b/Local/DataWoodObject.cs
@@ -3,7 +3,7 @@
 using CsvHelper.Configuration;
 using CsvHelper.Configuration.Attributes;
 
-namespace csvModule
+namespace DatawoodGH
 {
 	public class DataWoodObject
 	{	

diff --git a/Network/ApiCall.cs b/Network/ApiCall.cs
@@ -6,7 +6,7 @@
 using Grasshopper.Kernel;
 using Rhino.Geometry;
 
-namespace CSVModule
+namespace DatawoodGH.Network
 {
     public class ApiCall : NetworkComponent
     {

diff --git a/Network/FtpTransfer.cs b/Network/FtpTransfer.cs
@@ -8,7 +8,7 @@
 using Renci.SshNet;
 using Rhino.Geometry;
 
-namespace CSVModule
+namespace DatawoodGH.Network
 {
     public class FtpTransfer : NetworkComponent
     {

diff --git a/Network/SocketConnection/ModFileObject.cs b/Network/SocketConnection/ModFileObject.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DatawoodGH.Utility;
+
+namespace DatawoodGH.Network.SocketConnection
+{
+    public class ModFileObject
+    {
+        public List<string> MovesFull {  get; private set; }
+        public Dictionary<string, string> Speeds { get; private set; }
+        public Dictionary<string, string> Zones { get; private set; }
+        public List<MoveObject> Voves { get; set; } 
+
+        /// <summary>
+        /// Reads the modfile and puts the Moves, speeds and zones in their respective variables.
+        /// </summary>
+        /// <param name="path">path of the modfile</param>
+        public ModFileObject(string path) {
+            MovesFull = new List<string>();
+            Speeds = new Dictionary<string, string>();
+            Zones = new Dictionary<string, string>();
+            ReadModFile(path);
+        }
+
+        private void ReadModFile(string path) {
+            string[] lines = System.IO.File.ReadAllLines(path);
+            foreach (var line in lines)
+            {
+                ReadMoves(line);
+                ReadSpeeds(line);
+                ReadZones(line);
+            }
+        }
+
+        private void ReadMoves(string line) {
+            if (line.Contains("MoveL") || line.Contains("MoveAbsJ"))
+            {
+                MovesFull.Add(line);
+            }
+        }
+
+        private void ReadSpeeds(string line) {
+            if (line.Contains("speeddata")) {
+                var startName = Utils.GetNthIndex(line, 'S', 3);
+                var endName = line.IndexOf(':');
+                var speedName = line.Substring(startName, endName - startName);
+
+                var startData = line.IndexOf('[');
+                var endData = line.IndexOf(']') + 1;
+
+                var speedData = line.Substring(startData, endData - startData);
+
+                Speeds.Add(speedName, speedData);
+            }
+        }
+
+        private void ReadZones(string line) {
+            if (line.Contains("zonedata"))
+            {
+                var startName = line.IndexOf('Z');
+                var endName = line.IndexOf(':');
+                var zoneName = line.Substring(startName, endName - startName);
+
+                var startData = line.IndexOf('[');
+                var endData = line.IndexOf(']') + 1;
+
+                var zoneData = line.Substring(startData, endData - startData);
+
+                Speeds.Add(zoneName, zoneData);
+            }
+        }
+    }
+}
diff --git a/Network/SocketConnection/MoveAbsJObject.cs b/Network/SocketConnection/MoveAbsJObject.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DatawoodGH.Utility;
+
+namespace DatawoodGH.Network.SocketConnection
+{
+    public class MoveAbsJObject : MoveObject
+    {
+        public string RobJoint { get; set; }
+        public MoveAbsJObject(string line, Dictionary<string, string> speeds, Dictionary<string, string> zones) : base(line, speeds, zones)
+        {
+            ReadRobJoint(line);
+        }
+
+        private void ReadRobJoint(string line) {
+            int openBracket = Utils.GetNthIndex(line, '[', 2);
+            int closeBracket = line.IndexOf(']') + 1;
+
+            RobJoint = line.Substring(openBracket, closeBracket - openBracket);
+        }
+
+    }
+}
diff --git a/Network/SocketConnection/MoveLObject.cs b/Network/SocketConnection/MoveLObject.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DatawoodGH.Utility;
+
+namespace DatawoodGH.Network.SocketConnection
+{
+    public class MoveLObject : MoveObject
+    {
+        public string Pos { get; set; }
+        public string Orient { get; set; }
+
+        public MoveLObject(string line, Dictionary<string, string> speeds, Dictionary<string, string> zones) : base(line, speeds, zones)
+        {
+            ReadPos(line);
+            ReadOrient(line);
+        }
+
+        private void ReadPos(string line) {
+            int openBracket = Utils.GetNthIndex(line, '[', 2);
+            int closeBracket = line.IndexOf(']') + 1;
+
+            Pos = line.Substring(openBracket, closeBracket - openBracket);
+        }
+
+        private void ReadOrient(string line) {
+            int openBracket = Utils.GetNthIndex(line, '[', 3);
+            int closeBracket = Utils.GetNthIndex(line, ']', 2) + 1;
+
+            Orient = line.Substring(openBracket, closeBracket - openBracket);
+        }
+
+    }
+}
diff --git a/Network/SocketConnection/MoveObject.cs b/Network/SocketConnection/MoveObject.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+
+namespace DatawoodGH.Network.SocketConnection
+{
+    public abstract class MoveObject
+    {
+
+
+        public string Name { get; set; }    
+        public string Speed { get; set; }
+        public string Zone { get; set; }
+        public string ExternalJoint { get; set; }
+
+        public MoveObject(string line, Dictionary<string , string> speeds, Dictionary<string, string> zones) {
+            ReadExternalJoint(line);
+            ReadSpeed(line, speeds);
+            ReadZone(line, zones);
+        }
+
+        private void ReadExternalJoint(string line) {
+            int openBracket = line.LastIndexOf('[');
+            int closeBracket = line.LastIndexOf(']');
+            ExternalJoint = line.Substring(openBracket, closeBracket - openBracket);
+        }
+
+        private void ReadSpeed(string line, Dictionary<string, string> speeds) {
+            string[] values = line.Split(',');
+            string speedKey = null;
+            foreach (var value in values)
+            {
+                if (value.Contains("Speed"))
+                {
+                    speedKey = value;
+                }
+            }
+
+            speeds.TryGetValue(speedKey, out string speedValue);
+
+            Speed = speedValue;
+        }
+
+        private void ReadZone(string line, Dictionary<string, string> zones) {
+            string[] values = line.Split(',');
+            string zoneKey = null;
+            foreach (var value in values)
+            {
+                if (value.Contains("Zone"))
+                {
+                    zoneKey = value;
+                }
+            }
+
+            zones.TryGetValue(zoneKey, out string zoneValue);
+
+            Zone = zoneValue;
+        }
+    }
+}
diff --git a/Network/SocketClient.cs → Network/SocketConnection/SocketClient.cs b/Network/SocketClient.cs → Network/SocketConnection/SocketClient.cs
@@ -6,10 +6,10 @@
 using System.Net.Sockets;
 using System.Net;
 using System.Text;
-using DatawoodGH.Utils;
+using DatawoodGH.Utility;
 using DatawoodGH.Properties;
 
-namespace CSVModule.Network
+namespace DatawoodGH.Network.SocketConnection
 {
     public class SocketClient : NetworkComponent
     {
@@ -77,9 +77,9 @@ protected override void SolveInstance(IGH_DataAccess DA)
             DA.GetData("Run", ref run);
 
             if (run) {
-                List<string> targets = ReadModFile(path);
+                ModFileObject mod = new ModFileObject(path);
                 Socket client = SocketConnection(ip, port);
-                SendTargets(client, targets);
+                SendTargets(client, mod.MovesFull);
                 CloseConnection(client);
             }
         }
@@ -190,7 +190,7 @@ private string GetSpeed(string RAPID) {
             {
                 if (value.Contains("Speed"))
                 {
-                    speed = value;
+                    speed = value; 
                 }
             }
             return speed;
@@ -220,11 +220,13 @@ private string GetExtJoint(string RAPID) {
         private List<string> ReadModFile(string path) {
             string[] lines = System.IO.File.ReadAllLines(path);
             List<string> targets = new List<string>();
+            Dictionary<string,string> speeds = new Dictionary<string,string>();
             foreach (var line in lines) {
                 if (line.Contains("MoveL") || line.Contains("MoveAbsJ")) { 
                     targets.Add(line);
                 }
             }
+
             return targets;
         }
 

diff --git a/Utils/Utils.cs → Utility/Utils.cs b/Utils/Utils.cs → Utility/Utils.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DatawoodGH.Utils
+namespace DatawoodGH.Utility
 {
 	public static class Utils
 	{