Merge pull request #555 from will-moore/points_in_shapeEditor

Points in shape editor

omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py

@@ -465,7 +465,7 @@ def draw_ellipse(self, shape):
         cy = self.page_height - c['y']
         rx = shape['radiusX'] * self.scale
         ry = shape['radiusY'] * self.scale
-        rotation = (shape['rotation'] + self.panel['rotation']) * -1
+        rotation = (shape.get('rotation', 0) + self.panel['rotation']) * -1
         r, g, b, a = self.get_rgba(shape['strokeColor'])
         self.canvas.setStrokeColorRGB(r, g, b, alpha=a)
 
@@ -761,7 +761,7 @@ def draw_ellipse(self, shape):
         cy = ctr['y']
         rx = self.scale * shape['radiusX']
         ry = self.scale * shape['radiusY']
-        rotation = (shape['rotation'] + self.panel['rotation']) * -1
+        rotation = (shape.get('rotation', 0) + self.panel['rotation']) * -1
 
         width = int((rx * 2) + w)
         height = int((ry * 2) + w)
@@ -772,7 +772,9 @@ def draw_ellipse(self, shape):
         rgba = ShapeToPdfExport.get_rgba_int(shape['strokeColor'])
         ellipse_draw.ellipse((0, 0, width, height), fill=rgba)
         rgba = self.get_rgba_int(shape.get('fillColor', '#00000000'))
-        ellipse_draw.ellipse((w, w, width - w, height - w), fill=rgba)
+        # when rx is ~zero (for a Point, scaled down) don't need inner ellipse
+        if (width - w) >= w:
+            ellipse_draw.ellipse((w, w, width - w, height - w), fill=rgba)
         temp_ellipse = temp_ellipse.rotate(rotation, resample=Image.BICUBIC,
                                            expand=True)
         # Use ellipse as mask, so transparent part is not pasted

src/css/figure.css

@@ -1266,6 +1266,10 @@
     .ellipse-icon{
         background-image: url("../images/ellipse-icon-16.png");
     }
+    .point-icon{
+        background-image: url("../images/point-icon-24.png");
+        background-position: center;
+    }
     .polygon-icon{
         background-image: url("../images/polygon-icon-16.png");
     }

src/js/models/panel_model.js

@@ -251,7 +251,7 @@
                 return true;
             }
             var points;
-            if (shape.type === "Ellipse") {
+            if (shape.type === "Ellipse" || shape.type === "Point") {
                 points = [[shape.cx, shape.cy]];
             } else if (shape.type === "Rectangle") {
                 points = [[shape.x, shape.y],

src/js/shapeEditorTest.js

@@ -254,6 +254,11 @@ $(function() {
                           "y": 260.5,
                           "x": 419});
 
+    shapeManager.addShapeJson({"type": "Point",
+                          "strokeWidth": 2,
+                          "y": 30,
+                          "x": 30});
+
     var s = shapeManager.addShapeJson({"type": "Line",
                                "strokeColor": "#00ff00",
                                "strokeWidth": 2,

src/js/shape_editor/ellipse.js

@@ -476,7 +476,7 @@ Ellipse.prototype.createHandles = function createHandles() {
     handle = this.paper.rect(hx - hsize / 2, hy - hsize / 2, hsize, hsize);
     handle.attr({ cursor: "move" });
     handle.h_id = key;
-    handle.line = self;
+    // handle.line = self;
 
     if (this.manager.canEdit) {
       handle.drag(_handle_drag(), _handle_drag_start(), _handle_drag_end());
@@ -511,7 +511,7 @@ Ellipse.prototype.getHandleCoords = function getHandleCoords() {
   };
 };
 
-// Class for creating Lines.
+// Class for creating Ellipse.
 var CreateEllipse = function CreateEllipse(options) {
   this.paper = options.paper;
   this.manager = options.manager;