Merge branch 'release/neptus-3.0' into develop

Conflicts: src/pt/lsts/neptus/renderer2d/ImageLayer.java
krisklau · Jan 15, 2014 · 6980fba · 6980fba
2 parents 87578eb + 3c77b23
commit 6980fba
Show file tree

Hide file tree

Showing 14 changed files with 244 additions and 155 deletions.
diff --git a/.gitignore b/.gitignore
@@ -201,4 +201,6 @@ dev-scripts/grow_pot.sh
 /IHData/
 
 /.s57
-/s57maps
+/s57maps
+
+/*_dist
diff --git a/build.xml b/build.xml
@@ -389,7 +389,7 @@ For simple use the main targets are:
 		<filterset id="neptusSeacon.filters">
 			<filter token="NEPTUS_NAME" value="${Name}SC" />
 			<filter token="EXTRA_DIST_NAME" value="Seacon Edition ${seacon.release}" />
-			<filter token="INSTALL_DIR" value="${install.dir.name}Seacon" />
+			<filter token="INSTALL_DIR" value="${install.dir.name}SC" />
 			<!--filter token="VERSION_SE" value="${seacon.release}" /-->
 			<filter token="DIST_EXE" value="${dist.installer.name.seacon}" />
 			<filter token="INSTALLER_NSIS_NEPTUS_BATCH_PATH" value="..\static_files\batch_files\neptusse.bat" />

diff --git a/dist/excludes_NeptusSE.txt b/dist/excludes_NeptusSE.txt
@@ -1,8 +1,11 @@
 conf/mraplots/*.plot
 plugins/accu.jar
+plugins/blue-eye.jar
+plugins/caoAgent.jar
 plugins/envdisp*.jar
 plugins/followRef.jar
 plugins/matlab*.jar
+plugins/matlab-planning.jar
 plugins/mavs.jar
 plugins/noptilus.jar
 plugins/odss.jar

diff --git a/dist/excludes_NeptusSeacon.txt b/dist/excludes_NeptusSeacon.txt
@@ -1 +1,2 @@
-plugins/s57-client.jar
+plugins/caoAgent.jar
+plugins/s57-client.jar
diff --git a/plugins-dev/echosounder/pt/lsts/neptus/plugins/sidescan/SidescanAnalyzer.java b/plugins-dev/echosounder/pt/lsts/neptus/plugins/sidescan/SidescanAnalyzer.java
@@ -35,7 +35,6 @@
 import java.awt.Graphics;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.TimeZone;
 
 import javax.swing.ImageIcon;
@@ -53,7 +52,6 @@
 import pt.lsts.neptus.mra.importers.IMraLogGroup;
 import pt.lsts.neptus.mra.plots.LogMarkerListener;
 import pt.lsts.neptus.mra.visualizations.MRAVisualization;
-import pt.lsts.neptus.plugins.NeptusProperty;
 import pt.lsts.neptus.plugins.PluginDescription;
 import pt.lsts.neptus.util.ImageUtils;
 import pt.lsts.neptus.util.llf.LogUtils;
@@ -62,15 +60,15 @@
  * @author jqcorreia
  * 
  */
