Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SVG export!!!! #525

Merged
merged 7 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions taxonium_component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
},
"dependencies": {
"@fontsource/roboto": "^5.0.1",
"@headlessui/react": "^1.7.17",
"@jbrowse/core": "^2.5.0",
"@jbrowse/plugin-data-management": "^2.5.0",
"@jbrowse/react-linear-genome-view": "^2.5.0",
Expand Down
5 changes: 3 additions & 2 deletions taxonium_component/src/Deck.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ function Deck({
[hoverDetails]
);

const { layers, layerFilter, keyStuff } = useLayers({
const { layers, layerFilter, keyStuff, triggerSVGdownload } = useLayers({
data,
search,
viewState,
Expand Down Expand Up @@ -314,7 +314,8 @@ function Deck({
// we want this to intercept all mouse events
// so that we can prevent the default behavior
// of the browser

triggerSVGdownload={triggerSVGdownload}
deckSize={deckSize}
zoomReset={zoomReset}
zoomIncrement={zoomIncrement}
zoomAxis={zoomAxis}
Expand Down
34 changes: 10 additions & 24 deletions taxonium_component/src/components/DeckButtons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,8 @@ import { TiZoom, TiCog } from "react-icons/ti";

import { MdOutlineZoomOutMap } from "react-icons/md";
import { ClipLoader } from "react-spinners";

const TaxButton = ({ children, onClick, title }) => {
return (
<button
className=" w-12 h-10 bg-gray-100 p-1 rounded border-gray-300 text-gray-700 opacity-70 hover:opacity-100 mr-1 z-50 mt-auto mb-1
shadow-md "
onClick={onClick}
title={title}
style={{
pointerEvents: "auto",
}}
>
{children}
</button>
);
};
import TaxButton from "./TaxButton";
import SnapshotButton from "./SnapshotButton";

export const DeckButtons = ({
loading,
Expand All @@ -37,6 +23,8 @@ export const DeckButtons = ({
requestOpenSettings,
zoomReset,
settings,
deckSize,
triggerSVGdownload,
}) => {
return (
<div
Expand Down Expand Up @@ -116,14 +104,12 @@ export const DeckButtons = ({
>
<MdOutlineZoomOutMap className="mx-auto w-5 h-5 inline-block " />
</TaxButton>
<TaxButton
onClick={() => {
snapshot();
}}
title="Take screenshot"
>
<BiCamera className="mx-auto w-5 h-5 inline-block" />
</TaxButton>
<SnapshotButton
svgFunction={triggerSVGdownload}
pixelFunction={snapshot}
deckSize={deckSize}
/>

<div className="">
<div>
<TaxButton
Expand Down
2 changes: 0 additions & 2 deletions taxonium_component/src/components/SearchPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,7 @@ function SearchPanel({
</Select>
</div>
{colorBy.colorByField === "genotype" && (

<div className="space-x-2">

<label className="space-x-2">
<span>Gene</span>
<Select
Expand Down
72 changes: 72 additions & 0 deletions taxonium_component/src/components/SnapshotButton.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import React, { useState, Fragment } from "react";
import { Dialog, Transition } from "@headlessui/react";
import { BiCamera } from "react-icons/bi";
import TaxButton from "./TaxButton";

const SnapshotButton = ({ svgFunction, pixelFunction, deckSize }) => {
const [isOpen, setIsOpen] = useState(false);

function snapshot(option) {
if (option === "pixels") {
pixelFunction();
} else if (option === "SVG") {
svgFunction(deckSize);
}
setIsOpen(false);
}

return (
<>
<TaxButton onClick={() => setIsOpen(true)} title="Take screenshot">
<BiCamera className="mx-auto w-5 h-5 inline-block" />
</TaxButton>

<Transition.Root show={isOpen} as={Fragment}>
<Dialog
as="div"
static
className="fixed inset-0 z-10 overflow-y-auto"
open={isOpen}
onClose={setIsOpen}
>
<div className="min-h-screen px-4 text-center">
<Dialog.Overlay className="fixed inset-0 bg-black opacity-30" />

<span
className="inline-block h-screen align-middle"
aria-hidden="true"
>
&#8203;
</span>

<div className="inline-block w-full max-w-md p-6 my-8 overflow-hidden text-left align-middle transition-all transform bg-white shadow-xl rounded-2xl">
<Dialog.Title
as="h3"
className="text-lg font-medium leading-6 text-gray-900"
>
Choose format
</Dialog.Title>

<div className="mt-4">
<button
onClick={() => snapshot("SVG")}
className="text-blue-600 hover:text-blue-800"
>
SVG (vector)
</button>
<button
onClick={() => snapshot("pixels")}
className="ml-4 text-blue-600 hover:text-blue-800"
>
PNG
</button>
</div>
</div>
</div>
</Dialog>
</Transition.Root>
</>
);
};

export default SnapshotButton;
17 changes: 17 additions & 0 deletions taxonium_component/src/components/TaxButton.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const TaxButton = ({ children, onClick, title }) => {
return (
<button
className=" w-12 h-10 bg-gray-100 p-1 rounded border-gray-300 text-gray-700 opacity-70 hover:opacity-100 mr-1 z-50 mt-auto mb-1
shadow-md "
onClick={onClick}
title={title}
style={{
pointerEvents: "auto",
}}
>
{children}
</button>
);
};

export default TaxButton;
Loading