diff --git a/Eplant/views/InteractionsViewer/Topbar.tsx b/Eplant/views/InteractionsViewer/Topbar.tsx index b4f1f7b..e85b68b 100644 --- a/Eplant/views/InteractionsViewer/Topbar.tsx +++ b/Eplant/views/InteractionsViewer/Topbar.tsx @@ -30,16 +30,20 @@ const Topbar: FC = ({ gene }) => { interConfSelector: '[interolog_conf <=', // PPPI correlation EPDISelector: '[type = "PDI"][method = "E"]', PPDISelector: '[type = "PDI"][method = "P"]', - fimoConfSelector: '[fimo_conf >= ' -} + fimoConfSelector: '[fimo_conf >= ', + } const zoomValue = 1000 - const applyFilters = () =>{ + const applyFilters = () => { // Create selectors - const eppiCorr = selectors.EPPISelector + selectors.corrSelector + EPPICorrValue + ']'; - const pppiCorr = selectors.PPPISelector + selectors.corrSelector + PPPICorrValue + ']'; - const pppiConf = selectors.PPPISelector + selectors.interConfSelector + PPPIConfValue + ']'; - const ppdiConf = selectors.PPDISelector + selectors.fimoConfSelector + PPDIConfValue + ']'; + const eppiCorr = + selectors.EPPISelector + selectors.corrSelector + EPPICorrValue + ']' + const pppiCorr = + selectors.PPPISelector + selectors.corrSelector + PPPICorrValue + ']' + const pppiConf = + selectors.PPPISelector + selectors.interConfSelector + PPPIConfValue + ']' + const ppdiConf = + selectors.PPDISelector + selectors.fimoConfSelector + PPDIConfValue + ']' } const handleLegendClick = () => { setShowLegend(!showLegend) @@ -84,7 +88,7 @@ const Topbar: FC = ({ gene }) => { - + @@ -102,50 +106,37 @@ const Topbar: FC = ({ gene }) => { id='filter-option-1' primary='Hide ALL experimentally determined Protein-Protein interactions' /> - {}} - checked={false} - - /> + {}} checked={false} /> - - {}} - checked={false} - + + {}} checked={false} /> - - {}} - checked={false} - + 0.5' /> + {}} checked={false} /> - - {}} - checked={false} - + + {}} checked={false} /> - - {}} - checked={false} - + + {}} checked={false} /> diff --git a/Eplant/views/InteractionsViewer/index.tsx b/Eplant/views/InteractionsViewer/index.tsx index 93135dc..f8e9cca 100644 --- a/Eplant/views/InteractionsViewer/index.tsx +++ b/Eplant/views/InteractionsViewer/index.tsx @@ -20,7 +20,7 @@ import loadInteractions from './scripts/loadInteractions' import loadSublocalizations from './scripts/loadSublocalizations' import cytoStyles from './cytoStyles' import { InteractionsIcon } from './icon' -import Topbar from './Topbar.1' +import Topbar from './Topbar' // import GeneDialog from './GeneDialog' import { Interaction, diff --git a/Eplant/views/InteractionsViewer/scripts/filterLogic.ts b/Eplant/views/InteractionsViewer/scripts/filterLogic.ts index 32b9ec6..aaf7d36 100644 --- a/Eplant/views/InteractionsViewer/scripts/filterLogic.ts +++ b/Eplant/views/InteractionsViewer/scripts/filterLogic.ts @@ -17,9 +17,9 @@ export const applyFilter = (cy: Core, selector: string) => { /** - * Clears interaction view of nodes without associated edges - * @returns {void} - */ + * Clears interaction view of nodes without associated edges + * @returns {void} + */ export const cleanNodes = (cy: Core) => { // Get all nodes in interaction view const nodes = cy.nodes();