Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c8c334b

Browse files
author
javiluli
committed
Agrego la opcion de 1024 graficos
1 parent b2d80e9 commit c8c334b

File tree

3 files changed

+36
-28
lines changed

3 files changed

+36
-28
lines changed

‎src/Sorts/Algoritmos/Bubble.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package Sorts.Algoritmos;
22

33
import Interfaz.Sort;
4+
import Principal.Barras;
45
import Principal.Main;
56
import Sorts.Sorts;
67

@@ -16,12 +17,13 @@ public void sort() {
1617
setInicio(System.currentTimeMillis());
1718
for (int i = 0; i < n.length; i++) {
1819
for (int j = 0; j < n.length - 1 - i; j++) {
19-
if (Sorts.n[j] > n[j + 1]) {
20+
if (n[j] > n[j + 1]) {
2021
int temp = n[j];
2122
n[j] = n[j + 1];
2223
n[j + 1] = temp;
2324
cambiosArray++;
2425
}
26+
// Barras.mismo = j+1;
2527
accesoArray += 2;
2628
m.updateAnimaciones();
2729
}

‎src/principal/Barras.java

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public class Barras extends JPanel {
1616
private final static int WIN_WIDTH = 1024;
1717
private final static int WIN_HEIGHT = 1024;
1818
private static int NUM_BARS = 32;
19-
privatestatic int BAR_WIDTH = getWinWidth() / getNUM_BARS();
20-
privatestatic int BAR_HEIGHT = getWinHeight() / getNUM_BARS();
19+
static int BAR_WIDTH = WIN_WIDTH / NUM_BARS;
20+
static int BAR_HEIGHT = WIN_HEIGHT / NUM_BARS;
2121
private boolean marcarSepacaion = false;
2222

2323
/**
@@ -32,8 +32,8 @@ public Barras() {
3232
* Constructor de iniciar el array con numeros ordenados.
3333
*/
3434
public void barras() {
35-
Sorts.n = new int[getNUM_BARS()];
36-
for (int i = 0; i < getNUM_BARS(); i++) {
35+
Sorts.n = new int[NUM_BARS];
36+
for (int i = 0; i < NUM_BARS; i++) {
3737
Sorts.n[i] = i;
3838
}
3939
}
@@ -45,8 +45,8 @@ public void barras() {
4545
*/
4646
public void shuffleArray() {
4747
Random rng = new Random();
48-
for (int i = 0; i < getNUM_BARS(); i++) {
49-
int swapWidthIndex = rng.nextInt(getNUM_BARS() - 1);
48+
for (int i = 0; i < NUM_BARS; i++) {
49+
int swapWidthIndex = rng.nextInt(NUM_BARS - 1);
5050
int temp = Sorts.n[i];
5151
Sorts.n[i] = Sorts.n[swapWidthIndex];
5252
Sorts.n[swapWidthIndex] = temp;
@@ -55,6 +55,8 @@ public void shuffleArray() {
5555
}
5656
}
5757

58+
public static int mismo;
59+
5860
/**
5961
* Pinta los componentes.
6062
*
@@ -64,41 +66,45 @@ public void shuffleArray() {
6466
public void paintComponent(Graphics g) {
6567
Graphics2D graphics = (Graphics2D) g;
6668
super.paintComponent(graphics);
67-
graphics.setColor(Color.WHITE);
69+
6870
int opcionGrafico = Main.getComboboxtiposgraficos().getSelectedIndex();
6971

70-
for (int i = 0; i < getNUM_BARS(); i++) {
72+
for (int i = 0; i < NUM_BARS; i++) {
73+
graphics.setColor(Color.WHITE);
74+
// if (i == mismo) {
75+
// graphics.setColor(Color.RED);
76+
// }
7177
comunes(i, graphics, opcionGrafico);
7278
}
7379
}
7480

7581
private void comunes(int i, Graphics2D graphics, int opcionGrafico) {
7682
int height = 0, xBegin = 0, yBegin = 0;
77-
height = (Sorts.n[i] * getBAR_HEIGHT()) + getBAR_HEIGHT();
78-
xBegin = i + (getBAR_WIDTH() - 1) * i;
83+
height = (Sorts.n[i] * BAR_HEIGHT) + BAR_HEIGHT;
84+
xBegin = i + (BAR_WIDTH - 1) * i;
7985
// --------------------------------------------------------------------------------------------
8086

8187
// SELECCION ENTRE EL ESTILO GRAFICO DE "ESCALERAS" Y "PIRAMIDE HORIZONTAL"
8288
if (opcionGrafico == 1) { // GRAFICOS "Piramide horizontal"
8389
// Al dividir entre 2 de divide el espacio entre las barras y los lados de la
8490
// ventana.
85-
yBegin = ((getWinHeight() - height) / 2);
91+
yBegin = (WIN_HEIGHT - height) / 2;
8692
} else if (opcionGrafico != 1) { // GRAFICOS "Escalera"
87-
yBegin = ((getWinHeight() - height));
93+
yBegin = WIN_HEIGHT - height;
8894
}
8995
// --------------------------------------------------------------------------------------------
9096

9197
// SELECCION ENTRE LOS DISTINTOS TIPOS DE ESTILOS GRAFICOS
9298
if (opcionGrafico == 0 || opcionGrafico == 1) { // GRAFICOS "Escalera" Y "Piramide horizontal"
9399
if (marcarSepacaion) { // EFECTO GRAFICO CON EL CONTORNO BARRAS
94-
graphics.fill3DRect(xBegin, yBegin, getBAR_WIDTH(), height, true);
100+
graphics.fill3DRect(xBegin, yBegin, BAR_WIDTH, height, true);
95101
} else if (!marcarSepacaion) { // EFECTO GRAFICO SIN EL CONTORNO BARRAS
96-
graphics.fillRect(xBegin, yBegin, getBAR_HEIGHT(), height);
102+
graphics.fillRect(xBegin, yBegin, BAR_HEIGHT, height);
97103
}
98104
} else if (opcionGrafico == 2) { // GRAFICOS "Cuadrado"
99-
graphics.fillRect(xBegin, yBegin, getBAR_HEIGHT(), getBAR_HEIGHT());
105+
graphics.fillRect(xBegin, yBegin, BAR_HEIGHT, BAR_HEIGHT);
100106
} else if (opcionGrafico == 3) { // GRAFICOS "Punto"
101-
graphics.fillOval(xBegin, yBegin, getBAR_HEIGHT(), getBAR_HEIGHT());
107+
graphics.fillOval(xBegin, yBegin, BAR_HEIGHT, BAR_HEIGHT);
102108
}
103109
}
104110

@@ -109,7 +115,7 @@ private void comunes(int i, Graphics2D graphics, int opcionGrafico) {
109115
*/
110116
@Override
111117
public Dimension getPreferredSize() {
112-
return new Dimension(getWinWidth(), getWinHeight());
118+
return new Dimension(WIN_WIDTH, WIN_HEIGHT);
113119
}
114120

115121
public static int getWinWidth() {
@@ -128,25 +134,25 @@ public static void setNUM_BARS(int nUM_BARS) {
128134
NUM_BARS = nUM_BARS;
129135
}
130136

131-
public static int getBAR_WIDTH() {
132-
return BAR_WIDTH;
133-
}
137+
// public static int getBAR_WIDTH() {
138+
// return BAR_WIDTH;
139+
// }
134140

135141
public static void setBAR_WIDTH(int bAR_WIDTH) {
136142
BAR_WIDTH = bAR_WIDTH;
137143
}
138144

139-
public static int getBAR_HEIGHT() {
140-
return BAR_HEIGHT;
141-
}
145+
// public static int getBAR_HEIGHT() {
146+
// return BAR_HEIGHT;
147+
// }
142148

143149
public static void setBAR_HEIGHT(int bAR_HEIGHT) {
144150
BAR_HEIGHT = bAR_HEIGHT;
145151
}
146152

147-
public boolean isMarcarSepacaion() {
148-
return marcarSepacaion;
149-
}
153+
// public boolean isMarcarSepacaion() {
154+
// return marcarSepacaion;
155+
// }
150156

151157
public void setMarcarSepacaion(boolean marcarSepacaion) {
152158
this.marcarSepacaion = marcarSepacaion;

‎src/principal/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public void actionPerformed(ActionEvent e) {
221221
panelOpcionesMenu.add(lblNumeroBarras);
222222

223223
// Slider para seleccionar el tamaño de las barras pintadas en pantalla.
224-
final int maxNumBars = 9;
224+
final int maxNumBars = 10;
225225
sliderTamBarras.setOrientation(SwingConstants.VERTICAL);
226226
sliderTamBarras.setMajorTickSpacing(1);
227227
sliderTamBarras.setForeground(Color.WHITE);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /