Skip to content

Commit 313a44f

Browse files
committed
Small changes, added nlog(n) sorts
1 parent f544a71 commit 313a44f

File tree

3 files changed

+115
-115
lines changed

3 files changed

+115
-115
lines changed

global.cpp

+34
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,40 @@ void Global::renderMenu(X11& x11) {
5656
cur = &options[i];
5757
x11.setColor(200,200,200);
5858
x11.fillRectangle(cur->getX(),cur->getY(),cur->getWidth(),cur->getHeight());
59+
x11.setColor(0,0,0);
60+
// Title on buttons
61+
switch(cur->getValue()) {
62+
case SHUFFLE:
63+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "SHUFFLE");
64+
break;
65+
case BUBBLESORT:
66+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "BUBBLE");
67+
break;
68+
case SELECTIONSORT:
69+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "SELECTION");
70+
break;
71+
case INSERTIONSORT:
72+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "INSERTION");
73+
break;
74+
case SHELLSORT:
75+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "SHELL");
76+
break;
77+
case BISELECTIONSORT:
78+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "BI-SELECTION");
79+
break;
80+
case COCKTAILSORT:
81+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "COCKTAIL");
82+
break;
83+
case MERGESORT:
84+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "MERGE");
85+
break;
86+
case HEAPSORT:
87+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "HEAP");
88+
break;
89+
case QUICKSORT:
90+
x11.drawString(cur->getX() + 10, cur->getY() + (cur->getHeight()/2), "QUICK");
91+
break;
92+
}
5993
}
6094
}
6195
else {

global.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <cstdlib>
77
#include <ctime>
88

9-
enum {SHUFFLE=0,BUBBLESORT,SELECTIONSORT,INSERTIONSORT,SHELLSORT,BISELECTIONSORT,NUMSORTS};
9+
enum {SHUFFLE=0,BUBBLESORT,SELECTIONSORT,INSERTIONSORT,SHELLSORT,BISELECTIONSORT,COCKTAILSORT,MERGESORT,HEAPSORT,QUICKSORT,NUMSORTS};
1010

1111
class Global {
1212
public:

0 commit comments

Comments
 (0)