Changeset 532 in tmcsimulator for trunk/src/tmcsim/client/CADClient.java

Timestamp:

11/27/2019 07:56:32 AM (6 years ago)

Author:

jdalbey

Message:

Login.java, CADClient.java: Implement #206, login screen has drop down box of student names read from a config file.

File:

• trunk/src/tmcsim/client/CADClient.java (modified) (7 diffs)

trunk/src/tmcsim/client/CADClient.java

@@ -9 +9 @@
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -19 +21 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
 import javax.swing.JDialog;
 
@@ -88 +92 @@
                 "CADRmiPort"), CLIENT_CAD_POS("CADPosition"), CLIENT_USER_ID(
                 "CADUserID"), KEYBOARD_TYPE("KeyboardType"), DISPLAY_TYPE(
-                "DisplayType");
+                "DisplayType"), STUDENT_NAMES_FILE("StudentNamesFile");
 
         public String name;
@@ -182 +186 @@
         // This ensures they all have access to each other and the data model
         theClientGUI.screen = new ScreenManager(theCoorInt);
-        theClientGUI.login = new Login();
+        theClientGUI.login = new Login(cadClientProp.getProperty(PROPERTIES.STUDENT_NAMES_FILE.name).trim());
         theClientGUI.client = this;
 
@@ -345 +349 @@
         // CAD Simulator's connection information.
         if (cadClientProp.getProperty(PROPERTIES.CAD_SIM_HOST.name) == null
-                || cadClientProp.getProperty(PROPERTIES.CAD_SIM_PORT.name) == null) {
+                || cadClientProp.getProperty(PROPERTIES.CAD_SIM_PORT.name) == null
+                || cadClientProp.getProperty(PROPERTIES.STUDENT_NAMES_FILE.name) == null) {
             cadClientLogger.logp(Level.SEVERE, "SimulationManager",
                     "Constructor", "Null value in properties file.");
@@ -522 +527 @@
     private JDialog createSplashScreen()
     {
-        final int dialogSize = 300;  // desired width and height of dialog
+        final int dialogSize = 268;  // desired width and height of dialog
         // create the dialog
         JDialog dlg = new JDialog(null,"VisiCAD loading",Dialog.ModalityType.MODELESS);
@@ -534 +539 @@
         // Add the msg to the center of the dialog
         dlg.add(dlgMsg,BorderLayout.CENTER); 
+        // Add TriTech banner to top of screen 
+        try {
+            BufferedImage myPicture = ImageIO.read(new File("images/CADMenuImages/Tritech.png"));
+            JLabel picLabel = new JLabel(new ImageIcon(myPicture));
+            dlg.add(picLabel, BorderLayout.NORTH);
+        } catch (IOException ex) {
+            Logger.getLogger(Login.class.getName()).log(Level.SEVERE, null, ex);
+        }        
         // Set how big we want the dialog to be
         dlg.setSize(dialogSize, dialogSize);