[Jflight-checkins] jflight/app/src/jflight/model Wpt.java,1.1,1.2 BaroContainer.java,1.1,1.2 ThermalContainer.java,1.1,1.2 TrackContainer.java,1.3,1.4

[Rüdiger <ru...@us...>]

Update of /cvsroot/jflight/jflight/app/src/jflight/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/model

Modified Files:
	Wpt.java BaroContainer.java ThermalContainer.java 
	TrackContainer.java 
Log Message:
cleanup of unused code ...

Index: ThermalContainer.java
===================================================================
RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/ThermalContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ThermalContainer.java	25 Mar 2006 11:27:16 -0000	1.1
--- ThermalContainer.java	26 Apr 2006 19:19:16 -0000	1.2
***************
*** 9,13 ****
  import java.util.*;
  //import java.text.*;
! import java.util.logging.Logger;
  
  //import jflight.tools.*;
--- 9,13 ----
  import java.util.*;
  //import java.text.*;
! //import java.util.logging.Logger;
  
  //import jflight.tools.*;
***************
*** 19,23 ****
  public class ThermalContainer  extends DataContainer
  {
-     private Logger log = Logger.getLogger("global");
      private Vector thermBuf;
      private static ThermalContainer thermContainer = null;
--- 19,22 ----

Index: TrackContainer.java
===================================================================
RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/TrackContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrackContainer.java	23 Apr 2006 10:35:06 -0000	1.3
--- TrackContainer.java	26 Apr 2006 19:19:16 -0000	1.4
***************
*** 100,107 ****
       *
       */
!     private void setTrk(int trkNum, Vector trackData) {
! 		this.dataHasChanged = true;
!         trkBuf[trkNum] = trackData;
!     }
      
      /**
--- 100,107 ----
       *
       */
! //    private void setTrk(int trkNum, Vector trackData) {
! //		this.dataHasChanged = true;
! //        trkBuf[trkNum] = trackData;
! //    }
      
      /**
***************
*** 152,157 ****
          diff = 0;
          int i, size;
!         Trk initTrk,
!         curTrk=null;
          boolean foundStart = false;
          
--- 152,156 ----
          diff = 0;
          int i, size;
!         Trk curTrk=null;
          boolean foundStart = false;
          
***************
*** 424,429 ****
          endTime = 0;
          int i;
!         Trk initTrk,
!         curTrk;
          boolean foundStart = false;
          
--- 423,427 ----
          endTime = 0;
          int i;
!         Trk curTrk;
          boolean foundStart = false;
          
***************
*** 506,511 ****
      public void removeNonFlights(int trkNum, double minDistance ) {
          int i,
!         size,
!         num;
          int startIndex,
          endIndex;
--- 504,508 ----
      public void removeNonFlights(int trkNum, double minDistance ) {
          int i,
!         size;
          int startIndex,
          endIndex;
***************
*** 564,569 ****
      private int getSegLengths(int trkNum) {
          int size,i;
!         int startIndex,
!         endIndex, length;
          Trk curTrk;
          
--- 561,565 ----
      private int getSegLengths(int trkNum) {
          int size,i;
!         int length;
          Trk curTrk;
          
***************
*** 575,579 ****
          
          printMessage("get track info: " + size);
-         startIndex = endIndex = 0;
          length = 1;
          for( i=1; i<size; i++ ) {
--- 571,574 ----
***************
*** 601,606 ****
          Trk curTrk;
          int i,
!         size,
!         length;
          Date date = new Date();
          Date date2 = new Date();
--- 596,600 ----
          Trk curTrk;
          int i,
!         size;
          Date date = new Date();
          Date date2 = new Date();
***************
*** 645,650 ****
       */
      public void removeThisTrack(int trkNum, int trackToRemove ) {
!         int i,j,
!         size;
          int startIndex;
          Integer len;
--- 639,643 ----
       */
      public void removeThisTrack(int trkNum, int trackToRemove ) {
!         int i,j;
          int startIndex;
          Integer len;
***************
*** 742,747 ****
          int i,
          size;
!         Trk fromTrk, newTrk,
!         toTrk;
          
          size = trkBuf[trkNumFrom].size();
--- 735,739 ----
          int i,
          size;
!         Trk fromTrk, newTrk;
          
          size = trkBuf[trkNumFrom].size();
***************
*** 779,783 ****
       */
      public void searchLocalMinMax(int flightNum, int interval, double minDist) {
!         int i,j,size,cnt=0;
          int min=10000,
          max=0;
--- 771,775 ----
       */
      public void searchLocalMinMax(int flightNum, int interval, double minDist) {
!         int i,j,cnt=0;
          int min=10000,
          max=0;
***************
*** 786,797 ****
          long startTime, timestamp;
          int curHeight, h;
!         boolean found = false,
!         finished;
!         double dist;
          int[] filter = new int[FILTER_SIZE];
          
          startIndex = getStartIndex(flightNum);
          endIndex = getEndIndex(flightNum);
!         size = getTrkSize(flightNum);
          min = 10000;
          
--- 778,787 ----
          long startTime, timestamp;
          int curHeight, h;
!         boolean found = false;
          int[] filter = new int[FILTER_SIZE];
          
          startIndex = getStartIndex(flightNum);
          endIndex = getEndIndex(flightNum);
!         //size = getTrkSize(flightNum);
          min = 10000;
          
***************
*** 856,861 ****
              }
          }
-         // pass2:
-         finished = false;
          lastMinMax = (Trk) trkBuf[flightNum].elementAt(i-1);
          do {
--- 846,849 ----
***************
*** 877,881 ****
                  for( i=startIndex; i<=endIndex; i++ ) {
                      aTrk = (Trk) trkBuf[flightNum].elementAt(i);
!                     if( (!aTrk.isChecked()) && aTrk.isLocalMin() && ((dist=aTrk.dist(lastMinMax)) < minDist) ) {
                          aTrk.setLocalMin(false);
                      }
--- 865,869 ----
                  for( i=startIndex; i<=endIndex; i++ ) {
                      aTrk = (Trk) trkBuf[flightNum].elementAt(i);
!                     if( (!aTrk.isChecked()) && aTrk.isLocalMin() && ((aTrk.dist(lastMinMax)) < minDist) ) {
                          aTrk.setLocalMin(false);
                      }
***************
*** 923,928 ****
              }
          }
-         // pass2:
-         finished = false;
          do {
              max = 0;
--- 911,914 ----
***************
*** 943,947 ****
                  for( i=startIndex; i<=endIndex; i++ ) {
                      aTrk = (Trk) trkBuf[flightNum].elementAt(i);
!                     if( (!aTrk.isChecked()) && aTrk.isLocalMax() && ((dist=aTrk.dist(lastMinMax)) < minDist) ) {
                          aTrk.setLocalMax(false);
                      }
--- 929,933 ----
                  for( i=startIndex; i<=endIndex; i++ ) {
                      aTrk = (Trk) trkBuf[flightNum].elementAt(i);
!                     if( (!aTrk.isChecked()) && aTrk.isLocalMax() && ((aTrk.dist(lastMinMax)) < minDist) ) {
                          aTrk.setLocalMax(false);
                      }
***************
*** 953,971 ****
  
      public int searchMaxTimeInterval(int flightNum) {
!         int i,size;
!         int min=10000;
          long max=0,delta=0;
          Trk aTrk, prvTrk;
          int startIndex, endIndex;
-         long startTime, timestamp;
-         int curHeight, h;
-         boolean found = false,
-         finished;
-         double dist;
-         int[] filter = new int[FILTER_SIZE];
-         
          startIndex = getStartIndex(flightNum);
          endIndex = getEndIndex(flightNum);
!         size = getTrkSize(flightNum);
          
          prvTrk = (Trk) trkBuf[flightNum].elementAt(startIndex);
--- 939,949 ----
  
      public int searchMaxTimeInterval(int flightNum) {
!         int i;
          long max=0,delta=0;
          Trk aTrk, prvTrk;
          int startIndex, endIndex;
          startIndex = getStartIndex(flightNum);
          endIndex = getEndIndex(flightNum);
!         //size = getTrkSize(flightNum);
          
          prvTrk = (Trk) trkBuf[flightNum].elementAt(startIndex);
***************
*** 1002,1007 ****
          long lengthTrack, lengthBaro, diff;
          boolean merge = false;
!         int t, numTrk, startIndex, endIndex;
!         long startTime, curTime;
          int timeDiff;
          int height;
--- 980,985 ----
          long lengthTrack, lengthBaro, diff;
          boolean merge = false;
!         int t, startIndex, endIndex;
!         long startTime;
          int timeDiff;
          int height;
***************
*** 1035,1039 ****
              startIndex = this.getStartIndex(trkNum);
              endIndex = this.getEndIndex(trkNum);
-             numTrk = endIndex - startIndex;
              aTrk = (Trk) trkBuf[trkNum].elementAt(startIndex);
              startTime = aTrk.getTimeStamp()/1000;
--- 1013,1016 ----
***************
*** 1113,1126 ****
       */
      public void searchThermals(int flightNum, int minHeightDiff, double minDist, boolean mode) {
!         int i,j,k,size,cnt=0;
          int min=10000,
          max=0;
!         Trk aTrk, nextTrk, prvTrk, lastMinMax;
          int startIndex, endIndex;
!         long startTime, timestamp;
!         int curHeight, h;
!         boolean found = false,
!         finished;
!         double dist;
          int[] filter = new int[FILTER_SIZE];
          int minH=100000, maxH=0, limit;
--- 1090,1100 ----
       */
      public void searchThermals(int flightNum, int minHeightDiff, double minDist, boolean mode) {
!         int i,j,k;
          int min=10000,
          max=0;
!         Trk aTrk, nextTrk;
          int startIndex, endIndex;
!         long timestamp;
!         int h;
          int[] filter = new int[FILTER_SIZE];
          int minH=100000, maxH=0, limit;
***************
*** 1128,1132 ****
          startIndex = getStartIndex(flightNum);
          endIndex = getEndIndex(flightNum);
!         size = getTrkSize(flightNum);
          min = 10000;
          
--- 1102,1106 ----
          startIndex = getStartIndex(flightNum);
          endIndex = getEndIndex(flightNum);
!         //size = getTrkSize(flightNum);
          min = 10000;
          

Index: BaroContainer.java
===================================================================
RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/BaroContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaroContainer.java	25 Mar 2006 11:27:16 -0000	1.1
--- BaroContainer.java	26 Apr 2006 19:19:16 -0000	1.2
***************
*** 66,72 ****
      
      public int getSize(int flightNum) {
-         int i;
-         VarioData vData;
-         
          return varioBuf[flightNum].size();
      }
--- 66,69 ----
***************
*** 222,227 ****
          int i;
          VarioData vData;
-         VarioConfig vConfig = (VarioConfig) varioBuf[flightNum].elementAt(0);
-         
          for( i=1; i<varioBuf[flightNum].size()-1; i++ ) {
              vData = (VarioData) varioBuf[flightNum].elementAt(i);
--- 219,222 ----

Index: Wpt.java
===================================================================
RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/Wpt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Wpt.java	25 Mar 2006 11:27:16 -0000	1.1
--- Wpt.java	26 Apr 2006 19:19:16 -0000	1.2
***************
*** 19,23 ****
  
  @since                  JDK1.1.x
! @author                 Rüdiger Bien
  
  CVS-section:
--- 19,23 ----
  
  @since                  JDK1.1.x
! @author                 Rüdiger Bien
  
  CVS-section:
***************
*** 164,169 ****
          
          double d, dst, tc = 0.0, // tc == true course
!         dlat, dlon, offsAngle = 0.0, tmp,
!         refLat, refLon;
          Wpt newWpt;
          
--- 164,168 ----
          
          double d, dst, tc = 0.0, // tc == true course
!         dlat, dlon, offsAngle = 0.0, refLat, refLon;
          Wpt newWpt;