diff --git a/build/built-jar.properties b/build/built-jar.properties index d5d6d39..35df921 100644 --- a/build/built-jar.properties +++ b/build/built-jar.properties @@ -1,4 +1,4 @@ -#Thu, 31 Jan 2019 16:42:40 -0600 +#Thu, 31 Jan 2019 16:46:59 -0600 C\:\\Users\\cd109\\Desktop\\CancerGrowth= diff --git a/build/classes/cancergrowth/Cell.class b/build/classes/cancergrowth/Cell.class index e28ed90..d3da602 100644 Binary files a/build/classes/cancergrowth/Cell.class and b/build/classes/cancergrowth/Cell.class differ diff --git a/build/classes/cancergrowth/CellPanel.class b/build/classes/cancergrowth/CellPanel.class index 0163ac9..94be4c1 100644 Binary files a/build/classes/cancergrowth/CellPanel.class and b/build/classes/cancergrowth/CellPanel.class differ diff --git a/dist/CancerGrowth.jar b/dist/CancerGrowth.jar index f849664..ab06b32 100644 Binary files a/dist/CancerGrowth.jar and b/dist/CancerGrowth.jar differ diff --git a/src/cancergrowth/Cell.java b/src/cancergrowth/Cell.java index 27a7a6a..d22f63e 100644 --- a/src/cancergrowth/Cell.java +++ b/src/cancergrowth/Cell.java @@ -75,7 +75,7 @@ public class Cell extends Object int height = (int) (-50 + Math.random()*101); while (width < 20 && width > -20) width = (int) (-50 + Math.random()*101); while (height < 20 && height > -20) height = (int) (-50 + Math.random()*101); - newcell = new Cell(xval + width, yval + height, new Color(255, 0, 0, 100)); + newcell = new Cell(xval + width, yval + height, new Color(255, 0, 0)); //stages = new ArrayList(); //stages.add(10 + (int) Math.random() * 3 - 1); //stages.add(7 + (int) Math.random() * 3 - 1); @@ -86,14 +86,14 @@ public class Cell extends Object yval -= height; currentStage = 0; currentTime = 1; - myColor = new Color(255, 0, 0, 100); + myColor = new Color(255, 0, 0); } else { this.currentStage ++; this.currentTime = 0; - if(currentStage == 1) myColor = new Color(255, 255, 0, 100); - if(currentStage == 2) myColor = new Color(0, 255, 0, 100); - if(currentStage == 3) myColor = new Color(0, 0, 255, 100); + if(currentStage == 1) myColor = new Color(255, 255, 0); + if(currentStage == 2) myColor = new Color(0, 255, 0); + if(currentStage == 3) myColor = new Color(0, 0, 255); } } return newcell; diff --git a/src/cancergrowth/CellPanel.java b/src/cancergrowth/CellPanel.java index 0cfb1ef..e92f173 100644 --- a/src/cancergrowth/CellPanel.java +++ b/src/cancergrowth/CellPanel.java @@ -40,7 +40,7 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha //Cell t1 = new Cell(300, 100, Color.RED); //choice1.addItem(t1); //cells.add(t1); - Cell t2 = new Cell(475, 475, new Color(255, 0, 0, 100)); + Cell t2 = new Cell(475, 475, new Color(255, 0, 0)); //choice1.addItem(t2); cells.add(t2); //choice2.addItem(t2);