Skip to content

Commit

Permalink
Merge pull request #637 from pupil-labs/dan/patch-1
Browse files Browse the repository at this point in the history
Fix links and remove service worker
  • Loading branch information
marc-tonsen authored Nov 24, 2023
2 parents 5dd0dd0 + aee393e commit aae660d
Show file tree
Hide file tree
Showing 17 changed files with 208 additions and 179 deletions.
2 changes: 1 addition & 1 deletion alpha-lab/gaze-metrics-in-aois/data/enrichment_info.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
reference-image-mapper export
Find detailed documentation here: https://docs.pupil-labs.com/cloud/enrichments/#reference-image-mapper
Find detailed documentation here: https://docs.pupil-labs.com/cloud/enrichments/#reference-image-mapper
Version 1
196 changes: 98 additions & 98 deletions components/header/NavBarHamburger.vue
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<script lang="ts" setup>
defineProps<{
active: boolean;
}>();
defineProps<{
active: boolean;
}>();
const emit = defineEmits<{
(e: "click"): void;
}>();
const emit = defineEmits<{
(e: "click"): void;
}>();
const handleOnClick = () => {
emit("click");
setTimeout(() => {
const navEl = document.querySelector(".VPNavScreen");
const socialEls = navEl.querySelectorAll(".VPSocialLink");
const handleOnClick = () => {
emit("click");
setTimeout(() => {
const navEl = document.querySelector(".VPNavScreen");
const socialEls = navEl.querySelectorAll(".VPSocialLink");
socialEls.forEach((socialEl) => {
if (
// @ts-ignore
socialEl.href === "https://docs.pupil-labs.com/" ||
// @ts-ignore
socialEl.href === "https://docs.pupil-labs.com/alpha-lab"
) {
socialEl.setAttribute("target", "_self");
socialEl.setAttribute("rel", "noopener");
}
});
}, 100);
};
socialEls.forEach((socialEl) => {
if (
// @ts-ignore
socialEl.href === "/" ||
// @ts-ignore
socialEl.href === "/alpha-lab/"
) {
socialEl.setAttribute("target", "_self");
socialEl.setAttribute("rel", "noopener");
}
});
}, 100);
};
</script>

<template>
Expand All @@ -47,86 +47,86 @@
</template>

