change contig text colour

chgibb · Sep 12, 2019 · 89606c5 · 89606c5
1 parent ff39ee7
commit 89606c5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx b/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx
@@ -14,6 +14,7 @@ import {CircularGenomeEditCache, CircularGenomeEditOpts, CircularGenomeEditActio
 import {changeName} from "./editCache/changeName";
 import {changeContigText} from "./editCache/changeContigText";
 import {changeContigBodyColour} from "./editCache/changeContigBodyColour";
+import { changeContigTextColour } from './editCache/changeContigTextColour';
 
 export interface CircularGenomeBuilderViewState {
     figureSelectOvelayOpen: boolean;
@@ -40,6 +41,7 @@ export class CircularGenomeBuilderView extends React.Component<CircularGenomeBui
     protected changeName = changeName.bind(this);
     protected changeContigText = changeContigText.bind(this);
     protected changeContigBodyColour = changeContigBodyColour.bind(this);
+    protected changeContigTextColour = changeContigTextColour.bind(this);
     private GenomeBuilderAppBar = GenomeBuilderAppBar.bind(this);
     private GenomeBuilderOverlays = GenomeBuilderOverlays.bind(this);
     public constructor(props: CircularGenomeBuilderViewProps) 

diff --git a/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderOverlays.tsx b/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderOverlays.tsx
@@ -48,6 +48,11 @@ export function GenomeBuilderOverlays(this: CircularGenomeBuilderView, props: {
                                     {
                                         this.changeContigBodyColour(figure,opts.contigUuid,opts.newBodyColour);
                                     }
+
+                                    if(opts.newTextColour)
+                                    {
+                                        this.changeContigTextColour(figure,opts.contigUuid,opts.newTextColour);
+                                    }
                                 }
                             }}
                             onClose={() => 

diff --git a/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigOverlay.tsx b/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/editContigOverlay.tsx
@@ -173,7 +173,7 @@ export function EditContigOverlay(props: EditContigOverlayProps): JSX.Element
                                         contigUuid: props.contig.uuid,
                                         newName: endteredName,
                                         newBodyColour: enteredBodyColour ? enteredBodyColour.hex : "", 
-                                        newTextColour : undefined
+                                        newTextColour : enteredTextColour ? enteredTextColour.hex : "",
                                     });
                                 }}
                                 type="advance"

diff --git a/src/req/renderer/views/circularGenomeBuilderView/editCache/changeContigBodyColour.ts b/src/req/renderer/views/circularGenomeBuilderView/editCache/changeContigBodyColour.ts
@@ -12,8 +12,6 @@ export function changeContigBodyColour(this: CircularGenomeBuilderView, figure:
 
                 if (contig) 
                 {
-                    console.log(contig.color);
-                    console.log(colour);
                     contig.color = colour;
                 }
             },

diff --git a/src/req/renderer/views/circularGenomeBuilderView/editCache/changeContigTextColour.ts b/src/req/renderer/views/circularGenomeBuilderView/editCache/changeContigTextColour.ts
@@ -0,0 +1,34 @@
+import {CircularGenomeBuilderView} from "../circularGenomeBuilderView";
+import {CircularFigure} from "../../../circularFigure/circularFigure";
+
+export function changeContigTextColour(this: CircularGenomeBuilderView, figure: CircularFigure, contigUuid: string, colour: string): void 
+{
+    this.maybePushEdit(
+        figure, {
+            description: `Change contig text colour to ${colour}`,
+            commit: (figure: CircularFigure) => 
+            {
+                let contig = figure.contigs.find(x => x.uuid == contigUuid);
+
+                if (contig) 
+                {
+                    contig.fontFill = colour;
+                }
+            },
+            afterCommit: () => 
+            {
+                this.saveFigures();
+            },
+            rollback: (newFigure: CircularFigure, oldFigure: CircularFigure) => 
+            {
+                let newContig = newFigure.contigs.find(x => x.uuid == contigUuid);
+                let oldContig = oldFigure.contigs.find(x => x.uuid == contigUuid);
+
+                if (newContig && oldContig) 
+                {
+                    newContig.fontFill = oldContig.fontFill;
+                }
+            }
+        }
+    );
+}