Merge branch 'feature/undo-redo' into develop

Author: paulosousadias

src/java/pt/lsts/neptus/types/map/AbstractElement.java

@@ -238,6 +238,9 @@ public boolean load(Element elem) {
                     }
                     setPhi(val);
                 }
+                else {
+                    setPhi(0);
+                }
                 ndTemp = nd.selectSingleNode("theta");
                 if (ndTemp != null) {
                     String text = ndTemp.getText();
@@ -251,6 +254,9 @@ public boolean load(Element elem) {
                     }
                     setTheta(val);
                 }
+                else {
+                    setTheta(0);
+                }
                 ndTemp = nd.selectSingleNode("psi");
                 if (ndTemp != null) {
                     String text = ndTemp.getText();
@@ -264,6 +270,9 @@ public boolean load(Element elem) {
                     }
                     setPsi(val);
                 }
+                else {
+                    setPsi(0);
+                }
             }
             nd = doc.selectSingleNode("//filled");
             if (nd != null) {
@@ -296,7 +305,10 @@ public boolean load(Element elem) {
                     val = 100;
 
                 setTransparency((int)val);
-            }            
+            }
+            else {
+                setTransparency(0);
+            }
         }
         catch (Exception e) {
             NeptusLog.pub().error(this + ":XML not recognized!!!");
@@ -347,7 +359,7 @@ public Document asDocument(String rootElementName) {
 
         Element root = getCenterLocation().asElement(rootElementName);
 
-        if ( (phi != 0) || (theta != 0) || (psi != 0) ) {
+        if ( (phi != 0) || (theta != 0) || (psi != 0) || this instanceof RotatableElement) {
             Element att = root.addElement("attitude");
             if (phi != 0)
                 att.addElement("phi").addText(Double.toString(phi));
@@ -492,7 +504,7 @@ public void setPitchDeg(double pitch) {
     public void setYawDeg(double yaw) {
         this.psi = yaw;
     }
-    
+
 
     /**
      * @return the current roll rotation in RADIANS!
@@ -783,6 +795,7 @@ public void showParametersDialog(Component parentComp, String[] takenNames, MapT
      * @param takenNames
      */
     protected void showParametersDialog(Component parentComp, String[] takenNames, MapType map, boolean editable, boolean idEditable) {
+        this.userCancel = false;
         this.takenNames = takenNames;
         this.parentMap = map;
 

src/java/pt/lsts/neptus/types/map/ImageElement.java

@@ -442,13 +442,17 @@ public Document asDocument(String rootElementName) {
         Element root = (Element) super.asDocument(DEFAULT_ROOT_ELEMENT).getRootElement().detach();
         document.add(root);
 
-        if ("".equals(originalFilePath)) {
-            root.addElement("href").addText(getImageFileName());
+        if (getImageFileName() != null && !getImageFileName().isEmpty()) {
+            if (originalFilePath != null && !originalFilePath.isEmpty()) {
+                root.addElement("href").addText(FileUtil.relativizeFilePathAsURI(originalFilePath, getImageFileName()));
+            } else {
+                root.addElement("href").addText(getImageFileName());
+            }
+        } else if (originalFilePath != null && !originalFilePath.isEmpty()) {
+            root.addElement("href").addText(originalFilePath);
+        } else {
             NeptusLog.pub().error(this + ": Original file path is empty!");
         }
-        else
-            root.addElement("href")
-                    .addText(FileUtil.relativizeFilePathAsURI(getOriginalFilePath(), getImageFileName()));
         Element scaleElm = root.addElement("scale");
         scaleElm.addText(Double.toString(getImageScale()));
         if (!Double.isNaN(imageScaleV)) {
@@ -503,7 +507,7 @@ public int getLayerPriority() {
 
     @Override
     public ParametersPanel getParametersPanel(boolean editable, MapType map) {
-        params.setCenter(getCenterLocation());
+        params.setCenter(new LocationType(getCenterLocation()));
         params.setImageFileName(getImageFileName());
         params.setImageScale(getImageScale());
         params.setImageScaleV(getImageScaleV());
@@ -524,7 +528,7 @@ public boolean paramsOK(JPanel paramsPanel) {
     @Override
     public void initialize(ParametersPanel paramsPanel) {
 
-        setCenterLocation(params.getCenter());
+        setCenterLocation(new LocationType(params.getCenter()));
         setImageFileName(params.getImageFileName());
         setImageScale(params.getImageScale());
         setImageScaleV(params.getImageScaleV());