From 89606c5544ca4909c299ced134299c9301b774d6 Mon Sep 17 00:00:00 2001
From: chgibb <chris.gibb@outlook.com>
Date: Wed, 11 Sep 2019 23:01:42 -0400
Subject: [PATCH] change contig text colour

---
 .../circularGenomeBuilderView.tsx             |  2 ++
 .../containers/genomeBuilderOverlays.tsx      |  5 +++
 .../containers/overlays/editContigOverlay.tsx |  2 +-
 .../editCache/changeContigBodyColour.ts       |  2 --
 .../editCache/changeContigTextColour.ts       | 34 +++++++++++++++++++
 5 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 src/req/renderer/views/circularGenomeBuilderView/editCache/changeContigTextColour.ts

diff --git a/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx b/src/req/renderer/views/circularGenomeBuilderView/circularGenomeBuilderView.tsx
index 5c701b1e3..75ae7ab63 100644
--- 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
index 27722cc37..d7f863410 100644
--- 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
index e4ba349dd..068812a54 100644
--- 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
index b49eaadfd..155683287 100644
--- 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
new file mode 100644
index 000000000..6b326bedf
--- /dev/null
+++ 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;
+                }
+            }
+        }
+    );
+}