Merge branch 'TeselaGen:master' into upgradeReactRedux

TeselaGen · Dec 13, 2022 · cfa387b · cfa387b
2 parents d829ffe + 953aaed
commit cfa387b
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 19 deletions.
diff --git a/cypress/e2e/chromatogram.spec.js b/cypress/e2e/chromatogram.spec.js
@@ -6,9 +6,7 @@ describe("chromatogram", function () {
     cy.tgToggle("chromatogramExample");
     cy.get(".chromatogram");
     cy.get(".chromatogram.noQualityScores").should("not.exist");
-    cy.triggerFileCmd("Chromatogram", { noEnter: true });
-    cy.contains("Chromatogram").click();
-    cy.contains("Show Quality Scores").click({ force: true });
+    cy.triggerFileCmd("Show Quality Scores");
     cy.get(".chromatogram.noQualityScores").should("exist");
   });
 

diff --git a/demo/src/exampleData/msaAlignment.json b/demo/src/exampleData/msaAlignment.json
@@ -18,6 +18,7 @@
   "alignmentTracks": [
     {
       "sequenceData": {
+        "seqLink": "https://github.com/TeselaGen/",
         "id": "0bd61b29-d822-474f-86e1-877c476fb5dc",
         "features": [{
           "start": 10,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-vector-editor",
-  "version": "18.1.58",
+  "version": "18.1.60",
   "description": "Teselagen's Open Source Vector Editor",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/src/AlignmentView/index.js b/src/AlignmentView/index.js
@@ -16,7 +16,8 @@ import {
   MenuItem,
   Tooltip,
   Icon,
-  Spinner
+  Spinner,
+  AnchorButton
 } from "@blueprintjs/core";
 import {
   InfoHelper,
@@ -788,6 +789,21 @@ export class AlignmentView extends React.Component {
                   minimal
                 ></Button>
               )}
+              {sequenceData.seqLink && (
+                <AnchorButton
+                  href={sequenceData.seqLink}
+                  target="_blank"
+                  small
+                  icon={
+                    <Icon
+                      size={12}
+                      color="lightgrey"
+                      icon="document-open"
+                    ></Icon>
+                  }
+                  minimal
+                ></AnchorButton>
+              )}
               {name}
             </div>
             <div style={{ fontSize: 10 }}>

diff --git a/src/CircularView/Feature.js b/src/CircularView/Feature.js
@@ -26,7 +26,7 @@ export default function Feature(props) {
   if (isPart) {
     colorToUse = startsWith(color, "override_")
       ? color.replace("override_", "")
-      : "purple";
+      : "#ac68cc";
   }
   const labelNeedsFlip = shouldFlipText(centerAngle + rotationRadians);
   if (containsLocations) {

diff --git a/src/CircularView/Labels/style.css b/src/CircularView/Labels/style.css
diff --git a/src/CircularView/Part.js b/src/CircularView/Part.js
@@ -21,7 +21,7 @@ export default function Part({
   });
   const colorToUse = startsWith(color, "override_")
     ? color.replace("override_", "")
-    : "purple";
+    : "#ac68cc";
   return (
     <path
       className={className}

diff --git a/src/CircularView/drawAnnotations.js b/src/CircularView/drawAnnotations.js
@@ -242,15 +242,15 @@ function drawAnnotations(props) {
           fontStyle: fontStyle || "normal",
           color:
             annotation.labelColor ||
-            (annotationType === "part" ? "purple" : "black"),
+            (annotationType === "part" ? "#ac68cc" : "black"),
           onContextMenu,
           ...labelOptions
         };
       }
       if (!hideAnnotation) {
         const annotationColor = getColor
           ? getColor(annotation)
-          : annotation.color || "purple";
+          : annotation.color || "#ac68cc";
         DrawAnnotation.displayName = annotationType + "--- DrawAnnotation";
         const CompToUse = noHover ? DrawAnnotationInner : DrawAnnotation;
         svgGroup.push(

diff --git a/src/CircularView/getInternalLabel.js b/src/CircularView/getInternalLabel.js
@@ -23,7 +23,7 @@ export function getInternalLabel({
           (revTransform || "") + (angleAdjust ? ` rotate(${angleAdjust})` : "")
         }
         fill={
-          isPart ? "purple" : Color(colorToUse).isDark() ? "white" : "black"
+          isPart ? "#ac68cc" : Color(colorToUse).isDark() ? "white" : "black"
         }
         dy={-2}
       >

diff --git a/src/FindBar/index.js b/src/FindBar/index.js
@@ -387,7 +387,7 @@ function AnnotationSearchMatchComp({
                         style={{
                           background:
                             type === "parts"
-                              ? "purple"
+                              ? "#ac68cc"
                               : ann.color ||
                                 getFeatureToColorMap({ includeHidden: true })[
                                   ann.type

diff --git a/src/RowItem/Chromatograms/Chromatogram.js b/src/RowItem/Chromatograms/Chromatogram.js
@@ -205,7 +205,7 @@ function drawTrace({
     thymine: "red",
     guanine: "black",
     cytosine: "blue",
-    other: "purple"
+    other: "#ac68cc"
   };
   const ctx = peakCanvas.getContext("2d");
 

diff --git a/src/RowItem/Labels.js b/src/RowItem/Labels.js
@@ -288,7 +288,7 @@ const DrawLabel = withHover(
               whiteSpace: "nowrap",
               color:
                 annotation.annotationTypePlural === "parts"
-                  ? "purple"
+                  ? "#ac68cc"
                   : annotation.labelColor,
               zIndex: 10
             }}

diff --git a/src/RowItem/StackedAnnotations/PointedAnnotation.js b/src/RowItem/StackedAnnotations/PointedAnnotation.js
@@ -262,7 +262,7 @@ function PointedAnnotation(props) {
             <circle
               className="partWithOverhangsIndicator"
               style={{ fillOpacity: 1 }}
-              fill="purple"
+              fill="#ac68cc"
               cx={(forward ? -7 : 0) + 15}
               cy={7}
               r={4}
@@ -283,7 +283,7 @@ function PointedAnnotation(props) {
             <circle
               className="partWithOverhangsIndicator"
               style={{ fillOpacity: 1 }}
-              fill="purple"
+              fill="#ac68cc"
               cx={(forward ? -7 : 0) + width - 10}
               cy={7}
               r={4}
@@ -318,7 +318,7 @@ export default withHover(PointedAnnotation);
 //             >
 //               <rect
 //                 style={{ fillOpacity: 1 }}
-//                 stroke="purple"
+//                 stroke="#ac68cc"
 //                 fill="none"
 //                 x={-10}
 //                 width={10}
@@ -332,7 +332,7 @@ export default withHover(PointedAnnotation);
 //             >
 //               <rect
 //                 style={{ fillOpacity: 1 }}
-//                 stroke="purple"
+//                 stroke="#ac68cc"
 //                 fill="none"
 //                 x={ width + 2 }
 //                 y={7}

diff --git a/src/RowItem/index.js b/src/RowItem/index.js
@@ -314,7 +314,7 @@ export default function RowItem(props) {
       const { color } = annotation;
       const colorToUse = startsWith(color, "override_")
         ? color.replace("override_", "")
-        : "purple";
+        : "#ac68cc";
       return {
         textColor: colorToUse,
         stroke: colorToUse
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ export function getInternalLabel({ @@
               (revTransform || "") + (angleAdjust ? ` rotate(${angleAdjust})` : "")
             }
             fill={
-              isPart ? "purple" : Color(colorToUse).isDark() ? "white" : "black"
+              isPart ? "#ac68cc" : Color(colorToUse).isDark() ? "white" : "black"
             }
             dy={-2}
           >
@@ Expand Down @@