@datagrok/sequence-translator 1.0.10 → 1.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datagrok/sequence-translator",
|
|
3
3
|
"friendlyName": "Sequence Translator",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.11",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Vadym Kovadlo",
|
|
7
7
|
"email": "vkovadlo@datagrok.ai"
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@datagrok-libraries/utils": "^1.11.1",
|
|
17
17
|
"@types/react": "^18.0.15",
|
|
18
|
-
"datagrok-api": "^1.
|
|
18
|
+
"datagrok-api": "^1.7.2",
|
|
19
19
|
"datagrok-tools": "^4.1.2",
|
|
20
20
|
"npm": "^8.11.0",
|
|
21
21
|
"openchemlib": "6.0.1",
|
package/src/axolabs/draw-svg.ts
CHANGED
|
@@ -38,8 +38,11 @@ function getTextWidth(text: string, font: number): number {
|
|
|
38
38
|
function getTextInsideCircle(
|
|
39
39
|
bases: string[], index: number, nucleotideCounter: number,
|
|
40
40
|
numberOfNucleotides: number, enumerateModifications: string[]): string {
|
|
41
|
-
return (bases[index].slice(-3) == '(o)') || !enumerateModifications.includes(bases[index]) ?
|
|
42
|
-
|
|
41
|
+
return ((bases[index].slice(-3) == '(o)') || !enumerateModifications.includes(bases[index])) ?
|
|
42
|
+
'' :
|
|
43
|
+
(['A', 'G', 'C', 'U', 'T'].includes(bases[index])) ?
|
|
44
|
+
bases[index] :
|
|
45
|
+
'';//String(numberOfNucleotides - nucleotideCounter);
|
|
43
46
|
}
|
|
44
47
|
|
|
45
48
|
function getFontColorVisibleOnBackground(rgbString: string): string {
|
|
@@ -157,6 +160,7 @@ export function drawAxolabsPattern(
|
|
|
157
160
|
Math.max(xOfSsRightModifications, xOfAsRightModifications) +
|
|
158
161
|
widthOfLeftModification + baseDiameter * (Math.max(ssRightOverhangs, asRightOverhangs));
|
|
159
162
|
const yOfTitle = baseRadius;
|
|
163
|
+
const yOfNumbers = 2 * baseRadius;
|
|
160
164
|
const yOfSsTexts = 4 * baseRadius;
|
|
161
165
|
const yOfAsTexts = 7 * baseRadius;
|
|
162
166
|
const yOfComment = asExists ? 11 * baseRadius : 8.5 * baseRadius;
|
|
@@ -188,14 +192,15 @@ export function drawAxolabsPattern(
|
|
|
188
192
|
}
|
|
189
193
|
let nucleotideCounter = numberOfSsNucleotides;
|
|
190
194
|
for (let i = ssBases.length - 1; i > -1; i--) {
|
|
195
|
+
const xOfNumbers = getXOfBaseCircles(i, ssRightOverhangs) +
|
|
196
|
+
getShiftToAlignNumberInsideCircle(ssBases, ssBases.length - i, numberOfSsNucleotides - nucleotideCounter);
|
|
191
197
|
if (ssBases[i].slice(-3) != '(o)')
|
|
192
198
|
nucleotideCounter--;
|
|
193
199
|
image.append(
|
|
200
|
+
svg.text(String(numberOfSsNucleotides - nucleotideCounter), xOfNumbers, yOfNumbers, legendFontSize, fontColor),
|
|
194
201
|
svg.circle(getXOfBaseCircles(i, ssRightOverhangs), yOfSsCircles, baseRadius, getBaseColor(ssBases[i])),
|
|
195
202
|
svg.text(getTextInsideCircle(ssBases, i, nucleotideCounter, numberOfSsNucleotides, enumerateModifications),
|
|
196
|
-
|
|
197
|
-
getShiftToAlignNumberInsideCircle(ssBases, ssBases.length - i, numberOfSsNucleotides - nucleotideCounter),
|
|
198
|
-
yOfSsTexts, baseFontSize, getFontColorVisibleOnBackground(axolabsMap[ssBases[i]]['color'])),
|
|
203
|
+
xOfNumbers, yOfSsTexts, baseFontSize, getFontColorVisibleOnBackground(axolabsMap[ssBases[i]]['color'])),
|
|
199
204
|
ssPtoStatuses[i] ?
|
|
200
205
|
svg.star(getXOfBaseCircles(i, ssRightOverhangs) + baseRadius, yOfSsTexts + psLinkageRadius, psLinkageColor) :
|
|
201
206
|
'',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<html><head><meta charset="utf-8"/><title>SequenceTranslator Test Report. Datagrok version datagrok/datagrok:latest SHA=916a90d7d48b. Commit
|
|
1
|
+
<html><head><meta charset="utf-8"/><title>SequenceTranslator Test Report. Datagrok version datagrok/datagrok:latest SHA=916a90d7d48b. Commit 7afd2a61.</title><style type="text/css">html,
|
|
2
2
|
body {
|
|
3
3
|
font-family: Arial, Helvetica, sans-serif;
|
|
4
4
|
font-size: 1rem;
|
|
@@ -229,7 +229,7 @@ header {
|
|
|
229
229
|
font-size: 1rem;
|
|
230
230
|
padding: 0 0.5rem;
|
|
231
231
|
}
|
|
232
|
-
</style></head><body><div id="jesthtml-content"><header><h1 id="title">SequenceTranslator Test Report. Datagrok version datagrok/datagrok:latest SHA=916a90d7d48b. Commit
|
|
232
|
+
</style></head><body><div id="jesthtml-content"><header><h1 id="title">SequenceTranslator Test Report. Datagrok version datagrok/datagrok:latest SHA=916a90d7d48b. Commit 7afd2a61.</h1></header><div id="metadata-container"><div id="timestamp">Started: 2022-10-19 12:32:26</div><div id="summary"><div id="suite-summary"><div class="summary-total">Suites (1)</div><div class="summary-passed">1 passed</div><div class="summary-failed summary-empty">0 failed</div><div class="summary-pending summary-empty">0 pending</div></div><div id="test-summary"><div class="summary-total">Tests (1)</div><div class="summary-passed">1 passed</div><div class="summary-failed summary-empty">0 failed</div><div class="summary-pending summary-empty">0 pending</div></div></div></div><div id="suite-1" class="suite-container"><div class="suite-info"><div class="suite-path">/home/runner/work/public/public/packages/SequenceTranslator/src/__jest__/remote.test.ts</div><div class="suite-time warn">17.557s</div></div><div class="suite-tests"><div class="test-result passed"><div class="test-info"><div class="test-suitename"> </div><div class="test-title">TEST</div><div class="test-status">passed</div><div class="test-duration">2.994s</div></div></div></div><div class="suite-consolelog"><div class="suite-consolelog-header">Console Log</div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at Object.<anonymous> (/home/runner/work/public/public/packages/SequenceTranslator/src/__jest__/test-node.ts:62:11)
|
|
233
233
|
at Generator.next (<anonymous>)
|
|
234
234
|
at fulfilled (/home/runner/work/public/public/packages/SequenceTranslator/src/__jest__/test-node.ts:28:58)
|
|
235
235
|
at processTicksAndRejections (internal/process/task_queues.js:97:5)</pre><pre class="suite-consolelog-item-message">Using web root: http://localhost:8080</pre></div><div class="suite-consolelog-item"><pre class="suite-consolelog-item-origin"> at /home/runner/work/public/public/packages/SequenceTranslator/src/__jest__/remote.test.ts:40:11
|
|
@@ -243,14 +243,14 @@ header {
|
|
|
243
243
|
at Generator.next (<anonymous>)
|
|
244
244
|
at fulfilled (/home/runner/work/public/public/packages/SequenceTranslator/src/__jest__/remote.test.ts:28:58)
|
|
245
245
|
at processTicksAndRejections (internal/process/task_queues.js:97:5)</pre><pre class="suite-consolelog-item-message">Test result : Success : 1 : SequenceTranslator.sequence-translator.usCfCfUfGfAf : OK
|
|
246
|
-
Test result : Success :
|
|
247
|
-
Test result : Success :
|
|
246
|
+
Test result : Success : 0 : SequenceTranslator.sequence-translator.usAfsusgsgsg : OK
|
|
247
|
+
Test result : Success : 0 : SequenceTranslator.sequence-translator.UfUfUfsCfsuacg : OK
|
|
248
248
|
Test result : Success : 0 : SequenceTranslator.sequence-translator.susususauasu : OK
|
|
249
249
|
Test result : Success : 0 : SequenceTranslator.sequence-translator.CfGfCfsGfsCf : OK
|
|
250
|
-
Test result : Success :
|
|
250
|
+
Test result : Success : 1 : SequenceTranslator.sequence-translator.acacacsacsac : OK
|
|
251
251
|
Test result : Success : 0 : SequenceTranslator.sequence-translator.cccgggusug : OK
|
|
252
252
|
Test result : Success : 0 : SequenceTranslator.sequence-translator.UfAfCfGfGfCfAfUf : OK
|
|
253
253
|
Test result : Success : 1 : SequenceTranslator.sequence-translator.(invabasic)cuCfuUfsc : OK
|
|
254
|
-
Test result : Success :
|
|
254
|
+
Test result : Success : 0 : SequenceTranslator.sequence-translator.(invabasic)usAfsucuCfuUfAfgcugUfgCfacususu : OK
|
|
255
255
|
Test result : Success : 1 : SequenceTranslator.sequence-translator.(invabasic)asacgGfuGfCfAfacucuauuca : OK
|
|
256
256
|
</pre></div></div></div></div></body></html>
|