Fixing annotation saving issues

* Handle case when loading when an error occurs.
* Fixing selectors after loading annotation.
* Fixing issues with saving blur
* Fixing issues with saving bubbles
* Fixing issues with saving pencil lines
* Cleaning up debug output from previous work

Author: phase1geo

src/Canvas.vala

@@ -514,16 +514,20 @@ public class Canvas : DrawingArea {
 
   //-------------------------------------------------------------
   // Loads this canvas and the canvas items from XML format.
-  public void load( Xml.Node* node ) {
+  public bool load( Xml.Node* node ) {
+
+    bool image_loaded = false;
 
     for( Xml.Node* it=node->children; it!=null; it=it->next ) {
       if( it->type == Xml.ElementType.ELEMENT_NODE ) {
         switch( it->name ) {
-          case "image" :  image.load( it );  break;
+          case "image" :  image_loaded = image.load( it );  break;
           case "items" :  items.load( it );  break;
         }
       }
-    }    
+    }
+
+    return( image_loaded );
 
   }
 

src/CanvasImage.vala

@@ -607,12 +607,13 @@ public class CanvasImage {
 
   //-------------------------------------------------------------
   // Load the contents of this canvas image from XML format.
-  public void load( Xml.Node* node ) {
+  public bool load( Xml.Node* node ) {
+
+    var loaded = false;
 
     var fname = node->get_prop( "filename" );
     if( fname != null ) {
-      stdout.printf( "Opening image: %s\n", fname );
-      _canvas.editor.open_image( fname ); 
+      loaded = _canvas.editor.open_image( fname ); 
     }
 
     var a = node->get_prop( "angle" );
@@ -621,6 +622,8 @@ public class CanvasImage {
       // TBD - We will probably want to handle the angle change in the canvas.
     }
 
+    return( loaded );
+
   }
 
   /****************************************************************************/

src/CanvasPoint.vala

@@ -34,7 +34,8 @@ public enum CanvasPointType {
   CONTROL,
   SELECTOR;
 
-  /* Returns the string version of this type */
+  //-------------------------------------------------------------
+  // Returns the string version of this type.
   public string to_string() {
     switch( this ) {
       case RESIZER0 :  return( "resizer0" );
@@ -51,7 +52,26 @@ public enum CanvasPointType {
     }
   }
 
-  /* Returns the hidden/shown version of the current type */
+  //-------------------------------------------------------------
+  // Parses the given string and returns its CanvasPointType value.
+  public static CanvasPointType parse( string value ) {
+    switch( value ) {
+      case "resizer0" :  return( RESIZER0 );
+      case "resizer1" :  return( RESIZER1 );
+      case "resizer2" :  return( RESIZER2 );
+      case "resizer3" :  return( RESIZER3 );
+      case "hidden0"  :  return( HIDDEN0 );
+      case "hidden1"  :  return( HIDDEN1 );
+      case "hidden2"  :  return( HIDDEN2 );
+      case "hidden3"  :  return( HIDDEN3 );
+      case "control"  :  return( CONTROL );
+      case "selector" :  return( SELECTOR );
+      default         :  return( NONE );
+    }
+  }
+
+  //-------------------------------------------------------------
+  // Returns the hidden/shown version of the current type.
   public CanvasPointType version( bool hide ) {
     switch( this ) {
       case RESIZER0 :  return( hide ? HIDDEN0 : RESIZER0 );
@@ -66,12 +86,14 @@ public enum CanvasPointType {
     }
   }
 
-  /* Returns true if this point should be drawn */
+  //-------------------------------------------------------------
+  // Returns true if this point should be drawn.
   public bool draw() {
     return( (this == RESIZER0) || (this == RESIZER1) || (this == RESIZER2) || (this == RESIZER3) || (this == CONTROL) || (this == SELECTOR) );
   }
 
-  /* Returns the color to draw the given point */
+  //-------------------------------------------------------------
+  // Returns the color to draw the given point.
   public Gdk.RGBA color() {
     switch( this ) {
       case SELECTOR :
@@ -88,7 +110,8 @@ public enum CanvasPointType {
     }
   }
 
-  /* Returns true if the kind is hidden */
+  //-------------------------------------------------------------
+  // Returns true if the kind is hidden.
   public bool is_hidden() {
     return( (this == HIDDEN0) || (this == HIDDEN1) || (this == HIDDEN2) || (this == HIDDEN3) );
   }
@@ -101,57 +124,97 @@ public class CanvasPoint {
   public double          y    { get; set; default = 0.0; }
   public CanvasPointType kind { get; private set; default = CanvasPointType.NONE; }
 
-  /* Constructor */
+  //-------------------------------------------------------------
+  // Constructor.
   public CanvasPoint( CanvasPointType kind = CanvasPointType.NONE ) {
     this.kind = kind;
   }
 
-  /* Copy constructor */
+  //-------------------------------------------------------------
+  // Copy constructor
   public CanvasPoint.from_point( CanvasPoint point ) {
     copy( point );
   }
 
-  /* Constructor */
+  //-------------------------------------------------------------
+  // Constructor.
   public CanvasPoint.from_coords( double x, double y, CanvasPointType kind = CanvasPointType.NONE ) {
     copy_coords( x, y );
     this.kind = kind;
   }
 
-  /* Copies the point information to this instance */
+  //-------------------------------------------------------------
+  // Copies the point information to this instance.
   public void copy( CanvasPoint point ) {
     this.x    = point.x;
     this.y    = point.y;
     this.kind = point.kind;
   }
 
-  /* Copies the x,y coordinates to this instance */
+  //-------------------------------------------------------------
+  // Copies the x,y coordinates to this instance.
   public void copy_coords( double x, double y ) {
     this.x = x;
     this.y = y;
   }
 
-  /* Adjust the point by the given amounts */
+  //-------------------------------------------------------------
+  // Adjust the point by the given amounts.
   public void adjust( double diffx, double diffy ) {
     this.x += diffx;
     this.y += diffy;
   }
 
-  /* Resets the visual aspect of this point to non-hidden state */
+  //-------------------------------------------------------------
+  // Resets the visual aspect of this point to non-hidden state.
   public void reset_visual() {
     kind = kind.version( false );
   }
 
-  /* Updates the visual status of this point kind */
+  //-------------------------------------------------------------
+  // Updates the visual status of this point kind.
   public void set_visual( CanvasPointType point_kind, bool hide ) {
     if( point_kind != kind ) {
       kind = kind.version( hide );
     }
   }
 
-  /* Returns a printable version of this point */
+  //-------------------------------------------------------------
+  // Returns a printable version of this point.
   public string to_string() {
     return( "x: %g, y: %g, kind: %s".printf( x, y, kind.to_string() ) );
   }
 
+  //-------------------------------------------------------------
+  // Saves the contents of this point in XML format.
+  public Xml.Node* save() {
+    Xml.Node* node = new Xml.Node( null, "point" );
+    node->set_prop( "x", x.to_string() );
+    node->set_prop( "y", y.to_string() );
+    node->set_prop( "kind", kind.to_string() );
+    return( node );
+  }
+
+  //-------------------------------------------------------------
+  // Loads the contents of this point
+  public void load( Xml.Node* node ) {
+
+    var x = node->get_prop( "x" );
+    if( x != null ) {
+      this.x = double.parse( x );
+    }
+
+    var y = node->get_prop( "y" );
+    if( y != null ) {
+      this.y = double.parse( y );
+    }
+
+    var k = node->get_prop( "kind" );
+    if( k != null ) {
+      this.kind = CanvasPointType.parse( k );
+    }
+
+  }
+
 }
 

src/Editor.vala

@@ -106,13 +106,9 @@ public class Editor : Box {
 
   //-------------------------------------------------------------
   // Opens the given image.
-  public void open_image( string filename ) {
+  public bool open_image( string filename ) {
     _filename = filename;
-    if( filename.has_suffix( ".annotator" ) ) {
-      // TBD - load( filename );
-    } else {
-      canvas.open_image( filename );
-    }
+    return( canvas.open_image( filename ) );
   }
 
   //-------------------------------------------------------------

src/MainWindow.vala

@@ -456,7 +456,7 @@ public class MainWindow : Gtk.ApplicationWindow {
 
     /* Add the 'all image formats' filter first */
     var filter = new FileFilter();
-    filter.set_filter_name( _( "All Image Formats  (*)" ) );
+    filter.set_filter_name( _( "All Loadable Formats" ) );
     foreach( string pattern in patterns ) {
       filter.add_pattern( pattern );
     }
@@ -498,19 +498,19 @@ public class MainWindow : Gtk.ApplicationWindow {
    image is successfully read and displayed.
   */
   public void open_file( string filename ) {
-    stdout.printf( "HERE A\n" );
+    var opened = false;
     if( filename.has_suffix( ".annotator" ) ) {
-      stdout.printf( "HERE B\n" );
       var export = (_editor.canvas.image.exports.get_by_name( "annotator" ) as ExportEditable);
       if( export != null ) {
-        stdout.printf( "HERE C\n" );
-        export.import( filename );
+        opened = export.import( filename );
       }
     } else {
-      _editor.open_image( filename );
+      opened = _editor.open_image( filename );
+    }
+    if( opened ) {
+      _zoom_btn.set_sensitive( true );
+      _export_btn.set_sensitive( true );
     }
-    _zoom_btn.set_sensitive( true );
-    _export_btn.set_sensitive( true );
   }
 
   /* Parses image data from standard output to use as pixbuf */

src/canvas_items/CanvasItemArrow.vala

@@ -259,7 +259,6 @@ public class CanvasItemArrow : CanvasItem {
 
   /* Loads this item from XML */
   public override void load( Xml.Node* node ) {
-    base.load( node );
     var pa = node->get_prop( "peak-angle" );
     if( pa != null ) {
       _peak_a = double.parse( pa );
@@ -276,6 +275,7 @@ public class CanvasItemArrow : CanvasItem {
     if( vc != null ) {
       _valley_c = double.parse( vc );
     }
+    base.load( node );
   }
 
   /* Draw the rectangle */

src/canvas_items/CanvasItemBlur.vala

@@ -121,11 +121,31 @@ public class CanvasItemBlur : CanvasItem {
 
   }
 
-  /* Provides cursor to display when mouse cursor is hovering over the given selector */
+  //-------------------------------------------------------------
+  // Provides cursor to display when mouse cursor is hovering over
+  // the given selector.
   public override Cursor? get_selector_cursor( int index ) {
     return( _sel_cursors[index] );
   }
 
+  //-------------------------------------------------------------
+  // Saves the description of this blur item in XML format.
+  public override Xml.Node* save( int id, string? image_dir ) {
+    Xml.Node* node = base.save( id, image_dir );
+    node->set_prop( "radius", blur_radius.to_string() );
+    return( node );
+  }
+
+  //-------------------------------------------------------------
+  // Loads the description of this blur item from XML format.
+  public override void load( Xml.Node* node ) {
+    var r = node->get_prop( "radius" );
+    if( r != null ) {
+      blur_radius = int.parse( r );
+    }
+    base.load( node );
+  }
+
   //-------------------------------------------------------------
   // Adds the contextual menu item values
   protected override void add_contextual_menu_items( CanvasItemMenu menu ) {

src/canvas_items/CanvasItemBubble.vala

@@ -43,7 +43,7 @@ public enum CanvasBubbleType {
     }
   }
 
-  public CanvasBubbleType parse( string str ) {
+  public static CanvasBubbleType parse( string str ) {
     switch( str ) {
       case "talk"  :  return( TALK );
       case "think" :  return( THINK );
@@ -152,11 +152,31 @@ public class CanvasItemBubble : CanvasItem {
 
   }
 
-  /* Provides cursor to display when mouse cursor is hovering over the given selector */
+  //-------------------------------------------------------------
+  // Provides cursor to display when mouse cursor is hovering over
+  // the given selector.
   public override Cursor? get_selector_cursor( int index ) {
     return( _sel_cursors[index] );
   }
 
+  //-------------------------------------------------------------
+  // Saves the description of this item in XML format.
+  public override Xml.Node* save( int id, string? image_dir ) {
+    Xml.Node* node = base.save( id, image_dir );
+    node->set_prop( "type", _type.to_string() );
+    return( node );
+  }
+
+  //-------------------------------------------------------------
+  // Loads the description of this item from XML format.
+  public override void load( Xml.Node* node ) {
+    var t = node->get_prop( "type" );
+    if( t != null ) {
+      _type = CanvasBubbleType.parse( t );
+    }
+    base.load( node );
+  }
+
   /* Helper function that finds the two tangential points on a circle to a given point */
   private bool find_tangents( CanvasPoint center, double radius, CanvasPoint external, CanvasPoint pt1, CanvasPoint pt2 ) {
 

src/canvas_items/CanvasItemImage.vala

@@ -142,7 +142,6 @@ public class CanvasItemImage : CanvasItem {
 
   /* Loads this item from XML */
   public override void load( Xml.Node* node ) {
-    base.load( node );
     var n = node->get_prop( "name" );
     if( n != null ) {
       _name = n;
@@ -152,6 +151,7 @@ public class CanvasItemImage : CanvasItem {
       _file = bool.parse( f );
     }
     create_image( _name, _file, (int)bbox.width );
+    base.load( node );
   }
 
   /* Draw the rectangle */

src/canvas_items/CanvasItemMagnifier.vala

@@ -237,11 +237,11 @@ public class CanvasItemMagnifier : CanvasItem {
   //-------------------------------------------------------------
   // Loads this item from XML.
   public override void load( Xml.Node* node ) {
-    base.load( node );
     var f = node->get_prop( "zoom-factor" );
     if( f != null ) {
       _zoom_factor = double.parse( f );
     }
+    base.load( node );
   }
 
   /* Helper function that finds the two tangential points on a circle to a given point */