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

Move point cloud plugin and settings #1968

Merged
merged 4 commits into from
Jul 26, 2022
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 app/packages/app/src/Root/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ const Root: Route<RootQuery> = ({ children, prepared }) => {
gridZoom
loopVideos
notebookHeight
plugins
showConfidence
showIndex
showLabel
Expand Down
244 changes: 126 additions & 118 deletions app/packages/app/src/Root/__generated__/RootConfig_query.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions app/packages/app/src/Root/__generated__/RootQuery.graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/packages/app/src/components/Actions/Options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Autorenew, Check } from "@material-ui/icons";
import { constSelector, useRecoilState, useRecoilValue } from "recoil";

import Checkbox from "../Common/Checkbox";
import { PopoutSectionTitle, TabOption } from "../utils";
import { PopoutSectionTitle, TabOption } from "@fiftyone/components";

import { Button } from "../utils";
import Popout from "./Popout";
Expand Down
3 changes: 1 addition & 2 deletions app/packages/app/src/components/Actions/Similar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ import Checkbox from "../Common/Checkbox";
import Input from "../Common/Input";
import RadioGroup from "../Common/RadioGroup";
import { Button } from "../utils";
import { PopoutSectionTitle } from "../utils";

import { ActionOption } from "./Common";
import Popout from "./Popout";
import { getFetchFunction, toSnakeCase } from "@fiftyone/utilities";
import { useErrorHandler } from "react-error-boundary";
import { useTheme } from "@fiftyone/components";
import { useTheme, PopoutSectionTitle } from "@fiftyone/components";
import * as fos from "@fiftyone/state";

const getQueryIds = async (snapshot: Snapshot, brainKey?: string) => {
Expand Down
2 changes: 1 addition & 1 deletion app/packages/app/src/components/Actions/Tagger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
tagStatistics,
} from "./utils";
import { Button } from "../utils";
import { PopoutSectionTitle } from "../utils";
import { PopoutSectionTitle, TabOption } from "@fiftyone/components";
import { FrameLooker, ImageLooker, VideoLooker } from "@fiftyone/looker";
import { getFetchFunction, toSnakeCase } from "@fiftyone/utilities";
import { useTheme } from "@fiftyone/components";
Expand Down
2 changes: 1 addition & 1 deletion app/packages/app/src/components/Filters/Exclude.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { RecoilState, useRecoilState } from "recoil";

import { TabOption } from "../utils";
import { TabOption } from "@fiftyone/components";

interface ExcludeOptionProps {
excludeAtom: RecoilState<boolean>;
Expand Down
3 changes: 3 additions & 0 deletions app/packages/app/src/components/Looker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ interface LookerProps {
onSelectLabel?: EventCallback;
style?: React.CSSProperties;
pinned: boolean;
isGroupMainView: boolean;
}

const Looker = ({
Expand All @@ -398,6 +399,7 @@ const Looker = ({
onSelectLabel,
style,
pinned,
isGroupMainView,
}: LookerProps) => {
const [id] = useState(() => uuid());
const sampleData = useRecoilValue(fos.modal);
Expand Down Expand Up @@ -455,6 +457,7 @@ const Looker = ({
state: fos,
dataset: useRecoilValue(fos.dataset),
pinned,
isGroupMainView,
};
const pluginIsActive = plugin && plugin.activator(pluginAPI);
const PluginComponent = pluginIsActive && plugin.component;
Expand Down
4 changes: 3 additions & 1 deletion app/packages/app/src/components/SampleModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ const SampleModal = () => {
: { width: "95%", height: "90%", borderRadius: "3px" };
const wrapperRef = useRef();
const queryRef = useRecoilValue(fos.paginateGroupQueryRef);
const isGroupMode = useRecoilValue(isGroup) && queryRef;

return ReactDOM.createPortal(
<ModalWrapper
Expand All @@ -215,8 +216,9 @@ const SampleModal = () => {
onPrevious={index > 0 ? () => getIndex(index - 1) : undefined}
onNext={() => getIndex(index + 1)}
style={{ flex: 1 }}
isGroupMainView={isGroupMode}
/>
{useRecoilValue(isGroup) && queryRef && <Group queryRef={queryRef} />}
{isGroupMode && <Group queryRef={queryRef} />}
</ContentColumn>
{useRecoilValue(isPinned) && queryRef && (
<PinnedLooker queryRef={queryRef} />
Expand Down
Loading