#39713 コンテンツの回転表示

e5b6abae · Kim Eunchul · fca45616 · e5b6abae · e5b6abae · e5b6abae
Commit e5b6abae authored Sep 29, 2020 by Kim Eunchul
14 changed files
--- a/abvw/common/js/common.js
+++ b/abvw/common/js/common.js
@@ -153,6 +153,8 @@ COMMON.Keys = {
    // Local: true/false
    IsDisplayMarking : 'IsDisplayMarking',
    // Local: true/false
+    IsRotate : 'IsRotate',
+    // Local: true/false
    IsDisplayMemo : 'IsDisplayMemo',
    // Local
    MarkingType : 'MarkingType',
@@ -779,6 +781,13 @@ var ClientData = {
            return COMMON.operateData(arguments, COMMON.Keys.IsDisplayMarking, undefined);
        }
    },
+    IsRotate : function(data) {
+        if (arguments.length > 0) {
+            COMMON.operateData(arguments, COMMON.Keys.IsRotate, undefined);
+        } else {
+            return COMMON.operateData(arguments, COMMON.Keys.IsRotate, undefined);
+        }
+    },
    // Local
    IsDisplayMemo : function(data) {
        if (arguments.length > 0) {

--- a/abvw/common/js/script.js
+++ b/abvw/common/js/script.js
@@ -15,6 +15,7 @@ $(function() {
 		$('.memoAdd').powerTip({placement: 's'});
 		$('.marking').powerTip({placement: 's'});
 		$('.markingToolbar').powerTip({placement: 's'});
+		$('.rotate').powerTip({placement: 's'});
 		$('.begin').powerTip({placement: 'n'});
 		$('.prev').powerTip({placement: 'n'});

--- a/abvw/contentview.html
+++ b/abvw/contentview.html
@@ -130,6 +130,10 @@
        		<span class="lgloupe">
        			<a id="imgmarking" class="marking" title="マーキング" lang="txtTooltipShowMarking"> </a>
        			<a id="imgmarkingtoolbar" class="markingToolbar" title="マーキングツールバー表示" lang="txtTooltipShowMarkingTool"> </a>
+                </span>
+                <span class="gloupe">
+                    <a id="rotatebtnR" class="rotateR" title="コンテンツ回転" lang="txtTooltipRotateContent" angle = '0'> </a>
+                    <a id="rotatebtnL" class="rotateL" title="コンテンツ逆回転" lang="txtTooltipRotateContent"> </a>
        		</span>
        	</div>
        	<div class="hdRcolumn">

--- a/abvw/css/layout/viewer.css
+++ b/abvw/css/layout/viewer.css
@@ -96,7 +96,7 @@ body{
 /*ヘッダー左カラム*/
 .hdLcolumn{
    display:block;
-    width:726px;
+    width:890px;
    float:left;
    position:absolute;
 }
@@ -143,6 +143,8 @@ body{
 .hdLcolumn a.memoAdd{margin:0 0 0 11px;}
 .hdLcolumn a.marking{}
 .hdLcolumn a.markingToolbar{margin:0 0 0 11px;}
+.hdLcolumn a.rotateR{}
+.hdLcolumn a.rotateL{margin:0 0 0 11px;}
 .hdLcolumn a.home_device{}
 .hdLcolumn a.back_device{margin:0 0 0 11px;}
@@ -154,6 +156,8 @@ body{
 .hdLcolumn a.memoAdd_device{margin:0 0 0 11px;}
 .hdLcolumn a.marking_device{}
 .hdLcolumn a.markingToolbar_device{margin:0 0 0 11px;}
+.hdLcolumn a.rotateR_device{}
+.hdLcolumn a.rotateL_device{margin:0 0 0 11px;}
 /*オンマウス時*/
 .hdLcolumn a:hover.home{}
@@ -166,6 +170,8 @@ body{
 .hdLcolumn a:hover.memoAdd{}
 .hdLcolumn a:hover.marking{}
 .hdLcolumn a:hover.markingToolbar{}
+.hdLcolumn a:hover.rotateR{}
+.hdLcolumn a:hover.rotateL{}
 /*リンクオフ時*/
 #viewer .hdLcolumn a.home_off{}
@@ -178,6 +184,8 @@ body{
 #viewer .hdLcolumn a.memoAdd_off{margin:0 0 0 11px;}
 #viewer .hdLcolumn a.marking_off{}
 #viewer .hdLcolumn a.markingToolbar_off{margin:0 0 0 11px;}
+#viewer .hdLcolumn a.rotateR_off{}
+#viewer .hdLcolumn a.rotateL_off{margin:0 0 0 11px;}
 /*リンクオフ時*/
 #viewer .hdLcolumn a.bmList_hover{}
@@ -188,6 +196,8 @@ body{
 #viewer .hdLcolumn a.memoAdd_hover{margin:0 0 0 11px;}
 #viewer .hdLcolumn a.marking_hover{}
 #viewer .hdLcolumn a.markingToolbar_hover{margin:0 0 0 11px;}
+#viewer .hdLcolumn a.rotateR_hover{}
+#viewer .hdLcolumn a.rotateL_hover{margin:0 0 0 11px;}
 /*ヘッダー右カラム*/
 .hdRcolumn{
@@ -1815,7 +1825,7 @@ body{
 }
 .hdLcolumn a{
-    background:url(../../img/viewer/hdicon_01.png) 0 0 no-repeat;
+    background:url(../../img/viewer/hdicon_01.png) 0 0;
    font-size:0;
 }
@@ -1841,6 +1851,8 @@ body{
 .hdLcolumn a.memoAdd{background-position:-322px 0;}
 .hdLcolumn a.marking{background-position:-368px 0;}
 .hdLcolumn a.markingToolbar{background-position:-414px 0;}
+.hdLcolumn a.rotateR{background-position:-460px 0;}
+.hdLcolumn a.rotateL{background-position:-506px 0;}
 .hdLcolumn a.home_device{background-position:0 0;}
 .hdLcolumn a.back_device{background-position:-46px 0;}
@@ -1852,6 +1864,8 @@ body{
 .hdLcolumn a.memoAdd_device{background-position:-322px 0;}
 .hdLcolumn a.marking_device{background-position:-368px 0;}
 .hdLcolumn a.markingToolbar_device{background-position:-414px 0;}
+.hdLcolumn a.rotateR_device{background-position:-460px 0;}
+.hdLcolumn a.rotateL_device{background-position:-506px 0;}
 /*オンマウス時*/
 .hdLcolumn a:hover.home{background-position:0 -92px;}
@@ -1864,6 +1878,8 @@ body{
 .hdLcolumn a:hover.memoAdd{background-position:-322px -92px;}
 .hdLcolumn a:hover.marking{background-position:-368px -92px;}
 .hdLcolumn a:hover.markingToolbar{background-position:-414px -92px;}
+.hdLcolumn a:hover.rotateR{background-position:-460px -92px;}
+.hdLcolumn a:hover.rotateL{background-position:-506px -92px;}
 /*リンクオフ時*/
 #viewer .hdLcolumn a.home_off{background-position:0 -46px;cursor:default;}
@@ -1876,6 +1892,8 @@ body{
 #viewer .hdLcolumn a.memoAdd_off{background-position:-322px -46px;}
 #viewer .hdLcolumn a.marking_off{background-position:-368px -46px;}
 #viewer .hdLcolumn a.markingToolbar_off{background-position:-414px -46px;}
+#viewer .hdLcolumn a.rotateR_off{background-position:-460px -46px;}
+#viewer .hdLcolumn a.rotateL_off{background-position:-506px -46px;}
 /*リンクオフ時*/
 #viewer .hdLcolumn a.bmList_hover{background-position:-92px -92px;}
@@ -1886,6 +1904,8 @@ body{
 #viewer .hdLcolumn a.memoAdd_hover{background-position:-322px -92px;}
 #viewer .hdLcolumn a.marking_hover{background-position:-368px -92px;}
 #viewer .hdLcolumn a.markingToolbar_hover{background-position:-414px -92px;}
+#viewer .hdLcolumn a.rotateR_hover{background-position:-460px -92px;}
+#viewer .hdLcolumn a.rotateL_hover{background-position:-506px -92px;}
 /*ヘッダー右カラム*/
 .hdRcolumn{

--- a/abvw/inc_contentview.html
+++ b/abvw/inc_contentview.html
@@ -50,6 +50,10 @@
 						<a id="imgmarking" class="marking" title="マーキング" lang="txtTooltipShowMarking"> </a>
 						<a id="imgmarkingtoolbar" class="markingToolbar" title="マーキングツールバー表示" lang="txtTooltipShowMarkingTool"> </a>
 					</span>
+					<span class="gloupe">
+						<a id="rotatebtnR" class="rotateR" title="コンテンツ回転" lang="txtTooltipRotateContent" angle = '0'> </a>
+						<a id="rotatebtnL" class="rotateL" title="コンテンツ逆回転" lang="txtTooltipRotateContent"> </a>
+					</span>
 				</div>
 				<div id="search_toolbar" class="hdRcolumn">
 					<input id="txtSearch" type="text">

--- a/abvw/js/contentpreview.js
+++ b/abvw/js/contentpreview.js
@@ -53,6 +53,7 @@ CONTENTPREVIEW.ready = function(){
        ClientData.IsAddingMarking(false);
        ClientData.IsAddingMemo(false);
        ClientData.IsDisplayMarking(false);
+        ClientData.IsRotate(false);
        ClientData.IsDisplayMemo(false);
        CONTENTVIEW_INITOBJECT.clearViewerComponent();

--- a/abvw/js/contentview.js
+++ b/abvw/js/contentview.js
--- a/abvw/js/contentview_CreateObjects.js
+++ b/abvw/js/contentview_CreateObjects.js
@@ -2641,7 +2641,9 @@ CONTENTVIEW_CREATEOBJECT.createPage = function(pageNumber, pageImage, pageObject
    /* add page Object */
    //Start Function: No.12
    if (CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile) {
-        page.addPageObjects(pageObjects);
+        if($('#rotatebtnR').attr('angle') == '0'){
+            page.addPageObjects(pageObjects);
+        }
    }
    //End Function: No.12
    /* load page */

--- a/abvw/js/contentview_Events.js
+++ b/abvw/js/contentview_Events.js
@@ -970,9 +970,18 @@ CONTENTVIEW_EVENTS.mouseWheel_CanvasMain = function(event, detail) {
        //var sx = 1 / CONTENTVIEW.userScale;
        var sy = 1 / CONTENTVIEW.userScale;
-        // calc scaling moving distance
+        if($(rotatebtnR).attr('angle') == '180'){
-        //CONTENTVIEW.moveX = Math.round(detail * sx);
+            CONTENTVIEW.moveY = -Math.round(detail * sy * 20);
-        CONTENTVIEW.moveY = Math.round(detail * sy * 20); //20は感覚的な移動量の補正
+        }else if($(rotatebtnR).attr('angle') == '-90'){
+            CONTENTVIEW.moveX = -Math.round(detail * sy * 20);
+        }else if($(rotatebtnR).attr('angle') == '90'){
+            CONTENTVIEW.moveX = Math.round(detail * sy * 20);
+        }else{
+            // calc scaling moving distance
+            //CONTENTVIEW.moveX = Math.round(detail * sx);
+            CONTENTVIEW.moveY = Math.round(detail * sy * 20); //20は感覚的な移動量の補正
+        }
        // redraw
        CONTENTVIEW.flip();
@@ -1029,6 +1038,16 @@ CONTENTVIEW_EVENTS.mouseMove_CanvasMain = function(event) {
        CONTENTVIEW.moveX = Math.round(-mx * sx);
        CONTENTVIEW.moveY = Math.round(-my * sy);
+        if($(rotatebtnR).attr('angle') == '180'){
+            CONTENTVIEW.moveX = -(Math.round(-mx * sx));
+            CONTENTVIEW.moveY = -(Math.round(-my * sy));
+        }else if($(rotatebtnR).attr('angle') == '-90'){
+            CONTENTVIEW.moveX = -(Math.round(-my * sy));
+            CONTENTVIEW.moveY = (Math.round(-mx * sx));
+        }else if($(rotatebtnR).attr('angle') == '90'){
+            CONTENTVIEW.moveX = (Math.round(-my * sy));
+            CONTENTVIEW.moveY = -(Math.round(-mx * sx));
+        }
        // store current mouse point
        if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() == false && CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) {
@@ -1348,6 +1367,8 @@ CONTENTVIEW_EVENTS.imgHome_click = function(e) {
    //window.location.href = COMMON.ScreenIds.Home;
    AVWEB.avwScreenMove(COMMON.ScreenIds.Home);
+    $('#rotatebtnR').attr('angle', '0');
 };
 CONTENTVIEW_EVENTS.closePopUpCopyMemo = function() {

--- a/abvw/js/contentview_General.js
+++ b/abvw/js/contentview_General.js
@@ -24,6 +24,8 @@ CONTENTVIEW_GENERAL.disableAllControl = function() {
    $("#imgaddmemo").css('cursor', 'default');
    $("#imgmarking").css('cursor', 'default');
    $("#imgmarkingtoolbar").css('cursor', 'default');
+    $("#rotatebtnR").css('cursor', 'default');
+    $("#rotatebtnL").css('cursor', 'default');
    $("#firstpage").css('cursor', 'default');
    $("#prevpage").css('cursor', 'default');
    $("#nextpage").css('cursor', 'default');
@@ -80,6 +82,14 @@ CONTENTVIEW_GENERAL.disableAllControl = function() {
    $('#imgmarkingtoolbar').removeClass();
    $('#imgmarkingtoolbar').addClass('markingToolbar_off');
+    $('#rotatebtnR').unbind('click');
+    $('#rotatebtnR').removeClass();
+    $('#rotatebtnR').addClass('rotateR_off');
+    $('#rotatebtnL').unbind('click');
+    $('#rotatebtnL').removeClass();
+    $('#rotatebtnL').addClass('rotateL_off');
    $('#firstpage').unbind('click');
    $('#firstpage').removeClass();
    $('#firstpage').addClass('begin_off');
@@ -127,6 +137,8 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
    if (CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF) {
        $("#listindex").css('cursor', 'pointer');
        $("#copytext").css('cursor', 'pointer');
+        $("#rotatebtnR").css('cursor', 'pointer');
+        $("#rotatebtnL").css('cursor', 'pointer');
    }
    //End Function: No.12
@@ -177,6 +189,12 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
        $('#listindex').bind('click', CONTENTVIEW_EVENTS.showListPageIndex);
        $('#listindex').removeClass();
+        $('#rotatebtnR').bind('click', CONTENTVIEW.rotateR);
+        $('#rotatebtnR').removeClass();
+        $('#rotatebtnL').bind('click', CONTENTVIEW.rotateL);
+        $('#rotatebtnL').removeClass();
        if(ClientData.serviceOpt_copy_text() == 'Y') {
        	$('#copytext').bind('click', CONTENTVIEW_EVENTS.showCopyText);
            $('#copytext').removeClass();
@@ -283,6 +301,18 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
                $('#imgmarkingtoolbar').addClass('markingToolbar_device');
            }
        }
+        if (ClientData.IsRotate() == true) {
+            $('#rotatebtnR').addClass('rotateR_hover');
+        } else {
+            $('#rotatebtnR').addClass('rotateR_device');
+        }
+        if (ClientData.IsRotate() == true) {
+            $('#rotatebtnL').addClass('rotateL_hover');
+        } else {
+            $('#rotatebtnL').addClass('rotateL_device');
+        }
    } else { /* set css for PC */
        $('#imgHome').addClass('home');
        $('#imgBack').addClass('back');
@@ -338,6 +368,17 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
                $('#imgmarkingtoolbar').addClass('markingToolbar');
            }
        }
+        if (ClientData.IsRotate() == true) {
+            $('#rotatebtnR').addClass('rotateR_hover');
+        } else {
+            $('#rotatebtnR').addClass('rotateR');
+        }
+        if (ClientData.IsRotate() == true) {
+            $('#rotatebtnL').addClass('rotateL_hover');
+        } else {
+            $('#rotatebtnL').addClass('rotateL');
+        }
    }
    if( ClientData.isGetitsMode() == true ){
@@ -351,6 +392,7 @@ CONTENTVIEW_GENERAL.enableAllControl = function() {
        $('#imgBack').addClass('back_off');
    }
+    CONTENTVIEW.checkDisableButtonRotate();
    CONTENTVIEW.checkExistNextPrePage();
 };

--- a/abvw/js/contentview_InitObjects.js
+++ b/abvw/js/contentview_InitObjects.js
@@ -239,6 +239,10 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
    	CONTENTVIEW_EVENTS.showListSearchResult();
    }
+    /* rotate event */
+    $('#rotatebtnR').click(CONTENTVIEW.rotateR);
+    $('#rotatebtnL').click(CONTENTVIEW.rotateR);
    /* zoom event */
    $('#zoomin').click(CONTENTVIEW.zoomIn);
    $('#zoomout').click(CONTENTVIEW.zoomOut);

--- a/custom/daihatsu/abvw/contentview.html
+++ b/custom/daihatsu/abvw/contentview.html
@@ -121,7 +121,11 @@
        		<span class="lgloupe">
        			<a id="imgmarking" class="marking" title="マーキング" lang="txtTooltipShowMarking"> </a>
        			<a id="imgmarkingtoolbar" class="markingToolbar" title="マーキングツールバー表示" lang="txtTooltipShowMarkingTool"> </a>
-        		</span>		
+                </span>		
+                <span class="gloupe">
+                    <a id="rotatebtnR" class="rotateR" title="コンテンツ回転" lang="txtTooltipRotateContent" angle = '0'> </a>
+                    <a id="rotatebtnL" class="rotateL" title="コンテンツ逆回転" lang="txtTooltipRotateContent"> </a>
+        		</span>
        	</div>
        	<div class="hdRcolumn">
        		<input id="txtSearch" type="text">

--- a/custom/daihatsu/abvw/css/layout/viewer.css
+++ b/custom/daihatsu/abvw/css/layout/viewer.css
@@ -130,6 +130,8 @@ header{
 .hdLcolumn a.memoAdd{margin:0 0 0 11px; width:48px;}
 .hdLcolumn a.marking{ width:97px; }
 .hdLcolumn a.markingToolbar{margin:0 0 0 11px; }
+.hdLcolumn a.rotateR{ width:47px; }
+.hdLcolumn a.rotateL{ margin:0 0 0 11px; width:47px; }
 .hdLcolumn a.home_device{ width:48px; }
 .hdLcolumn a.back_device{margin:0 0 0 11px; width:48px;}
@@ -141,6 +143,8 @@ header{
 .hdLcolumn a.memoAdd_device{margin:0 0 0 11px; width:48px;}
 .hdLcolumn a.marking_device{ width:97px; }
 .hdLcolumn a.markingToolbar_device{margin:0 0 0 11px; }
+.hdLcolumn a.rotateR_device{ width:47px; }
+.hdLcolumn a.rotateL_device{ margin:0 0 0 11px; width:47px; }
 /*オンマウス時*/
 .hdLcolumn a:hover.home{ width:48px; }
@@ -153,6 +157,8 @@ header{
 .hdLcolumn a:hover.memoAdd{ width:48px; }
 .hdLcolumn a:hover.marking{ width:97px; }
 .hdLcolumn a:hover.markingToolbar{}
+.hdLcolumn a:hover.rotateR{ width:48px; }
+.hdLcolumn a:hover.rotateL{ width:48px; }
 /*リンクオフ時*/
 #viewer .hdLcolumn a.home_off{ width:48px; }
@@ -165,6 +171,8 @@ header{
 #viewer .hdLcolumn a.memoAdd_off{margin:0 0 0 11px; width:48px; }
 #viewer .hdLcolumn a.marking_off{ width:97px; }
 #viewer .hdLcolumn a.markingToolbar_off{margin:0 0 0 11px; }
+#viewer .hdLcolumn a.rotateR_off{ width:47px;}
+#viewer .hdLcolumn a.rotateL_off{ margin:0 0 0 11px; width:47px;}
 /*リンクオフ時*/
 #viewer .hdLcolumn a.bmList_hover{ width:48px; }
@@ -175,6 +183,8 @@ header{
 #viewer .hdLcolumn a.memoAdd_hover{margin:0 0 0 11px; width:48px; }
 #viewer .hdLcolumn a.marking_hover{ width:97px; }
 #viewer .hdLcolumn a.markingToolbar_hover{margin:0 0 0 11px; }
+#viewer .hdLcolumn a.rotateR_hover{ width:47px; }
+#viewer .hdLcolumn a.rotateL_hover{ margin:0 0 0 11px; width:47px; }
 /*ヘッダー右カラム*/
 .hdRcolumn{

--- a/custom/daihatsu/abvw/css/theme/viewer.css
+++ b/custom/daihatsu/abvw/css/theme/viewer.css
@@ -112,6 +112,8 @@ header{
 .hdLcolumn a.memoAdd{background-position:-396px 0;}
 .hdLcolumn a.marking{background-position:-445px 0;}
 .hdLcolumn a.markingToolbar{background-position:-543px 0;}
+.hdLcolumn a.rotateR{background-position:-591px 0;}
+.hdLcolumn a.rotateL{background-position:-639px 0;}
 .hdLcolumn a.home_device{background-position:0 0;}
 .hdLcolumn a.back_device{background-position:-48px 0;}
@@ -123,6 +125,8 @@ header{
 .hdLcolumn a.memoAdd_device{background-position:-396px 0;}
 .hdLcolumn a.marking_device{background-position:-445px 0;}
 .hdLcolumn a.markingToolbar_device{background-position:-543px 0;}
+.hdLcolumn a.rotateR_device{background-position:-591px 0;}
+.hdLcolumn a.rotateL_device{background-position:-639px 0;}
 /*オンマウス時*/
 .hdLcolumn a:hover.home{background-position:0 -92px;}
@@ -135,6 +139,8 @@ header{
 .hdLcolumn a:hover.memoAdd{background-position:-396px -92px;}
 .hdLcolumn a:hover.marking{background-position:-445px -92px;}
 .hdLcolumn a:hover.markingToolbar{background-position:-543px -92px;}
+.hdLcolumn a:hover.rotateR{background-position:-591px -92px;}
+.hdLcolumn a:hover.rotateL{background-position:-639px -92px;}
 /*リンクオフ時*/
 #viewer .hdLcolumn a.home_off{background-position:0 -46px;cursor:default;}
@@ -147,6 +153,8 @@ header{
 #viewer .hdLcolumn a.memoAdd_off{background-position:-396px -46px;}
 #viewer .hdLcolumn a.marking_off{background-position:-445px -46px;}
 #viewer .hdLcolumn a.markingToolbar_off{background-position:-543px -46px;}
+#viewer .hdLcolumn a.rotateR_off{background-position:-591px -46px;}
+#viewer .hdLcolumn a.rotateL_off{background-position:-639px -46px;}
 /*リンクオフ時*/
 #viewer .hdLcolumn a.bmList_hover{background-position:-96px -92px;}
@@ -157,6 +165,8 @@ header{
 #viewer .hdLcolumn a.memoAdd_hover{background-position:-396px -92px;}
 #viewer .hdLcolumn a.marking_hover{background-position:-445px -92px;}
 #viewer .hdLcolumn a.markingToolbar_hover{background-position:-543px -92px;}
+#viewer .hdLcolumn a.rotateR_hover{background-position:-591px -92px;}
+#viewer .hdLcolumn a.rotateL_hover{background-position:-639px -92px;}
 /*ヘッダー右カラム*/
 .hdRcolumn{