<style scoped>
.VPNavBarHamburger {
display: flex;
justify-content: center;
align-items: center;
width: 48px;
height: var(--vp-nav-height);
}
@media (min-width: 1146px) {
.VPNavBarHamburger {
display: flex;
justify-content: center;
align-items: center;
width: 48px;
height: var(--vp-nav-height);
display: none;
}
}
@media (min-width: 1146px) {
.VPNavBarHamburger {
display: none;
}
}
.container {
position: relative;
width: 16px;
height: 14px;
overflow: hidden;
}
.container {
position: relative;
width: 16px;
height: 14px;
overflow: hidden;
}
.VPNavBarHamburger:hover .top {
top: 0;
left: 0;
transform: translateX(4px);
}
.VPNavBarHamburger:hover .middle {
top: 6px;
left: 0;
transform: translateX(0);
}
.VPNavBarHamburger:hover .bottom {
top: 12px;
left: 0;
transform: translateX(8px);
}
.VPNavBarHamburger:hover .top {
top: 0;
left: 0;
transform: translateX(4px);
}
.VPNavBarHamburger:hover .middle {
top: 6px;
left: 0;
transform: translateX(0);
}
.VPNavBarHamburger:hover .bottom {
top: 12px;
left: 0;
transform: translateX(8px);
}
.VPNavBarHamburger.active .top {
top: 6px;
transform: translateX(0) rotate(225deg);
}
.VPNavBarHamburger.active .middle {
top: 6px;
transform: translateX(16px);
}
.VPNavBarHamburger.active .bottom {
top: 6px;
transform: translateX(0) rotate(135deg);
}
.VPNavBarHamburger.active .top {
top: 6px;
transform: translateX(0) rotate(225deg);
}
.VPNavBarHamburger.active .middle {
top: 6px;
transform: translateX(16px);
}
.VPNavBarHamburger.active .bottom {
top: 6px;
transform: translateX(0) rotate(135deg);
}
.VPNavBarHamburger.active:hover .top,
.VPNavBarHamburger.active:hover .middle,
.VPNavBarHamburger.active:hover .bottom {
background-color: var(--vp-c-text-2);
transition: top 0.25s, background-color 0.25s, transform 0.25s;
}
.VPNavBarHamburger.active:hover .top,
.VPNavBarHamburger.active:hover .middle,
.VPNavBarHamburger.active:hover .bottom {
background-color: var(--vp-c-text-2);
transition: top 0.25s, background-color 0.25s, transform 0.25s;
}
.top,
.middle,
.bottom {
position: absolute;
width: 16px;
height: 2px;
background-color: var(--vp-c-text-1);
transition: top 0.25s, background-color 0.5s, transform 0.25s;
}
.top,
.middle,
.bottom {
position: absolute;
width: 16px;
height: 2px;
background-color: var(--vp-c-text-1);
transition: top 0.25s, background-color 0.5s, transform 0.25s;
}
.top {
top: 0;
left: 0;
transform: translateX(0);
}
.middle {
top: 6px;
left: 0;
transform: translateX(8px);
}
.bottom {
top: 12px;
left: 0;
transform: translateX(4px);
}
.top {
top: 0;
left: 0;
transform: translateX(0);
}
.middle {
top: 6px;
left: 0;
transform: translateX(8px);
}
.bottom {
top: 12px;
left: 0;
transform: translateX(4px);
}
</style>
72 changes: 36 additions & 36 deletions core/software/pupil-capture/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ The World window is the main control center for Pupil Capture. It displays a liv

### Keyboard Shortcuts

| Keyboard Shortcut | Description |
|:--------------------|:-------------------------------------------------------------|
| `r` | Start and stop recording |
| `c` | Start and stop calibration |
| `t` | Start and stop validation |
| `a` | Surface tracker: Add new surface |
| `x` | Add annotation (default keyboard shortcut) |
| `i` | Camera intrinsic estimation: Take snapshot of circle pattern |
| Keyboard Shortcut | Description |
| :---------------- | :----------------------------------------------------------- |
| `r` | Start and stop recording |
| `c` | Start and stop calibration |
| `t` | Start and stop validation |
| `a` | Surface tracker: Add new surface |
| `x` | Add annotation (default keyboard shortcut) |
| `i` | Camera intrinsic estimation: Take snapshot of circle pattern |

## Video Source Selection
By default Pupil Capture will use Local USB as the capture source.
Expand Down Expand Up @@ -64,11 +64,11 @@ sudo usermod -a -G plugdev $USER

