Browse Source

controller outrpints removed (canvas resize, animation time)

Kevin Trometer 7 years ago
parent
commit
1d2b2101f0
3 changed files with 0 additions and 22 deletions
  1. 0 1
      src/ui/view/GUI.java
  2. 0 11
      src/ui/view/MyCanvas.java
  3. 0 10
      src/ui/view/UpperNodeCanvas.java

+ 0 - 1
src/ui/view/GUI.java

@@ -1744,7 +1744,6 @@ public class GUI<E> implements CategoryListener {
 			public void componentResized(ComponentEvent e) {
 				controller.setCanvasX(Math.max(model.getCanvasX(), canvasSP.getViewport().getWidth()));
 				controller.setCanvasY(Math.max(model.getCanvasY(), canvasSP.getViewport().getHeight()));
-				controller.addTextToConsole(model.getCanvasY() + ", " + model.getCanvasY());
 				canvas.repaint();
 			}
 		});

+ 0 - 11
src/ui/view/MyCanvas.java

@@ -2,7 +2,6 @@ package ui.view;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -10,9 +9,6 @@ import java.awt.Point;
 import java.awt.RenderingHints;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -24,7 +20,6 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import javax.swing.ImageIcon;
-import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -201,12 +196,9 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 							controller.addUpperNode("NodeOfNode", null, animCps);
 							controller.calculateStateForCurrentTimeStep();
 							repaint();
-							elapsedTime = System.currentTimeMillis() - start;
-							controller.addTextToConsole(elapsedTime + "");
 						}
 					}
 				});
-				start = System.currentTimeMillis();
 				animT.start();
 			}
 		});
@@ -265,12 +257,9 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 
 							controller.calculateStateForCurrentTimeStep();
 							repaint();
-							elapsedTime = System.currentTimeMillis() - start;
-							controller.addTextToConsole(elapsedTime + "");
 						}
 					}
 				});
-				start = System.currentTimeMillis();
 				animT.start();
 			}
 		});

+ 0 - 10
src/ui/view/UpperNodeCanvas.java

@@ -26,8 +26,6 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
-import javax.swing.JToolTip;
-
 import classes.CpsEdge;
 import classes.CpsNode;
 import classes.CpsUpperNode;
@@ -111,8 +109,6 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	private int animDuration = ANIMTIME; // animation Duration
 	private int animDelay = 1000 / animFPS; // animation Delay
 	private int animSteps = animDuration / animDelay; // animation Steps;
-	private long start = 0; // for time
-	private long elapsedTime = 0; // outprint
 	private Position unPos;
 	private ArrayList<Position> savePos;
 
@@ -214,12 +210,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 							controller.addUpperNode("NodeOfNode", upperNode, model.getSelectedCpsObjects());
 							controller.calculateStateForCurrentTimeStep();
 							repaint();
-							elapsedTime = System.currentTimeMillis() - start;
-							controller.addTextToConsole(elapsedTime + "");
 						}
 					}
 				});
-				start = System.currentTimeMillis();
 				animT.start();
 			}
 		});
@@ -278,12 +271,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 
 							controller.calculateStateForCurrentTimeStep();
 							repaint();
-							elapsedTime = System.currentTimeMillis() - start;
-							controller.addTextToConsole(elapsedTime + "");
 						}
 					}
 				});
-				start = System.currentTimeMillis();
 				animT.start();
 			}
 		});