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.

Sign up for GitHub

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

Jump to bottom

separate nova sheet from use-wwt sheet, triggered by two separate buttons #51

Merged
merged 3 commits into from
Oct 17, 2024
Merged

separate nova sheet from use-wwt sheet, triggered by two separate buttons #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
930adb0
separate Nova sheet from use-wwt sheet so they are triggered by two s…
heywooddogwood Oct 15, 2024
6cb463f
move CBr is set chip below control box to avoid downward shift; don't…
patudom Oct 17, 2024
7ca1372
Remove unused stuff to avoid errors
patudom Oct 17, 2024
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
189 changes: 105 additions & 84 deletions src/BlazeStarNova.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,89 +25,60 @@

<div id="top-content">
<div id="left-buttons" v-if="!isTourPlaying">
<icon-button v-model="showTextSheet" fa-icon="book-open" :color="buttonColor"
:tooltip-text="showTextSheet ? 'Hide Info' : 'Learn More'" tooltip-location="start">
<icon-button v-model="showNovaSheet" fa-icon="book-open" :color="buttonColor"
:tooltip-text="showNovaSheet ? 'Hide Info' : 'Learn More'" tooltip-location="start">
</icon-button>
<icon-button v-model="showUseSheet" fa-icon="info" :color="buttonColor"
:tooltip-text="showUseSheet ? 'Hide Info' : 'Learn More'" tooltip-location="start">
</icon-button>
<!-- <icon-button v-model="showVideoSheet" fa-icon="video" :color="buttonColor" tooltip-text="Watch video"
tooltip-location="start">
</icon-button> -->


<div id="controls" class="control-icon-wrapper">
<div id="controls-top-row">
<font-awesome-icon
size="lg"
class="tab-focusable"
:icon="showControls ? `chevron-down` : `gear`"
@click="showControls = !showControls"
@keyup.enter="showControls = !showControls"
tabindex="0" />
</div>

<div v-if="showControls" id="control-checkboxes">
<v-checkbox :color="accentColor" v-model="showAltAzGrid" @keyup.enter="showAltAzGrid = !showAltAzGrid"
label="Sky Grid" hide-details />
<v-checkbox :color="accentColor" v-model="showHorizon" @keyup.enter="showHorizon = !showHorizon"
label="Horizon" hide-details />
<v-checkbox :color="accentColor" v-model="showConstellations" @keyup.enter="showConstellations = !showConstellations"
label="Constellations" hide-details />
<v-checkbox :color="accentColor" v-model="showBlazeOverlay" @keyup.enter="showBlazeOverlay = !showBlazeOverlay"
label="Blaze Star Location" hide-details />
<v-checkbox :color="accentColor" v-model="showAlphaOverlay" @keyup.enter="showAlphaOverlay = !showAlphaOverlay"
label="Alphecca Location" hide-details />
</div>
</div>

</div>

<div id="center-buttons">
<icon-button
v-if="!isTourPlaying"
v-model="showLocationSelector"
fa-icon="location-dot"
:color="buttonColor"
tooltip-text="Select Location"
tooltip-location="start"
></icon-button>

<v-dialog
v-model="showLocationSelector"
max-width="fit-content"
transition="slide-y-transition"
id="eclipse-prediction-sheet"
>
<v-card>
<font-awesome-icon
style="position: absolute; right: 12px; top: 12px; cursor: pointer; padding: 1em; margin: -1em; z-index: 1000;"
icon="square-xmark"
size="xl"
@click="showLocationSelector = false"
@keyup.enter="showLocationSelector = false"
tabindex="0"
color="black"
></font-awesome-icon>
<location-selector
v-model="selectedLocation"
/>
<geolocation-button
:debug="false"
size="30px"
density="default"
elevation="5"
color="black"
@location="selectedLocation = {longitudeDeg: $event.longitude, latitudeDeg: $event.latitude}"
/>
</v-card>
</v-dialog>



</div>
<div id="right-buttons">
<v-chip
v-if="crbBelowHorizon && !isTourPlaying"
class="chip-text"
></icon-button>

