diff --git a/DivaBot/calibration_data.txt b/DivaBot/calibration_data.txt index d05e0e1..1abcb5b 100644 --- a/DivaBot/calibration_data.txt +++ b/DivaBot/calibration_data.txt @@ -1,4 +1,4 @@ -589 -378 -1501 -888 +438 +290 +1329 +787 diff --git a/DivaBot/src/sig/Display.java b/DivaBot/src/sig/Display.java index fdaab5f..bdb6b92 100644 --- a/DivaBot/src/sig/Display.java +++ b/DivaBot/src/sig/Display.java @@ -106,8 +106,10 @@ public class Display { } private void AdvanceCycle() { - cycle=(cycle+1)%labels.length; - currentText=interpretLabel(labels[cycle]); + if (labels.length!=0) { + cycle=(cycle+1)%labels.length; + currentText=interpretLabel(labels[cycle]); + } } }; t.start(); diff --git a/DivaBot/src/sig/DrawCanvas.java b/DivaBot/src/sig/DrawCanvas.java index 88bc0c5..aaba43f 100644 --- a/DivaBot/src/sig/DrawCanvas.java +++ b/DivaBot/src/sig/DrawCanvas.java @@ -153,13 +153,13 @@ public class DrawCanvas extends JPanel implements KeyListener,ComponentListener, if (lastRating0)?romanizedname:englishname)+" "+(artist.length()>0?"by "+artist:"")+" "+((plays>0)?("Plays - "+(passes)+"/"+(plays)):"")+" "+((plays!=0)?"("+((int)(Math.floor(((float)passes)/plays*100)))+"% pass rate"+((fcCount>0)?" - "+fcCount+" FC"+(fcCount==1?"":"s")+" "+((int)(Math.floor(((float)fcCount)/plays*100)))+"% FC rate":"")+")":"No plays")+" "+((bestPlay!=null)?"Best Play - "+bestPlay.display():"")+" Overall Rating: "+overallrating; - Rectangle2D bounds = TextUtils.calculateStringBoundsFont(text, programFont); + /*Rectangle2D bounds = TextUtils.calculateStringBoundsFont(text, programFont); if (bounds.getWidth()>1345) { scrolling=true; } else { scrolling=false; } - scrollX = 0; + scrollX = 0;*/ MyRobot.p.repaint(0,0,MyRobot.p.getWidth(),MyRobot.p.getHeight()); } } diff --git a/DivaBot/src/sig/ListTransferHandler.java b/DivaBot/src/sig/ListTransferHandler.java index a3b46bd..335f29c 100644 --- a/DivaBot/src/sig/ListTransferHandler.java +++ b/DivaBot/src/sig/ListTransferHandler.java @@ -35,7 +35,7 @@ public class ListTransferHandler extends TransferHandler { JList list = (JList)c; start = (DefaultListModel)list.getModel(); indices = list.getSelectedIndices(); - System.out.println("Selected indexes: "+Arrays.toString(indices)); + //System.out.println("Selected indexes: "+Arrays.toString(indices)); Object[] values = list.getSelectedValues(); @@ -48,7 +48,7 @@ public class ListTransferHandler extends TransferHandler { buff.append("\n"); } } - System.out.println(buff.toString()); + // System.out.println(buff.toString()); return new StringSelection(buff.toString()); } @@ -90,11 +90,11 @@ public class ListTransferHandler extends TransferHandler { addIndex = index; addCount = values.length; - //System.out.println(Arrays.toString(values)); + //System.out.println(listModel); + for (int i=0;i=165&&c.getRed()<=185&&c.getGreen()<=10&&c.getBlue()>=185&&c.getBlue()<=200)) { + FUTURETONE=true; + onSongSelect=true; + } //System.out.println(onSongSelect+"/"+c); + + //777,179 FUTURE TONE return onSongSelect; }