-@PluginDescription(author = "jqcorreia", name = "Sidescan Analyzer")
-public class SidescanAnalyzer extends JPanel implements MRAVisualization, TimelineChangeListener,
-LogMarkerListener {
+@PluginDescription(author = "jqcorreia", name = "Sidescan Analyzer", icon = "pt/lsts/neptus/plugins/echosounder/echosounder.png")
+public class SidescanAnalyzer extends JPanel implements MRAVisualization, TimelineChangeListener, LogMarkerListener {
     private static final long serialVersionUID = 1L;
 
     protected MRAPanel mraPanel;
 
+    // bottom toolbar for playing / pausing etc..
     private Timeline timeline;
-    //Histogram histogram;
+    // Histogram histogram;
 
     private long firstPingTime;
     private long lastPingTime;
@@ -79,15 +77,15 @@ public class SidescanAnalyzer extends JPanel implements MRAVisualization, Timeli
     private long lastUpdateTime;
 
     // List of different frequencies on this log
-    //private ArrayList<Double> freqList = new ArrayList<Double>();
+    // private ArrayList<Double> freqList = new ArrayList<Double>();
 
-    // Processing flags
-    @NeptusProperty(name="Vertical Blending")
-    public boolean verticalBlending = false;
-    @NeptusProperty(name="Slant Range Correction")
-    public boolean slantRangeCorrection = false;
-    @NeptusProperty(name="Time Variable Gain")
-    public boolean timeVariableGain = false;
+    // Processing flags - not used ?!?!
+    //    @NeptusProperty(name = "vertical Blending")
+    //    public boolean verticalBlending = false;
+    //    @NeptusProperty(name = "Slant Range Correction")
+    //    public boolean slantRangeCorrection = false;
+    //    @NeptusProperty(name = "Time Variable Gain")
+    //    public boolean timeVariableGain = false;
 
     private ArrayList<SidescanPanel> sidescanPanels = new ArrayList<SidescanPanel>();
 
@@ -109,14 +107,16 @@ public void initialize(IMraLogGroup source) {
 
         lastUpdateTime = firstPingTime;
 
-        for(Integer subsys : ssParser.getSubsystemList()) {
+        for (Integer subsys : ssParser.getSubsystemList()) {
             System.out.println(subsys);
             sidescanPanels.add(new SidescanPanel(this, ssParser, subsys));
         }
 
         fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
 
-        System.out.println(fmt.format(new Date(firstPingTime)) + " " + fmt.format(new Date(lastPingTime)) + " " + (lastPingTime - firstPingTime));
+        // NeptusLog.pub().info(
+        // fmt.format("First Ping time: " + new Date(firstPingTime)) + "\nLast Ping time: "
+        // + fmt.format(new Date(lastPingTime)) + " " + "\nTotal time: " + (lastPingTime - firstPingTime));
 
         timeline = new Timeline(0, (int) (lastPingTime - firstPingTime), 30, 1000, false);
         timeline.getSlider().setValue(0);
@@ -126,18 +126,19 @@ public void initialize(IMraLogGroup source) {
             @Override
             public void paintTicks(Graphics g) {
                 super.paintTicks(g);
-                for(LogMarker m : markerList) {
+                for (LogMarker m : markerList) {
                     long mtime = new Double(m.timestamp).longValue();
-                    g.drawLine(xPositionForValue((int)(mtime-firstPingTime)), 0, xPositionForValue((int)(mtime-firstPingTime)),timeline.getSlider().getHeight()/2);
-                    //                    g.drawString(m.label, xPositionForValue((int)(mtime-firstPingTime))-10, 22);
+                    g.drawLine(xPositionForValue((int) (mtime - firstPingTime)), 0,
+                            xPositionForValue((int) (mtime - firstPingTime)), timeline.getSlider().getHeight() / 2);
+                    // g.drawString(m.label, xPositionForValue((int)(mtime-firstPingTime))-10, 22);
                 }
-            } 
+            }
         });
 
         // Layout building
         setLayout(new MigLayout());
 
-        for(SidescanPanel p : sidescanPanels) {
+        for (SidescanPanel p : sidescanPanels) {
             add(p, "w 100%, h 100%, wrap");
         }
 
@@ -172,9 +173,9 @@ public void timelineChanged(int value) {
         try {
             // This distinguishes between a drag and normal execution
             // If this is true but currentTime and lastTime as the same value
-            if(Math.abs(value - currentTime) > 1000 / 15 * timeline.getSpeed() ) {
+            if (Math.abs(value - currentTime) > 1000 / 15 * timeline.getSpeed()) {
                 // this means it dragged
-                for(SidescanPanel p : sidescanPanels)
+                for (SidescanPanel p : sidescanPanels)
                     p.clearLines();
 
                 lastUpdateTime = value;
@@ -207,7 +208,8 @@ public void timelineChanged(int value) {
 
     @Override
     public boolean canBeApplied(IMraLogGroup source) {
-        return LogUtils.hasIMCSidescan(source) || source.getFile("Data.jsf") != null || source.getLog("SidescanPing") != null;
+        return LogUtils.hasIMCSidescan(source) || source.getFile("Data.jsf") != null
+                || source.getLog("SidescanPing") != null;
     }
 
     @Override
@@ -238,6 +240,7 @@ public Type getType() {
     public ArrayList<LogMarker> getMarkerList() {
         return markerList;
     }
+
     @Override
     public void onCleanup() {
         sidescanPanels.clear();
@@ -256,7 +259,6 @@ public void onShow() {
 
     }
 
-
     @Override
     public void addLogMarker(LogMarker e) {
         markerList.add(e);
@@ -272,5 +274,4 @@ public void GotoMarker(LogMarker marker) {
 
     }
 
-
 }