Skip to content

Commit

Permalink
stroke adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@aphitorite
aphitorite committed Apr 12, 2021
1 parent e7394ff commit 078b76d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
8 changes: 4 additions & 4 deletions src/visuals/dots/DisparityDots.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ public void drawVisual(int[] array, ArrayVisualizer ArrayVisualizer, Renderer Re
double disp = (1 + Math.cos((Math.PI * (array[n-1] - (n-1))) / (ArrayVisualizer.getCurrentLength() * 0.5))) * 0.5;
int lastX = width/2 + (int)(disp * r * Math.cos(Math.PI * (2d*(n-1) / n - 0.5)));
int lastY = height/2 + (int)(disp * r * Math.sin(Math.PI * (2d*(n-1) / n - 0.5)));
this.mainRender.setStroke(ArrayVisualizer.getThinStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

for(int i = 0; i < n; i++) {
if(Highlights.fancyFinishActive() && i < Highlights.getFancyFinishPosition()) {
this.mainRender.setColor(Color.GREEN);
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(4));
}
else if(Highlights.containsPosition(i)) {
this.mainRender.setColor(ArrayVisualizer.getHighlightColor());
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(4));
}
else if(ArrayVisualizer.colorEnabled())
this.mainRender.setColor(getIntColor(array[i], ArrayVisualizer.getCurrentLength()));
Expand All @@ -77,7 +77,7 @@ else if(ArrayVisualizer.colorEnabled())
int y = height/2 + (int)(disp * r * Math.sin(Math.PI * (2d*i / n - 0.5)));

this.mainRender.drawLine(lastX, lastY, x, y);
this.mainRender.setStroke(ArrayVisualizer.getThinStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

lastX = x;
lastY = y;
Expand Down
8 changes: 4 additions & 4 deletions src/visuals/dots/ScatterPlot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ public void drawVisual(int[] array, ArrayVisualizer ArrayVisualizer, Renderer Re
if(ArrayVisualizer.linesEnabled()) {
int lastX = 0;
int lastY = (int) (((Renderer.getViewSize() - 20)) - (array[0] + 1) * Renderer.getYScale());
this.mainRender.setStroke(ArrayVisualizer.getThinStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

for(int i = 1, j = (int) Renderer.getXScale(); i < Renderer.getArrayLength(); i++) {
if(Highlights.fancyFinishActive() && i < Highlights.getFancyFinishPosition()) {
this.mainRender.setColor(Color.GREEN);
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(4));
}
else if(Highlights.containsPosition(i)) {
this.mainRender.setColor(ArrayVisualizer.getHighlightColor());
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(4));
}
else if(ArrayVisualizer.colorEnabled())
this.mainRender.setColor(getIntColor(array[i-1], ArrayVisualizer.getCurrentLength()));
Expand All @@ -68,7 +68,7 @@ else if(ArrayVisualizer.colorEnabled())
lastX = j;
lastY = y;

this.mainRender.setStroke(ArrayVisualizer.getThinStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

int width = (int) (Renderer.getXScale() * (i + 1)) - j;
j += width;
Expand Down
6 changes: 4 additions & 2 deletions src/visuals/dots/SpiralDots.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,15 @@ public void drawVisual(int[] array, ArrayVisualizer ArrayVisualizer, Renderer Re
double mult = (double) array[n-1] / ArrayVisualizer.getCurrentLength();
int lastX = width/2 + (int)(mult * r * Math.cos(Math.PI * (2d*(n-1) / n - 0.5)));
int lastY = height/2 + (int)(mult * r * Math.sin(Math.PI * (2d*(n-1) / n - 0.5)));
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

for(int i = 0; i < n; i++) {
if(Highlights.fancyFinishActive() && i < Highlights.getFancyFinishPosition())
this.mainRender.setColor(Color.GREEN);

if(Highlights.containsPosition(i)) {
this.mainRender.setColor(ArrayVisualizer.getHighlightColor());
this.mainRender.setStroke(ArrayVisualizer.getThickStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(4));
}
else if(ArrayVisualizer.colorEnabled())
this.mainRender.setColor(getIntColor(array[i], ArrayVisualizer.getCurrentLength()));
Expand All @@ -75,11 +76,12 @@ else if(ArrayVisualizer.colorEnabled())
int y = height/2 + (int)(mult * r * Math.sin(Math.PI * (2d*i / n - 0.5)));

this.mainRender.drawLine(lastX, lastY, x, y);
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

lastX = x;
lastY = y;
}
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
}
else {
int dotS = Renderer.getDotDimensions();
Expand Down
10 changes: 5 additions & 5 deletions src/visuals/dots/WaveDots.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ public void drawVisual(int[] array, ArrayVisualizer ArrayVisualizer, Renderer Re

if(ArrayVisualizer.linesEnabled()) {
int lastX = 0;
int lastY = (int) ((Renderer.getViewSize() / 2.5) * Math.sin((2 * Math.PI * ((double) array[0] / Renderer.getArrayLength()))) + Renderer.halfViewSize());
this.mainRender.setStroke(ArrayVisualizer.getThinStroke());
int lastY = (int) (((Renderer.getViewSize() - 20) / 2.5) * Math.sin((2 * Math.PI * ((double) array[0] / Renderer.getArrayLength()))) + Renderer.halfViewSize() - 20);
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

for(int i = 1, j = (int) Renderer.getXScale(); i < Renderer.getArrayLength(); i++) {
if(Highlights.fancyFinishActive() && i < Highlights.getFancyFinishPosition()) {
this.mainRender.setColor(Color.GREEN);
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(4));
}
else if(Highlights.containsPosition(i)) {
this.mainRender.setColor(ArrayVisualizer.getHighlightColor());
this.mainRender.setStroke(ArrayVisualizer.getDefaultStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(4));
}
else if(ArrayVisualizer.colorEnabled())
this.mainRender.setColor(getIntColor(array[i-1], ArrayVisualizer.getCurrentLength()));
Expand All @@ -70,7 +70,7 @@ else if(ArrayVisualizer.colorEnabled())
lastX = j;
lastY = y;

this.mainRender.setStroke(ArrayVisualizer.getThinStroke());
this.mainRender.setStroke(ArrayVisualizer.getCustomStroke(2));

int width = (int) (Renderer.getXScale() * (i + 1)) - j;
j += width;
Expand Down

0 comments on commit 078b76d

Please sign in to comment.