diff --git a/2022_1/a_ortho/ortho_heat.html b/2022_1/a_ortho/ortho_heat.html index f650851..50ce487 100644 --- a/2022_1/a_ortho/ortho_heat.html +++ b/2022_1/a_ortho/ortho_heat.html @@ -71,6 +71,12 @@

オルソリひーと | Ortho Heat

+ + + + + +
@@ -83,6 +89,7 @@

Change Layout

+ @@ -99,6 +106,7 @@

Change Text

+
diff --git a/2022_1/a_ortho/ortho_typing.html b/2022_1/a_ortho/ortho_typing.html index fd3f672..6dd253b 100644 --- a/2022_1/a_ortho/ortho_typing.html +++ b/2022_1/a_ortho/ortho_typing.html @@ -82,6 +82,12 @@

オルソリふぉーる | Ortho Fall

+ + + + + +
@@ -95,6 +101,7 @@

Change Layout

+ diff --git a/2022_1/a_ortho/static/createheatmap.js b/2022_1/a_ortho/static/createheatmap.js index b3bf666..886ec57 100644 --- a/2022_1/a_ortho/static/createheatmap.js +++ b/2022_1/a_ortho/static/createheatmap.js @@ -13,7 +13,7 @@ function createheatmap(layout, text){ console.log(text); console.log(text.length) - for(var i = 0; i < 30; i++){ + for(var i = 0; i < 36; i++){ $(".key").eq(i).text(layout[i]); } @@ -43,7 +43,7 @@ function createheatmap(layout, text){ // now generate some random data var points = []; var max = 0; - var width = 700; + var width = 840; var height = 210; var len = 200; diff --git a/2022_1/a_ortho/static/ortho_heat.css b/2022_1/a_ortho/static/ortho_heat.css index 59a2719..c9860ef 100644 --- a/2022_1/a_ortho/static/ortho_heat.css +++ b/2022_1/a_ortho/static/ortho_heat.css @@ -19,7 +19,7 @@ header{ .playground{ position:relative; - width: 700px; + width: 840px; height: 500px; border: solid 1px black; background-color: #faf6e9; @@ -38,7 +38,7 @@ header{ .heat-box{ display: block; - width: 700px; + width: 840px; height: 210px; margin: 50px 0; } @@ -64,7 +64,7 @@ header{ height: 100px; } .text-mod textarea{ - width: 700px; + width: 840px; height: 300px; } diff --git a/2022_1/a_ortho/static/ortho_heat.js b/2022_1/a_ortho/static/ortho_heat.js index 64dbd3e..ab3e1c8 100644 --- a/2022_1/a_ortho/static/ortho_heat.js +++ b/2022_1/a_ortho/static/ortho_heat.js @@ -11,13 +11,14 @@ $("#create").click(() => { }); const layouts = [ - "QWERTYUIOP\nASDFGHJKL_\nZXCVBNM___", - "ABCDEFGHIJ\nKLMNOPQRST\nUVWXYZ____", - "___PYFGCRL\nAOEUIDHTNS\n_QJKXBMWVZ", - "QWFPBJLUY_\nARSTGMNEIO\nZXCDVKH___", - "QW___MRDYP\nAOEIUGTKSN\nZXCVFBHJL_", - "_WBF_MRDYP\nAOEUIGTKNS\nZXCV__HJLQ", - "ZGMK__CWPQ\nDNHTRIEAOU\nVFLS__YBXJ" + "QWERTYUIOP__\nASDFGHJKL___\nZXCVBNM_____", + "ABCDEFGHIJ__\nKLMNOPQRST__\nUVWXYZ______", + "ЙЦУКЕНГШЩЗХЪ\nФЫВАПРОЛДЖЭЁ\nЯЧСМИТЬБЮ___", + "___PYFGCRL__\nAOEUIDHTNS__\n_QJKXBMWVZ__", + "QWFPBJLUY___\nARSTGMNEIO__\nZXCDVKH_____", + "QW___MRDYP__\nAOEIUGTKSN__\nZXCVFBHJL___", + "_WBF_MRDYP__\nAOEUIGTKNS__\nZXCV__HJLQ__", + "ZGMK__CWPQ__\nDNHTRIEAOU__\nVFLS__YBXJ__" ]; $(".layout-mod .btn-group .btn").on('click', function(){ var index = $(".layout-mod .btn-group .btn").index($(this)); @@ -31,7 +32,8 @@ const texts = [ "It was on a dreary night of November that I beheld the accomplishment of my toils. With an anxiety that almost amounted to agony, I collected the instruments of life around me, that I might infuse a spark of being into the lifeless thing that lay at my feet. It was already one in the morning; the rain pattered dismally against the panes, and my candle was nearly burnt out, when, by the glimmer of the half-extinguished light, I saw the dull yellow eye of the creature open; it breathed hard, and a convulsive motion agitated its limbs.How can I describe my emotions at this catastrophe, or how delineate the wretch whom with such infinite pains and care I had endeavoured to form? His limbs were in proportion, and I had selected his features as beautiful. Beautiful! Great God! His yellow skin scarcely covered the work of muscles and arteries beneath; his hair was of a lustrous black, and flowing; his teeth of a pearly whiteness; but these luxuriances only formed a more horrid contrast with h" + "konaida roan roan kun ni a xtu ta toki 、 maruzen no mise de 一 niti ni mannenhitu ga nani honi u reru daro u to tazu ne tara 、 roan kun ha oo i toki ha hyakumoto kurai de ru sou da to kota e ta 。 otto sore de ha 一 hon no mannenhitu ga dono kurai naga ku tuka eru daro u to ki i tara 、 konaida yokohama no mono de 、 pen ha mada ka nari da ga 、 ziku zi kuga he xtu ta kara ziku take dake kae kae te kure kure to i xtu te mo xtu te ki ta no ga aru ga 、 konohito ha 十三 nen mae ni 一 hon ka xtu ta giri de 、 sono 一 hon wo kyou made ta e zu siyou si te i ta no da to iu kara 、 kore kore ga maa itiban naga i rei rasii to hana si ta 。 si te mi ru to hutuu no baai de ha ikura zankoku ni tuka xtu te mo taitei 六七 nen no hosyou ha tu ke rareru no ga 、 ippan no mannenhitu no unmei rasii 。 一 hon de otto hodo sorehodo naga ku tuka eru mono ga hi ni hyakumoto mo de ru to i e ba mannenhitu wo zyuyou suru hito no hani ha hizyou na ikioi wo omonmi moxtu te hiro gari tutu aru to mi te mo manzara manzara kentoutiga", "It was on a dreary night of November that I beheld the accomplishment of my toils. With an anxiety that almost amounted to agony, I collected the instruments of life around me, that I might infuse a spark of being into the lifeless thing that lay at my feet. It was already one in the morning; the rain pattered dismally against the panes, and my candle was nearly burnt out, when, by the glimmer of the half-extinguished light, I saw the dull yellow eye of the creature open; it breathed hard, and a convulsive motion agitated its limbs.How can I describe my emotions at this catastrophe, or how delineate the wretch whom with such infinite pains and care I had endeavoured to form? His limbs were in proportion, and I had selected his features as beautiful. Beautiful! Great God! His yellow skin scarcely covered the work of muscles and arteries beneath; his hair was of a lustrous black, and flowing; his teeth of a pearly whiteness; but these luxuriances only formed a more horrid contrast with h", - "konaida roan roan kun ni a xtu ta toki 、 maruzen no mise de 一 niti ni mannenhitu ga nani honi u reru daro u to tazu ne tara 、 roan kun ha oo i toki ha hyakumoto kurai de ru sou da to kota e ta 。 otto sore de ha 一 hon no mannenhitu ga dono kurai naga ku tuka eru daro u to ki i tara 、 konaida yokohama no mono de 、 pen ha mada ka nari da ga 、 ziku zi kuga he xtu ta kara ziku take dake kae kae te kure kure to i xtu te mo xtu te ki ta no ga aru ga 、 konohito ha 十三 nen mae ni 一 hon ka xtu ta giri de 、 sono 一 hon wo kyou made ta e zu siyou si te i ta no da to iu kara 、 kore kore ga maa itiban naga i rei rasii to hana si ta 。 si te mi ru to hutuu no baai de ha ikura zankoku ni tuka xtu te mo taitei 六七 nen no hosyou ha tu ke rareru no ga 、 ippan no mannenhitu no unmei rasii 。 一 hon de otto hodo sorehodo naga ku tuka eru mono ga hi ni hyakumoto mo de ru to i e ba mannenhitu wo zyuyou suru hito no hani ha hizyou na ikioi wo omonmi moxtu te hiro gari tutu aru to mi te mo manzara manzara kentoutiga" + "konaida roan roan kun ni a xtu ta toki 、 maruzen no mise de 一 niti ni mannenhitu ga nani honi u reru daro u to tazu ne tara 、 roan kun ha oo i toki ha hyakumoto kurai de ru sou da to kota e ta 。 otto sore de ha 一 hon no mannenhitu ga dono kurai naga ku tuka eru daro u to ki i tara 、 konaida yokohama no mono de 、 pen ha mada ka nari da ga 、 ziku zi kuga he xtu ta kara ziku take dake kae kae te kure kure to i xtu te mo xtu te ki ta no ga aru ga 、 konohito ha 十三 nen mae ni 一 hon ka xtu ta giri de 、 sono 一 hon wo kyou made ta e zu siyou si te i ta no da to iu kara 、 kore kore ga maa itiban naga i rei rasii to hana si ta 。 si te mi ru to hutuu no baai de ha ikura zankoku ni tuka xtu te mo taitei 六七 nen no hosyou ha tu ke rareru no ga 、 ippan no mannenhitu no unmei rasii 。 一 hon de otto hodo sorehodo naga ku tuka eru mono ga hi ni hyakumoto mo de ru to i e ba mannenhitu wo zyuyou suru hito no hani ha hizyou na ikioi wo omonmi moxtu te hiro gari tutu aru to mi te mo manzara manzara kentoutiga", + "Как раз в то время, когда сознание покинуло Стёпу в Ялте, то есть около половины двенадцатого дня, оно вернулось к Ивану Николаевичу Бездомному, проснувшемуся после глубокого и продолжительного сна. Некоторое время он соображал, каким это образом он попал в неизвестную комнату с белыми стенами, с удивительным ночным столиком из какого-то светлого металла и с белой шторой, за которой чувствовалось солнце. Иван тряхнул головой, убедился в том, что она не болит, и вспомнил, что он находится в лечебнице. Эта мысль потянула за собою воспоминание о гибели Берлиоза, но сегодня оно не вызвало у Ивана сильного потрясения. Выспавшись, Иван Николаевич стал поспокойнее и соображать начал яснее. Полежав некоторое время неподвижно в чистейшей, мягкой и удобной пружинной кровати, Иван увидел кнопку звонка рядом с собою. По привычке трогать предметы без надобности, Иван нажал её. Он ожидал какого-то звона или явления вслед за нажатием кнопки, но произошло совсем другое. В ногах Ивановой постели загоре" ]; $(".text-mod .btn-group .btn").on('click', function(){ var index = $(".text-mod .btn-group .btn").index($(this));