From bbb3ae4870a0d3fee1ac266d51d8fb5da1422bc9 Mon Sep 17 00:00:00 2001 From: ThirstyShark Date: Fri, 8 Feb 2019 09:21:16 -0600 Subject: [PATCH] add cyclin measurements --- build/built-jar.properties | 2 +- build/classes/cancergrowth/Cell.class | Bin 3658 -> 3658 bytes build/classes/cancergrowth/CellPanel$1.class | Bin 745 -> 745 bytes build/classes/cancergrowth/CellPanel$2.class | Bin 776 -> 776 bytes build/classes/cancergrowth/CellPanel$3.class | Bin 776 -> 776 bytes build/classes/cancergrowth/CellPanel$4.class | Bin 776 -> 776 bytes build/classes/cancergrowth/CellPanel.class | Bin 9004 -> 9508 bytes src/cancergrowth/Cell.java | 2 +- src/cancergrowth/CellPanel.form | 40 ++++++++++---- src/cancergrowth/CellPanel.java | 55 +++++++++++++++---- 10 files changed, 74 insertions(+), 25 deletions(-) diff --git a/build/built-jar.properties b/build/built-jar.properties index 72ac385..85dcdc7 100644 --- a/build/built-jar.properties +++ b/build/built-jar.properties @@ -1,4 +1,4 @@ -#Thu, 07 Feb 2019 21:38:24 -0600 +#Fri, 08 Feb 2019 09:19:53 -0600 C\:\\Users\\cd109\\Desktop\\temp2\\CancerGrowth= diff --git a/build/classes/cancergrowth/Cell.class b/build/classes/cancergrowth/Cell.class index aa6a2acd82e5d4561bf7adcdff66140abdcfe0a2..084300d4d541fab7203d82c5a5e47f1947485f3f 100644 GIT binary patch delta 14 VcmX>lb4q5z2UbRg%^z7KIRGxb1$_Vj delta 14 VcmX>lb4q5z2UbR=%^z7KIRGxn1%Chl diff --git a/build/classes/cancergrowth/CellPanel$1.class b/build/classes/cancergrowth/CellPanel$1.class index e4b16a88cb43c53816737c85ebd495c35e04738b..45709dc10581c40898e167b7a0953ac8232cb824 100644 GIT binary patch delta 23 fcmaFK`jT}+BopI~$x%#Rth*UF81_tF$>ab4W>*K? delta 23 fcmaFK`jT}+BopKE$x%#Rtg9F}7*ab4WNHVg diff --git a/build/classes/cancergrowth/CellPanel$2.class b/build/classes/cancergrowth/CellPanel$2.class index 4dd5c555dbd377a064184ef05890cebd16af84be..c54dc762afdba64d8e439928eb48e8a0e2c86db2 100644 GIT binary patch delta 23 fcmeBR>tNeZ!NhoUawU@&>j?%9hLe*|FgXAKTWklQ delta 23 fcmeBR>tNeZ!Nj;_awU@&>vjeXh8>enFgXAKS$_v@ diff --git a/build/classes/cancergrowth/CellPanel$3.class b/build/classes/cancergrowth/CellPanel$3.class index 8c83dfaf1ddd55c7b6f171be645a7c4623c520fe..62e09a0bed0c449315e9892b1abdc3d12b9af63f 100644 GIT binary patch delta 23 fcmeBR>tNeZ!NhoeawU@&>m>#bhRc&rFgXAKT#g66 delta 23 fcmeBR>tNeZ!Nj<4awU@&>p=z%hC`E2FgXAKTA>Gv diff --git a/build/classes/cancergrowth/CellPanel$4.class b/build/classes/cancergrowth/CellPanel$4.class index 73cb6c084b577a7f4f21829aaf72058300804937..8117c49b01d2ab3dbde4e7defb3a8dea705463c0 100644 GIT binary patch delta 23 fcmeBR>tNeZ!NhoTawU@&>m3FThP#tbFgXAKU9bn- delta 23 fcmeBR>tNeZ!NhoCawU@&>uClKhBK2-FgXAKTf+yb diff --git a/build/classes/cancergrowth/CellPanel.class b/build/classes/cancergrowth/CellPanel.class index 66ad2e2b4f474067af5a4ba6413efd2fe0a5e2cf..32337015f704d784621df1b9530c2bc1aee44fe7 100644 GIT binary patch literal 9508 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 diff --git a/src/cancergrowth/Cell.java b/src/cancergrowth/Cell.java index fcde5a9..2f0e240 100644 --- a/src/cancergrowth/Cell.java +++ b/src/cancergrowth/Cell.java @@ -21,7 +21,7 @@ public class Cell extends Object private int xval; // Declare variables like position, cycle timing private int yval; private ArrayList stages = new ArrayList(); - private int currentStage; + int currentStage; private int currentTime; private static final BufferedImage p0; private static BufferedImage[] p1 = new BufferedImage[12]; // Create cell images before the widnow opens diff --git a/src/cancergrowth/CellPanel.form b/src/cancergrowth/CellPanel.form index 718df4e..1145ccb 100644 --- a/src/cancergrowth/CellPanel.form +++ b/src/cancergrowth/CellPanel.form @@ -18,15 +18,23 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -37,14 +45,16 @@ - + - + + + @@ -103,5 +113,13 @@ + + + + + + + + diff --git a/src/cancergrowth/CellPanel.java b/src/cancergrowth/CellPanel.java index 01aa37e..7eb35f7 100644 --- a/src/cancergrowth/CellPanel.java +++ b/src/cancergrowth/CellPanel.java @@ -97,7 +97,10 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha { super.paintComponent(g); - + int g1 = 0; + int s = 0; + int g2 = 0; + int m = 0; int x = cells.size() - 1; for (int k = x; k >= 0; k--) // Use a loop to draw each cell { @@ -112,6 +115,18 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha } else g.drawImage(t.getImage(), t.getX(), t.getY(), this); // otherwise, draw the cell + if(t.currentStage == 0) { + g1 ++; + } + if(t.currentStage == 1) { + s ++; + } + if(t.currentStage == 2) { + g2 ++; + } + if(t.currentStage == 3) { + m ++; + } //swingTimer.stop(); //} } @@ -136,6 +151,7 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha kill = false; // turn off pacman } jLabel1.setText("Delay: " + delay + "ms. Hours since start: " + count + ". Cell Count: " + cells.size()); + jLabel2.setText("Cyclin G1: " + g1 * 99 + ". Cyclin S: " + s * 99 + ". Cyclin G2: " + g2 * 99 + ". Cyclin M: " + m * 99); System.out.println("Cell Count: " + cells.size()); //growing = false; } @@ -157,6 +173,7 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha jButton1 = new javax.swing.JButton(); jButton2 = new javax.swing.JButton(); jButton3 = new javax.swing.JButton(); + jLabel2 = new javax.swing.JLabel(); speed.setMaximum(1000); speed.setMinimum(1); @@ -204,21 +221,29 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha } }); + jLabel2.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N + jLabel2.setText("jLabel2"); + org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() .addContainerGap() - .add(speed, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(jLabel1) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 513, Short.MAX_VALUE) - .add(jButton3) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(jButton2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 63, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(jButton1) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(layout.createSequentialGroup() + .add(jLabel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 789, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(0, 199, Short.MAX_VALUE)) + .add(layout.createSequentialGroup() + .add(speed, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(18, 18, 18) + .add(jButton3) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jButton2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 63, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jButton1))) .add(18, 18, 18)) ); layout.setVerticalGroup( @@ -227,12 +252,14 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false) .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) - .add(jButton1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .add(jButton1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .add(jLabel1) .add(jButton2) .add(jButton3)) .add(org.jdesktop.layout.GroupLayout.LEADING, speed, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap(959, Short.MAX_VALUE)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 934, Short.MAX_VALUE) + .add(jLabel2) + .addContainerGap()) ); }// //GEN-END:initComponents @@ -247,6 +274,8 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha {//GEN-HEADEREND:event_jButton1ActionPerformed swingTimer.setDelay(delay); // When we press start, start the simulation swingTimer.start(); + kill = false; + dontkill = false; }//GEN-LAST:event_jButton1ActionPerformed private void jButton2ActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_jButton2ActionPerformed @@ -289,6 +318,7 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha // TODO add your handling code here: kill = true; dontkill = true; + swingTimer.setDelay(100); }//GEN-LAST:event_jButton3ActionPerformed @@ -297,6 +327,7 @@ public class CellPanel extends javax.swing.JPanel implements ActionListener, Cha private javax.swing.JButton jButton2; private javax.swing.JButton jButton3; private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; private javax.swing.JSlider speed; // End of variables declaration//GEN-END:variables