<v-dialog
v-model="showLocationSelector"
max-width="fit-content"
transition="slide-y-transition"
id="eclipse-prediction-sheet"
>
Corona Borealis is Set
</v-chip>
<v-card>
<font-awesome-icon
style="position: absolute; right: 12px; top: 12px; cursor: pointer; padding: 1em; margin: -1em; z-index: 1000;"
icon="square-xmark"
size="xl"
@click="showLocationSelector = false"
@keyup.enter="showLocationSelector = false"
tabindex="0"
color="black"
></font-awesome-icon>
<location-selector
v-model="selectedLocation"
/>
<geolocation-button
:debug="false"
size="30px"
density="default"
elevation="5"
color="black"
@location="selectedLocation = {longitudeDeg: $event.longitude, latitudeDeg: $event.latitude}"
/>
</v-card>
</v-dialog>
</div>
<div id="right-buttons" v-if="!isTourPlaying">
<button
class="icon-wrapper jl_icon-button jl_debug"
@click="() => updateHorizonAndSky()"
Expand All @@ -124,6 +95,36 @@
class="icon-wrapper jl_icon-button jl_debug"
@click="() => WWTControl.singleton.renderOneFrame()"
>Render one frame</button>
<div id="controls" class="control-icon-wrapper">
<div id="controls-top-row">
<font-awesome-icon
size="lg"
class="tab-focusable"
:icon="showControls ? `chevron-down` : `gear`"
@click="showControls = !showControls"
@keyup.enter="showControls = !showControls"
tabindex="0" />
</div>

<div v-if="showControls" id="control-checkboxes">
<v-checkbox :color="accentColor" v-model="showAltAzGrid" @keyup.enter="showAltAzGrid = !showAltAzGrid"
label="Sky Grid" hide-details />
<v-checkbox :color="accentColor" v-model="showHorizon" @keyup.enter="showHorizon = !showHorizon"
label="Horizon" hide-details />
<v-checkbox :color="accentColor" v-model="showConstellations" @keyup.enter="showConstellations = !showConstellations"
label="Constellations" hide-details />
<v-checkbox :color="accentColor" v-model="showBlazeOverlay" @keyup.enter="showBlazeOverlay = !showBlazeOverlay"
label="Blaze Star Location" hide-details />
<v-checkbox :color="accentColor" v-model="showAlphaOverlay" @keyup.enter="showAlphaOverlay = !showAlphaOverlay"
label="Alphecca Location" hide-details />
</div>
</div>
<v-chip
v-if="crbBelowHorizon"
class="chip-text"
>
Corona Borealis is Set
</v-chip>
</div>
</div>

Expand Down Expand Up @@ -196,12 +197,12 @@
<div id="bottom-content">
<div id="date-picker">
<v-overlay
activator="parent"
location-strategy="connected"
location="top end"
origin="bottom end"
:scrim="false"
:style="cssVars"
activator="parent"
location-strategy="connected"
location="top end"
origin="bottom end"
:scrim="false"
:style="cssVars"
>
<template #activator="{props}">
<!-- any props added are passed directly to v-card -->
Expand Down Expand Up @@ -253,13 +254,24 @@
</div>
</v-dialog>




<!-- This dialog contains the informational content that is displayed when the book icon is clicked -->
<bottom-sheet
<bottom-nova-sheet
:cssVars="cssVars"
v-model="showTextSheet"
v-model="showNovaSheet"
:accent-color="accentColor"
:touchscreen="touchscreen"
:show-blaze-overlay="showBlazeOverlay"
:show-alpha-overlay="showAlphaOverlay"
@toggle-blaze="() => store.gotoRADecZoom({ raRad: crbPlace.get_RA() * 15 * D2R, decRad: crbPlace.get_dec() * D2R, zoomDeg: 180, instant: false })"
@toggle-alpha="() => {
toggleAlpha();
}"
/>

<!-- This dialog contains the informational content that is displayed when the info icon is clicked -->
<bottom-use-sheet
:cssVars="cssVars"
v-model="showUseSheet"
:accent-color="accentColor"
:touchscreen="touchscreen"
:show-blaze-overlay="showBlazeOverlay"
Expand Down Expand Up @@ -292,7 +304,7 @@ import { resetAltAzGridText, makeAltAzGridText, setupConstellationFigures, rende
import { usePlaybackControl } from "./wwt_playback_control";
import { useTimezone } from "./timezones";

type SheetType = "text" | "video";
type SheetType = "nova-text" | "use-text" | "video";
type CameraParams = Omit<GotoRADecZoomParams, "instant">;
export interface MainComponentProps {
wwtNamespace?: string;
Expand Down Expand Up @@ -549,7 +561,7 @@ const cssVars = computed(() => {
// get the text-bottom-sheet id height and subtract it from 100vh
return {
"--accent-color": accentColor.value,
"--app-content-height": showTextSheet.value ? "66%" : "100%",
"--app-content-height": (showNovaSheet.value | showUseSheet.value) ? "66%" : "100%",
};
});

Expand All @@ -560,12 +572,21 @@ const cssVars = computed(() => {
computed wrappers around modifying/querying that which can be used as
dialog v-model values
*/
const showTextSheet = computed({
const showNovaSheet = computed({
get() {
return sheet.value === "nova-text";
},
set(_value: boolean) {
selectSheet("nova-text");
}
});

const showUseSheet = computed({
get() {
return sheet.value === "text";
return sheet.value === "use-text";
},
set(_value: boolean) {
selectSheet("text");
selectSheet("use-text");
}
});

Expand Down
Loading
Loading