From 5744d1d599dfaeaa768e1667509eee1fda3b8aea Mon Sep 17 00:00:00 2001
From: EvilSpirit <anandamide@mail.ru>
Date: Tue, 29 Nov 2016 23:49:20 +0700
Subject: [PATCH] Implement an image request.

---
 CHANGELOG.md                        |   1 +
 res/CMakeLists.txt                  |   1 +
 res/icons/graphics-window/image.png | Bin 0 -> 1025 bytes
 res/shaders/imesh.frag              |   2 +
 src/describescreen.cpp              |  10 +
 src/draw.cpp                        |   3 +
 src/drawentity.cpp                  |  49 ++++
 src/entity.cpp                      |   8 +-
 src/file.cpp                        |  79 ++++-
 src/graphicswin.cpp                 |  10 +-
 src/group.cpp                       |   3 +-
 src/mouse.cpp                       |  24 +-
 src/platform/climain.cpp            |   2 +-
 src/render/render.cpp               |   2 +-
 src/render/rendergl2.cpp            |  69 ++++-
 src/request.cpp                     |  19 +-
 src/sketch.h                        |  10 +-
 src/solvespace.cpp                  |   2 +-
 src/solvespace.h                    |   7 +-
 src/style.cpp                       |   2 +-
 src/textscreens.cpp                 |   2 +-
 src/toolbar.cpp                     |   2 +
 src/ui.h                            |   4 +-
 src/undoredo.cpp                    |   2 +-
 test/CMakeLists.txt                 |   1 +
 test/request/image/drawing.png      | Bin 0 -> 8565 bytes
 test/request/image/linked.slvs      | 430 ++++++++++++++++++++++++++++
 test/request/image/normal.slvs      | 319 +++++++++++++++++++++
 test/request/image/test.cpp         |  14 +
 29 files changed, 1040 insertions(+), 37 deletions(-)
 create mode 100644 res/icons/graphics-window/image.png
 create mode 100644 test/request/image/drawing.png
 create mode 100644 test/request/image/linked.slvs
 create mode 100644 test/request/image/normal.slvs
 create mode 100644 test/request/image/test.cpp

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b194fdd..c85bda3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ New sketch features:
   * A new sketch in workplane group can be created based on existing workplane.
   * TTF text request has two additional points on the right side, which allow
     constraining the width of text.
+  * Image requests can now be created, similar to TTF text requests.
   * Irrelevant points (e.g. arc center point) are not counted when estimating
     the bounding box used to compute chord tolerance.
   * When adding a constraint which has a label and is redundant with another
diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index b91f2165..200eb6fb 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -158,6 +158,7 @@ add_resources(
     icons/graphics-window/equal.png
     icons/graphics-window/extrude.png
     icons/graphics-window/horiz.png
+    icons/graphics-window/image.png
     icons/graphics-window/in3d.png
     icons/graphics-window/lathe.png
     icons/graphics-window/length.png
diff --git a/res/icons/graphics-window/image.png b/res/icons/graphics-window/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..d652d8e77c4297cc57816378acc0b9fa50ac3429
GIT binary patch
literal 1025
zcmV+c1pfPpP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q00009a7bBm000XT
z000XT0n*)m`~Uy|AY({UO#lFTB>(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM
zkN^M!08mU+MgRZ*0L%dX{{9040|W#F1qB5L1_lQQ2M7oV2?+@b3JMDg3k(bl4Gj$r
z4h|0w4-gO#5fKp*5)u;=6BHB_6%`d078Vy57Z?~A85tQG8X6lL8yp-Q9UUDW9v&Yb
zA0QwgAt50mA|fLrBP1jwB_$;$CMG8*CnzW=DJdx`Dk>{0D=aK5EiElBE-o)GFEB7L
zF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG`KR`f0K|w)6
zLPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>
zQ&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAx
zWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--i
zc6N7ncX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fS
zhlq%XiHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbEC
znVFfInwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|
zs;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&
zyS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo
z&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z
z-rnEe-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ
z@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}|Hfb8
z3IG5A0d!JMQvg8b*k%9#0B%V{K~#9!tkFph!ypg^QM$PDzkg)`#@NavCAH+KTL@bF
zV^#J1sHy-!nJwtI<`VigA!4U3@K|NS1%iT@>=PR2gr1-#QAO}r<p!hff@DfIptB$e
vY`4m2_y*?E3AyzFUOwWxXaC~we(5m)B!F#GM#sRj00000NkvXXu0mjfIyc~t

literal 0
HcmV?d00001

diff --git a/res/shaders/imesh.frag b/res/shaders/imesh.frag
index 872bb48e..4fa0713c 100644
--- a/res/shaders/imesh.frag
+++ b/res/shaders/imesh.frag
@@ -4,7 +4,9 @@
 // Copyright 2016 Aleksey Egorov
 //-----------------------------------------------------------------------------
 uniform vec4 color;
+uniform sampler2D texture;
 
 void main() {
+    if(texture2D(texture, gl_FragCoord.xy / 32.0).a < 0.5) discard;
     gl_FragColor = color;
 }
diff --git a/src/describescreen.cpp b/src/describescreen.cpp
index 003c31d4..454cedfb 100644
--- a/src/describescreen.cpp
+++ b/src/describescreen.cpp
@@ -195,6 +195,16 @@ void TextWindow::DescribeSelection() {
                 }
                 break;
             }
+            case Entity::Type::IMAGE: {
+                Printf(false, "%FtIMAGE%E");
+                Platform::Path relativePath = e->file.RelativeTo(SS.saveFile.Parent());
+                if(relativePath.IsEmpty()) {
+                    Printf(true, "  file = '%Fi%s%E'", e->file.raw.c_str());
+                } else {
+                    Printf(true, "  file = '%Fi%s%E'", relativePath.raw.c_str());
+                }
+                break;
+            }
 
             default:
                 Printf(true, "%Ft?? ENTITY%E");
diff --git a/src/draw.cpp b/src/draw.cpp
index e7e007cb..1a638a7b 100644
--- a/src/draw.cpp
+++ b/src/draw.cpp
@@ -394,6 +394,9 @@ void GraphicsWindow::HitTestMakeSelection(Point2d mp) {
     for(Entity &e : SK.entity) {
         if(!e.IsVisible()) continue;
 
+        // If faces aren't selectable, image entities aren't either.
+        if(e.type == Entity::Type::IMAGE && !showFaces) continue;
+
         // Don't hover whatever's being dragged.
         if(IsFromPending(e.h.request())) {
             // The one exception is when we're creating a new cubic; we
diff --git a/src/drawentity.cpp b/src/drawentity.cpp
index 1e5a31ec..ce455f1d 100644
--- a/src/drawentity.cpp
+++ b/src/drawentity.cpp
@@ -104,6 +104,7 @@ void Entity::GetReferencePoints(std::vector<Vector> *refs) {
         case Type::CUBIC:
         case Type::CUBIC_PERIODIC:
         case Type::TTF_TEXT:
+        case Type::IMAGE:
             refs->push_back(SK.GetEntity(point[0])->PointGetNum());
             break;
 
@@ -695,6 +696,54 @@ void Entity::Draw(DrawAs how, Canvas *canvas) {
             }
             return;
         }
+        case Type::IMAGE: {
+            Canvas::Fill fill = {};
+            std::shared_ptr<Pixmap> pixmap;
+            switch(how) {
+                case DrawAs::HIDDEN: return;
+
+                case DrawAs::HOVERED: {
+                    fill.color   = Style::Color(Style::HOVERED).WithAlpha(180);
+                    fill.pattern = Canvas::FillPattern::CHECKERED_A;
+                    fill.zIndex  = 2;
+                    break;
+                }
+
+                case DrawAs::SELECTED: {
+                    fill.color   = Style::Color(Style::SELECTED).WithAlpha(180);
+                    fill.pattern = Canvas::FillPattern::CHECKERED_B;
+                    fill.zIndex  = 1;
+                    break;
+                }
+
+                default:
+                    fill.color   = RgbaColor::FromFloat(1.0f, 1.0f, 1.0f);
+                    pixmap       = SS.images[file];
+                    break;
+            }
+
+            Canvas::hFill hf = canvas->GetFill(fill);
+            Vector v[4] = {};
+            for(int i = 0; i < 4; i++) {
+                v[i] = SK.GetEntity(point[i])->PointGetNum();
+            }
+            Vector iu = v[3].Minus(v[0]);
+            Vector iv = v[1].Minus(v[0]);
+
+            if(how == DrawAs::DEFAULT && pixmap == NULL) {
+                Canvas::Stroke stroke = Style::Stroke(Style::DRAW_ERROR);
+                stroke.color = stroke.color.WithAlpha(50);
+                Canvas::hStroke hs = canvas->GetStroke(stroke);
+                canvas->DrawLine(v[0], v[2], hs);
+                canvas->DrawLine(v[1], v[3], hs);
+                for(int i = 0; i < 4; i++) {
+                    canvas->DrawLine(v[i], v[(i + 1) % 4], hs);
+                }
+            } else {
+                canvas->DrawPixmap(pixmap, v[0], iu, iv,
+                                   Point2d::From(0.0, 0.0), Point2d::From(1.0, 1.0), hf);
+            }
+        }
 
         case Type::FACE_NORMAL_PT:
         case Type::FACE_XPROD:
diff --git a/src/entity.cpp b/src/entity.cpp
index 8d579d1f..4f4eabe1 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -785,7 +785,10 @@ Vector EntityBase::EndpointFinish() const {
     } else ssassert(false, "Unexpected entity type");
 }
 
-void EntityBase::TtfTextGetPointsExprs(ExprVector *eb, ExprVector *ec) const {
+void EntityBase::RectGetPointsExprs(ExprVector *eb, ExprVector *ec) const {
+    ssassert(type == Type::TTF_TEXT || type == Type::IMAGE,
+             "Unexpected entity type");
+
     EntityBase *a = SK.GetEntity(point[0]);
     EntityBase *o = SK.GetEntity(point[1]);
 
@@ -846,6 +849,7 @@ void EntityBase::GenerateEquations(IdList<Equation,hEquation> *l) const {
             break;
         }
 
+        case Type::IMAGE:
         case Type::TTF_TEXT: {
             if(SK.GetEntity(point[0])->type != Type::POINT_IN_2D) break;
             EntityBase *b = SK.GetEntity(point[2]);
@@ -854,7 +858,7 @@ void EntityBase::GenerateEquations(IdList<Equation,hEquation> *l) const {
             ExprVector ec = c->PointGetExprsInWorkplane(workplane);
 
             ExprVector ebp, ecp;
-            TtfTextGetPointsExprs(&ebp, &ecp);
+            RectGetPointsExprs(&ebp, &ecp);
 
             ExprVector beq = eb.Minus(ebp);
             AddEq(l, beq.x, 0);
diff --git a/src/file.cpp b/src/file.cpp
index 99ac2c7d..5b8447ac 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -33,6 +33,7 @@ void SolveSpaceUI::ClearExisting() {
 
     SK.entity.Clear();
     SK.param.Clear();
+    images.clear();
 }
 
 hGroup SolveSpaceUI::CreateDefaultDrawingGroup() {
@@ -131,6 +132,7 @@ const SolveSpaceUI::SaveTable SolveSpaceUI::SAVED[] = {
     { 'r',  "Request.style",            'x',    &(SS.sv.r.style)              },
     { 'r',  "Request.str",              'S',    &(SS.sv.r.str)                },
     { 'r',  "Request.font",             'S',    &(SS.sv.r.font)               },
+    { 'r',  "Request.file",             'P',    &(SS.sv.r.file)               },
     { 'r',  "Request.aspectRatio",      'f',    &(SS.sv.r.aspectRatio)        },
 
     { 'e',  "Entity.h.v",               'x',    &(SS.sv.e.h.v)                },
@@ -139,6 +141,7 @@ const SolveSpaceUI::SaveTable SolveSpaceUI::SAVED[] = {
     { 'e',  "Entity.style",             'x',    &(SS.sv.e.style)              },
     { 'e',  "Entity.str",               'S',    &(SS.sv.e.str)                },
     { 'e',  "Entity.font",              'S',    &(SS.sv.e.font)               },
+    { 'e',  "Entity.file",              'P',    &(SS.sv.e.file)               },
     { 'e',  "Entity.point[0].v",        'x',    &(SS.sv.e.point[0].v)         },
     { 'e',  "Entity.point[1].v",        'x',    &(SS.sv.e.point[1].v)         },
     { 'e',  "Entity.point[2].v",        'x',    &(SS.sv.e.point[2].v)         },
@@ -408,7 +411,10 @@ void SolveSpaceUI::LoadUsingTable(const Platform::Path &filename, char *key, cha
                 case 'x': sscanf(val, "%x", &u); p->x()= u; break;
 
                 case 'P': {
-                    p->P() = filename.Parent().Join(Platform::Path::FromPortable(val));
+                    Platform::Path path = Platform::Path::FromPortable(val);
+                    if(!path.IsEmpty()) {
+                        p->P() = filename.Parent().Join(path).Expand();
+                    }
                     break;
                 }
 
@@ -537,7 +543,7 @@ bool SolveSpaceUI::LoadFromFile(const Platform::Path &filename, bool canCancel)
             NewFile();
         }
     }
-    if(!ReloadAllImported(filename, canCancel)) {
+    if(!ReloadAllLinked(filename, canCancel)) {
         return false;
     }
     UpgradeLegacyData();
@@ -577,7 +583,7 @@ void SolveSpaceUI::UpgradeLegacyData() {
                     Entity *b = entity.FindById(text->point[2]);
                     Entity *c = entity.FindById(text->point[3]);
                     ExprVector bex, cex;
-                    text->TtfTextGetPointsExprs(&bex, &cex);
+                    text->RectGetPointsExprs(&bex, &cex);
                     b->PointForceParamTo(bex.Eval());
                     c->PointForceParamTo(cex.Eval());
                 }
@@ -819,11 +825,11 @@ bool SolveSpaceUI::LoadEntitiesFromFile(const Platform::Path &filename, EntityLi
     return true;
 }
 
-bool SolveSpaceUI::ReloadAllImported(const Platform::Path &filename, bool canCancel)
-{
+bool SolveSpaceUI::ReloadAllLinked(const Platform::Path &saveFile, bool canCancel) {
     std::map<Platform::Path, Platform::Path, Platform::PathLess> linkMap;
 
     allConsistent = false;
+
     for(Group &g : SK.group) {
         if(g.type != Group::Type::LINKED) continue;
 
@@ -838,10 +844,16 @@ bool SolveSpaceUI::ReloadAllImported(const Platform::Path &filename, bool canCan
 
 try_again:
         if(LoadEntitiesFromFile(g.linkFile, &g.impEntity, &g.impMesh, &g.impShell)) {
-            // We loaded the data, good.
+            // We loaded the data, good. Now import its dependencies as well.
+            for(Entity &e : g.impEntity) {
+                if(e.type != Entity::Type::IMAGE) continue;
+                if(!ReloadLinkedImage(g.linkFile, &e.file, canCancel)) {
+                    return false;
+                }
+            }
         } else if(linkMap.count(g.linkFile) == 0) {
             // The file was moved; prompt the user for its new location.
-            switch(LocateImportedFileYesNoCancel(g.linkFile.RelativeTo(filename), canCancel)) {
+            switch(LocateImportedFileYesNoCancel(g.linkFile.RelativeTo(saveFile), canCancel)) {
             case DIALOG_YES: {
                 Platform::Path newLinkFile;
                 if(GetOpenFile(&newLinkFile, "", SlvsFileFilter)) {
@@ -867,6 +879,59 @@ try_again:
         }
     }
 
+    for(Request &r : SK.request) {
+        if(r.type != Request::Type::IMAGE) continue;
+
+        if(!ReloadLinkedImage(saveFile, &r.file, canCancel)) {
+            return false;
+        }
+    }
+
     return true;
 }
 
+bool SolveSpaceUI::ReloadLinkedImage(const Platform::Path &saveFile,
+                                     Platform::Path *filename, bool canCancel) {
+    std::shared_ptr<Pixmap> pixmap;
+    bool promptOpenFile = false;
+    if(filename->IsEmpty()) {
+        // We're prompting the user for a new image.
+        promptOpenFile = true;
+    } else {
+        auto image = SS.images.find(*filename);
+        if(image != SS.images.end()) return true;
+
+        pixmap = Pixmap::ReadPng(*filename);
+        if(pixmap == NULL) {
+            // The file was moved; prompt the user for its new location.
+            switch(LocateImportedFileYesNoCancel(filename->RelativeTo(saveFile), canCancel)) {
+                case DIALOG_YES:
+                    promptOpenFile = true;
+                    break;
+
+                case DIALOG_NO:
+                    // We don't know where the file is, record it as absent.
+                    break;
+
+                case DIALOG_CANCEL:
+                    return false;
+            }
+        }
+    }
+
+    if(promptOpenFile) {
+        if(GetOpenFile(filename, "", RasterFileFilter)) {
+            pixmap = Pixmap::ReadPng(*filename);
+            if(pixmap == NULL) {
+                Error("The image '%s' is corrupted.", filename->raw.c_str());
+            }
+            // We know where the file is now, good.
+        } else if(canCancel) {
+            return false;
+        }
+    }
+
+    // We loaded the data, good.
+    SS.images[*filename] = pixmap;
+    return true;
+}
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
index e634e9e8..83d5f93e 100644
--- a/src/graphicswin.cpp
+++ b/src/graphicswin.cpp
@@ -112,6 +112,7 @@ const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = {
 { 1, N_("&Bezier Cubic Spline"),        Command::CUBIC,            'B',     TN, mReq  },
 { 1, NULL,                              Command::NONE,             0,       TN, NULL  },
 { 1, N_("&Text in TrueType Font"),      Command::TTF_TEXT,         'T',     TN, mReq  },
+{ 1, N_("&Image"),                      Command::IMAGE,            0,       TN, mReq  },
 { 1, NULL,                              Command::NONE,             0,       TN, NULL  },
 { 1, N_("To&ggle Construction"),        Command::CONSTRUCTION,     'G',     TN, mReq  },
 { 1, N_("Tangent &Arc at Point"),       Command::TANGENT_ARC,      S|'A',   TN, mReq  },
@@ -943,7 +944,8 @@ void GraphicsWindow::MenuEdit(Command id) {
             break;
 
         case Command::REGEN_ALL:
-            SS.ReloadAllImported(SS.saveFile);
+            SS.images.clear();
+            SS.ReloadAllLinked(SS.saveFile);
             SS.GenerateAll(SolveSpaceUI::Generate::UNTIL_ACTIVE);
             SS.ScheduleShowTW();
             break;
@@ -1015,6 +1017,12 @@ void GraphicsWindow::MenuRequest(Command id) {
         case Command::WORKPLANE: s = _("click origin of workplane"); goto c;
         case Command::RECTANGLE: s = _("click one corner of rectangle"); goto c;
         case Command::TTF_TEXT: s = _("click top left of text"); goto c;
+        case Command::IMAGE:
+            if(!SS.ReloadLinkedImage(SS.saveFile, &SS.GW.pending.filename,
+                                     /*canCancel=*/true)) {
+                return;
+            }
+            s = _("click top left of image"); goto c;
 c:
             SS.GW.pending.operation = GraphicsWindow::Pending::COMMAND;
             SS.GW.pending.command = id;
diff --git a/src/group.cpp b/src/group.cpp
index 4671c86c..07d63a8b 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -274,7 +274,7 @@ void Group::MenuGroup(Command id) {
     Group *gg = SK.GetGroup(g.h);
 
     if(gg->type == Type::LINKED) {
-        SS.ReloadAllImported(SS.saveFile);
+        SS.ReloadAllLinked(SS.saveFile);
     }
     gg->clean = false;
     SS.GW.activeGroup = gg->h;
@@ -801,6 +801,7 @@ void Group::CopyEntity(IdList<Entity,hEntity> *el,
     en.style = ep->style;
     en.str = ep->str;
     en.font = ep->font;
+    en.file = ep->file;
 
     switch(ep->type) {
         case Entity::Type::WORKPLANE:
diff --git a/src/mouse.cpp b/src/mouse.cpp
index 3247cc59..d3dd7c9b 100644
--- a/src/mouse.cpp
+++ b/src/mouse.cpp
@@ -51,7 +51,8 @@ void GraphicsWindow::StartDraggingByEntity(hEntity he) {
               e->type == Entity::Type::CUBIC ||
               e->type == Entity::Type::CUBIC_PERIODIC ||
               e->type == Entity::Type::CIRCLE ||
-              e->type == Entity::Type::TTF_TEXT)
+              e->type == Entity::Type::TTF_TEXT ||
+              e->type == Entity::Type::IMAGE)
     {
         int pts;
         EntReqTable::GetEntityInfo(e->type, e->extraPoints,
@@ -1146,6 +1147,27 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
                     break;
                 }
 
+                case Command::IMAGE: {
+                    if(!SS.GW.LockedInWorkplane()) {
+                        Error(_("Can't draw image in 3d; first, activate a workplane "
+                                "with Sketch -> In Workplane."));
+                        ClearSuper();
+                        break;
+                    }
+                    hr = AddRequest(Request::Type::IMAGE);
+                    AddToPending(hr);
+                    Request *r = SK.GetRequest(hr);
+                    r->file = pending.filename;
+
+                    SK.GetEntity(hr.entity(1))->PointForceTo(v);
+                    SK.GetEntity(hr.entity(2))->PointForceTo(v);
+
+                    pending.operation = Pending::DRAGGING_NEW_POINT;
+                    pending.point = hr.entity(2);
+                    pending.description = "click to place bottom left of image";
+                    break;
+                }
+
                 case Command::COMMENT: {
                     ClearSuper();
                     Constraint c = {};
diff --git a/src/platform/climain.cpp b/src/platform/climain.cpp
index 52881ac8..af8d7b07 100644
--- a/src/platform/climain.cpp
+++ b/src/platform/climain.cpp
@@ -76,7 +76,7 @@ File formats:
     export-wireframe:%s
     export-mesh:%s
     export-surfaces:%s
-)", FormatListFromFileFilter(PngFileFilter).c_str(),
+)", FormatListFromFileFilter(RasterFileFilter).c_str(),
     FormatListFromFileFilter(VectorFileFilter).c_str(),
     FormatListFromFileFilter(Vector3dFileFilter).c_str(),
     FormatListFromFileFilter(MeshFileFilter).c_str(),
diff --git a/src/render/render.cpp b/src/render/render.cpp
index a9e5e27a..16a2cc81 100644
--- a/src/render/render.cpp
+++ b/src/render/render.cpp
@@ -441,7 +441,7 @@ void ObjectPicker::DrawFaces(const SMesh &m, const std::vector<uint32_t> &faces,
 void ObjectPicker::DrawPixmap(std::shared_ptr<const Pixmap> pm,
                               const Vector &o, const Vector &u, const Vector &v,
                               const Point2d &ta, const Point2d &tb, Canvas::hFill hcf) {
-    ssassert(false, "Not implemented");
+    DrawQuad(o, o.Plus(u), o.Plus(u).Plus(v), o.Plus(v), hcf);
 }
 
 bool ObjectPicker::Pick(std::function<void()> drawFn) {
diff --git a/src/render/rendergl2.cpp b/src/render/rendergl2.cpp
index 5aa7110d..5830199f 100644
--- a/src/render/rendergl2.cpp
+++ b/src/render/rendergl2.cpp
@@ -769,11 +769,11 @@ public:
     virtual Canvas::Layer GetLayer() const override { return stroke.layer; };
     virtual int GetZIndex() const override { return stroke.zIndex; };
 
-    static std::shared_ptr<DrawCall> Create(OpenGl2Renderer *renderer, const SIndexedMesh &im,
+    static std::shared_ptr<DrawCall> Create(OpenGl2Renderer *renderer, const SIndexedMesh &mesh,
                                             Canvas::Stroke *stroke) {
         PointDrawCall *dc = new PointDrawCall();
         dc->stroke = *stroke;
-        dc->handle = renderer->imeshRenderer.Add(im);
+        dc->handle = renderer->imeshRenderer.Add(mesh);
         return std::shared_ptr<DrawCall>(dc);
     }
 
@@ -788,6 +788,42 @@ public:
     }
 };
 
+class PixmapDrawCall : public DrawCall {
+public:
+    // Key
+    Canvas::Fill                 fill;
+    // Data
+    IndexedMeshRenderer::Handle  handle;
+
+    virtual Canvas::Layer GetLayer() const override { return fill.layer; };
+    virtual int GetZIndex() const override { return fill.zIndex; };
+
+    static std::shared_ptr<DrawCall> Create(OpenGl2Renderer *renderer, const SIndexedMesh &mesh,
+                                            Canvas::Fill *fill) {
+        PixmapDrawCall *dc = new PixmapDrawCall();
+        dc->fill   = *fill;
+        dc->handle = renderer->imeshRenderer.Add(mesh);
+        return std::shared_ptr<DrawCall>(dc);
+    }
+
+    void Draw(OpenGl2Renderer *renderer) override {
+        ssglDepthRange(fill.layer, fill.zIndex);
+        if(fill.pattern != Canvas::FillPattern::SOLID) {
+            renderer->SelectMask(fill.pattern);
+        } else if(fill.texture) {
+            renderer->SelectTexture(fill.texture);
+        } else {
+            renderer->SelectMask(Canvas::FillPattern::SOLID);
+        }
+        renderer->imeshRenderer.UseFilled(fill);
+        renderer->imeshRenderer.Draw(handle);
+    }
+
+    void Remove(OpenGl2Renderer *renderer) override {
+        renderer->imeshRenderer.Remove(handle);
+    }
+};
+
 class MeshDrawCall : public DrawCall {
 public:
     // Key
@@ -813,22 +849,22 @@ public:
         return std::shared_ptr<DrawCall>(dc);
     }
 
-    void DrawFace(OpenGl2Renderer *renderer, GLenum cullFace, Canvas::Fill *fill) {
+    void DrawFace(OpenGl2Renderer *renderer, GLenum cullFace, const Canvas::Fill &fill) {
         glCullFace(cullFace);
-        ssglDepthRange(fill->layer, fill->zIndex);
-        if(fill->pattern != Canvas::FillPattern::SOLID) {
-            renderer->SelectMask(fill->pattern);
-        } else if(fill->texture) {
-            renderer->SelectTexture(fill->texture);
+        ssglDepthRange(fill.layer, fill.zIndex);
+        if(fill.pattern != Canvas::FillPattern::SOLID) {
+            renderer->SelectMask(fill.pattern);
+        } else if(fill.texture) {
+            renderer->SelectTexture(fill.texture);
         } else {
             renderer->SelectMask(Canvas::FillPattern::SOLID);
         }
         if(isShaded) {
             renderer->meshRenderer.UseShaded(renderer->lighting);
         } else {
-            renderer->meshRenderer.UseFilled(*fill);
+            renderer->meshRenderer.UseFilled(fill);
         }
-        renderer->meshRenderer.Draw(handle, /*useColors=*/fill->color.IsEmpty(), fill->color);
+        renderer->meshRenderer.Draw(handle, /*useColors=*/fill.color.IsEmpty(), fill.color);
     }
 
     void Draw(OpenGl2Renderer *renderer) override {
@@ -836,8 +872,8 @@ public:
         glEnable(GL_CULL_FACE);
 
         if(hasFillBack)
-            DrawFace(renderer, GL_FRONT, &fillBack);
-        DrawFace(renderer, GL_BACK, &fillFront);
+            DrawFace(renderer, GL_FRONT, fillBack);
+        DrawFace(renderer, GL_BACK, fillFront);
 
         glDisable(GL_POLYGON_OFFSET_FILL);
         glDisable(GL_CULL_FACE);
@@ -977,7 +1013,14 @@ public:
     void DrawPixmap(std::shared_ptr<const Pixmap> pm,
                     const Vector &o, const Vector &u, const Vector &v,
                     const Point2d &ta, const Point2d &tb, hFill hcf) override {
-        ssassert(false, "Not implemented");
+        Fill fill = *fills.FindById(hcf);
+        fill.texture = pm;
+        hcf = GetFill(fill);
+
+        SIndexedMesh mesh = {};
+        mesh.AddPixmap(o, u, v, ta, tb);
+        drawCalls.emplace(PixmapDrawCall::Create(renderer, mesh, fills.FindByIdNoOops(hcf)));
+        mesh.Clear();
     }
 
     void InvalidatePixmap(std::shared_ptr<const Pixmap> pm) override {
diff --git a/src/request.cpp b/src/request.cpp
index 0fdd0969..5046c018 100644
--- a/src/request.cpp
+++ b/src/request.cpp
@@ -30,6 +30,7 @@ static const EntReqMapping EntReqMap[] = {
 { Request::Type::CIRCLE,          Entity::Type::CIRCLE,         1,  false,  true,   true  },
 { Request::Type::ARC_OF_CIRCLE,   Entity::Type::ARC_OF_CIRCLE,  3,  false,  true,   false },
 { Request::Type::TTF_TEXT,        Entity::Type::TTF_TEXT,       4,  false,  true,   false },
+{ Request::Type::IMAGE,           Entity::Type::IMAGE,          4,  false,  true,   false },
 };
 
 static void CopyEntityInfo(const EntReqMapping *te, int extraPoints,
@@ -102,6 +103,20 @@ void Request::Generate(IdList<Entity,hEntity> *entity,
             break;
         }
 
+        case Type::IMAGE: {
+            auto image = SS.images.find(file);
+            if(image != SS.images.end()) {
+                std::shared_ptr<Pixmap> pixmap = (*image).second;
+                if(pixmap != NULL) {
+                    aspectRatio = (double)pixmap->width / (double)pixmap->height;
+                }
+            }
+            if(EXACT(aspectRatio == 0.0)) {
+                aspectRatio = 1.0;
+            }
+            break;
+        }
+
         default: // most requests don't do anything else
             break;
     }
@@ -118,6 +133,7 @@ void Request::Generate(IdList<Entity,hEntity> *entity,
     e.construction = construction;
     e.str = str;
     e.font = font;
+    e.file = file;
     e.aspectRatio = aspectRatio;
     e.h = h.entity(0);
 
@@ -205,8 +221,9 @@ std::string Request::DescriptionString() const {
             case Type::CUBIC:           s = "cubic-bezier";   break;
             case Type::CUBIC_PERIODIC:  s = "periodic-cubic"; break;
             case Type::CIRCLE:          s = "circle";         break;
-            case Type::ARC_OF_CIRCLE:   s = "arc-of-circle;";  break;
+            case Type::ARC_OF_CIRCLE:   s = "arc-of-circle";  break;
             case Type::TTF_TEXT:        s = "ttf-text";       break;
+            case Type::IMAGE:           s = "image";          break;
         }
     }
     ssassert(s != NULL, "Unexpected request type");
diff --git a/src/sketch.h b/src/sketch.h
index 35c26023..c7950c3a 100644
--- a/src/sketch.h
+++ b/src/sketch.h
@@ -312,7 +312,8 @@ public:
         CUBIC_PERIODIC         = 301,
         CIRCLE                 = 400,
         ARC_OF_CIRCLE          = 500,
-        TTF_TEXT               = 600
+        TTF_TEXT               = 600,
+        IMAGE                  = 700
     };
 
     Request::Type type;
@@ -326,6 +327,7 @@ public:
 
     std::string str;
     std::string font;
+    Platform::Path file;
     double      aspectRatio;
 
     static hParam AddParam(ParamList *param, hParam hp);
@@ -375,7 +377,8 @@ public:
         CUBIC_PERIODIC         = 12001,
         CIRCLE                 = 13000,
         ARC_OF_CIRCLE          = 14000,
-        TTF_TEXT               = 15000
+        TTF_TEXT               = 15000,
+        IMAGE                  = 16000
     };
 
     Type        type;
@@ -400,6 +403,7 @@ public:
 
     std::string str;
     std::string font;
+    Platform::Path file;
     double      aspectRatio;
 
     // For entities that are derived by a transformation, the number of
@@ -476,7 +480,7 @@ public:
     Vector EndpointStart() const;
     Vector EndpointFinish() const;
 
-    void TtfTextGetPointsExprs(ExprVector *eap, ExprVector *ebp) const;
+    void RectGetPointsExprs(ExprVector *eap, ExprVector *ebp) const;
 
     void AddEq(IdList<Equation,hEquation> *l, Expr *expr, int index) const;
     void GenerateEquations(IdList<Equation,hEquation> *l) const;
diff --git a/src/solvespace.cpp b/src/solvespace.cpp
index 67f76341..9021a1e5 100644
--- a/src/solvespace.cpp
+++ b/src/solvespace.cpp
@@ -457,7 +457,7 @@ void SolveSpaceUI::MenuFile(Command id) {
 
         case Command::EXPORT_PNG: {
             Platform::Path exportFile = SS.saveFile;
-            if(!GetSaveFile(&exportFile, "", PngFileFilter)) break;
+            if(!GetSaveFile(&exportFile, "", RasterFileFilter)) break;
             SS.ExportAsPngTo(exportFile);
             break;
         }
diff --git a/src/solvespace.h b/src/solvespace.h
index 77181913..82c37d40 100644
--- a/src/solvespace.h
+++ b/src/solvespace.h
@@ -620,6 +620,11 @@ public:
     } UndoStack;
     UndoStack   undo;
     UndoStack   redo;
+
+    std::map<Platform::Path, std::shared_ptr<Pixmap>, Platform::PathLess> images;
+    bool ReloadLinkedImage(const Platform::Path &saveFile, Platform::Path *filename,
+                           bool canCancel);
+
     void UndoEnableMenus();
     void UndoRemember();
     void UndoUndo();
@@ -743,7 +748,7 @@ public:
     void UpgradeLegacyData();
     bool LoadEntitiesFromFile(const Platform::Path &filename, EntityList *le,
                               SMesh *m, SShell *sh);
-    bool ReloadAllImported(const Platform::Path &filename, bool canCancel = false);
+    bool ReloadAllLinked(const Platform::Path &filename, bool canCancel = false);
     // And the various export options
     void ExportAsPngTo(const Platform::Path &filename);
     void ExportMeshTo(const Platform::Path &filename);
diff --git a/src/style.cpp b/src/style.cpp
index eb30516f..c08f7ed6 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -394,7 +394,7 @@ void TextWindow::ScreenBackgroundImage(int link, uint32_t v) {
 
     if(link == 'l') {
         Platform::Path bgImageFile;
-        if(GetOpenFile(&bgImageFile, "", PngFileFilter)) {
+        if(GetOpenFile(&bgImageFile, "", RasterFileFilter)) {
             FILE *f = OpenFile(bgImageFile, "rb");
             if(f) {
                 SS.bgImage.pixmap = Pixmap::ReadPng(f);
diff --git a/src/textscreens.cpp b/src/textscreens.cpp
index 49ba0ac8..79fc46c1 100644
--- a/src/textscreens.cpp
+++ b/src/textscreens.cpp
@@ -327,7 +327,7 @@ void TextWindow::ShowGroupInfo() {
         }
     } else if(g->type == Group::Type::LINKED) {
         Printf(true, " %Ftlink geometry from file%E");
-        Platform::Path relativePath =g->linkFile.RelativeTo(SS.saveFile.Parent());
+        Platform::Path relativePath = g->linkFile.RelativeTo(SS.saveFile.Parent());
         if(relativePath.IsEmpty()) {
             Printf(false, "%Ba   '%s'", g->linkFile.raw.c_str());
         } else {
diff --git a/src/toolbar.cpp b/src/toolbar.cpp
index 6000be74..b467d44b 100644
--- a/src/toolbar.cpp
+++ b/src/toolbar.cpp
@@ -24,6 +24,8 @@ static ToolIcon Toolbar[] = {
       N_("Sketch arc of a circle"),                           {} },
     { "text",            Command::TTF_TEXT,
       N_("Sketch curves from text in a TrueType font"),       {} },
+    { "image",           Command::IMAGE,
+      N_("Sketch image from a file"),                         {} },
     { "tangent-arc",     Command::TANGENT_ARC,
       N_("Create tangent arc at selected point"),             {} },
     { "bezier",          Command::CUBIC,
diff --git a/src/ui.h b/src/ui.h
index bcf1d237..bdef6ce0 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -70,7 +70,7 @@ const FileFilter SlvsFileFilter[] = {
     { NULL, {} }
 };
 // PNG format bitmap
-const FileFilter PngFileFilter[] = {
+const FileFilter RasterFileFilter[] = {
     { N_("PNG file"),                   { "png" } },
     { NULL, {} }
 };
@@ -173,6 +173,7 @@ enum class Command : uint32_t {
     RECTANGLE,
     CUBIC,
     TTF_TEXT,
+    IMAGE,
     SPLIT_CURVES,
     TANGENT_ARC,
     CONSTRUCTION,
@@ -712,6 +713,7 @@ public:
         hConstraint          constraint;
 
         const char          *description;
+        Platform::Path       filename;
 
         bool                 hasSuggestion;
         Constraint::Type     suggestion;
diff --git a/src/undoredo.cpp b/src/undoredo.cpp
index be1fef2f..1739caf1 100644
--- a/src/undoredo.cpp
+++ b/src/undoredo.cpp
@@ -138,7 +138,7 @@ void SolveSpaceUI::PopOntoCurrentFrom(UndoStack *uk) {
     // sketch just changed a lot.
     SS.GW.ClearSuper();
     SS.TW.ClearSuper();
-    SS.ReloadAllImported(SS.saveFile);
+    SS.ReloadAllLinked(SS.saveFile);
     SS.GenerateAll(SolveSpaceUI::Generate::ALL);
     SS.ScheduleShowTW();
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bac0fa74..bb70d978 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -54,6 +54,7 @@ set(testsuite_SOURCES
     request/cubic/test.cpp
     request/cubic_periodic/test.cpp
     request/datum_point/test.cpp
+    request/image/test.cpp
     request/line_segment/test.cpp
     request/ttf_text/test.cpp
     group/link/test.cpp
diff --git a/test/request/image/drawing.png b/test/request/image/drawing.png
new file mode 100644
index 0000000000000000000000000000000000000000..56bedb7523f0a12bb142429e073d77ef8b58f8ac
GIT binary patch
literal 8565
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

literal 0
HcmV?d00001

diff --git a/test/request/image/linked.slvs b/test/request/image/linked.slvs
new file mode 100644
index 00000000..48190587
--- /dev/null
+++ b/test/request/image/linked.slvs
@@ -0,0 +1,430 @@
+±²³SolveSpaceREVa
+
+
+Group.h.v=00000001
+Group.type=5000
+Group.name=#references
+Group.color=ff000000
+Group.skipFirst=0
+Group.predef.swapUV=0
+Group.predef.negateU=0
+Group.predef.negateV=0
+Group.visible=1
+Group.suppress=0
+Group.relaxConstraints=0
+Group.allowRedundant=0
+Group.allDimsReference=0
+Group.scale=1.00000000000000000000
+Group.remap={
+}
+AddGroup
+
+Group.h.v=00000002
+Group.type=5001
+Group.order=1
+Group.name=sketch-in-plane
+Group.activeWorkplane.v=80020000
+Group.color=ff000000
+Group.subtype=6000
+Group.skipFirst=0
+Group.predef.q.w=1.00000000000000000000
+Group.predef.origin.v=00010001
+Group.predef.swapUV=0
+Group.predef.negateU=0
+Group.predef.negateV=0
+Group.visible=1
+Group.suppress=0
+Group.relaxConstraints=0
+Group.allowRedundant=0
+Group.allDimsReference=0
+Group.scale=1.00000000000000000000
+Group.remap={
+}
+AddGroup
+
+Group.h.v=00000003
+Group.type=5300
+Group.order=2
+Group.name=normal
+Group.activeWorkplane.v=00010000
+Group.color=00646464
+Group.skipFirst=0
+Group.meshCombine=2
+Group.predef.swapUV=0
+Group.predef.negateU=0
+Group.predef.negateV=0
+Group.visible=1
+Group.suppress=0
+Group.relaxConstraints=0
+Group.allowRedundant=0
+Group.allDimsReference=0
+Group.scale=1.00000000000000000000
+Group.remap={
+    1 00010000 0
+    2 00010001 0
+    3 00010020 0
+    4 00020000 0
+    5 00020001 0
+    6 00020020 0
+    7 00030000 0
+    8 00030001 0
+    9 00030020 0
+    10 00040000 0
+    11 00040001 0
+    12 00040002 0
+    13 00040003 0
+    14 00040004 0
+    15 00040020 0
+    16 80020000 0
+    17 80020001 0
+    18 80020002 0
+}
+Group.impFileRel=normal.slvs
+AddGroup
+
+Param.h.v.=00010010
+AddParam
+
+Param.h.v.=00010011
+AddParam
+
+Param.h.v.=00010012
+AddParam
+
+Param.h.v.=00010020
+Param.val=1.00000000000000000000
+AddParam
+
+Param.h.v.=00010021
+AddParam
+
+Param.h.v.=00010022
+AddParam
+
+Param.h.v.=00010023
+AddParam
+
+Param.h.v.=00020010
+AddParam
+
+Param.h.v.=00020011
+AddParam
+
+Param.h.v.=00020012
+AddParam
+
+Param.h.v.=00020020
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00020021
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00020022
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00020023
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00030010
+AddParam
+
+Param.h.v.=00030011
+AddParam
+
+Param.h.v.=00030012
+AddParam
+
+Param.h.v.=00030020
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00030021
+Param.val=-0.50000000000000000000
+AddParam
+
+Param.h.v.=00030022
+Param.val=-0.50000000000000000000
+AddParam
+
+Param.h.v.=00030023
+Param.val=-0.50000000000000000000
+AddParam
+
+Param.h.v.=40000001
+Param.val=1.00000000000000000000
+AddParam
+
+Param.h.v.=80030000
+Param.val=5.00000000000000000000
+AddParam
+
+Param.h.v.=80030001
+Param.val=5.00000000000000000000
+AddParam
+
+Param.h.v.=80030002
+AddParam
+
+Param.h.v.=80030003
+Param.val=1.00000000000000000000
+AddParam
+
+Param.h.v.=80030004
+AddParam
+
+Param.h.v.=80030005
+AddParam
+
+Param.h.v.=80030006
+AddParam
+
+Request.h.v=00000001
+Request.type=100
+Request.group.v=00000001
+Request.construction=0
+AddRequest
+
+Request.h.v=00000002
+Request.type=100
+Request.group.v=00000001
+Request.construction=0
+AddRequest
+
+Request.h.v=00000003
+Request.type=100
+Request.group.v=00000001
+Request.construction=0
+AddRequest
+
+Entity.h.v=00010000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=00010001
+Entity.normal.v=00010020
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00010001
+Entity.type=2000
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00010020
+Entity.type=3000
+Entity.construction=0
+Entity.point[0].v=00010001
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00020000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=00020001
+Entity.normal.v=00020020
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00020001
+Entity.type=2000
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00020020
+Entity.type=3000
+Entity.construction=0
+Entity.point[0].v=00020001
+Entity.actNormal.w=0.50000000000000000000
+Entity.actNormal.vx=0.50000000000000000000
+Entity.actNormal.vy=0.50000000000000000000
+Entity.actNormal.vz=0.50000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00030000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=00030001
+Entity.normal.v=00030020
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00030001
+Entity.type=2000
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00030020
+Entity.type=3000
+Entity.construction=0
+Entity.point[0].v=00030001
+Entity.actNormal.w=0.50000000000000000000
+Entity.actNormal.vx=-0.50000000000000000000
+Entity.actNormal.vy=-0.50000000000000000000
+Entity.actNormal.vz=-0.50000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80020000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=80020002
+Entity.normal.v=80020001
+Entity.actVisible=0
+AddEntity
+
+Entity.h.v=80020001
+Entity.type=3010
+Entity.construction=0
+Entity.point[0].v=80020002
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80020002
+Entity.type=2012
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030002
+Entity.type=2011
+Entity.construction=1
+Entity.actPoint.x=5.00000000000000000000
+Entity.actPoint.y=5.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030003
+Entity.type=3011
+Entity.construction=0
+Entity.point[0].v=80030002
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030005
+Entity.type=2011
+Entity.construction=1
+Entity.actPoint.x=5.00000000000000000000
+Entity.actPoint.y=5.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030006
+Entity.type=3011
+Entity.construction=0
+Entity.point[0].v=80030005
+Entity.actNormal.w=0.50000000000000000000
+Entity.actNormal.vx=0.50000000000000000000
+Entity.actNormal.vy=0.50000000000000000000
+Entity.actNormal.vz=0.50000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030008
+Entity.type=2011
+Entity.construction=1
+Entity.actPoint.x=5.00000000000000000000
+Entity.actPoint.y=5.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030009
+Entity.type=3011
+Entity.construction=0
+Entity.point[0].v=80030008
+Entity.actNormal.w=0.50000000000000000000
+Entity.actNormal.vx=-0.50000000000000000000
+Entity.actNormal.vy=-0.50000000000000000000
+Entity.actNormal.vz=-0.50000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=8003000a
+Entity.type=16000
+Entity.construction=0
+Entity.file=drawing.png
+Entity.point[0].v=8003000b
+Entity.point[1].v=8003000c
+Entity.point[2].v=8003000d
+Entity.point[3].v=8003000e
+Entity.normal.v=8003000f
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=8003000b
+Entity.type=2011
+Entity.construction=0
+Entity.actPoint.x=5.00000000000000000000
+Entity.actPoint.y=15.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=8003000c
+Entity.type=2011
+Entity.construction=0
+Entity.actPoint.x=5.00000000000000000000
+Entity.actPoint.y=5.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=8003000d
+Entity.type=2011
+Entity.construction=0
+Entity.actPoint.x=20.00000000000000000000
+Entity.actPoint.y=5.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=8003000e
+Entity.type=2011
+Entity.construction=0
+Entity.actPoint.x=20.00000000000000000000
+Entity.actPoint.y=15.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=8003000f
+Entity.type=3011
+Entity.construction=0
+Entity.point[0].v=8003000b
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030011
+Entity.type=3011
+Entity.construction=0
+Entity.point[0].v=80030012
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80030012
+Entity.type=2011
+Entity.construction=1
+Entity.actPoint.x=5.00000000000000000000
+Entity.actPoint.y=5.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Constraint.h.v=00000001
+Constraint.type=110
+Constraint.group.v=00000003
+Constraint.workplane.v=00010000
+Constraint.valP.v=40000001
+Constraint.entityA.v=80030006
+Constraint.entityB.v=00020020
+Constraint.other=0
+Constraint.other2=0
+Constraint.reference=0
+AddConstraint
+
diff --git a/test/request/image/normal.slvs b/test/request/image/normal.slvs
new file mode 100644
index 00000000..dab1385a
--- /dev/null
+++ b/test/request/image/normal.slvs
@@ -0,0 +1,319 @@
+±²³SolveSpaceREVa
+
+
+Group.h.v=00000001
+Group.type=5000
+Group.name=#references
+Group.color=ff000000
+Group.skipFirst=0
+Group.predef.swapUV=0
+Group.predef.negateU=0
+Group.predef.negateV=0
+Group.visible=1
+Group.suppress=0
+Group.relaxConstraints=0
+Group.allowRedundant=0
+Group.allDimsReference=0
+Group.scale=1.00000000000000000000
+Group.remap={
+}
+AddGroup
+
+Group.h.v=00000002
+Group.type=5001
+Group.order=1
+Group.name=sketch-in-plane
+Group.activeWorkplane.v=80020000
+Group.color=ff000000
+Group.subtype=6000
+Group.skipFirst=0
+Group.predef.q.w=1.00000000000000000000
+Group.predef.origin.v=00010001
+Group.predef.swapUV=0
+Group.predef.negateU=0
+Group.predef.negateV=0
+Group.visible=1
+Group.suppress=0
+Group.relaxConstraints=0
+Group.allowRedundant=0
+Group.allDimsReference=0
+Group.scale=1.00000000000000000000
+Group.remap={
+}
+AddGroup
+
+Param.h.v.=00010010
+AddParam
+
+Param.h.v.=00010011
+AddParam
+
+Param.h.v.=00010012
+AddParam
+
+Param.h.v.=00010020
+Param.val=1.00000000000000000000
+AddParam
+
+Param.h.v.=00010021
+AddParam
+
+Param.h.v.=00010022
+AddParam
+
+Param.h.v.=00010023
+AddParam
+
+Param.h.v.=00020010
+AddParam
+
+Param.h.v.=00020011
+AddParam
+
+Param.h.v.=00020012
+AddParam
+
+Param.h.v.=00020020
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00020021
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00020022
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00020023
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00030010
+AddParam
+
+Param.h.v.=00030011
+AddParam
+
+Param.h.v.=00030012
+AddParam
+
+Param.h.v.=00030020
+Param.val=0.50000000000000000000
+AddParam
+
+Param.h.v.=00030021
+Param.val=-0.50000000000000000000
+AddParam
+
+Param.h.v.=00030022
+Param.val=-0.50000000000000000000
+AddParam
+
+Param.h.v.=00030023
+Param.val=-0.50000000000000000000
+AddParam
+
+Param.h.v.=00040010
+AddParam
+
+Param.h.v.=00040011
+Param.val=10.00000000000000000000
+AddParam
+
+Param.h.v.=00040013
+AddParam
+
+Param.h.v.=00040014
+AddParam
+
+Param.h.v.=00040016
+Param.val=15.00000000000000000000
+AddParam
+
+Param.h.v.=00040017
+AddParam
+
+Param.h.v.=00040019
+Param.val=15.00000000000000000000
+AddParam
+
+Param.h.v.=0004001a
+Param.val=10.00000000000000000000
+AddParam
+
+Request.h.v=00000001
+Request.type=100
+Request.group.v=00000001
+Request.construction=0
+AddRequest
+
+Request.h.v=00000002
+Request.type=100
+Request.group.v=00000001
+Request.construction=0
+AddRequest
+
+Request.h.v=00000003
+Request.type=100
+Request.group.v=00000001
+Request.construction=0
+AddRequest
+
+Request.h.v=00000004
+Request.type=700
+Request.workplane.v=80020000
+Request.group.v=00000002
+Request.construction=0
+Request.file=drawing.png
+Request.aspectRatio=1.50000000000000000000
+AddRequest
+
+Entity.h.v=00010000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=00010001
+Entity.normal.v=00010020
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00010001
+Entity.type=2000
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00010020
+Entity.type=3000
+Entity.construction=0
+Entity.point[0].v=00010001
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00020000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=00020001
+Entity.normal.v=00020020
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00020001
+Entity.type=2000
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00020020
+Entity.type=3000
+Entity.construction=0
+Entity.point[0].v=00020001
+Entity.actNormal.w=0.50000000000000000000
+Entity.actNormal.vx=0.50000000000000000000
+Entity.actNormal.vy=0.50000000000000000000
+Entity.actNormal.vz=0.50000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00030000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=00030001
+Entity.normal.v=00030020
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00030001
+Entity.type=2000
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00030020
+Entity.type=3000
+Entity.construction=0
+Entity.point[0].v=00030001
+Entity.actNormal.w=0.50000000000000000000
+Entity.actNormal.vx=-0.50000000000000000000
+Entity.actNormal.vy=-0.50000000000000000000
+Entity.actNormal.vz=-0.50000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00040000
+Entity.type=16000
+Entity.construction=0
+Entity.file=drawing.png
+Entity.point[0].v=00040001
+Entity.point[1].v=00040002
+Entity.point[2].v=00040003
+Entity.point[3].v=00040004
+Entity.normal.v=00040020
+Entity.workplane.v=80020000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00040001
+Entity.type=2001
+Entity.construction=0
+Entity.workplane.v=80020000
+Entity.actPoint.y=10.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00040002
+Entity.type=2001
+Entity.construction=0
+Entity.workplane.v=80020000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00040003
+Entity.type=2001
+Entity.construction=0
+Entity.workplane.v=80020000
+Entity.actPoint.x=15.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00040004
+Entity.type=2001
+Entity.construction=0
+Entity.workplane.v=80020000
+Entity.actPoint.x=15.00000000000000000000
+Entity.actPoint.y=10.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=00040020
+Entity.type=3001
+Entity.construction=0
+Entity.point[0].v=00040001
+Entity.workplane.v=80020000
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80020000
+Entity.type=10000
+Entity.construction=0
+Entity.point[0].v=80020002
+Entity.normal.v=80020001
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80020001
+Entity.type=3010
+Entity.construction=0
+Entity.point[0].v=80020002
+Entity.actNormal.w=1.00000000000000000000
+Entity.actVisible=1
+AddEntity
+
+Entity.h.v=80020002
+Entity.type=2012
+Entity.construction=1
+Entity.actVisible=1
+AddEntity
+
diff --git a/test/request/image/test.cpp b/test/request/image/test.cpp
new file mode 100644
index 00000000..da0954e0
--- /dev/null
+++ b/test/request/image/test.cpp
@@ -0,0 +1,14 @@
+#include "harness.h"
+
+TEST_CASE(normal_roundtrip) {
+    CHECK_LOAD("normal.slvs");
+    // Can't render images through cairo for now.
+    // CHECK_RENDER("normal.png");
+    CHECK_SAVE("normal.slvs");
+}
+
+TEST_CASE(linked_roundtrip) {
+    CHECK_LOAD("linked.slvs");
+    // CHECK_RENDER("linked.png");
+    CHECK_SAVE("linked.slvs");
+}