diff --git a/.jekyll-metadata b/.jekyll-metadata new file mode 100644 index 000000000..c280d872e Binary files /dev/null and b/.jekyll-metadata differ diff --git a/_data/galleries/workshop23 b/_data/galleries/workshop23 deleted file mode 100644 index e593044a4..000000000 --- a/_data/galleries/workshop23 +++ /dev/null @@ -1,4 +0,0 @@ -images: - - url: "Lorem Ipsum Dolor" - - url: "Sit Amet" - - url: "Testbild 123" \ No newline at end of file diff --git a/_includes/gallery.html b/_includes/gallery.html deleted file mode 100644 index a32c946e8..000000000 --- a/_includes/gallery.html +++ /dev/null @@ -1,9 +0,0 @@ -{% comment %} images=site.data.gallery.workshop23 height="30vh" scroll_direction="x" auto_scroll="true" {% endcomment %} - -
- {% for image in include.images %} - - {{ image.url }} - - {% endfor %} -
\ No newline at end of file diff --git a/_site/css/customstyles.css b/_site/css/customstyles.css index c9da3fb26..262fba2b4 100644 --- a/_site/css/customstyles.css +++ b/_site/css/customstyles.css @@ -1289,6 +1289,30 @@ abbr[title]:after { width: 100%; } +/* horizontal scrollable rows */ +.row.no-wrap-scrollable-x { + display: flex; + overflow-x: auto; + white-space: nowrap; + /* margin: auto; */ + scroll-snap-type: x mandatory; + outline: 1px solid red; +} +.row.no-wrap-scrollable-x > div { + display: ruby; + white-space: initial; + scroll-snap-align: start; +} + +/* show scrollbar at top of container */ +.scrollbar-at-top { + transform: rotateX(180deg); +} +.scrollbar-at-top > * { + padding-top: 10px; + transform: rotateX(180deg); +} + /* -------------------------- */ /* important / override rules */ /* -------------------------- */ diff --git a/_site/index.html b/_site/index.html index befe984c2..03c33818f 100644 --- a/_site/index.html +++ b/_site/index.html @@ -223,6 +223,7 @@    

+
@@ -325,6 +326,7 @@
+
@@ -342,7 +344,45 @@
-
+ +
+
+
+
+ +
+
+

Grain Tutorial

+

A quick guide through the grain reconstruction capabilities of MTEX.

+ Learn More +
+
+
+
+
+
+ +
+
+

Denoising Orientation Maps

+

In this section we demonstrate how random errors can be significantly reduced using denoising techniques.

+ Learn More +
+
+
+
+
+
+ +
+
+

Martensite Parent Grain Reconstruction

+

Here we demonstrate the tools MTEX offers to reconstruct a parent austenite phase from a measured martensite phase.

+ Learn More +
+
+
+
@@ -381,6 +421,7 @@

Martensite Parent Grain Reconstruction

+
@@ -422,6 +463,7 @@

Martensite Parent Grain Reconstruction

