From 3bb8256f8f35d1418312760c49e380955ffc13e3 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Mon, 10 Nov 2014 17:58:15 -0500 Subject: [PATCH] updated missing map image. added topic description signifier and relocated topic link signifier to top left. added synapse count signifier. --- app/assets/images/linkedmedia.png | Bin 404 -> 0 bytes app/assets/images/missing-map.png | Bin 16291 -> 4242 bytes app/assets/images/synapsestar.png | Bin 304 -> 0 bytes .../images/topic_description_signifier.png | Bin 0 -> 450 bytes app/assets/images/topic_link_signifier.png | Bin 0 -> 621 bytes app/assets/javascripts/src/Metamaps.JIT.js | 77 +++++++++++++----- 6 files changed, 55 insertions(+), 22 deletions(-) delete mode 100755 app/assets/images/linkedmedia.png delete mode 100755 app/assets/images/synapsestar.png create mode 100644 app/assets/images/topic_description_signifier.png create mode 100644 app/assets/images/topic_link_signifier.png diff --git a/app/assets/images/linkedmedia.png b/app/assets/images/linkedmedia.png deleted file mode 100755 index 2009b7a356935d0cad6509c1ed619717f699a636..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 404 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 NX{zc#DwJ)){{u9uFJAxv literal 16291 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 ZU;zH03AX4(D#HK(002ovPDHLkV1jyu&AI>p diff --git a/app/assets/images/synapsestar.png b/app/assets/images/synapsestar.png deleted file mode 100755 index ba9a7dd3f98f7c2388c1a0d40e589fdfeb44a726..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP|;pb7srr_TSsWZ73{| z4hRd|#^6$3TBv)^z1T31fgzO1G^*Jv`(fe&)hGaX*ec!;3cbq0mCDw6}>MWD21GBOi*Cj z8^o~W*Toj@M!)$E24W4f9M@Sed_Cr_qThIf&%s&m!Dl8869>}<2PTojJedcidp+11 va-uo5{hW2!Y~j7LP5z0q@#olP$mcypllFENJ*CsfC)kth(bq4HV7kx3E*D(BC>2^ zgGCVXORt#Z-+%U>&x{5=+sFZM0Qv?nem5})f((z4f1Zk>SbuE?P<+)YP8RYz$ALd1 zA^IBQF@;wk*~yS6#E}KOL2jyw8)~wgtbrfkN1k{uq(lT1zTv!C>zneFyaMpByxTrN z-1_7|V@krrV(|l3F9qPKGU~c6ec#V9oNzxUhDB++iMR=h?~F+(;lzRo7I%aa zS=9laFxLppb&DGTzz&ceWE!Cv$68myJ&RJ8O(hzkG*5H&v7+~MQqFMkCY*!7cM$o~ zHTO`XIGuo6@`>bm$uU<}NAcV*W#VJnf>7~3QjFWJ2yJjcwt}?HbRNqtoa$o$d<&+6 ss%;f~CxY)zye5g12RF$1Z^guchMnT zEE}H-9Q;M@+AERaLd*yTw$N0DuA>ugdTnfE2cG z!x;gveUNqLvjl7q!J~x!#D-7gk~^tI!jS;A0`Lj_nfgU)5id(HfE61)!f6vW=aJ@E zE#eFz0T=*5>%=hk$J-q)0N7x>QCx#CTkn{lQ#De6$;HaxUn_vY9i^{gX1V|)_n>)k zvmC}+3wWx=gUB7Q7~c7f1^}(_jn@zQ9{LxIWMC>=3vw_Vr+FWgWQqSwD zrD7$zqOdTU`QGq1kNlf>=>^J`KcouEj)NCoF#!vu%*;}Wc1ms%ccgy>Fa!~?AWY{37=kF63f8od z6yV^R-c1lWljD^R!~lRfB6F=LLPJH=DizTU2&rSM0Vo2GHmH~yDLzq*lrAOxXxTR8 zgkUNFQ9Z$m)w3pr@5TZ+m;7LrE#(4qN2x2-W`~%o{R%JuFVP};@r%Nk00000NkvXX Hu0mjfLW%=q literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js index 06ed616f..bbbfd1d7 100644 --- a/app/assets/javascripts/src/Metamaps.JIT.js +++ b/app/assets/javascripts/src/Metamaps.JIT.js @@ -28,11 +28,11 @@ Metamaps.JIT = { $(".takeScreenshot").click(Metamaps.Map.exportImage); - self.synapseStarImage = new Image(); - self.synapseStarImage.src = '/assets/synapsestar.png'; + self.topicDescImage = new Image(); + self.topicDescImage.src = '/assets/topic_description_signifier.png'; - self.topicMediaImage = new Image(); - self.topicMediaImage.src = '/assets/linkedmedia.png'; + self.topicLinkImage = new Image(); + self.topicLinkImage.src = '/assets/topic_link_signifier.png'; }, /** * convert our topic JSON into something JIT can use @@ -140,14 +140,31 @@ Metamaps.JIT = { var showDesc = adj.getData("showDesc"); - var drawStar = function (context, x, y) { - var starImage = Metamaps.JIT.synapseStarImage; - var starImageLoaded = starImage.complete || - (typeof starImage.naturalWidth !== "undefined" && - starImage.naturalWidth !== 0) - if (starImageLoaded) { - context.drawImage(starImage, x, y, 16, 16); - } + var drawSynapseCount = function (context, x, y, count) { + /* + circle size: 16x16px + positioning: overlay and center on top right corner of synapse label - 8px left and 8px down + color: #dab539 + border color: #424242 + border size: 1.5px + font: DIN medium + font-size: 14pt + font-color: #424242 + */ + context.beginPath(); + context.arc(x, y, 8, 0, 2 * Math.PI, false); + context.fillStyle = '#DAB539'; + context.strokeStyle = '#424242'; + context.lineWidth = 1.5; + context.closePath(); + context.fill(); + context.stroke(); + + // add the synapse count + context.fillStyle = '#424242'; + context.textAlign = 'center'; + context.font = '14px din-medium'; + context.fillText(count, x, y - 6); }; if (!canvas.denySelected && desc != "" && showDesc) { @@ -165,7 +182,7 @@ Metamaps.JIT = { for (index = 0; index < arrayOfLabelLines.length; ++index) { lineWidths.push(ctx.measureText(arrayOfLabelLines[index]).width) } - var width = Math.max.apply(null, lineWidths) + 8; + var width = Math.max.apply(null, lineWidths) + 16; var height = (16 * arrayOfLabelLines.length) + 8; var x = (pos.x + posChild.x - width) / 2; @@ -187,23 +204,29 @@ Metamaps.JIT = { ctx.closePath(); ctx.fill(); + // get number of synapses + var synapseNum = adj.getData("synapses").length; + //render text - ctx.fillStyle = '#222222'; + ctx.fillStyle = '#424242'; ctx.textAlign = 'center'; for (index = 0; index < arrayOfLabelLines.length; ++index) { - ctx.fillText(arrayOfLabelLines[index], x + (width / 2), y + 5 + (16 * index)); + ctx.fillText(arrayOfLabelLines[index], x + (width / 2), y + 7 + (16 * index)); } - if (adj.getData("synapses").length > 1) { - drawStar(ctx, x + width, y); + if (synapseNum > 1) { + drawSynapseCount(ctx, x + width, y, synapseNum); } } else if (!canvas.denySelected && showDesc) { - if (adj.getData("synapses").length > 1) { + // get number of synapses + var synapseNum = adj.getData("synapses").length; + + if (synapseNum > 1) { var ctx = canvas.getCtx(); var x = (pos.x + posChild.x) / 2; var y = (pos.y + posChild.y) / 2; - drawStar(ctx, x, y); + drawSynapseCount(ctx, x, y, synapseNum); } } @@ -433,12 +456,22 @@ Metamaps.JIT = { // if the topic has a link, draw a small image to indicate that var hasLink = topic && topic.get('link') !== "" && topic.get('link') !== null; - var linkImage = Metamaps.JIT.topicMediaImage; + var linkImage = Metamaps.JIT.topicLinkImage; var linkImageLoaded = linkImage.complete || (typeof linkImage.naturalWidth !== "undefined" && linkImage.naturalWidth !== 0) if (hasLink && linkImageLoaded) { - ctx.drawImage(linkImage, pos.x + dim / 2, pos.y - dim - 8, 16, 16); + ctx.drawImage(linkImage, pos.x - dim - 8, pos.y - dim - 8, 16, 16); + } + + // if the topic has a desc, draw a small image to indicate that + var hasDesc = topic && topic.get('desc') !== "" && topic.get('desc') !== null; + var descImage = Metamaps.JIT.topicDescImage; + var descImageLoaded = descImage.complete || + (typeof descImage.naturalWidth !== "undefined" && + descImage.naturalWidth !== 0) + if (hasDesc && descImageLoaded) { + ctx.drawImage(descImage, pos.x + dim - 8, pos.y - dim - 8, 16, 16); } }, 'contains': function (node, pos) { @@ -479,7 +512,7 @@ Metamaps.JIT = { if (-1 < pos.x && pos.x < 1) pos.x = 0; if (-1 < pos.y && pos.y < 1) pos.y = 0; - return $jit.Graph.Plot.edgeHelper.line.contains(from, to, pos, adj.Edge.epsilon); + return $jit.Graph.Plot.edgeHelper.line.contains(from, to, pos, adj.Edge.epsilon + 5); } } }