adsiRepository · adsiRepository · Apr 29, 2015 · Apr 29, 2015
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/SIMGEPLAP_java1/dist/
diff --git a/SIMGEPLAP_java1/build.xml b/SIMGEPLAP_java1/build.xml
@@ -7,8 +7,8 @@
 <!-- the Compile on Save feature is turned off for the project. -->
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="SIMGEPLAP_v38_1.0" default="default" basedir=".">
-    <description>Builds, tests, and runs the project SIMGEPLAP v38_1.0.</description>
+<project name="SIMGEPLAP_java1" default="default" basedir=".">
+    <description>Builds, tests, and runs the project SIMGEPLAP_java1.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
 
@@ -58,7 +58,7 @@
 
     An example of overriding the target for project execution could look like this:
 
-        <target name="run" depends="SIMGEPLAP_v38_1.0-impl.jar">
+        <target name="run" depends="SIMGEPLAP_java1.jar">
             <exec dir="bin" executable="launcher.exe">
                 <arg file="${dist.jar}"/>
             </exec>

diff --git a/SIMGEPLAP_java1/build/built-jar.properties b/SIMGEPLAP_java1/build/built-jar.properties
@@ -0,0 +1,4 @@
+#Wed, 29 Apr 2015 13:34:02 -0500
+
+
+D\:\\MY_GIT_REPO\\SIMGEPLAP_java1=
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/Grafos$Escritorio.class b/SIMGEPLAP_java1/build/classes/Controlador/Grafos$Escritorio.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/Grafos$MiAcceso.class b/SIMGEPLAP_java1/build/classes/Controlador/Grafos$MiAcceso.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/Grafos$MiPortal.class b/SIMGEPLAP_java1/build/classes/Controlador/Grafos$MiPortal.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/Grafos$MoveButton.class b/SIMGEPLAP_java1/build/classes/Controlador/Grafos$MoveButton.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/Grafos$SplashBienvenida.class b/SIMGEPLAP_java1/build/classes/Controlador/Grafos$SplashBienvenida.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/Grafos.class b/SIMGEPLAP_java1/build/classes/Controlador/Grafos.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/Incidencias.class b/SIMGEPLAP_java1/build/classes/Controlador/Incidencias.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/PDF$1.class b/SIMGEPLAP_java1/build/classes/Controlador/PDF$1.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/PDF$DiseñoPagina.class b/SIMGEPLAP_java1/build/classes/Controlador/PDF$DiseñoPagina.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/PDF.class b/SIMGEPLAP_java1/build/classes/Controlador/PDF.class
diff --git a/SIMGEPLAP_java1/build/classes/Controlador/text.class b/SIMGEPLAP_java1/build/classes/Controlador/text.class
diff --git a/SIMGEPLAP_java1/build/classes/META-INF/splash.png b/SIMGEPLAP_java1/build/classes/META-INF/splash.png
diff --git a/SIMGEPLAP_java1/build/classes/Otros/DialExample.class b/SIMGEPLAP_java1/build/classes/Otros/DialExample.class
diff --git a/SIMGEPLAP_java1/build/classes/Otros/GrafosA.class b/SIMGEPLAP_java1/build/classes/Otros/GrafosA.class
diff --git a/SIMGEPLAP_java1/build/classes/Otros/JMail.class b/SIMGEPLAP_java1/build/classes/Otros/JMail.class
diff --git a/SIMGEPLAP_java1/build/classes/Vistas/GestionItinerario.class b/SIMGEPLAP_java1/build/classes/Vistas/GestionItinerario.class
diff --git a/SIMGEPLAP_java1/build/classes/Vistas/Historial.class b/SIMGEPLAP_java1/build/classes/Vistas/Historial.class
diff --git a/SIMGEPLAP_java1/build/classes/Vistas/Menu$5.class b/SIMGEPLAP_java1/build/classes/Vistas/Menu$5.class
diff --git a/SIMGEPLAP_java1/build/classes/Vistas/Menu.class b/SIMGEPLAP_java1/build/classes/Vistas/Menu.class
diff --git a/SIMGEPLAP_java1/build/classes/Vistas/Menu.form b/SIMGEPLAP_java1/build/classes/Vistas/Menu.form
@@ -61,11 +61,10 @@
                   <EmptySpace min="-2" pref="534" max="-2" attributes="0"/>
               </Group>
               <Group type="102" attributes="0">
-                  <EmptySpace min="-2" pref="178" max="-2" attributes="0"/>
-                  <Component id="txtstt" min="-2" pref="542" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="302" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="51" max="-2" attributes="0"/>
+                  <Component id="txtstt" max="32767" attributes="0"/>
+                  <EmptySpace min="-2" pref="207" max="-2" attributes="0"/>
                   <Component id="lbl_ActualUser" min="-2" pref="335" max="-2" attributes="0"/>
-                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
               </Group>
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace min="-2" pref="312" max="-2" attributes="0"/>

diff --git a/SIMGEPLAP_java1/build/classes/Vistas/Portal.class b/SIMGEPLAP_java1/build/classes/Vistas/Portal.class
diff --git a/SIMGEPLAP_java1/build/classes/simgeplap/Nivel$LectorNivel.class b/SIMGEPLAP_java1/build/classes/simgeplap/Nivel$LectorNivel.class
diff --git a/SIMGEPLAP_java1/build/classes/simgeplap/SIMGEPLAP.class b/SIMGEPLAP_java1/build/classes/simgeplap/SIMGEPLAP.class
diff --git a/SIMGEPLAP_java1/build/classes/simgeplap/Temperatura$LectorTemperatura.class b/SIMGEPLAP_java1/build/classes/simgeplap/Temperatura$LectorTemperatura.class
diff --git a/SIMGEPLAP_java1/nbproject/build-impl.xml b/SIMGEPLAP_java1/nbproject/build-impl.xml
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SIMGEPLAP_v38_1.0-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SIMGEPLAP_java1-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>

diff --git a/SIMGEPLAP_java1/nbproject/private/private.properties b/SIMGEPLAP_java1/nbproject/private/private.properties
@@ -3,4 +3,4 @@ do.depend=false
 do.jar=true
 javac.debug=true
 javadoc.preview=true
-user.properties.file=C:\\Users\\Miguel\\AppData\\Roaming\\NetBeans\\7.4\\build.properties
+user.properties.file=C:\\Users\\user\\AppData\\Roaming\\NetBeans\\8.0.1\\build.properties
diff --git a/SIMGEPLAP_java1/nbproject/project.properties b/SIMGEPLAP_java1/nbproject/project.properties
@@ -4,7 +4,7 @@ annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.splash=src\\Recursos\\Imagenes\\splash.png
-application.title=SIMGEPLAP_protoB
+application.title=SIMGEPLAP_java1
 application.vendor=Usuario
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
@@ -26,7 +26,7 @@ debug.test.classpath=\
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/SIMGEPLAP_protoB.jar
+dist.jar=${dist.dir}/SIMGEPLAP_java1.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=

diff --git a/SIMGEPLAP_java1/nbproject/project.xml b/SIMGEPLAP_java1/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>SIMGEPLAP v38_1.0</name>
+            <name>SIMGEPLAP_java1</name>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

diff --git a/SIMGEPLAP_java1/src/Controlador/Grafos.java b/SIMGEPLAP_java1/src/Controlador/Grafos.java
@@ -59,7 +59,7 @@
 // Ejemplos de los Gráficos que se pueden hacer ->  http://www.jfree.org/jfreechart/samples.html
 /**
  *
- * @author -------
+ * @author Grupo de Desarrollo ADSI-38
  */
 public class Grafos {
     //private static final long serialVersionUID = 1L;
@@ -210,7 +210,7 @@ public static ChartPanel DisplayGrafico(JFreeChart esquema) {
 
 
 
-    @SuppressWarnings("FinallyDiscardsException")
+    //@SuppressWarnings("FinallyDiscardsException")
     public static byte[] chartToPNG(JFreeChart esquema /*, OutputStream ruta*/ ) {
 
         BufferedImage imagenChart = esquema.createBufferedImage(500, 300);
@@ -237,7 +237,7 @@ public static byte[] chartToPNG(JFreeChart esquema /*, OutputStream ruta*/ ) {
     //http://www.jc-mouse.net/java/anadir-splash-screen-en-javanetbeans
     public static class SplashBienvenida{
 
-        private SplashScreen splash;
+        private final SplashScreen splash;
 
         public SplashBienvenida() {
             splash = SplashScreen.getSplashScreen();
@@ -269,7 +269,7 @@ public void animar(Component ini){
 
     //Aqui se crea y se diseña lo que será el fondo/entorno de la aplicación 
     @SuppressWarnings("serial")
-    public static class Escritorio extends JDesktopPane implements ChangeListener{ // de la clase jdesktoppane 
+    public static class Escritorio extends JDesktopPane{ // de la clase jdesktoppane 
         private final Image fondoEscritorio;
 
         public Escritorio(){
@@ -284,17 +284,10 @@ protected void paintComponent(Graphics grf){
             grf.drawImage(fondoEscritorio, 0 , 0, getWidth(), getHeight(), null, this);//-(getHeight()/8)
         }
 
-        @Override
-        public void stateChanged(ChangeEvent e) {
-
-        }
-
     }
 
 
-
-
-
+
 // Diseño del portal de inicio    
     public static class MiPortal extends JDesktopPane{
         private final Image fondoEntrada;
@@ -338,6 +331,8 @@ public static class MoveButton extends JButton implements MouseMotionListener, M
 
         private int newX, newY;
 
+        private int Awidth, Aheight;
+
         private Point pOrigen, pFinal, coordenadas;
 
         private int x, y;
@@ -347,8 +342,8 @@ public MoveButton(JDesktopPane vyro){
             addMouseMotionListener(this);
             addMouseListener(this);
             addFocusListener(this);
-
-
+            this.Awidth = vyro.getWidth();
+            this.Aheight = vyro.getHeight();
         }
 
         @Override
@@ -396,7 +391,11 @@ public void mouseDragged(MouseEvent ev) { // evento de arrastrar con el raton
                     }
                 }
 
-                Vistas.Menu.txtstt.setText("x en pantalla = "+ev.getXOnScreen()+", en el boton = "+x+"; y en pantalla = "+ev.getYOnScreen()+", coord y = "+this.getY()+"; y en el boton = "+y);
+                /*if((Awidth - ev.getXOnScreen()) < x){
+                    this.setLocation(Awidth - this.getSize().width , (ev.getYOnScreen() - y) - 23);
+                }*/
+
+                Vistas.Menu.txtstt.setText("x en pantalla = "+ev.getXOnScreen()+", en el boton = "+x+"; y en pantalla = "+ev.getYOnScreen()+", coord y = "+this.getY()+"; y en el boton = "+y+"; escrt: w = "+Awidth+", h = "+Aheight);
 
             } catch (Exception eh) {
                 JOptionPane.showMessageDialog(this, eh.getLocalizedMessage(), "Class MoveButton", 0);

diff --git a/SIMGEPLAP_java1/src/Vistas/Menu.form b/SIMGEPLAP_java1/src/Vistas/Menu.form
@@ -61,11 +61,10 @@
                   <EmptySpace min="-2" pref="534" max="-2" attributes="0"/>
               </Group>
               <Group type="102" attributes="0">
-                  <EmptySpace min="-2" pref="178" max="-2" attributes="0"/>
-                  <Component id="txtstt" min="-2" pref="542" max="-2" attributes="0"/>
-                  <EmptySpace min="-2" pref="302" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="51" max="-2" attributes="0"/>
+                  <Component id="txtstt" max="32767" attributes="0"/>
+                  <EmptySpace min="-2" pref="207" max="-2" attributes="0"/>
                   <Component id="lbl_ActualUser" min="-2" pref="335" max="-2" attributes="0"/>
-                  <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
               </Group>
               <Group type="102" alignment="0" attributes="0">
                   <EmptySpace min="-2" pref="312" max="-2" attributes="0"/>

diff --git a/SIMGEPLAP_java1/src/Vistas/Menu.java b/SIMGEPLAP_java1/src/Vistas/Menu.java
@@ -9,7 +9,7 @@
 import javax.swing.JComponent;
 
 /*
- @author: Grupo de Dasarrollo ADSI3
+ @author: Grupo de Dasarrollo ADSI38
 */
 public class Menu extends javax.swing.JFrame {
 
@@ -18,9 +18,9 @@ public class Menu extends javax.swing.JFrame {
     public static ConsolaControl ventanaControl;
     public static Historial ventanaHistorial;
 
-    /*Temperatura.LectorTemperatura panelT;
+    Temperatura.LectorTemperatura panelT;
     Nivel.LectorNivel panelN;
-    Flujo.LectorFlujo panelF;*/
+    Flujo.LectorFlujo panelF;
 
 
     public static MonitorDial monitor;
@@ -37,20 +37,20 @@ public Menu() {
             this.setExtendedState(MAXIMIZED_BOTH);
             this.setTitle("SIMGEPLAP, SENA ADSI-38");
             setIconImage(new ImageIcon(getClass().getResource("../Recursos/Imagenes/senaLog1.png")).getImage());
-            //lbl_ActualUser.setText(lbl_ActualUser.getText().concat("\t" + SIMGEPLAP.user_session));
+            lbl_ActualUser.setText(lbl_ActualUser.getText().concat("\t" + SIMGEPLAP.user_session));
         }
 
         {// instanciacion de las ventanas
-            /*ventanaNewUser = new RegUsers(Escritorio);
+            ventanaNewUser = new RegUsers(Escritorio);
             ventanaProgramacion = new GestionItinerario(Escritorio);
             ventanaControl = new ConsolaControl(Escritorio);
-            ventanaHistorial = new Historial(Escritorio);*/
+            ventanaHistorial = new Historial(Escritorio);
         }
 
-        //monitor = new MonitorDial(Escritorio);
-        //Escritorio.add(monitor);
-        //monitor.setVisible(true);
-        //monitor.toFront();
+        monitor = new MonitorDial(Escritorio);
+        Escritorio.add(monitor);
+        monitor.setVisible(true);
+        monitor.toFront();
 
         /*
         {
@@ -81,14 +81,14 @@ public Menu() {
 
       //###########  ENTORNO SEGUN USUARIO  ###############//
 
-        /*    if (!(SIMGEPLAP.rol_user.equals("Administrador"))) {
+            if (!(SIMGEPLAP.rol_user.equals("Administrador"))) {
             btnNewUser_.setVisible(false);
             }
 
             if (SIMGEPLAP.rol_user.equals("Control Tecnico") || SIMGEPLAP.rol_user.equals("Aprendiz")) {
             btnControlItinerario_.setVisible(false);
             }
-         */   
+
         //##################################################//
 
     }
@@ -170,11 +170,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                     .addComponent(btnConfigVariables_, javax.swing.GroupLayout.PREFERRED_SIZE, 244, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addGap(534, 534, 534))
             .addGroup(EscritorioLayout.createSequentialGroup()
-                .addGap(178, 178, 178)
-                .addComponent(txtstt, javax.swing.GroupLayout.PREFERRED_SIZE, 542, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(302, 302, 302)
-                .addComponent(lbl_ActualUser, javax.swing.GroupLayout.PREFERRED_SIZE, 335, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(0, 0, Short.MAX_VALUE))
+                .addGap(51, 51, 51)
+                .addComponent(txtstt)
+                .addGap(207, 207, 207)
+                .addComponent(lbl_ActualUser, javax.swing.GroupLayout.PREFERRED_SIZE, 335, javax.swing.GroupLayout.PREFERRED_SIZE))
             .addGroup(EscritorioLayout.createSequentialGroup()
                 .addGap(312, 312, 312)
                 .addComponent(btnNewUser_, javax.swing.GroupLayout.PREFERRED_SIZE, 233, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -261,7 +260,7 @@ private void btnConsultas_ActionPerformed(java.awt.event.ActionEvent evt) {//GEN
 
     private void btnControlItinerario_ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnControlItinerario_ActionPerformed
 
-       /* if (ventanaProgramacion.isVisible()){
+        if (ventanaProgramacion.isVisible()){
             ventanaProgramacion.toFront();
             if (ventanaProgramacion.isIcon()){
                 try {
@@ -275,7 +274,7 @@ private void btnControlItinerario_ActionPerformed(java.awt.event.ActionEvent evt
             Escritorio.add(ventanaProgramacion);
             ventanaProgramacion.setVisible(true);
             ventanaProgramacion.toFront();
-        }*/
+        }
 
     }//GEN-LAST:event_btnControlItinerario_ActionPerformed
 
@@ -354,7 +353,7 @@ private void confBotones(){
         /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel.
          * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html 
          */
- public static void main(String args[]) {
+ /*public static void main(String args[]) {
 
         try {
             for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
@@ -374,7 +373,7 @@ public void run() {
                 new Menu().setVisible(true);
             }
         });
-    } 
+    } */
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     public static javax.swing.JDesktopPane Escritorio;

diff --git a/SIMGEPLAP_java1/src/simgeplap/Nivel.java b/SIMGEPLAP_java1/src/simgeplap/Nivel.java
@@ -110,7 +110,7 @@ public LectorNivel() {
         @SuppressWarnings("UseSpecificCatch")
         public void run() {
 
-            long retardo = 735; // milisegundos
+            long retardo = 935; // milisegundos
 
             while (true) {
                 try {

diff --git a/SIMGEPLAP_java1/src/simgeplap/SIMGEPLAP.java b/SIMGEPLAP_java1/src/simgeplap/SIMGEPLAP.java
@@ -31,14 +31,14 @@ public static void main( String[] args ) {
         ingreso.setVisible( true );*/
 
         //métodos opcionales, hacerlos comentario cuando no operen.
-        Menu f = new Menu();
-        f.setVisible(true);
+        /*Menu f = new Menu();
+        f.setVisible(true);*/
 
         //new SplashBienvenida().animar(f);
 
         //entrada por el portal de bienvenida
-        /*puerta = new Portal();
-        puerta.setVisible(true);*/
+        puerta = new Portal();
+        puerta.setVisible(true);
         //-----------------------
 
     }

diff --git a/SIMGEPLAP_java1/src/simgeplap/Temperatura.java b/SIMGEPLAP_java1/src/simgeplap/Temperatura.java
@@ -135,7 +135,7 @@ public LectorTemperatura() {
         @SuppressWarnings("UseSpecificCatch")
         public void run() {
 
-            long retardo = 478; // milisegundos en que tarda la aguja en indicar un nuevo valor
+            long retardo = 878; // milisegundos en que tarda la aguja en indicar un nuevo valor
 
             while (true) { // es decir que será un bucle indefinido
                 try {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		#Wed, 29 Apr 2015 13:34:02 -0500


		D\:\\MY_GIT_REPO\\SIMGEPLAP_java1=