Due to new [technical limitations](https://github.com/libusb/libusb/issues/1014), Pupil Capture and Pupil Service need to be started with administrator privileges to get access to the video camera feeds. To do that, copy the applications into your /Applications folder and run the corresponding command from the terminal:

Pupil Capture:
Pupil Capture:
``` zsh
sudo /Applications/Pupil\ Capture.app/Contents/MacOS/pupil_capture
```
Pupil Service:
Pupil Service:
``` zsh
sudo /Applications/Pupil\ Service.app/Contents/MacOS/pupil_service
```
Expand Down Expand Up @@ -135,7 +135,7 @@ Before starting a calibration, ensure that the participant's pupil is robustly d

<p>Your Pupil is properly detected by the camera.</p>
</div>

<div style="flex-grow:1;display:flex;flex-direction:column;align-items:center;" class="pa-2">

![Focus](focus.jpg)
Expand Down Expand Up @@ -189,7 +189,7 @@ Make sure to always use the **v0.4 marker design** for best detection performanc
</div>
</div>

[Download Pupil Labs Calibration Marker v0.4](http://docs.pupil-labs.com/core/software/pupil-capture/v0.4_marker.pdf') to print or display on smartphone/tablet screen.
[Download Pupil Labs Calibration Marker v0.4](./v0.4_marker.pdf) to print or display on smartphone/tablet screen.


#### Single Marker Calibration Choreography
Expand Down Expand Up @@ -385,7 +385,7 @@ Apriltags ready to use:

</a>
<a download="apriltags_tag36h11_24-47.jpg" href="../../../media/shared/imgs/apriltags_tag36h11_24-47.jpg" title="AprilTags 0-23">

![Apriltags 24 - 47](./apriltags_tag36h11_24-47.jpg)

</a>
Expand Down Expand Up @@ -462,8 +462,8 @@ For all new projects we strongly recommend using Apriltags!


### Blink Detector
The online blink detector classifies [blinks](/terminology/#blinks) according to onset and offset thresholds
associated with [2D pupil confidence](/terminology/#confidence). See the
The online blink detector classifies [blinks](/terminology/#blinks) according to onset and offset thresholds
associated with [2D pupil confidence](/terminology/#confidence). See the
[Blink Detector documentation](/software/pupil-player/#blink-detector) for more information.

Read more about accessing blink detection results in real-time in the [developer documentation](/developer/network-api/#blink-messages).
Expand Down Expand Up @@ -507,13 +507,13 @@ Specifically, the intrinsics are saved to a file with the name pattern `<camera

Pupil Capture provides [prerecorded intrinsics](https://github.com/pupil-labs/pupil/blob/master/pupil_src/shared_modules/camera_models.py#L26-L152) for the following cameras:

| Camera name | Resolutions | Notes |
| :--- | :---: | :--- |
| Camera name | Resolutions | Notes |
| :-------------------- | :--------------------------------------: | :-------------------------------------------------------- |
| Pupil Cam1 ID2 | `640x480`<br/>`1280x720`<br/>`1920x1080` | Pupil Core high-speed scene camera |
| Pupil Cam2 ID0/1 | `192x192`<br/>`400x400` | Core headset eye camera;<br/>max. 200 Hz sampling rate |
| Pupil Cam3 ID0/1 | `192x192`<br/>`400x400` | HTC Vive add-on eye camera;<br/>max. 200 Hz sampling rate |
| Pupil Cam2 ID0/1 | `192x192`<br/>`400x400` | Core headset eye camera;<br/>max. 200 Hz sampling rate |
| Pupil Cam3 ID0/1 | `192x192`<br/>`400x400` | HTC Vive add-on eye camera;<br/>max. 200 Hz sampling rate |
| Logitech Webcam C930e | `640x480`<br/>`1280x720`<br/>`1920x1080` | Pupil Core high-definition scene camera (discontinued) |
| Pupil Cam1 ID0/1 | `320x240`<br/>`640x480` | eye camera (discontinued);<br/>max. 120 Hz sampling rate |
| Pupil Cam1 ID0/1 | `320x240`<br/>`640x480` | eye camera (discontinued);<br/>max. 120 Hz sampling rate |

When a recording is started in Pupil Capture, the application saves the active camera intrinsics to the `world.intrinsics`, `eye0.intrinsics`, and `eye1.intrinsics` files within the recording.

Expand All @@ -532,19 +532,19 @@ Based on the estimated intrinsics, one can calculate the camera's field of view

**Field of view in degrees:**
| Camera name | Resolution | Horizontal | Vertical | Diagonal |
| :--- | :---: | :---: | :---: | :---: |
| Pupil Cam1 ID2 (default – wide-angle lens) | `1920x1080` | 155° | 85° | --- |
| | `1280x720` | 103° | 54° | 122° |
| | `640x480` | 103° | 73° | 134° |
| Pupil Cam1 ID2 (narrow-angle lens) | `1920x1080` | 88° | 54° | 106° |
| | `1280x720` | 63° | 37° | 70° |
| | `640x480` | 42° | 32° | 51° |
| Pupil Cam2 ID0/1 | `400x400` | 39° | 39° | 53° |
| | `192x192` | 37° | 37° | 51° |
| Pupil Cam3 ID0/1 | `400x400` | 71° | 71° | 91° |
| | `192x192` | 69° | 69° | 88° |
| Logitech Webcam C930e (discontinued) | `1920x1080` | 82° | 53° | 91° |
| | `1280x720` | 80° | 51° | 89° |
| | `640x480` | 64° | 52° | 77° |
| Pupil Cam1 ID0/1 (discontinued) | `640x480` | 51° | 39° | 62° |
| | `320x240` | 51° | 39° | 61° |
| :----------------------------------------- | :---------: | :--------: | :------: | :------: |
| Pupil Cam1 ID2 (default – wide-angle lens) | `1920x1080` | 155° | 85° | --- |
| | `1280x720` | 103° | 54° | 122° |
| | `640x480` | 103° | 73° | 134° |
| Pupil Cam1 ID2 (narrow-angle lens) | `1920x1080` | 88° | 54° | 106° |
| | `1280x720` | 63° | 37° | 70° |
| | `640x480` | 42° | 32° | 51° |
| Pupil Cam2 ID0/1 | `400x400` | 39° | 39° | 53° |
| | `192x192` | 37° | 37° | 51° |
| Pupil Cam3 ID0/1 | `400x400` | 71° | 71° | 91° |
| | `192x192` | 69° | 69° | 88° |
| Logitech Webcam C930e (discontinued) | `1920x1080` | 82° | 53° | 91° |
| | `1280x720` | 80° | 51° | 89° |
| | `640x480` | 64° | 52° | 77° |
| Pupil Cam1 ID0/1 (discontinued) | `640x480` | 51° | 39° | 62° |
| | `320x240` | 51° | 39° | 61° |
2 changes: 1 addition & 1 deletion invisible/data-collection/data-format/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ This file contains the timestamps of every world video frame.

## events.csv

This file contains [event](https://docs.pupil-labs.com/neon/data-collection/events/) data for all recordings. It contains both project event annotations and real-time recording events.
This file contains [event](/data-collection/events/) data for all recordings. It contains both project event annotations and real-time recording events.

| Field | Description |
| ------------------ | --------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion invisible/data-collection/lab-streaming-layer/index.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Lab Streaming Layer
This page is still a work in progress. To use LSL with Neon you need to use our [LSL Relay](https://github.com/pupil-labs/lsl-relay). More documentation is coming soon!
This page is still a work in progress. To use LSL with Pupil Invisible you need to use our [LSL Relay](https://github.com/pupil-labs/lsl-relay). More documentation is coming soon!
2 changes: 1 addition & 1 deletion invisible/data-collection/monitor-app/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Once the page has loaded, you will be presented with a live stream of the scene

If you have multiple Pupil Invisible devices connected to the network, you can switch between devices using the switch button.

Using the various event buttons, you can remotely save an [event](https://docs.pupil-labs.com/neon/data-collection/events/) in a recording to mark points of interest. In the settings view you can customize the according event names.
Using the various event buttons, you can remotely save an [event](/data-collection/events/) in a recording to mark points of interest. In the settings view you can customize the according event names.

![Monitor App UI](./monitor-ui.png)

Expand Down
2 changes: 1 addition & 1 deletion invisible/data-collection/recordings/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The Pupil Invisible Companion app has several more features to ensure robust dat
## Wearers, Templates & Events
When making a recording you can capture various additional data to record things like meta data or key events that happened during data collection. These will be saved as part of the recording itself.

[**Wearers**](/data-collection/wearers/) are the people who wear the Neon device while recording.
[**Wearers**](/data-collection/wearers/) are the people who wear the Pupil Invisible Glasses while recording.

[**Templates**](/data-collection/templates/) are questionnairs that can be filled out at recording time.

Expand Down
Loading

0 comments on commit aae660d

Please sign in to comment.