+
- {/*
*/}
+
+Размер окна должен быть не меньше чем 720x560
- table
+
@@ -404,6 +452,8 @@ export function Khokhlov_Gvozdik() {
>
+
+
);
}
diff --git a/src/gag_components/style.css b/src/gag_components/style.css
index 0c53412e..f1b0cfb7 100644
--- a/src/gag_components/style.css
+++ b/src/gag_components/style.css
@@ -1,3 +1,46 @@
+:root {
+ --my-white: white;
+ --menu-blue: #4690db;
+ --my-grey: #999999;
+ --checkbox-hover: #1975d2;
+ --my-black: #202020;
+ --checkmark-hover: #ccc;
+ --my-checkmark: #eee;
+ --my-select: #eee;
+ --my-shadow: rgba(0, 0, 0, 0.35);
+ --my-shadow2: rgba(0, 0, 0, 0.55);
+ --button-blue: #4690db;
+ --button-blue2: #90caf9;
+ --button-blue3: #62b8ff;
+
+ --color-scheme: light;
+}
+
+.dark {
+ --my-white: #424242;
+ --menu-blue: #90caf9;
+ --my-grey: #999999;
+ --checkbox-hover: #4892cf;
+ --my-black: #202020;
+ --checkmark-hover: #4892cf;
+ --my-checkmark: #90caf9;
+ --my-select: #90caf9;
+ --my-shadow: rgba(144, 202, 249, 0.21);
+ --my-shadow2: rgba(144, 202, 249, 0.55);
+
+ --button-blue: #2c94fc;
+ --button-blue2: #2375c6;
+ --button-blue3: #62b8ff;
+ --color-scheme: dark;
+}
+
+
+.low-screen{
+ color: #2c94fc;
+
+ visibility: hidden;
+ display: none;
+}
/* --------------------------------------------------------------*/
/* main grid*/
@@ -9,19 +52,26 @@
grid-gap: 10px;
height: 100vh;
overflow:auto;
+
/* grid-template-rows: minmax(0, 500px); */
/* justify-content: center;
justify-items: center; */
}
.common-container {
-
- background-color: white;
- box-shadow: rgba(34, 60, 80, 0.1) 0px 0px 10px 1px;
-
+ background-color: var(--my-white);
+
+ box-shadow: var(--my-shadow) 0px 0px 10px 1px;
overflow: auto;
position: relative;
padding: 10px;
+ transition: 0.4s ease-in-out;
+}
+
+.common-container:hover {
+
+ box-shadow: none;
+ transition: 0.4s ease-in-out;
}
@@ -65,7 +115,7 @@
overflow: scroll;
display: block;
- display: none;
+
/* grid-template-columns: 2fr 3fr; */
/* grid-template-rows: 6fr 2fr 6fr 2fr; */
/* grid-gap: 5px; */
@@ -74,15 +124,18 @@
}
-
+ .low-screen{
+ visibility: visible;
+ display: block;
+ }
.common-container {
- background-color: white;
- box-shadow: rgba(34, 60, 80, 0.21) 0px 0px 10px 1px;
+ background-color: var(--my-white);
+ box-shadow: var(--my-shadow) 0px 0px 10px 1px;
overflow: auto;
position: relative;
padding: 10px;
margin: 5px;
-
+ display: none;
}
.table_container{
@@ -135,14 +188,18 @@
}
-
+ .low-screen{
+ visibility: visible;
+ display: block;
+ }
.common-container {
- background-color: white;
- box-shadow: rgba(34, 60, 80, 0.21) 0px 0px 10px 1px;
+ background-color: var(--my-white);
+ box-shadow: var(--my-shadow) 0px 0px 10px 1px;
overflow: auto;
position: relative;
padding: 10px;
margin: 5px;
+ display: none;
}
@@ -188,7 +245,7 @@
/* --------------------------------------------------------------*/
.sphere_interface{
- border: 3px solid #999999;
+ border: 3px solid var(--my-grey);
border-radius: 6px;
padding: 10px;
height: 235px;
@@ -196,21 +253,23 @@
}
.sphere_interface:hover{
- border: 3px solid #4690db;
+ border: 3px solid var(--menu-blue);
border-radius: 12px;
+ transition: 0.4s ease-in-out;
}
.graph_interface{
height: 57vh;
width: 100%;
- border: 3px solid #999999;
+ border: 3px solid var(--my-grey);
border-radius: 6px;
padding: auto;
}
.graph_interface:hover{
- border: 3px solid #4690db;
+ border: 3px solid var(--menu-blue);
border-radius: 12px;
+ transition: 0.4s ease-in-out;
}
@@ -219,7 +278,7 @@
/* --------------------------------------------------------------*/
.interface{
- border: 3px solid #999999;
+ border: 3px solid var(--my-grey);
border-radius: 6px;
padding: 2.5vh;
height: 17.5vh;
@@ -230,14 +289,14 @@
}
.interface:hover{
- border: 3px solid #4690db;
+ border: 3px solid var(--menu-blue);
border-radius: 12px;
+ transition: 0.4s ease-in-out;
}
.item{
- /* background-color: #73bee9; */
border-radius: 5px;
}
@@ -303,8 +362,8 @@
font-family: 'Open Sans', sans-serif;
transition-duration: 0.15s;
border: none;
- color: white;
- background: #4690db;
+ color: var(--my-white);
+ background: var(--button-blue);
padding: 6px;
text-align: center;
@@ -314,15 +373,15 @@
}
.button:hover {
- background-color: #1975d2;
- color: white;
+ background-color: var(--button-blue3);
+ color: var(--my-white);
border-radius: 3px;
- box-shadow: 0px 2px 7px rgba(0, 0, 0, 0.45);
+ box-shadow: 0px 2px 7px var(--my-shadow2);
transition: transform 0.6s ease-in-out;
}
.button:active {
- background-color: #e2e2e2;
+ background-color: var(--my-select);
box-shadow: none;
transition: transform 0.6s ease-in-out;
}
@@ -338,11 +397,11 @@
outline:0;
box-shadow:none;
border:0!important;
- background: #e2e2e2;
+ background: var(--my-select);
background-image: none;
flex: 1;
padding: 5px 12px;
- color: #202020;
+ color: var(--my-black);
cursor:pointer;
border-radius: 3px;
transition: transform 0.6s ease-in-out;
@@ -350,7 +409,7 @@
.my_select:hover {
transition: transform 0.6s ease-in-out;
- box-shadow: 0px 2px 7px rgba(0, 0, 0, 0.35);
+ box-shadow: 0px 2px 7px var(--my-shadow2);
}
@@ -387,25 +446,28 @@
left: 0;
height: 20px;
width: 20px;
- background-color: #eee;
+ background-color: var(--my-checkmark);
border-radius: 5px;
}
-/* On mouse-over, add a grey background color */
+/* On mouse-over, add a g rey background color */
.my_input:hover input ~ .checkmark {
- background-color: #ccc;
+ background-color: var(--checkmark-hover);
}
+
/* When the checkbox is checked, add a blue background */
.my_input input:checked ~ .checkmark {
- background-color: #4690db;
+ background-color: var(--checkbox-hover);
}
.my_input input:checked:hover ~ .checkmark {
- background-color: #1975d2;
+ background-color: var(--button-blue2);
border-radius: 2px;
- transition-duration: 0.35s;
}
+
+
+
/* Create the checkmark/indicator (hidden when not checked) */
.checkmark:after {
content: "";
@@ -424,7 +486,7 @@
top: 2px;
width: 3px;
height: 10px;
- border: solid white;
+ border: solid var(--my-white);
border-width: 0 3px 3px 0;
-webkit-transform: rotate(45deg);
-ms-transform: rotate(45deg);
diff --git a/src/gag_components/zoomed_lambert_graph.tsx b/src/gag_components/zoomed_lambert_graph.tsx
index e99523ef..e3b1d884 100644
--- a/src/gag_components/zoomed_lambert_graph.tsx
+++ b/src/gag_components/zoomed_lambert_graph.tsx
@@ -28,7 +28,9 @@ export function Zoomed_lambert_graph(lambert_zoom_props:{
alpha95: number,
isvis: boolean,
isvisgrid: boolean,
- polygonPoints: string
+ polygonPoints: string,
+ grid_color: string,
+ poly_color: string
}) {
var center_zone = lambert_zoom_props.center_zone;
@@ -42,14 +44,18 @@ export function Zoomed_lambert_graph(lambert_zoom_props:{
var grid_isvis = lambert_zoom_props.isvisgrid;
var lambert_polygonPoints = lambert_zoom_props.polygonPoints;
+
+
+ var poly_color = lambert_zoom_props.poly_color;
+ var grid_color = lambert_zoom_props.grid_color;
+
+ var center_zone_color = '#4054E7';
var plot_point_numb = 170;
var circles_r = 0.0025;
var grid_r = 0.0015;
- var grid_color = '#16732f';
var center_zone_r = 0.003;
- var center_zone_color = '#4054E7';
var my_view_box = "-0.2 -0.2 0.4 0.4";
- var poly_color = "#AAE1BF";
+
if (angle_list[0] == 0){
From ee860e5f49eb5d9effa5d881af1129455855d5bf Mon Sep 17 00:00:00 2001
From: GAGvozdik <69218434+GAGvozdik@users.noreply.github.com>
Date: Mon, 4 Sep 2023 21:51:29 +0300
Subject: [PATCH 11/38] add tooltips, load svg, fix some styles
---
package-lock.json | 14 ++
package.json | 1 +
src/gag_components/khokhlov-gvozdik.tsx | 126 ++++++++++++----
src/gag_components/my-tooltip.tsx | 58 ++++++++
src/gag_components/question-mark.png | Bin 0 -> 3890 bytes
src/gag_components/style.css | 150 ++++++++++++++++----
src/gag_components/zoomed_lambert_graph.tsx | 83 ++++++++++-
7 files changed, 371 insertions(+), 61 deletions(-)
create mode 100644 src/gag_components/my-tooltip.tsx
create mode 100644 src/gag_components/question-mark.png
diff --git a/package-lock.json b/package-lock.json
index 1d16656e..6483df6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,6 +42,7 @@
"react-dropzone": "^12.0.4",
"react-hook-form": "^7.30.0",
"react-i18next": "^11.18.6",
+ "react-icons": "^4.10.1",
"react-redux": "^7.2.6",
"react-responsive": "^9.0.0-beta.6",
"react-router-dom": "^6.2.1",
@@ -16999,6 +17000,14 @@
}
}
},
+ "node_modules/react-icons": {
+ "version": "4.10.1",
+ "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz",
+ "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==",
+ "peerDependencies": {
+ "react": "*"
+ }
+ },
"node_modules/react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -33310,6 +33319,11 @@
"html-parse-stringify": "^3.0.1"
}
},
+ "react-icons": {
+ "version": "4.10.1",
+ "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz",
+ "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw=="
+ },
"react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
diff --git a/package.json b/package.json
index 06551388..6be91e4d 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
"react-dropzone": "^12.0.4",
"react-hook-form": "^7.30.0",
"react-i18next": "^11.18.6",
+ "react-icons": "^4.10.1",
"react-redux": "^7.2.6",
"react-responsive": "^9.0.0-beta.6",
"react-router-dom": "^6.2.1",
diff --git a/src/gag_components/khokhlov-gvozdik.tsx b/src/gag_components/khokhlov-gvozdik.tsx
index 52a25d35..5aaa4fe1 100644
--- a/src/gag_components/khokhlov-gvozdik.tsx
+++ b/src/gag_components/khokhlov-gvozdik.tsx
@@ -1,6 +1,8 @@
import React, {createElement as e, useEffect, useState} from 'react';
import {Zoomed_lambert_graph} from "./zoomed_lambert_graph";
import {Rotate_sphere} from "./rotate_sphere";
+import {TooltipContent} from "./my-tooltip";
+
import "./style.css";
import {
GeoVdek,
@@ -22,7 +24,9 @@ import {
getRandomInt,
get_quantiles
} from "./gag_functions";
-
+import HelpCenterOutlinedIcon from '@mui/icons-material/HelpCenterOutlined';
+import Tooltip from '@mui/material/Tooltip';
+import FileDownloadOutlinedIcon from '@mui/icons-material/FileDownloadOutlined';
import { useAppDispatch, useAppSelector } from '../services/store/hooks';
@@ -43,6 +47,10 @@ import ModalWrapper from '../components/Sub/Modal/ModalWrapper';
import UploadModal from '../components/Sub/Modal/UploadModal/UploadModal';
import { useMediaQuery } from 'react-responsive';
+
+
+
+
export function Khokhlov_Gvozdik() {
// const [dataToShow, setDataToShow] = useState
(null);
@@ -68,6 +76,12 @@ export function Khokhlov_Gvozdik() {
//-----------------------------------------------------------
// input data generating
//-----------------------------------------------------------
+
+ const [size, setSize] = React.useState('small');
+
+
+
+
// const theme = useTheme();
var max_lon = 0;
var min_lon = 10;
@@ -328,13 +342,51 @@ export function Khokhlov_Gvozdik() {
poly_color: poly_color
};
+
+ // Функция для загрузки SVG
+ const handleDownloadSVG = () => {
+ const svgElement = document.querySelector('.svg.graph_interface');
+ if (!svgElement) {
+ console.error('SVG element not found');
+ return;
+ }
+
+ const svgData = new XMLSerializer().serializeToString(svgElement);
+
+ const downloadLink = document.createElement('a');
+ const blob = new Blob([svgData], { type: 'image/svg+xml' });
+ const url = URL.createObjectURL(blob);
+
+ downloadLink.href = url;
+ downloadLink.download = 'graph.svg';
+
+ document.body.appendChild(downloadLink);
+ downloadLink.click();
+ document.body.removeChild(downloadLink);
+ URL.revokeObjectURL(url);
+ };
+
+
return (
-
Размер окна должен быть не меньше чем 720x560
+
Размер окна должен быть не меньше чем 720x560
-
+
@@ -369,22 +423,40 @@ export function Khokhlov_Gvozdik() {
*/}
+
+
+
{/*
Interface
*/}
+
+
+ } arrow>
+
+
+
+
+
+
+
-
+
+
@@ -395,25 +467,22 @@ export function Khokhlov_Gvozdik() {
-
-
-
{/*
The percentage of the zone from the sphere:
{" " + String((zone_square(grid_points.length, points_numb) * 100).toFixed(3))}%.
@@ -421,16 +490,22 @@ export function Khokhlov_Gvozdik() {
α95: {alpha95.toFixed(3)}
*/}
-
diff --git a/src/gag_components/my-tooltip.tsx b/src/gag_components/my-tooltip.tsx
new file mode 100644
index 00000000..841cec91
--- /dev/null
+++ b/src/gag_components/my-tooltip.tsx
@@ -0,0 +1,58 @@
+import React, {createElement as e, useEffect, useState} from 'react';
+import "./style.css";
+
+
+
+
+ export function TooltipContent(tooltip_props:{type:string}) {
+
+ var type = tooltip_props.type;
+
+
+ let content = '';
+ if (type === 'graph') {
+ return (
+
+ Этот график представляет собой результат проецирования на
+ плоскость изображения, построенного на поверхности сферы.
+ Красный круг - это доверительный интервал а95. Черные круги
+ построены вокруг направления, получанного из одного образца.
+ Радиус черных кругов отображает качество соответствующих
+ образцов и представляет собой доверительный интервал. Чем
+ больше шагов размагничивания было пройдено образцом, тем
+ меньше круг.
+
+ Пересечение кругов образует синеватую зону, в которой лежит
+ истинное палеомагнитное направление, закраску этой зоны можно
+ убрать нажав на галочку show zone Точность расчета центра
+ этой зоны зависит от плотности grid, которую можно настроить
+ на панели параметров, также сам grid можно отобразить, нажав
+ на галочку show grid. При достаточной точности, центр
+ будет находиться ровно в гипоцентре зоны.
+
+ );
+ }
+
+ else if (type === 'checkbox') {
+ return (
+
my checkbox
+ );
+ }
+
+ else if (type === 'select') {
+ return (
+
my select
+ );
+ }
+
+ else if (type === 'download svg') {
+ return (
+
download svg
+ );
+ }
+
+ else {
+ return
;
+ }
+
+ };
diff --git a/src/gag_components/question-mark.png b/src/gag_components/question-mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..baae32c83c389821fac4409bc6d0d0c8af7d195c
GIT binary patch
literal 3890
zcmV-256$q2P)
(iu&@SshvonP4$nzMK~#9!)Scgd(?$}&g+yt1
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
AC;$Ke
literal 0
HcmV?d00001
diff --git a/src/gag_components/style.css b/src/gag_components/style.css
index f1b0cfb7..b8105c7b 100644
--- a/src/gag_components/style.css
+++ b/src/gag_components/style.css
@@ -1,17 +1,19 @@
:root {
--my-white: white;
--menu-blue: #4690db;
- --my-grey: #999999;
+ --my-grey: #c5c5c5;
--checkbox-hover: #1975d2;
--my-black: #202020;
--checkmark-hover: #ccc;
- --my-checkmark: #eee;
- --my-select: #eee;
- --my-shadow: rgba(0, 0, 0, 0.35);
- --my-shadow2: rgba(0, 0, 0, 0.55);
+ --my-checkmark: #e0e0e0;
+ --my-select: #e4e4e4;
+ --my-shadow: rgba(0, 0, 0, 0.15);
+ --my-shadow2: rgba(0, 0, 0, 0.15);
--button-blue: #4690db;
--button-blue2: #90caf9;
--button-blue3: #62b8ff;
+ --my-tooltip: #202020;
+ --my-tooltip-back: #c5c5c5;
--color-scheme: light;
}
@@ -25,13 +27,15 @@
--checkmark-hover: #4892cf;
--my-checkmark: #90caf9;
--my-select: #90caf9;
- --my-shadow: rgba(144, 202, 249, 0.21);
+ --my-shadow: rgba(144, 202, 249, 0.31);
--my-shadow2: rgba(144, 202, 249, 0.55);
- --button-blue: #2c94fc;
+ --button-blue: #0280fd;
--button-blue2: #2375c6;
- --button-blue3: #62b8ff;
+ --button-blue3: #229cff;
+ --my-tooltip: #90caf9;
--color-scheme: dark;
+ --my-tooltip-back: #424242;
}
@@ -47,9 +51,9 @@
/* --------------------------------------------------------------*/
.main_container{
display: grid;
- grid-template-columns: 8fr 6fr 3fr;
+ grid-template-columns: 10fr 6fr 3fr;
grid-template-rows: 7fr 3fr;
- grid-gap: 10px;
+ grid-gap: 20px;
height: 100vh;
overflow:auto;
@@ -179,7 +183,7 @@
overflow: scroll;
display: block;
- display: none;
+
/* grid-template-columns: 2fr 3fr; */
/* grid-template-rows: 6fr 2fr 6fr 2fr; */
/* grid-gap: 5px; */
@@ -200,7 +204,6 @@
padding: 10px;
margin: 5px;
display: none;
-
}
.table_container{
@@ -227,7 +230,7 @@
padding: 5px;
height: 100vh;
display: grid;
- grid-template-columns: 5fr 5fr 5fr;
+ grid-template-columns: 5fr 5fr 3fr ;
grid-template-rows: 1fr 1fr 2fr;
grid-gap: 10px;
}
@@ -259,11 +262,15 @@
}
.graph_interface{
- height: 57vh;
+ height: 52vh;
width: 100%;
border: 3px solid var(--my-grey);
border-radius: 6px;
padding: auto;
+
+ position: relative;
+
+
}
.graph_interface:hover{
@@ -280,11 +287,11 @@
.interface{
border: 3px solid var(--my-grey);
border-radius: 6px;
- padding: 2.5vh;
+ padding: 1vh;
height: 17.5vh;
display: grid;
- grid-template-columns: 5fr 5fr 3fr;
- grid-template-rows: 1fr 1fr 2fr;
+ grid-template-columns: 6fr 6fr 4fr;
+ grid-template-rows: 1fr 1fr 1fr 1fr;
grid-gap: 10px;
}
@@ -331,18 +338,36 @@
grid-column-start: 1;
grid-column-end: 3;
grid-row-start: 3;
- grid-row-end: 3;
+ grid-row-end: 5;
justify-self: center;
align-self: center;
}
-.info-item {
+.info-item1 {
grid-column-start: 3;
grid-column-end: 3;
grid-row-start: 1;
- grid-row-end: 4;
+ grid-row-end: 1;
+ align-self: center;
+
}
+.info-item2 {
+ grid-column-start: 3;
+ grid-column-end: 3;
+ grid-row-start: 2;
+ grid-row-end: 2;
+ align-self: center;
+
+
+}
+.info-item3 {
+ grid-column-start: 3;
+ grid-column-end: 3;
+ grid-row-start: 3;
+ grid-row-end: 3;
+ align-self: center;
+}
.my_text {
@@ -354,7 +379,12 @@
}
.info {
- font-size: 14px;
+ /* background-color: #1975d2; */
+ font-size: 12px;
+ display: flex;
+ align-items: center;
+ /* flex-direction: column; */
+
}
.button {
@@ -362,8 +392,8 @@
font-family: 'Open Sans', sans-serif;
transition-duration: 0.15s;
border: none;
- color: var(--my-white);
- background: var(--button-blue);
+ color: white;
+ background: var(--button-blue3);
padding: 6px;
text-align: center;
@@ -372,10 +402,17 @@
transition: transform 0.6s ease-in-out;
}
+@media screen and (max-width: 900px){
+ .button {
+ font-size: 13px;
+
+ }
+}
+
.button:hover {
- background-color: var(--button-blue3);
+ background-color: var(--button-blue);
color: var(--my-white);
- border-radius: 3px;
+ border-radius: 6px;
box-shadow: 0px 2px 7px var(--my-shadow2);
transition: transform 0.6s ease-in-out;
}
@@ -411,8 +448,25 @@
transition: transform 0.6s ease-in-out;
box-shadow: 0px 2px 7px var(--my-shadow2);
}
+.my_select option {
+ border-radius: 5px;
+ outline: none;
+}
+.my_select option:checked {
+ background-color: var(--checkmark-hover);
+ color: var(--my-white);
+}
+
+.select-option:hover {
+ background-color: var(--checkmark-hover);
+ color: var(--my-white);
+}
+.my_select.decorated option:hover {
+ background-color: var(--checkmark-hover);
+ color: var(--my-white);
+}
/* --------------------------------------------------------------*/
/* CHECKBOX */
/* --------------------------------------------------------------*/
@@ -421,13 +475,16 @@
display: block;
position: relative;
padding-left: 27px;
- margin-bottom: 10px;
- margin-top: 10px;
+ /* margin-bottom: 30px; */
+ /* margin-top: 0px; */
font-family: 'Open Sans', sans-serif;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
+ display: flex;
+ align-items: center;
+ /* height: 100%; */
}
/* Hide the browser's default checkbox */
@@ -442,12 +499,15 @@
/* Create a custom checkbox */
.checkmark {
position: absolute;
- top: 0;
- left: 0;
+
+ left: 0px;
height: 20px;
width: 20px;
background-color: var(--my-checkmark);
border-radius: 5px;
+
+
+
}
/* On mouse-over, add a g rey background color */
@@ -493,4 +553,36 @@
transform: rotate(45deg);
}
+.graph-tooltip{
+ color: var(--menu-blue);
+ display: block;
+ float: right;
+}
+
+
+.interface-tooltip{
+ color: var(--menu-blue);
+ display: block;
+ width: 100%;
+ float: right;
+}
+
+
+
+
+.my-tooltip{
+
+}
+
+.tooltip-span{
+ color: var(--my-tooltip);
+}
+
+.MuiTooltip-tooltip {
+ background-color: var(--my-tooltip-back) !important;
+}
+
+.my-tooltip-arrow:before {
+ border-bottom-color: green;
+}
diff --git a/src/gag_components/zoomed_lambert_graph.tsx b/src/gag_components/zoomed_lambert_graph.tsx
index e3b1d884..640bed40 100644
--- a/src/gag_components/zoomed_lambert_graph.tsx
+++ b/src/gag_components/zoomed_lambert_graph.tsx
@@ -162,12 +162,6 @@ export function Zoomed_lambert_graph(lambert_zoom_props:{
my_key += 1;
}
}
- if (max_x < -1 * min_x) {var max_x = -min_x}
- if (max_y < -1 * min_y) {var max_y = -min_y}
-
- var my_view_box = String(-max_x) + " " + String(-max_y - 0.03) + " " + String(max_x * 2) + " " + String(max_y * 2 + 0.06);
-
- // "-0.2 -0.2 0.4 0.4";
//-----------------------------------------------------------------
// making grid on left svg
@@ -239,12 +233,76 @@ export function Zoomed_lambert_graph(lambert_zoom_props:{
)
);
+ my_key += 1;
+ //---------------------------------------------------------------------------------------
+ //
+ //---------------------------------------------------------------------------------------
+
+ var rumbs = e('circle',
+ {
+ key: my_key,
+ r: max_y * 1.3,
+ cx: String(0),
+ cy: String(0),
+ fill: "none",
+ stroke: "grey",
+ strokeWidth: "0.0016px",
+ strokeDasharray: "0.06px, 0.012px"
+
+ }, ''
+ );
+
+ my_key += 1;
+
+ if (max_x < -1 * min_x) {var max_x = -min_x}
+ if (max_y < -1 * min_y) {var max_y = -min_y}
+
+
+ // "-0.2 -0.2 0.4 0.4";
+
+
+ var my_view_box:string;
+ var rumb_font_size:number;
+ var my_max:number;
+
+ if (max_x > max_y){
+ rumb_font_size = max_x / 10;
+ my_max = max_x;
+
+ my_view_box = String(-max_x - 2 * rumb_font_size) + " ";
+ my_view_box += String(-max_x - 2 * rumb_font_size) + " ";
+ my_view_box += String(max_x * 2 + 4 * rumb_font_size) + " ";
+ my_view_box += String(max_x * 2 + 4 * rumb_font_size);
+
+ }
+ else{
+ rumb_font_size = max_y / 10;
+ my_max = max_y;
+
+ my_view_box = String(-max_y - 2 * rumb_font_size) + " ";
+ my_view_box += String(-max_y - 2 * rumb_font_size) + " ";
+ my_view_box += String(max_y * 2 + 4 * rumb_font_size) + " ";
+ my_view_box += String(max_y * 2 + 4 * rumb_font_size);
+
+
+
+ }
+ //---------------------------------------------------------------------------------------
+ //
+ //---------------------------------------------------------------------------------------
+
+
+
+
return (
{/*
Lambert svg
*/}
table2
- {/*
-
-
*/}
@@ -432,8 +452,12 @@ export function Khokhlov_Gvozdik() {
} arrow>
diff --git a/src/gag_components/my-tooltip.tsx b/src/gag_components/my-tooltip.tsx
index 841cec91..090f2d6a 100644
--- a/src/gag_components/my-tooltip.tsx
+++ b/src/gag_components/my-tooltip.tsx
@@ -1,13 +1,16 @@
import React, {createElement as e, useEffect, useState} from 'react';
import "./style.css";
+import {Rotate_sphere} from "./rotate_sphere";
-
-
- export function TooltipContent(tooltip_props:{type:string}) {
+ export function TooltipContent(tooltip_props:{type:string, sred_dir: number[], center_zone: number[], dir_list: number[][], angle_list: number[]}) {
var type = tooltip_props.type;
+ let center_zone = tooltip_props.center_zone;
+ let dir_list = tooltip_props.dir_list;
+ let angle_list = tooltip_props.angle_list;
+ let sred_dir = tooltip_props.sred_dir
let content = '';
if (type === 'graph') {
@@ -21,6 +24,7 @@ import "./style.css";
образцов и представляет собой доверительный интервал. Чем
больше шагов размагничивания было пройдено образцом, тем
меньше круг.
+
Пересечение кругов образует синеватую зону, в которой лежит
истинное палеомагнитное направление, закраску этой зоны можно
@@ -29,6 +33,11 @@ import "./style.css";
на панели параметров, также сам grid можно отобразить, нажав
на галочку show grid. При достаточной точности, центр
будет находиться ровно в гипоцентре зоны.
+
);
}
diff --git a/src/gag_components/my_sphere_black.html b/src/gag_components/my_sphere_black.html
new file mode 100644
index 00000000..0e3f0791
--- /dev/null
+++ b/src/gag_components/my_sphere_black.html
@@ -0,0 +1,434 @@
+
+
+
+
+ Sphere with Grid
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/gag_components/rotate_sphere.tsx b/src/gag_components/rotate_sphere.tsx
index abb61313..c295cf35 100644
--- a/src/gag_components/rotate_sphere.tsx
+++ b/src/gag_components/rotate_sphere.tsx
@@ -14,18 +14,20 @@ import {
} from "./gag_functions";
-export function Rotate_sphere(props:{center_zone: number[], dir_list: number[][], angle_list: number[]}) {
+export function Rotate_sphere(props:{sred_dir: number[], center_zone: number[], dir_list: number[][], angle_list: number[]}) {
var dir_list = props.dir_list;
var center_zone = props.center_zone;
var angle_list = props.angle_list;
-
+ let sred_dir = props.sred_dir;
//-----------------------------------------------------------------
// making center zone for drawing on center svg
//-----------------------------------------------------------------
- var rot_center_zone = RotateAroundV(center_zone, get_perp([0, 0, 1], center_zone), -angle_between_v([0, 0, 1], center_zone) * 180 / Math.PI)
+ var rot_center_zone = center_zone;
+
+ var rot_center_zone = sred_dir;
var center_center_zone = e('circle',
{
@@ -46,7 +48,7 @@ export function Rotate_sphere(props:{center_zone: number[], dir_list: number[][]
var my_key = 1;
for ( var i = 0; i < dir_list.length; i ++ ) {
- var dir_circle = centering(PlotCircle(dir_list[i], angle_list[i], 90), center_zone);
+ var dir_circle = PlotCircle(dir_list[i], angle_list[i], 90);
center_circles.push(
e('polyline',
{
@@ -70,19 +72,19 @@ export function Rotate_sphere(props:{center_zone: number[], dir_list: number[][]
var coords = [];
- var point = [0, 0, 1];
+ var point = [1, 0, 0];
var mer_numb = 9;
for ( var i = 0; i < mer_numb; i ++ ) {
point = RotateAroundV(point, [0, 1, 0], 30 - 10 * mer_numb / 9);
- var meridian = centering(PlotCircle(point, 90, 90), center_zone);
+ var meridian = PlotCircle(point, 90, 90);
coords.push(make_coords(meridian));
}
var par_numb = 9;
for ( var i = 0; i < par_numb; i ++ ) {
- var paralel = centering(PlotCircle([0, 1, 0], i * (30 - 10 * mer_numb / 9), 90), center_zone);
+ var paralel = PlotCircle([0, 1, 0], i * (30 - 10 * mer_numb / 9), 90);
coords.push(make_coords(paralel));
}
diff --git a/src/gag_components/style.css b/src/gag_components/style.css
index b8105c7b..a3c42937 100644
--- a/src/gag_components/style.css
+++ b/src/gag_components/style.css
@@ -93,12 +93,7 @@
grid-row-end: 1;
}
-.sphere_container {
- grid-column-start: 3;
- grid-column-end: 3;
- grid-row-start: 2;
- grid-row-end: 2;
-}
+
.table2_container{
grid-column-start: 1;
@@ -151,7 +146,7 @@
}
.sphere_container {
-
+ /* height: 200vh; */
}
.table2_container{
@@ -248,10 +243,10 @@
/* --------------------------------------------------------------*/
.sphere_interface{
- border: 3px solid var(--my-grey);
+ border: 3px solid var(--menu-blue);
border-radius: 6px;
padding: 10px;
- height: 235px;
+ height: 500px;
width: 90%;
}
diff --git a/src/gag_components/zoomed_lambert_graph.tsx b/src/gag_components/zoomed_lambert_graph.tsx
index 640bed40..6647e803 100644
--- a/src/gag_components/zoomed_lambert_graph.tsx
+++ b/src/gag_components/zoomed_lambert_graph.tsx
@@ -290,7 +290,43 @@ export function Zoomed_lambert_graph(lambert_zoom_props:{
//---------------------------------------------------------------------------------------
//
//---------------------------------------------------------------------------------------
+
+ var coords = [];
+
+ var point = [1, 0, 0];
+
+
+ var mer_numb = 18;
+ for ( var i = 0; i < mer_numb; i ++ ) {
+ point = RotateAroundV(point, [0, 1, 0], 30 - 10 * mer_numb / 9);
+ var meridian = centering(PlotCircle(point, 90, 90), lamb_sred_dir);
+ coords.push(make_coords(meridian));
+ }
+
+ var par_numb = 18;
+ for ( var i = 0; i < par_numb; i ++ ) {
+ var paralel = centering(PlotCircle([0, 1, 0], i * (30 - 10 * mer_numb / 9), 90), lamb_sred_dir);
+ coords.push(make_coords(paralel));
+ }
+
+ paralel = PlotCircle([0, 0, 1], 90, 90);
+ coords.push(make_coords(paralel));
+ var center_degree_grid = [];
+ for ( let i = 0; i < coords.length; i ++ ) {
+ center_degree_grid.push(
+ e('polyline',
+ {
+ key: my_key,
+ points: coords[i],
+ stroke: "grey",
+ fill: 'none',
+ strokeWidth:"0.0005px"
+ }, ''
+ )
+ );
+ my_key += 1;
+ }
@@ -302,7 +338,7 @@ export function Zoomed_lambert_graph(lambert_zoom_props:{
{/* {rumbs} */}
-
+ {center_degree_grid}
{lambert_isvis && }
{grid_isvis && grid}
{lambert_circles}
From db11b04357dc7f722902b0d26278e107f0cd6ebd Mon Sep 17 00:00:00 2001
From: GAGvozdik <69218434+GAGvozdik@users.noreply.github.com>
Date: Wed, 6 Sep 2023 23:48:11 +0300
Subject: [PATCH 13/38] I break all to fix centering break lambert projection
too
---
src/gag_components/3dsphere.tsx | 16 +-
src/gag_components/TreejsScene.ts | 86 ++---
src/gag_components/gag_functions.ts | 11 +
src/gag_components/khokhlov-gvozdik.tsx | 49 +--
src/gag_components/my_sphere_black.html | 371 +++++++++++++-------
src/gag_components/zoomed_lambert_graph.tsx | 120 +++++--
6 files changed, 398 insertions(+), 255 deletions(-)
diff --git a/src/gag_components/3dsphere.tsx b/src/gag_components/3dsphere.tsx
index 7df5cfb6..e8e6b2d6 100644
--- a/src/gag_components/3dsphere.tsx
+++ b/src/gag_components/3dsphere.tsx
@@ -13,17 +13,17 @@ import {
zone_square
} from "./gag_functions";
-import { createScene } from './ThreejsScene';
+// import { createScene } from './ThreejsScene';
export function Threedsphere() {
- const containerRef = useRef(null);
+ // const containerRef = useRef(null);
- useEffect(() => {
- if (containerRef.current) {
- createScene(containerRef.current);
- }
- }, [containerRef]);
+ // useEffect(() => {
+ // if (containerRef.current) {
+ // createScene(containerRef.current);
+ // }
+ // }, [containerRef]);
- return ;
+ // return ;
}
diff --git a/src/gag_components/TreejsScene.ts b/src/gag_components/TreejsScene.ts
index ed30a647..431fb827 100644
--- a/src/gag_components/TreejsScene.ts
+++ b/src/gag_components/TreejsScene.ts
@@ -2,47 +2,47 @@ import * as THREE from 'three';
import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
export const createScene = (container: HTMLElement) => {
- const scene = new THREE.Scene();
- scene.background = new THREE.Color(0x0000);
-
- // Set up the camera
- const camera = new THREE.PerspectiveCamera(
- 75,
- container.clientWidth / container.clientHeight,
- 0.9,
- 1000
- );
-
- camera.position.z = 2;
-
- // Set up the renderer
- const renderer = new THREE.WebGLRenderer({ antialias: true });
- renderer.setSize(container.clientWidth, container.clientHeight);
- container.appendChild(renderer.domElement);
-
- //Create a PointLight and turn on shadows for the light
- const light = new THREE.PointLight(0xffffff, 1, 100);
- scene.add(light);
-
- //-----------------------------------------------------------------------
- // make sphere
- //-----------------------------------------------------------------------
-
- const geometry = new THREE.SphereGeometry(0.997, 90, 90);
- const material = new THREE.MeshDepthMaterial({ color: 0x3B8C9A });
- const sphere = new THREE.Mesh(geometry, material);
- scene.add(sphere);
-
- // Set up the controls
- const controls = new OrbitControls(camera, renderer.domElement);
-
- // Animate the scene
- const animate = () => {
- requestAnimationFrame(animate);
- light.position.copy(camera.position);
- controls.update();
- renderer.render(scene, camera);
- };
-
- animate();
+ // const scene = new THREE.Scene();
+ // scene.background = new THREE.Color(0x0000);
+
+ // // Set up the camera
+ // const camera = new THREE.PerspectiveCamera(
+ // 75,
+ // container.clientWidth / container.clientHeight,
+ // 0.9,
+ // 1000
+ // );
+
+ // camera.position.z = 2;
+
+ // // Set up the renderer
+ // const renderer = new THREE.WebGLRenderer({ antialias: true });
+ // renderer.setSize(container.clientWidth, container.clientHeight);
+ // container.appendChild(renderer.domElement);
+
+ // //Create a PointLight and turn on shadows for the light
+ // const light = new THREE.PointLight(0xffffff, 1, 100);
+ // scene.add(light);
+
+ // //-----------------------------------------------------------------------
+ // // make sphere
+ // //-----------------------------------------------------------------------
+
+ // const geometry = new THREE.SphereGeometry(0.997, 90, 90);
+ // const material = new THREE.MeshDepthMaterial({ color: 0x3B8C9A });
+ // const sphere = new THREE.Mesh(geometry, material);
+ // scene.add(sphere);
+
+ // // Set up the controls
+ // const controls = new OrbitControls(camera, renderer.domElement);
+
+ // // Animate the scene
+ // const animate = () => {
+ // requestAnimationFrame(animate);
+ // light.position.copy(camera.position);
+ // controls.update();
+ // renderer.render(scene, camera);
+ // };
+
+ // animate();
};
\ No newline at end of file
diff --git a/src/gag_components/gag_functions.ts b/src/gag_components/gag_functions.ts
index 629fb347..197c4594 100644
--- a/src/gag_components/gag_functions.ts
+++ b/src/gag_components/gag_functions.ts
@@ -144,6 +144,17 @@ export function GeoVdek(r: number, phi: number, lmbd: number)
return C;
}
+export function GeoVdekG(r: number, point1: number, point2: number): [number, number, number] {
+ const projectedX = point1;
+ const projectedY = point2;
+ const squaredSum = projectedX * projectedX + projectedY * projectedY;
+ const projectedZ = Math.sqrt(1 - squaredSum);
+
+ return [projectedX, projectedY, projectedZ];
+}
+
+
+
export function vector_length(v:number[]) { return Math.sqrt( v[0] * v[0] + v[1] * v[1] + v[2] * v[2] ); }
export function points_dist(p1:number[], p2:number[]) {
diff --git a/src/gag_components/khokhlov-gvozdik.tsx b/src/gag_components/khokhlov-gvozdik.tsx
index 5ce1e9cd..7bf8f118 100644
--- a/src/gag_components/khokhlov-gvozdik.tsx
+++ b/src/gag_components/khokhlov-gvozdik.tsx
@@ -23,6 +23,7 @@ import {
lambertMass,
points_dist_2d,
getRandomInt,
+ GeoVdekG,
get_quantiles
} from "./gag_functions";
import HelpCenterOutlinedIcon from '@mui/icons-material/HelpCenterOutlined';
@@ -116,7 +117,8 @@ export function Khokhlov_Gvozdik() {
new_ang_list.push(quantiles[step_list[i] - 3]);
}
setAngleList(new_ang_list);
- console.log('angles changed')
+ console.log('angles changed');
+ console.log(new_ang_list);
}, [selectedD, apc, selectedP, dir_number, step_list]);
@@ -161,7 +163,8 @@ export function Khokhlov_Gvozdik() {
var random_angle = getRandomfloat(0, 180);
for ( var i = 0; i < dir_number; i ++ ) {
-
+ console.log('random_list[i * 2]');
+ console.log(random_list[i * 2]);
paleo_data = GeoVdek(1, random_list[i * 2], random_list[i * 2 + 1])
paleo_data = NormalizeV(RotateAroundV(paleo_data, random_dir, random_angle));
step = getRandomInt(6, quantiles.length);
@@ -230,7 +233,7 @@ export function Khokhlov_Gvozdik() {
var phi = 0.013;
-
+
for (var i = 0; i < points_numb; i++)
{
x = (i * phi - Math.round(i * phi)) * 360;
@@ -274,41 +277,6 @@ export function Khokhlov_Gvozdik() {
// polygon of zone and max radius calculation
//---------------------------------------------------------------------------------------
- var rot_center_zone = convertToLambert(center_zone, sred_dir);
- var calc_circ_points = 720 * 8;
- var input: [number, number][] = [];
- var circ_p = [];
-
- for ( var i = 0; i < dir_list.length; i ++ )
- {
- var b = lambertMass(PlotCircle(dir_list[i], angle_list[i], calc_circ_points), sred_dir);
-
- for (var j = 0; j < b.length; j++){
- circ_p.push(b[j]);
- }
- }
-
- for ( let i = 0; i < circ_p.length; i ++ )
- {
- input.push([circ_p[i][0], circ_p[i][1]]);
- }
-
- var poly_points2d = poly_contour(input, [rot_center_zone[0], rot_center_zone[1]]);
- var poly_points3d = [];
-
- for ( let i = 0; i < poly_points2d.length; i ++ )
- {
- poly_points3d.push([poly_points2d[i][0], poly_points2d[i][1], 1 ]);
- }
-
- const polygonPoints = make_coords(poly_points3d);
-
- var max_rad = -1;
- for ( let i = 0; i < input.length; i ++ )
- {
- if (points_dist_2d(rot_center_zone, input[i]) > max_rad){max_rad = points_dist_2d(rot_center_zone, input[i]);}
- }
-
//---------------------------------------------------------------------------------------
// Interface
//---------------------------------------------------------------------------------------
@@ -338,7 +306,6 @@ export function Khokhlov_Gvozdik() {
alpha95: alpha95,
isvis: isvis,
isvisgrid: isvisgrid,
- polygonPoints: polygonPoints,
grid_color: grid_color,
poly_color: poly_color
};
@@ -410,7 +377,6 @@ export function Khokhlov_Gvozdik() {
alpha95={alpha95}
isvis={isvis}
isvisgrid={isvisgrid}
- polygonPoints={polygonPoints}
grid_color={grid_color}
poly_color={poly_color}
/>
@@ -434,7 +400,7 @@ export function Khokhlov_Gvozdik() {
angle_list={angle_list}/>
*/}
-
+
@@ -471,6 +437,7 @@ export function Khokhlov_Gvozdik() {