diff --git a/src/Client/RobotController/.vs/RobotController/FileContentIndex/24ef3bc5-0773-4884-a889-d69404274708.vsidx b/src/Client/RobotController/.vs/RobotController/FileContentIndex/24ef3bc5-0773-4884-a889-d69404274708.vsidx deleted file mode 100644 index ebcc871..0000000 Binary files a/src/Client/RobotController/.vs/RobotController/FileContentIndex/24ef3bc5-0773-4884-a889-d69404274708.vsidx and /dev/null differ diff --git a/src/Client/RobotController/.vs/RobotController/FileContentIndex/65594268-eb87-4722-9bd8-7181c87f39b0.vsidx b/src/Client/RobotController/.vs/RobotController/FileContentIndex/65594268-eb87-4722-9bd8-7181c87f39b0.vsidx deleted file mode 100644 index eafcdef..0000000 Binary files a/src/Client/RobotController/.vs/RobotController/FileContentIndex/65594268-eb87-4722-9bd8-7181c87f39b0.vsidx and /dev/null differ diff --git a/src/Client/RobotController/.vs/RobotController/FileContentIndex/69dcdd0c-8400-48a9-9281-0a2f63139a69.vsidx b/src/Client/RobotController/.vs/RobotController/FileContentIndex/69dcdd0c-8400-48a9-9281-0a2f63139a69.vsidx deleted file mode 100644 index 7f10ec1..0000000 Binary files a/src/Client/RobotController/.vs/RobotController/FileContentIndex/69dcdd0c-8400-48a9-9281-0a2f63139a69.vsidx and /dev/null differ diff --git a/src/Client/RobotController/.vs/RobotController/FileContentIndex/6b417c8d-62f0-4907-ade6-c2a00899ee28.vsidx b/src/Client/RobotController/.vs/RobotController/FileContentIndex/6b417c8d-62f0-4907-ade6-c2a00899ee28.vsidx deleted file mode 100644 index 3022627..0000000 Binary files a/src/Client/RobotController/.vs/RobotController/FileContentIndex/6b417c8d-62f0-4907-ade6-c2a00899ee28.vsidx and /dev/null differ diff --git a/src/Client/RobotController/.vs/RobotController/FileContentIndex/7da26568-73b3-423c-a989-9f7bc9342816.vsidx b/src/Client/RobotController/.vs/RobotController/FileContentIndex/7da26568-73b3-423c-a989-9f7bc9342816.vsidx deleted file mode 100644 index dd432d6..0000000 Binary files a/src/Client/RobotController/.vs/RobotController/FileContentIndex/7da26568-73b3-423c-a989-9f7bc9342816.vsidx and /dev/null differ diff --git a/src/Client/RobotController/.vs/RobotController/v17/.futdcache.v2 b/src/Client/RobotController/.vs/RobotController/v17/.futdcache.v2 index 992f13c..702500f 100644 Binary files a/src/Client/RobotController/.vs/RobotController/v17/.futdcache.v2 and b/src/Client/RobotController/.vs/RobotController/v17/.futdcache.v2 differ diff --git a/src/Client/RobotController/.vs/RobotController/v17/.suo b/src/Client/RobotController/.vs/RobotController/v17/.suo index b0656b7..6077934 100644 Binary files a/src/Client/RobotController/.vs/RobotController/v17/.suo and b/src/Client/RobotController/.vs/RobotController/v17/.suo differ diff --git a/src/Client/RobotController/.vs/RobotController/v17/DocumentLayout.json b/src/Client/RobotController/.vs/RobotController/v17/DocumentLayout.json index f494a2d..776ac58 100644 --- a/src/Client/RobotController/.vs/RobotController/v17/DocumentLayout.json +++ b/src/Client/RobotController/.vs/RobotController/v17/DocumentLayout.json @@ -1,28 +1,7 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\", - "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|c:\\users\\wouter\\source\\repos\\roommapper\\src\\client\\robotcontroller\\robot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|solutionrelative:robot.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|c:\\users\\wouter\\source\\repos\\roommapper\\src\\client\\robotcontroller\\measurement.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|solutionrelative:measurement.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|c:\\users\\wouter\\source\\repos\\roommapper\\src\\client\\robotcontroller\\motor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|solutionrelative:motor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|c:\\users\\wouter\\source\\repos\\roommapper\\src\\client\\robotcontroller\\gyrosensor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|solutionrelative:gyrosensor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|c:\\users\\wouter\\source\\repos\\roommapper\\src\\client\\robotcontroller\\coordinate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{8962460F-9112-4A79-9B40-35CA420C98C6}|RobotController.csproj|solutionrelative:coordinate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - } - ], + "WorkspaceRootPath": "C:\\Users\\tosl1\\source\\repos\\Roommapper\\src\\Client\\RobotController\\", + "Documents": [], "DocumentGroupContainers": [ { "Orientation": 0, @@ -30,72 +9,11 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 4, + "SelectedChildIndex": -1, "Children": [ { - "$type": "Document", - "DocumentIndex": 1, - "Title": "Measurement.cs", - "DocumentMoniker": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Measurement.cs", - "RelativeDocumentMoniker": "Measurement.cs", - "ToolTip": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Measurement.cs", - "RelativeToolTip": "Measurement.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABIAAAAlAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-24T14:42:12.609Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "Motor.cs", - "DocumentMoniker": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Motor.cs", - "RelativeDocumentMoniker": "Motor.cs", - "ToolTip": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Motor.cs", - "RelativeToolTip": "Motor.cs", - "ViewState": "AQIAAAMAAAAAAAAAAAAAABYAAAAJAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-24T14:05:27.087Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, - "Title": "GyroSensor.cs", - "DocumentMoniker": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\GyroSensor.cs", - "RelativeDocumentMoniker": "GyroSensor.cs", - "ToolTip": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\GyroSensor.cs", - "RelativeToolTip": "GyroSensor.cs", - "ViewState": "AQIAAAgAAAAAAAAAAAAkwBQAAAAJAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-24T14:04:29.082Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "Coordinate.cs", - "DocumentMoniker": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Coordinate.cs", - "RelativeDocumentMoniker": "Coordinate.cs", - "ToolTip": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Coordinate.cs", - "RelativeToolTip": "Coordinate.cs", - "ViewState": "AQIAAAcAAAAAAAAAAAAcwA4AAAAJAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-24T13:44:32.642Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "Robot.cs", - "DocumentMoniker": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Robot.cs", - "RelativeDocumentMoniker": "Robot.cs", - "ToolTip": "C:\\Users\\Wouter\\source\\repos\\Roommapper\\src\\Client\\RobotController\\Robot.cs", - "RelativeToolTip": "Robot.cs", - "ViewState": "AQIAABEAAAAAAAAAAAAgwB0AAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-24T13:39:53.416Z", - "EditorCaption": "" + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" } ] } diff --git a/src/Client/RobotController/Map.cs b/src/Client/RobotController/Mapper/Map.cs similarity index 59% rename from src/Client/RobotController/Map.cs rename to src/Client/RobotController/Mapper/Map.cs index 2874ffc..9e01d02 100644 --- a/src/Client/RobotController/Map.cs +++ b/src/Client/RobotController/Mapper/Map.cs @@ -1,15 +1,13 @@ -namespace Mapper +namespace RobotController { - public class Map + internal class Map { - private Coordinate bottomLeft; - private Coordinate topRight; + private Coordinate bottomLeft, topRight; public Map(Coordinate bottomLeft, Coordinate topRight) { this.bottomLeft = bottomLeft; this.topRight = topRight; } - } } diff --git a/src/Client/RobotController/Measurement.cs b/src/Client/RobotController/Measurement.cs index 7b9726e..193eb57 100644 --- a/src/Client/RobotController/Measurement.cs +++ b/src/Client/RobotController/Measurement.cs @@ -1,4 +1,6 @@ -using System; +namespace RobotController +{ +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,17 +8,17 @@ using System.Threading.Tasks; namespace RobotController { - internal class Measurement - { - private Coordinate location; - private double angle; - private double distance; + internal class Measurement + { + private Coordinate location; + private double angle; + private double distance; - public Measurement(Coordinate location, double angle, double distance) - { - this.location = location; - this.angle = angle; - this.distance = distance; - } + public Measurement(Coordinate location, double angle, double distance) + { + this.location = location; + this.angle = angle; + this.distance = distance; } + } } diff --git a/src/Pathfinder/AStarPathfinding.sln b/src/Client/RobotController/RoutePlanner/AStarPathfinding.sln similarity index 100% rename from src/Pathfinder/AStarPathfinding.sln rename to src/Client/RobotController/RoutePlanner/AStarPathfinding.sln diff --git a/src/Pathfinder/AStarPathfinding/AStarPathfinding.csproj b/src/Client/RobotController/RoutePlanner/AStarPathfinding/AStarPathfinding.csproj similarity index 100% rename from src/Pathfinder/AStarPathfinding/AStarPathfinding.csproj rename to src/Client/RobotController/RoutePlanner/AStarPathfinding/AStarPathfinding.csproj diff --git a/src/Pathfinder/AStarPathfinding/App.config b/src/Client/RobotController/RoutePlanner/AStarPathfinding/App.config similarity index 100% rename from src/Pathfinder/AStarPathfinding/App.config rename to src/Client/RobotController/RoutePlanner/AStarPathfinding/App.config diff --git a/src/Pathfinder/AStarPathfinding/Program.cs b/src/Client/RobotController/RoutePlanner/AStarPathfinding/Program.cs similarity index 100% rename from src/Pathfinder/AStarPathfinding/Program.cs rename to src/Client/RobotController/RoutePlanner/AStarPathfinding/Program.cs diff --git a/src/Pathfinder/AStarPathfinding/Properties/AssemblyInfo.cs b/src/Client/RobotController/RoutePlanner/AStarPathfinding/Properties/AssemblyInfo.cs similarity index 100% rename from src/Pathfinder/AStarPathfinding/Properties/AssemblyInfo.cs rename to src/Client/RobotController/RoutePlanner/AStarPathfinding/Properties/AssemblyInfo.cs diff --git a/src/Pathfinder/AStarPathfinding/bin/Debug/AStarPathfinding.exe b/src/Client/RobotController/RoutePlanner/AStarPathfinding/bin/Debug/AStarPathfinding.exe similarity index 100% rename from src/Pathfinder/AStarPathfinding/bin/Debug/AStarPathfinding.exe rename to src/Client/RobotController/RoutePlanner/AStarPathfinding/bin/Debug/AStarPathfinding.exe diff --git a/src/Pathfinder/AStarPathfinding/bin/Debug/AStarPathfinding.exe.config b/src/Client/RobotController/RoutePlanner/AStarPathfinding/bin/Debug/AStarPathfinding.exe.config similarity index 100% rename from src/Pathfinder/AStarPathfinding/bin/Debug/AStarPathfinding.exe.config rename to src/Client/RobotController/RoutePlanner/AStarPathfinding/bin/Debug/AStarPathfinding.exe.config diff --git a/src/Pathfinder/AStarPathfinding/bin/Debug/AStarPathfinding.pdb b/src/Client/RobotController/RoutePlanner/AStarPathfinding/bin/Debug/AStarPathfinding.pdb similarity index 100% rename from src/Pathfinder/AStarPathfinding/bin/Debug/AStarPathfinding.pdb rename to src/Client/RobotController/RoutePlanner/AStarPathfinding/bin/Debug/AStarPathfinding.pdb diff --git a/src/Client/Ultrasonic/Ultrasonic.cs b/src/Client/RobotController/Ultrasonic.cs similarity index 100% rename from src/Client/Ultrasonic/Ultrasonic.cs rename to src/Client/RobotController/Ultrasonic.cs