Merge pull request #127 from LCOGT/feature/histogram_slider

Feature/histogram slider
LCOGT · Nov 20, 2024 · 3310ee3 · 3310ee3
2 parents edbd528 + 103cf60
commit 3310ee3
Show file tree

Hide file tree

Showing 43 changed files with 547 additions and 68 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,6 +16,8 @@ RUN echo -e "	server {\n" \
             "			root   /app;\n" \
             "			index  index.html;\n" \
             "			try_files \$uri \$uri/ /index.html;\n" \
+            "			add_header 'Cross-Origin-Embedder-Policy' 'require-corp';\n" \
+            "			add_header 'Cross-Origin-Opener-Policy' 'same-origin';\n" \
             "		}\n" \
             "	}\n" \
             > /etc/nginx/conf.d/datalab.conf

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "vue": "^3.5.9",
     "vue-router": "^4.2.5",
     "vue3-carousel": "^0.3.1",
-    "vuetify": "^3.6.0",
+    "vuetify": "^3.7.4",
     "webfontloader": "^1.0.0"
   },
   "devDependencies": {

diff --git a/src/assets/MockData.JSON b/src/assets/MockData.JSON
@@ -0,0 +1,195 @@
+[
+    {
+        "basefile_name": "aro1-sq002ms-20231210-00000001",
+        "time": "2023-12-11 00:15",
+        "object": "M33",
+        "image": "images/image1.png"
+    },
+    {
+        "basefile_name": "mrc1-ec002cs-20231210-00000002",
+        "time": "2023-12-11 00:30",
+        "object": "NGC 224",
+        "image": "images/image2.png"
+    },
+    {
+        "basefile_name": "mrc2-sq003cm-20231210-00000003",
+        "time": "2023-12-11 00:45",
+        "object": "NGC 253",
+        "image": "images/image3.png"
+    },
+    {
+        "basefile_name": "sro2-sq002ms-20231210-00000004",
+        "time": "2023-12-11 01:00",
+        "object": "M81",
+        "image": "images/image4.png"
+    },
+    {
+        "basefile_name": "eco1-ec002cs-20231210-00000005",
+        "time": "2023-12-11 01:15",
+        "object": "M82",
+        "image": "images/image5.png"
+    },
+    {
+        "basefile_name": "eco2-sq003cm-20231210-00000006",
+        "time": "2023-12-11 01:30",
+        "object": "M87",
+        "image": "images/image6.png"
+    },
+    {
+        "basefile_name": "aro1-sq002ms-20231210-00000007",
+        "time": "2023-12-11 01:45",
+        "object": "NGC 5128",
+        "image": "images/image7.png"
+    },
+    {
+        "basefile_name": "mrc1-ec002cs-20231210-00000008",
+        "time": "2023-12-11 02:00",
+        "object": "NGC 4736",
+        "image": "images/image8.png"
+    },
+    {
+        "basefile_name": "mrc2-sq003cm-20231210-00000009",
+        "time": "2023-12-11 02:15",
+        "object": "NGC 4826",
+        "image": "images/image9.png"
+    },
+    {
+        "basefile_name": "sro2-sq002ms-20231210-00000010",
+        "time": "2023-12-11 02:30",
+        "object": "NGC 5055",
+        "image": "images/image10.png"
+    },
+    {
+        "basefile_name": "eco1-ec002cs-20231210-00000011",
+        "time": "2023-12-11 02:45",
+        "object": "NGC 6946",
+        "image": "images/image11.png"
+    },
+    {
+        "basefile_name": "eco2-sq003cm-20231210-00000012",
+        "time": "2023-12-11 03:00",
+        "object": "NGC 5194",
+        "image": "images/image12.png"
+    },
+    {
+        "basefile_name": "aro1-sq002ms-20231210-00000013",
+        "time": "2023-12-11 03:15",
+        "object": "NGC 5236",
+        "image": "images/image13.png"
+    },
+    {
+        "basefile_name": "mrc1-ec002cs-20231210-00000014",
+        "time": "2023-12-11 03:30",
+        "object": "NGC 5457",
+        "image": "images/image14.png"
+    },
+    {
+        "basefile_name": "mrc2-sq003cm-20231210-00000015",
+        "time": "2023-12-11 03:45",
+        "object": "NGC 3031",
+        "image": "images/image15.png"
+    }, 
+    {
+        "basefile_name": "eco1-ec002cs-20231210-00000016",
+        "time": "2023-12-11 04:00",
+        "object": "NGC 5195",
+        "image": "images/image16.png"
+    },
+    {
+        "basefile_name": "eco2-sq003cm-20231210-00000017",
+        "time": "2023-12-11 04:15",
+        "object": "IC 342",
+        "image": "images/image17.png"
+    },
+    {
+        "basefile_name": "aro1-sq002ms-20231210-00000018",
+        "time": "2023-12-11 04:30",
+        "object": "NGC 2403",
+        "image": "images/image18.png"
+    },
+    {
+        "basefile_name": "mrc1-ec002cs-20231210-00000019",
+        "time": "2023-12-11 04:45",
+        "object": "NGC 2903",
+        "image": "images/image19.png"
+    },
+    {
+        "basefile_name": "mrc2-sq003cm-20231210-00000020",
+        "time": "2023-12-11 05:00",
+        "object": "NGC 3184",
+        "image": "images/image20.png"
+    },
+    {
+        "basefile_name": "sro2-sq002ms-20231210-00000021",
+        "time": "2023-12-11 05:15",
+        "object": "NGC 3344",
+        "image": "images/image21.png"
+    },
+    {
+        "basefile_name": "eco1-ec002cs-20231210-00000022",
+        "time": "2023-12-11 05:30",
+        "object": "NGC 3621",
+        "image": "images/image22.png"
+    },
+    {
+        "basefile_name": "eco2-sq003cm-20231210-00000023",
+        "time": "2023-12-11 05:45",
+        "object": "NGC 3627",
+        "image": "images/image23.png"
+    },
+    {
+        "basefile_name": "aro1-sq002ms-20231210-00000024",
+        "time": "2023-12-11 06:00",
+        "object": "NGC 4244",
+        "image": "images/image24.png"
+    },
+    {
+        "basefile_name": "mrc1-ec002cs-20231210-00000025",
+        "time": "2023-12-11 06:15",
+        "object": "NGC 4258",
+        "image": "images/image25.png"
+    },
+    {
+        "basefile_name": "mrc2-sq003cm-20231210-00000026",
+        "time": "2023-12-11 06:30",
+        "object": "NGC 4559",
+        "image": "images/image26.png"
+    },
+    {
+        "basefile_name": "sro2-sq002ms-20231210-00000027",
+        "time": "2023-12-11 06:45",
+        "object": "NGC 4565",
+        "image": "images/image27.png"
+    },
+    {
+        "basefile_name": "eco1-ec002cs-20231210-00000028",
+        "time": "2023-12-11 07:00",
+        "object": "NGC 4631",
+        "image": "images/image28.png"
+    },
+    {
+        "basefile_name": "eco2-sq003cm-20231210-00000029",
+        "time": "2023-12-11 07:15",
+        "object": "NGC 4725",
+        "image": "images/image29.png"
+    },
+    {
+        "basefile_name": "aro1-sq002ms-20231210-00000030",
+        "time": "2023-12-11 07:30",
+        "object": "NGC 4736",
+        "image": "images/image30.png"
+    },
+    {
+        "basefile_name": "mrc1-ec002cs-20231210-00000031",
+        "time": "2023-12-11 07:45",
+        "object": "NGC 4826",
+        "image": "images/image31.png"
+    },
+    {
+        "basefile_name": "mrc2-sq003cm-20231210-00000032",
+        "time": "2023-12-11 08:00",
+        "object": "NGC 5055",
+        "image": "images/image32.png"
+    }
+]
+
diff --git a/src/assets/images/image1.png b/src/assets/images/image1.png
diff --git a/src/assets/images/image10.png b/src/assets/images/image10.png
diff --git a/src/assets/images/image11.png b/src/assets/images/image11.png
diff --git a/src/assets/images/image12.png b/src/assets/images/image12.png
diff --git a/src/assets/images/image13.png b/src/assets/images/image13.png
diff --git a/src/assets/images/image14.png b/src/assets/images/image14.png
diff --git a/src/assets/images/image15.png b/src/assets/images/image15.png
diff --git a/src/assets/images/image16.png b/src/assets/images/image16.png
diff --git a/src/assets/images/image17.png b/src/assets/images/image17.png
diff --git a/src/assets/images/image18.png b/src/assets/images/image18.png
diff --git a/src/assets/images/image19.png b/src/assets/images/image19.png
diff --git a/src/assets/images/image2.png b/src/assets/images/image2.png
diff --git a/src/assets/images/image20.png b/src/assets/images/image20.png
diff --git a/src/assets/images/image21.png b/src/assets/images/image21.png
diff --git a/src/assets/images/image22.png b/src/assets/images/image22.png
diff --git a/src/assets/images/image23.png b/src/assets/images/image23.png
diff --git a/src/assets/images/image24.png b/src/assets/images/image24.png
diff --git a/src/assets/images/image25.png b/src/assets/images/image25.png
diff --git a/src/assets/images/image26.png b/src/assets/images/image26.png
diff --git a/src/assets/images/image27.png b/src/assets/images/image27.png
diff --git a/src/assets/images/image28.png b/src/assets/images/image28.png
diff --git a/src/assets/images/image29.png b/src/assets/images/image29.png
diff --git a/src/assets/images/image3.png b/src/assets/images/image3.png
diff --git a/src/assets/images/image30.png b/src/assets/images/image30.png
diff --git a/src/assets/images/image31.png b/src/assets/images/image31.png
diff --git a/src/assets/images/image32.png b/src/assets/images/image32.png
diff --git a/src/assets/images/image4.png b/src/assets/images/image4.png
diff --git a/src/assets/images/image5.png b/src/assets/images/image5.png
diff --git a/src/assets/images/image6.png b/src/assets/images/image6.png
diff --git a/src/assets/images/image7.png b/src/assets/images/image7.png
diff --git a/src/assets/images/image8.png b/src/assets/images/image8.png
diff --git a/src/assets/images/image9.png b/src/assets/images/image9.png
diff --git a/src/components/DataSession/OperationWizard.vue b/src/components/DataSession/OperationWizard.vue
@@ -3,7 +3,7 @@ import { ref, onMounted, computed, defineEmits, defineProps} from 'vue'
 import { fetchApiCall, handleError } from '@/utils/api'
 import { calculateColumnSpan } from '@/utils/common'
 import ImageGrid from '../Global/ImageGrid'
-import ImageScalingGroup from '../Global/ImageScalingGroup'
+import ImageScalingGroup from '../Global/Scaling/ImageScalingGroup'
 import { useConfigurationStore } from '@/stores/configuration'
 import { useAlertsStore } from '@/stores/alerts'
 

diff --git a/src/components/Global/CompositeImage.vue → ...ponents/Global/Scaling/CompositeImage.vue b/src/components/Global/CompositeImage.vue → ...ponents/Global/Scaling/CompositeImage.vue