Skip to content

Commit 84e7ab4

Browse files
committed
change routing algorithm colors
1 parent 0518409 commit 84e7ab4

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

Form1.Designer.cs

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Form1.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,14 @@ private void btnForel_Click(object sender, EventArgs e)
129129
private void btnClustersRoute_Click(object sender, EventArgs e)
130130
{
131131
AllowSelectClusterAndCalculateEnergy();
132+
132133
if (clusterCenters.Count == 0)
133134
routeBuilder.All_points(Calculator.DictionaryToList(allPoints));
134135
else
135136
routeBuilder.All_points(clusterCenters);
136137

137138
routeBuilder.CalculateRouteByConvexHullInsertion();
138-
graphic.DrawRoute(routeBuilder.RouteList, Color.Orange);
139+
graphic.DrawRoute(routeBuilder.RouteList, Color.Yellow);
139140
labelRoute.Text = "Route length: " + Math.Round(Calculator.calcRouteLength(routeBuilder.RouteList), 3);
140141

141142
//allPointsClustered = routeBuilder.SortClustersByRoute(allPointsClustered);
@@ -145,14 +146,15 @@ private void btnClustersRoute_Click(object sender, EventArgs e)
145146
private void btnSpiralRoute_Click(object sender, EventArgs e)
146147
{
147148
AllowSelectClusterAndCalculateEnergy();
149+
btnConvexHull.Enabled = false;
148150

149151
if (clusterCenters.Count > 0)
150152
routeBuilder.All_points(clusterCenters);
151153
else
152154
routeBuilder.All_points(Calculator.DictionaryToList(allPoints));
153155

154156
routeBuilder.JarvisMarch(true);
155-
graphic.DrawRoute(routeBuilder.Convex_hull, Color.DarkMagenta);
157+
graphic.DrawRoute(routeBuilder.Convex_hull, Color.Aqua);
156158
labelRoute.Text = "Route length: " + Math.Round(Calculator.calcRouteLength(routeBuilder.Convex_hull), 3);
157159
}
158160

@@ -226,11 +228,6 @@ private void btn1ClusterOn_Click(object sender, EventArgs e)
226228
//>
227229
}
228230

229-
private void btn1ClusterOff_Click(object sender, EventArgs e)
230-
{
231-
232-
}
233-
234231
private void DrawAllSavedObjects() {
235232
graphics.Clear(Color.White);
236233
textBoxInfo.Clear();
@@ -417,6 +414,7 @@ private void DrawScale() // draw scale in panel related to picturebox
417414
private void btnNearestNeighbour_Click(object sender, EventArgs e)
418415
{
419416
AllowSelectClusterAndCalculateEnergy();
417+
btnConvexHull.Enabled = true;
420418
List<Point> route = new List<Point> { };
421419

422420
if (clusterCenters.Count > 0)
@@ -432,6 +430,7 @@ private void btnNearestNeighbour_Click(object sender, EventArgs e)
432430
private void btnFPPWR_Click(object sender, EventArgs e)
433431
{
434432
AllowSelectClusterAndCalculateEnergy();
433+
btnConvexHull.Enabled = true;
435434
List<Point> route = new List<Point> { };
436435

437436
//< draw net on pictBoxArea
@@ -447,7 +446,7 @@ private void btnFPPWR_Click(object sender, EventArgs e)
447446
else
448447
route = routeBuilder.CalculateRouteByFPPWR(Calculator.DictionaryToList(allPoints), x_count, y_count, pictBoxArea.Width, pictBoxArea.Height);
449448

450-
graphic.DrawRoute(route, Color.Crimson);
449+
graphic.DrawRoute(route, Color.Purple);
451450
labelRoute.Text = "Route length: " + Math.Round(Calculator.calcRouteLength(route), 3);
452451
PrintToTextBoxInfo(allPointsClustered);
453452
}

Form1.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,15 @@
123123
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124124
<value>17, 17</value>
125125
</metadata>
126+
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127+
<value>17, 17</value>
128+
</metadata>
129+
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130+
<value>17, 17</value>
131+
</metadata>
132+
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
133+
<value>17, 17</value>
134+
</metadata>
126135
<data name="btnCalcEnergy.ToolTip" xml:space="preserve">
127136
<value>Calculate the energy consumption for data transmission.
128137
Draw the transmission path.

0 commit comments

Comments
 (0)