@@ -129,13 +129,14 @@ private void btnForel_Click(object sender, EventArgs e)
129
129
private void btnClustersRoute_Click ( object sender , EventArgs e )
130
130
{
131
131
AllowSelectClusterAndCalculateEnergy ( ) ;
132
+
132
133
if ( clusterCenters . Count == 0 )
133
134
routeBuilder . All_points ( Calculator . DictionaryToList ( allPoints ) ) ;
134
135
else
135
136
routeBuilder . All_points ( clusterCenters ) ;
136
137
137
138
routeBuilder . CalculateRouteByConvexHullInsertion ( ) ;
138
- graphic . DrawRoute ( routeBuilder . RouteList , Color . Orange ) ;
139
+ graphic . DrawRoute ( routeBuilder . RouteList , Color . Yellow ) ;
139
140
labelRoute . Text = "Route length: " + Math . Round ( Calculator . calcRouteLength ( routeBuilder . RouteList ) , 3 ) ;
140
141
141
142
//allPointsClustered = routeBuilder.SortClustersByRoute(allPointsClustered);
@@ -145,14 +146,15 @@ private void btnClustersRoute_Click(object sender, EventArgs e)
145
146
private void btnSpiralRoute_Click ( object sender , EventArgs e )
146
147
{
147
148
AllowSelectClusterAndCalculateEnergy ( ) ;
149
+ btnConvexHull . Enabled = false ;
148
150
149
151
if ( clusterCenters . Count > 0 )
150
152
routeBuilder . All_points ( clusterCenters ) ;
151
153
else
152
154
routeBuilder . All_points ( Calculator . DictionaryToList ( allPoints ) ) ;
153
155
154
156
routeBuilder . JarvisMarch ( true ) ;
155
- graphic . DrawRoute ( routeBuilder . Convex_hull , Color . DarkMagenta ) ;
157
+ graphic . DrawRoute ( routeBuilder . Convex_hull , Color . Aqua ) ;
156
158
labelRoute . Text = "Route length: " + Math . Round ( Calculator . calcRouteLength ( routeBuilder . Convex_hull ) , 3 ) ;
157
159
}
158
160
@@ -226,11 +228,6 @@ private void btn1ClusterOn_Click(object sender, EventArgs e)
226
228
//>
227
229
}
228
230
229
- private void btn1ClusterOff_Click ( object sender , EventArgs e )
230
- {
231
-
232
- }
233
-
234
231
private void DrawAllSavedObjects ( ) {
235
232
graphics . Clear ( Color . White ) ;
236
233
textBoxInfo . Clear ( ) ;
@@ -417,6 +414,7 @@ private void DrawScale() // draw scale in panel related to picturebox
417
414
private void btnNearestNeighbour_Click ( object sender , EventArgs e )
418
415
{
419
416
AllowSelectClusterAndCalculateEnergy ( ) ;
417
+ btnConvexHull . Enabled = true ;
420
418
List < Point > route = new List < Point > { } ;
421
419
422
420
if ( clusterCenters . Count > 0 )
@@ -432,6 +430,7 @@ private void btnNearestNeighbour_Click(object sender, EventArgs e)
432
430
private void btnFPPWR_Click ( object sender , EventArgs e )
433
431
{
434
432
AllowSelectClusterAndCalculateEnergy ( ) ;
433
+ btnConvexHull . Enabled = true ;
435
434
List < Point > route = new List < Point > { } ;
436
435
437
436
//< draw net on pictBoxArea
@@ -447,7 +446,7 @@ private void btnFPPWR_Click(object sender, EventArgs e)
447
446
else
448
447
route = routeBuilder . CalculateRouteByFPPWR ( Calculator . DictionaryToList ( allPoints ) , x_count , y_count , pictBoxArea . Width , pictBoxArea . Height ) ;
449
448
450
- graphic . DrawRoute ( route , Color . Crimson ) ;
449
+ graphic . DrawRoute ( route , Color . Purple ) ;
451
450
labelRoute . Text = "Route length: " + Math . Round ( Calculator . calcRouteLength ( route ) , 3 ) ;
452
451
PrintToTextBoxInfo ( allPointsClustered ) ;
453
452
}
0 commit comments