+
diff --git a/_site/js/customscripts.js b/_site/js/customscripts.js index a01511920..c905b71af 100644 --- a/_site/js/customscripts.js +++ b/_site/js/customscripts.js @@ -1,4 +1,38 @@ +function auto_scroll_x(scrollElement, scrollStep=1, scrollDelayMilSec=1000) { + const scrollWidth = scrollElement.scrollWidth - scrollElement.clientWidth; + const scrollDelay = scrollDelayMilSec; + + // auto-scrolling + const scrollAnimation = setInterval(()=>{ + if (scrollElement.scrollLeft >= scrollWidth) { + scrollStep *= -1; + } else if (scrollElement.scrollLeft <= 0) { + scrollStep *= -1; + } + scrollElement.scrollBy(scrollStep, 0); + }, scrollDelay); + + // stop auto-scrolling while mouse over element + scrollElement.addEventListener("mouseenter", (evt)=>{ + clearInterval(scrollAnimation); + }); + // continue auto-scrolling when mouse leave element + scrollElement.addEventListener("mouseleave", (evt)=>{ + auto_scroll_x(scrollElement, scrollStep, scrollDelayMilSec); + }); + + // stop auto-scrolling on mobile after short time + const scrollDuration = scrollWidth / scrollStep * scrollDelay; + if (scrollWidth < 200) { + setTimeout(()=>{ + clearInterval(scrollAnimation); + }, scrollDuration); + } +} + + + // some small functions const uniqId = (()=>{let i=0;return()=>{return i++;}})(); @@ -69,6 +103,11 @@ $(document).ready(function() { } } }); + + // auto scroll along x-axis + $(".auto-scroll-x").each(function() { + auto_scroll_x(this, 1, 3000) + }); }); // needed for nav tabs on pages. See Formatting > Nav tabs for more details. diff --git a/_site/workshop23.html b/_site/workshop23.html index 8267b2a86..34d08e0b3 100644 --- a/_site/workshop23.html +++ b/_site/workshop23.html @@ -347,10 +347,6 @@

Freiberg MTEX Workshop 2023

-
- -
-

Week 1: Learning Crystallographic Texture Analysis with MTEX

Date: 06.03.2023 - 10.03.2023

diff --git a/css/customstyles.css b/css/customstyles.css index c9da3fb26..262fba2b4 100644 --- a/css/customstyles.css +++ b/css/customstyles.css @@ -1289,6 +1289,30 @@ abbr[title]:after { width: 100%; } +/* horizontal scrollable rows */ +.row.no-wrap-scrollable-x { + display: flex; + overflow-x: auto; + white-space: nowrap; + /* margin: auto; */ + scroll-snap-type: x mandatory; + outline: 1px solid red; +} +.row.no-wrap-scrollable-x > div { + display: ruby; + white-space: initial; + scroll-snap-align: start; +} + +/* show scrollbar at top of container */ +.scrollbar-at-top { + transform: rotateX(180deg); +} +.scrollbar-at-top > * { + padding-top: 10px; + transform: rotateX(180deg); +} + /* -------------------------- */ /* important / override rules */ /* -------------------------- */ diff --git a/index.md b/index.md index bec670e00..b5bdf7952 100644 --- a/index.md +++ b/index.md @@ -20,6 +20,7 @@ of material scientists, geologists and mathematicians. ![](https://img.shields.io/github/downloads/mtex-toolbox/mtex/total)  ![](https://img.shields.io/github/contributors/mtex-toolbox/mtex)  +
@@ -124,6 +125,7 @@ of material scientists, geologists and mathematicians.
+
@@ -141,7 +143,45 @@ of material scientists, geologists and mathematicians.
-
+ +
+
+
+
+ +
+
+

Grain Tutorial

+

A quick guide through the grain reconstruction capabilities of MTEX.

+ {% include reference.html link="GrainTutorial.html" content="Learn More" class="btn btn-primary" %} +
+
+
+
+
+
+ +
+
+

Denoising Orientation Maps

+

In this section we demonstrate how random errors can be significantly reduced using denoising techniques.

+ {% include reference.html link="EBSDDenoising.html" content="Learn More" class="btn btn-primary" %} +
+
+
+
+
+
+ +
+
+

Martensite Parent Grain Reconstruction

+

Here we demonstrate the tools MTEX offers to reconstruct a parent austenite phase from a measured martensite phase.

+ {% include reference.html link="MaParentGrainReconstruction.html" content="Learn More" class="btn btn-primary" %} +
+
+
+
@@ -180,6 +220,7 @@ of material scientists, geologists and mathematicians.
+
@@ -221,6 +262,7 @@ of material scientists, geologists and mathematicians.
+
diff --git a/js/customscripts.js b/js/customscripts.js index a01511920..c905b71af 100644 --- a/js/customscripts.js +++ b/js/customscripts.js @@ -1,4 +1,38 @@ +function auto_scroll_x(scrollElement, scrollStep=1, scrollDelayMilSec=1000) { + const scrollWidth = scrollElement.scrollWidth - scrollElement.clientWidth; + const scrollDelay = scrollDelayMilSec; + + // auto-scrolling + const scrollAnimation = setInterval(()=>{ + if (scrollElement.scrollLeft >= scrollWidth) { + scrollStep *= -1; + } else if (scrollElement.scrollLeft <= 0) { + scrollStep *= -1; + } + scrollElement.scrollBy(scrollStep, 0); + }, scrollDelay); + + // stop auto-scrolling while mouse over element + scrollElement.addEventListener("mouseenter", (evt)=>{ + clearInterval(scrollAnimation); + }); + // continue auto-scrolling when mouse leave element + scrollElement.addEventListener("mouseleave", (evt)=>{ + auto_scroll_x(scrollElement, scrollStep, scrollDelayMilSec); + }); + + // stop auto-scrolling on mobile after short time + const scrollDuration = scrollWidth / scrollStep * scrollDelay; + if (scrollWidth < 200) { + setTimeout(()=>{ + clearInterval(scrollAnimation); + }, scrollDuration); + } +} + + + // some small functions const uniqId = (()=>{let i=0;return()=>{return i++;}})(); @@ -69,6 +103,11 @@ $(document).ready(function() { } } }); + + // auto scroll along x-axis + $(".auto-scroll-x").each(function() { + auto_scroll_x(this, 1, 3000) + }); }); // needed for nav tabs on pages. See Formatting > Nav tabs for more details. diff --git a/pages/workshops/workshop23.md b/pages/workshops/workshop23.md index 27b70c65e..5654f1a8c 100644 --- a/pages/workshops/workshop23.md +++ b/pages/workshops/workshop23.md @@ -18,8 +18,6 @@ The workshop extends over two weeks and is part of the master course {% include {% endcapture %} {% include password_access_restriction.html content_default=par_default content_access=par_access %} -{% include gallery.html images=site.data.galleries.workshop23 height="30vh" scroll_direction="x" auto_scroll="true" %} - ## Week 1: Learning Crystallographic Texture Analysis with MTEX Date: 06.03.2023 - 10.03.2023