Skip to content
Snippets Groups Projects
Commit d9fbe4fd authored by Edvard Berdal Eek's avatar Edvard Berdal Eek
Browse files

Merge branch 'bug-fixes' of gitlab.stud.idi.ntnu.no:idatt2003-19/chaosgame into bug-fixes

parents ae07ef45 b2307904
No related branches found
No related tags found
1 merge request!21Fix major bug when creating affine fractal with certain matrices.
...@@ -8,13 +8,12 @@ import org.idatt2003.model.chaos.ChaosCanvas; ...@@ -8,13 +8,12 @@ import org.idatt2003.model.chaos.ChaosCanvas;
/** /**
* Class for the CanvasPainter. * Abstract class for the CanvasPainter.
* The CanvasPainter is used for painting a fractal * The CanvasPainter is used for painting a fractal
* on the canvas. * on the canvas.
* All methods are public and static. * All methods are public and static.
*/ */
public abstract class CanvasPainter { public abstract class CanvasPainter {
protected Color fractalColor = Color.WHITE; protected Color fractalColor = Color.WHITE;
private static final int COLOR_FACTOR = 3; private static final int COLOR_FACTOR = 3;
private static final int MAX_COLOR_VALUE = 255; private static final int MAX_COLOR_VALUE = 255;
...@@ -22,7 +21,7 @@ public abstract class CanvasPainter { ...@@ -22,7 +21,7 @@ public abstract class CanvasPainter {
/** /**
* Method for painting the canvas. * Method for painting the canvas.
* Draws the canvas on the graphics context. * Draws the canvas on the graphics context.
* Uses the method createOffScreenImage to create the offscreen image. * Use the method createOffScreenImage to create the offscreen image.
* *
* @param chaosCanvas the chaos canvas * @param chaosCanvas the chaos canvas
* @param gc the graphics context * @param gc the graphics context
......
...@@ -13,7 +13,6 @@ public abstract class GamePage extends BorderPane { ...@@ -13,7 +13,6 @@ public abstract class GamePage extends BorderPane {
private static final int CANVAS_HEIGHT = 805; private static final int CANVAS_HEIGHT = 805;
protected final GraphicsContext gc; protected final GraphicsContext gc;
/** /**
* Constructor for the GamePage. * Constructor for the GamePage.
* Initializes the canvas and makes a new GraphicsContext * Initializes the canvas and makes a new GraphicsContext
......
...@@ -18,7 +18,9 @@ public class SliderImaginaryPart extends BaseSlider { ...@@ -18,7 +18,9 @@ public class SliderImaginaryPart extends BaseSlider {
} }
/** /**
* {@inheritDoc} * Get the complex number type of the slider.
*
* @return the part type of the slider
*/ */
@Override @Override
protected String getPartType() { protected String getPartType() {
......
...@@ -17,6 +17,11 @@ public class SliderRealPart extends BaseSlider { ...@@ -17,6 +17,11 @@ public class SliderRealPart extends BaseSlider {
this.getStyleClass().add("top-bottom-padding"); this.getStyleClass().add("top-bottom-padding");
} }
/**
* Get the complex number type of the slider.
*
* @return the part type of the slider
*/
@Override @Override
protected String getPartType() { protected String getPartType() {
return "real"; return "real";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment