Commit d20721ff authored by Nico Mack's avatar Nico Mack

Re-implemented Calibration functionality.

parent d7176a92
...@@ -3,16 +3,14 @@ ...@@ -3,16 +3,14 @@
<screen> <screen>
<x1>0</x1> <x1>0</x1>
<y1>0</y1> <y1>0</y1>
<!-- <x2>800</x2>
<y2>650</y2> -->
<x2>1280</x2> <x2>1280</x2>
<y2>800</y2> <y2>800</y2>
</screen> </screen>
<camera> <camera>
<x1>0.06699997</x1> <x1>0</x1>
<y1>-0.013999984</y1> <y1>0</y1>
<x2>0.92900026</x2> <x2>1</x2>
<y2>1.0049983</y2> <y2>1</y2>
</camera> </camera>
<table> <table>
<width>1000</width> <width>1000</width>
...@@ -27,8 +25,6 @@ ...@@ -27,8 +25,6 @@
<rotationThreshold>0.2</rotationThreshold> <rotationThreshold>0.2</rotationThreshold>
</table> </table>
<window> <window>
<!-- <x>1550</x>
<y>10</y> -->
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1280</width> <width>1280</width>
......
...@@ -354,22 +354,6 @@ public class Stage extends JComponent { ...@@ -354,22 +354,6 @@ public class Stage extends JComponent {
this.objects.put(objectId, widget); this.objects.put(objectId, widget);
} }
// ---------------------------------------------------------------------------
/**
* @param identifier
* @param content
*/
// ---------------------------------------------------------------------------
// public void addToStage(String identifier, Content content) {
// Preconditions.checkArgument(content != null, "The passed object cannot be null!");
// //$NON-NLS-1$
// Preconditions.checkArgument(content.getStageId() == this.stageId, "The passed content {} is
// not intended to be added to stage with ID {}!", identifier, stageId); //$NON-NLS-1$
//
// this.contents.put(identifier, content);
// }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** /**
* @param handleId * @param handleId
...@@ -473,30 +457,15 @@ public class Stage extends JComponent { ...@@ -473,30 +457,15 @@ public class Stage extends JComponent {
canvas2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); canvas2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
canvas2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); canvas2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
// long elapsed = System.currentTimeMillis();
List<Drawable> drawable = getContent(Drawable.class); List<Drawable> drawable = getContent(Drawable.class);
if (drawable != null) { if (drawable != null) {
drawable.forEach(content -> content.paint(canvas2D)); drawable.forEach(content -> content.paint(canvas2D));
} }
// elapsed = System.currentTimeMillis() - elapsed;
// if (logger.isTraceEnabled())
// logger.trace("Drawing Content for Stage {} took {} ms!", this.name, elapsed);
// //$NON-NLS-1$
// elapsed = System.currentTimeMillis();
if (this.objects != null) { if (this.objects != null) {
objects.values().forEach(widget -> widget.paint(canvas2D)); objects.values().forEach(widget -> widget.paint(canvas2D));
} }
// elapsed = System.currentTimeMillis() - elapsed;
// if (logger.isTraceEnabled())
// logger.trace("Drawing Objects for Stage {} took {} ms!", this.name, elapsed);
// //$NON-NLS-1$
} }
} }
This diff is collapsed.
...@@ -125,15 +125,6 @@ public class TangibleInterfaceManagerTest { ...@@ -125,15 +125,6 @@ public class TangibleInterfaceManagerTest {
// fail("Not yet implemented"); // fail("Not yet implemented");
} }
/**
* Test method for
* {@link lu.list.itis.dkd.tui.TangibleInterfaceManager#setupCalibrationWindow()}.
*/
@Test
public void testSetupCalibrationWindow() {
// fail("Not yet implemented");
}
/** /**
* Test method for {@link lu.list.itis.dkd.tui.TangibleInterfaceManager#setBounds()}. * Test method for {@link lu.list.itis.dkd.tui.TangibleInterfaceManager#setBounds()}.
*/ */
...@@ -143,8 +134,7 @@ public class TangibleInterfaceManagerTest { ...@@ -143,8 +134,7 @@ public class TangibleInterfaceManagerTest {
} }
/** /**
* Test method for * Test method for {@link lu.list.itis.dkd.tui.TangibleInterfaceManager#paint(java.awt.Graphics)}.
* {@link lu.list.itis.dkd.tui.TangibleInterfaceManager#paint(java.awt.Graphics)}.
*/ */
@Test @Test
public void testPaintGraphics() { public void testPaintGraphics() {
...@@ -161,8 +151,7 @@ public class TangibleInterfaceManagerTest { ...@@ -161,8 +151,7 @@ public class TangibleInterfaceManagerTest {
} }
/** /**
* Test method for * Test method for {@link lu.list.itis.dkd.tui.TangibleInterfaceManager#update(java.awt.Graphics)}.
* {@link lu.list.itis.dkd.tui.TangibleInterfaceManager#update(java.awt.Graphics)}.
*/ */
@Test @Test
public void testUpdateGraphics() { public void testUpdateGraphics() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment