Changeset 145 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures

Timestamp:

11/04/2019 08:14:32 AM (7 years ago)

Author:

sdanthin

Message:

Move from Git to Svn (LARGE COMMIT)

Location:

trunk/src/scriptbuilder/structures

Files:

• .directory (added)
• CadData.java (modified) (2 diffs)
• ELEMENT.java (modified) (1 diff)
• MyScriptHandler.java (modified) (3 diffs)
• ScriptEvent.java (modified) (1 diff)
• ScriptIncident.java (modified) (5 diffs)
• SimulationScript.java (modified) (7 diffs)
• TimeSlice.java (modified) (3 diffs)
• events/UnitEvent.java (modified) (1 diff)
• units/Unit.java (modified) (1 diff)

trunk/src/scriptbuilder/structures/CadData.java

@@ -15 +15 @@
         locInfo = new ArrayList<Location_Info>();
     }
+    
+    /**
+     * Constructor to add type and location, where TruncLoc is the first 5 letters of the fullloc.
+     * @param Header_Type
+     * @param Header_FullLoc 
+     */
+    public CadData(String Header_Type, String Header_FullLoc)
+    {
+        this.Header_Type = Header_Type;
+        this.Header_FullLoc = Header_FullLoc;
+//        if(Header_FullLoc.length()>10)
+//        {
+//            this.Header_TruncLoc = Header_FullLoc.substring(0,9);
+//        }
+        this.Header_TruncLoc = Header_FullLoc;
+        locInfo = new ArrayList<Location_Info>();
+    }
 
     public TimeSlice tSlice;
 
-    public String Header_Type = "DEFAULT";
+    public String Header_Type = "";
 
     public String Header_Beat = "";
 
-    public String Header_TruncLoc = "Default Location (short)";
-
-    public String Header_FullLoc = "Default Location (long)";
+    public String Header_TruncLoc = "";
+
+    public String Header_FullLoc = "";
 
     public String Master_Inc_Num = "";
@@ -134 +151 @@
         }
 
-        if (hasHeaderInfo() || true) //checking to see if header info is always necessary
-        {
+        if (hasHeaderInfo()) //checking to see if header info is always necessary
+        {
+            //todo: make this logic trigger only once per incident
             output += XMLWriter.openTag(ELEMENT.HEADER_INFO.tag);
 

trunk/src/scriptbuilder/structures/ELEMENT.java

@@ -35 +35 @@
     LOCATION_INFO,
     NEW_UNIT,
+    //todo: change this paramics to traffic modeler
     PARAMICS,//EVENT
     RADIO_EVALUATION,

trunk/src/scriptbuilder/structures/MyScriptHandler.java

@@ -304 +304 @@
 
         docPosition.push(ELEMENT.byName(qName));
-
+        
         try
         {
@@ -612 +612 @@
      * SAX Handler method. Executes at the close of each XML element.
      */
+    //todo: interpret this function better so that what is loaded from the XML file is easier to know.
     @Override
     public void endElement(String uri, String localName, String qName)
@@ -670 +671 @@
             {
                 cad.Header_Type = pcData.remove(currentElement);
+//                //change where the data is loaded in here
+//                currInc.insertCadData((int) currentEventTime, cad);
             }
             else if (currentElement == ELEMENT.Beat && docPosition.peek() == ELEMENT.HEADER_INFO)

trunk/src/scriptbuilder/structures/ScriptEvent.java

@@ -83 +83 @@
     public int length;
     
-    private TimeSlice slice;
+    public TimeSlice slice;
 
     /**

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -46 +46 @@
      */
     public String description;
-
+    
     /**
      * Length, in seconds, of the incident.
@@ -72 +72 @@
     public int eventCount = 0;
 
-    SimulationScript script;
+    public SimulationScript script;
 
     /**
@@ -135 +135 @@
         this.setOffset(offset);
     }
+    
+//    /**
+//     * Constructor with type and location parameters.
+//     * @param color
+//     * @param number
+//     * @param name
+//     * @param description
+//     * @param script
+//     * @param offset
+//     * @param type
+//     * @param location 
+//     */
+//    public ScriptIncident(Color color, int number, String name,
+//            String description, SimulationScript script,
+//            int offset, String type, String location)
+//    {
+//        this.color = color;
+//        this.number = number;
+//        this.name = name;
+//        this.description = description;
+//        this.script = script;
+//        slices = new TreeMap<Integer, TimeSlice>();
+//        this.setOffset(offset);
+//        this.location = location;
+//        this.type = type;
+//        insertCadData(offset, new CadData(type,location));
+//    }
 
     /**
@@ -293 +320 @@
     }
 
-    void insertCadData(long currentEventTime, CadData cad)
+    public void insertCadData(long currentEventTime, CadData cad)
     {
         int time = (int) currentEventTime;
@@ -305 +332 @@
         slice = slices.get(time);
         slice.cadData = cad;
+    }
+    
+    public CadData getCadData(long currentEventTime)
+    {
+        int time = (int) currentEventTime;
+        TimeSlice slice;
+        
+        slice = slices.get(time);
+        return slice.cadData;
     }
 

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -21 +21 @@
  *
  * @author Bryan McGuffin <bmcguffi@calpoly.edu>
+ * @author Sebastien Danthinne <sdanthin@calpoly.edu>
  * @version 2017/06/22
  */
@@ -61 +62 @@
      * The units which participate in Unit events.
      */
-    public List<Unit> units;
+    public List<Unit> units; 
 
     //Somewhere in the code, something assumes that the list of incidents
     //contains exactly 10 items. Until I can find and un-break that, this will do.
+    //todo: this incident fill count error
     private final int INCIDENT_FILL_COUNT = 10;
 
@@ -76 +78 @@
      */
     private MyScriptHandler sh;
+    
+    public boolean saved;
 
     //TODO: Pretty much everything in this constructor is dummy data.
@@ -89 +93 @@
         units = new ArrayList<Unit>();
         numberOfIncidents = 0;
+        saved = true;
 
         //Backfill with null incidents
@@ -96 +101 @@
         }
     }
-
+    
+    /**
+     * checks and sees if this object has the unit passed.
+     * @param unitID
+     * @return does this SimulationScript have unitnum?
+     */
+    public boolean hasUnit(String unitID){
+        boolean indicator = false;
+        if(units.size()!=0){
+            for(Unit u : units){
+               if(unitID.equals(u.UnitNum)){
+                   indicator = true;
+               }
+            }
+        }
+            
+        return indicator;
+    }
+    /**
+     * creates a dummy unit that only has unit number
+     * @param unitNum 
+     */
+    public void addDummyUnit(String unitNum){
+        Unit dummy = new Unit();
+        dummy.UnitNum = unitNum;
+        units.add(dummy);
+    }
     /**
      * Update the script's observers.
-     *
+     * 
      */
     public void update()
     {
         // The script has changed, notify observers
+        //use to rewrite the save indicator
+        //System.out.println("Script changed");
         setChanged();
         notifyObservers(this);
-    }
+        saved = false;
+        
+        
+    }
+    
 
     /**
@@ -154 +191 @@
         {
             System.out.println("ERROR LOADING SCRIPT");
+            ex.printStackTrace();
+        }
+        System.out.println("H");
+        for(Unit testUnit : units){
+            System.out.println(testUnit.toXML());
+        }
+        this.update();
+    }
+    
+    /**
+     * Load in an existing list of units from an XML file.
+     * @param f the file containing the units
+     */
+    public void loadUnitsFromFile(File f){
+        try
+        {
+            SAXParserFactory.newInstance().newSAXParser().parse(f, sh);
+            units.addAll(sh.getUnits());
+        }
+        catch (Exception ex)
+        {
+            System.out.println("ERROR LOADING UNITS");
             ex.printStackTrace();
         }
@@ -197 +256 @@
             ex.printStackTrace();
         }
+        saved = true;
     }
 

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -56 +56 @@
     }
 
+    
+    public ScriptIncident getIncident(){
+        return thisIncident;
+    }
     /**
      * Add a new script event to this time slice. Sort events by event type.
@@ -77 +81 @@
     public int getX()
     {
+//        System.out.println("position: " + seconds / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
+//                * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK);
         return seconds / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
                 * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK;
@@ -210 +216 @@
     public String toXML()
     {
+        //eventsCopy2 is used to clear out eventsCopy with one element contained
         ArrayList<I_ScriptEvent> eventsCopy = new ArrayList<I_ScriptEvent>();
         ArrayList<I_ScriptEvent> eventsCopy2 = new ArrayList<I_ScriptEvent>();

trunk/src/scriptbuilder/structures/events/UnitEvent.java

@@ -22 +22 @@
     /**
      * Constructor.
+     * //TODO: when created, add a unit to the main units list that is contained within SimulationScript
      */
     public UnitEvent()
     {
+        
         super(ScriptEventType.UNIT_EVENT);
+        
     }
 

trunk/src/scriptbuilder/structures/units/Unit.java

@@ -102 +102 @@
         Unit_Status = "";
     }
+    
+    public boolean equals(Unit u){
+        return UnitNum.equals(u.UnitNum);
+    }
+    public boolean equals(String num){
+        return UnitNum.equals(num);
+    }
 
     @Override