From 71076f5c7ee9ddcd1b9cf51537841a9b556b8dc6 Mon Sep 17 00:00:00 2001
From: Laura Radaelli <laura.radaelli.85@gmail.com>
Date: Thu, 8 Dec 2016 12:11:04 +0200
Subject: [PATCH] fix NullPointerException when calling votersBallot.toString
 and add showBallot (new window)

---
 voting-booth-gui/VotersBallot.png               | Bin 954 -> 973 bytes
 .../StraightChannelSectionController.java       |   1 +
 .../VoteHaveBeenCastController.java             |  16 ++++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/voting-booth-gui/VotersBallot.png b/voting-booth-gui/VotersBallot.png
index 992e0d5a39251df5526bfd3f447868b0c371e0c1..e1e48dd0c97cb412dcad3d4203d328fafd80fb10 100644
GIT binary patch
delta 180
zcmdnRewKZLIF||sGXn#|jk@NQ8x{GP>pMJM978H@y}fXdw?#p~A#jWIFa5Mz7bPw-
z?wL{X;X~afJ-&&t_k~i|y_<hyec_tLv$vJ*k3U}-Q(b90&%jUlZ<^iHvs>=o{l8>c
zw&cF~%ig|y^(Du1x%=}8(cN}js$NqxT7`h5Q>W0<fJH8yK^lRJM1X>UASs}rs+`wC
du;{<NygZ*Z<?FZ1I1h9kgQu&X%Q~loCIFSQPO1O^

delta 161
zcmX@hzKeZ=IF|$mGXn#|>SHeT8x{GP>q|Xd978H@y}fXew?To2)uBZCoBXoZ89f}W
z`n~hN3;F7LuH5b#8GK&-TzO3ClDyTQEBF5XIH&ikP2#&_1<x&>`fjiN>ibEq(&^r&
ze3O6fp3h&Ov8<jrzez~dYYLoj>;!Uw#L@*WK%(Y6<C3|W?5mtvI~llvZt-;Wb6Mw<
G&;$Ua(?g5^

diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java
index 10fd082..ed2e9c1 100644
--- a/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java
@@ -50,6 +50,7 @@ public class StraightChannelSectionController extends TwoWayNode {
         this.logger.debug("Created and filled with zeros the channel value.");
 
         this.updateVisualChanel();
+        this.UpdateVotersChoise();
     }
 
     /**
diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java
index eec4ecc..7ef85a6 100644
--- a/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java
@@ -15,6 +15,10 @@ import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.ImageIcon;
+import java.awt.image.BufferedImage;
 
 /**
  * Created by Vladimir Eliezer Tokarev on 8/27/2016.
@@ -33,6 +37,7 @@ public class VoteHaveBeenCastController extends TwoWayNode {
         BufferedImage image = BarcodeImageHandler.getImage(barcode);
         File outputfile = new File("VotersBallot.png");
         ImageIO.write(image, "png", outputfile);
+        showBallot("VotersBallot.png");
         this.logger.debug("Created the bar code with voters choises at VotersBallot.png.");
     }
 
@@ -50,4 +55,15 @@ public class VoteHaveBeenCastController extends TwoWayNode {
     public void UpdateNode() {
         // This panel doesn't have any questions representations that why there is nothing ti show here
     }
+
+    private void showBallot(String filename) throws IOException {
+        final JFrame frame = new JFrame();
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+//        bi = ImageIO.read(ImageResourceDemo.class.getResource("../resource/avatar6.jpeg"));
+        BufferedImage bi = ImageIO.read(new File(filename));
+        frame.add(new JLabel(new ImageIcon(bi)));
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
 }