Skip to content

C
check
Commit e5b6abae by Kim Eunchul
Options

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

parent fca45616
Showing with 556 additions and 19 deletions
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) {
......
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'});
......
abvw/contentview.html
......@@ -131,6 +131,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 class="hdRcolumn">
<input id="txtSearch" type="text">
......
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{
......
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">
......
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();
......
abvw/js/contentview.js
......@@ -3940,6 +3940,8 @@ CONTENTVIEW.disableControlsCopyMemo = function() {
$("#imgaddmemo").css('cursor', 'default');
$("#imgmarking").css('cursor', 'default');
$("#imgmarkingtoolbar").css('cursor', 'default');
$("#rotateR").css('cursor', 'default');
$("#rotateL").css('cursor', 'default');
$("#firstpage").css('cursor', 'default');
$("#prevpage").css('cursor', 'default');
$("#nextpage").css('cursor', 'default');
......@@ -4609,6 +4611,55 @@ CONTENTVIEW.flip = function(opt) {
var height = offscreen.height;
var aspect = offscreen.width / offscreen.height;
if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
aspect = offscreen.height / offscreen.width;
if (canvas.width > canvas.height) {
width = canvas.height;
height = width * aspect;
} else {
height = canvas.width;
width = height / aspect;
}
if (width > canvas.height) {
var size = canvas.height / width;
width = canvas.height;
height = height * size;
}
if (height > canvas.width) {
var size = canvas.height / height;
height = canvas.width;
width = width * size;
}
if (CONTENTVIEW.userScale != 1 && height < canvas.width) {
if(offscreen.width < offscreen.height){
height = height * CONTENTVIEW.userScale * aspect;
}else{
height = height * CONTENTVIEW.userScale;
}
if (height > canvas.width) {
height = canvas.width;
}
} else if (CONTENTVIEW.userScale != 1 && width < canvas.height) {
width = width * CONTENTVIEW.userScale;
if (width > canvas.height) {
width = canvas.height;
}
}
}else{
if (canvas.width > canvas.height) {
height = canvas.height;
width = height * aspect;
......@@ -4630,21 +4681,19 @@ CONTENTVIEW.flip = function(opt) {
}
if (CONTENTVIEW.userScale != 1 && width < canvas.width) {
width = width * CONTENTVIEW.userScale;
if (width > canvas.width) {
width = canvas.width;
}
} else if (CONTENTVIEW.userScale != 1 && height < canvas.height) {
height = height * CONTENTVIEW.userScale;
if (height > canvas.height) {
height = canvas.height;
}
}
}
var destX = 0, destY = 0;
destX = (canvas.width / 2) - (width / 2);
destY = (canvas.height / 2) - (height / 2);
......@@ -4694,10 +4743,28 @@ CONTENTVIEW.flip = function(opt) {
// draw canvas
context.clearRect(0, 0, canvas.width, canvas.height);
context.save();
if($(rotatebtnR).attr('angle') != '0'){
if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
context.translate(canvas.width/2,canvas.height/2);
context.rotate($(rotatebtnR).attr('angle')*Math.PI/180);
context.translate(-(canvas.width/2),-(canvas.height/2));
context.drawImage(offscreen,
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, (canvas.height - height)/2, width, height);
}else{
context.translate(canvas.width/2,canvas.height/2);
context.rotate($(rotatebtnR).attr('angle')*Math.PI/180);
context.translate(-(canvas.width/2),-(canvas.height/2));
context.drawImage(offscreen,
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, CONTENTVIEW.destRect.top, width, height);
}
}else{
context.drawImage(offscreen,
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, CONTENTVIEW.destRect.top, width, height);
}
context.restore();
}
else if(opt==1){
......@@ -4725,6 +4792,55 @@ CONTENTVIEW.flip = function(opt) {
var height = offscreen.height;
var aspect = offscreen.width / offscreen.height;
if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
aspect = offscreen.height / offscreen.width;
if (canvas.width > canvas.height) {
width = canvas.height;
height = width * aspect;
} else {
height = canvas.width;
width = height / aspect;
}
if (width > canvas.height) {
var size = canvas.height / width;
width = canvas.height;
height = height * size;
}
if (height > canvas.width) {
var size = canvas.height / height;
height = canvas.width;
width = width * size;
}
if (CONTENTVIEW.userScale != 1 && height < canvas.width) {
if(offscreen.width < offscreen.height){
height = height * CONTENTVIEW.userScale * aspect;
}else{
height = height * CONTENTVIEW.userScale;
}
if (height > canvas.width) {
height = canvas.width;
}
} else if (CONTENTVIEW.userScale != 1 && width < canvas.height) {
width = width * CONTENTVIEW.userScale;
if (width > canvas.height) {
width = canvas.height;
}
}
}else{
if (canvas.width > canvas.height) {
height = canvas.height;
width = height * aspect;
......@@ -4745,16 +4861,14 @@ CONTENTVIEW.flip = function(opt) {
height = height * size;
}
if (CONTENTVIEW.userScale != 1 && width < canvas.width)
{
if (CONTENTVIEW.userScale != 1 && width < canvas.width) {
width = width * CONTENTVIEW.userScale;
if (width > canvas.width) {
width = canvas.width;
}
}
else if (CONTENTVIEW.userScale != 1 && height < canvas.height) {
} else if (CONTENTVIEW.userScale != 1 && height < canvas.height) {
height = height * CONTENTVIEW.userScale;
......@@ -4762,6 +4876,7 @@ CONTENTVIEW.flip = function(opt) {
height = canvas.height;
}
}
}
var destX = 0, destY = 0;
destX = (canvas.width / 2) - (width / 2);
......@@ -4812,10 +4927,27 @@ CONTENTVIEW.flip = function(opt) {
// draw canvas
context.clearRect(0, 0, canvas.width, canvas.height);
context.save();
if($(rotatebtnR).attr('angle') != '0'){
if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
context.translate(canvas.width/2,canvas.height/2);
context.rotate($(rotatebtnR).attr('angle')*Math.PI/180);
context.translate(-(canvas.width/2),-(canvas.height/2));
context.drawImage(offscreen,
CONTENTVIEW.srcRectNext.left, CONTENTVIEW.srcRectNext.top, CONTENTVIEW.srcRectNext.right - CONTENTVIEW.srcRectNext.left, CONTENTVIEW.srcRectNext.bottom - CONTENTVIEW.srcRectNext.top,
CONTENTVIEW.destRectNext.left, CONTENTVIEW.destRectNext.top, width, height);
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, (canvas.height - height)/2, width, height);
}else{
context.translate(canvas.width/2,canvas.height/2);
context.rotate($(rotatebtnR).attr('angle')*Math.PI/180);
context.translate(-(canvas.width/2),-(canvas.height/2));
context.drawImage(offscreen,
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, CONTENTVIEW.destRect.top, width, height);
}
}else{
context.drawImage(offscreen,
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, CONTENTVIEW.destRect.top, width, height);
}
context.restore();
}
else if(opt==2){
......@@ -4843,6 +4975,55 @@ CONTENTVIEW.flip = function(opt) {
var height = offscreen.height;
var aspect = offscreen.width / offscreen.height;
if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
aspect = offscreen.height / offscreen.width;
if (canvas.width > canvas.height) {
width = canvas.height;
height = width * aspect;
} else {
height = canvas.width;
width = height / aspect;
}
if (width > canvas.height) {
var size = canvas.height / width;
width = canvas.height;
height = height * size;
}
if (height > canvas.width) {
var size = canvas.height / height;
height = canvas.width;
width = width * size;
}
if (CONTENTVIEW.userScale != 1 && height < canvas.width) {
if(offscreen.width < offscreen.height){
height = height * CONTENTVIEW.userScale * aspect;
}else{
height = height * CONTENTVIEW.userScale;
}
if (height > canvas.width) {
height = canvas.width;
}
} else if (CONTENTVIEW.userScale != 1 && width < canvas.height) {
width = width * CONTENTVIEW.userScale;
if (width > canvas.height) {
width = canvas.height;
}
}
}else{
if (canvas.width > canvas.height) {
height = canvas.height;
width = height * aspect;
......@@ -4863,16 +5044,14 @@ CONTENTVIEW.flip = function(opt) {
height = height * size;
}
if (CONTENTVIEW.userScale != 1 && width < canvas.width)
{
if (CONTENTVIEW.userScale != 1 && width < canvas.width) {
width = width * CONTENTVIEW.userScale;
if (width > canvas.width) {
width = canvas.width;
}
}
else if (CONTENTVIEW.userScale != 1 && height < canvas.height) {
} else if (CONTENTVIEW.userScale != 1 && height < canvas.height) {
height = height * CONTENTVIEW.userScale;
......@@ -4880,6 +5059,7 @@ CONTENTVIEW.flip = function(opt) {
height = canvas.height;
}
}
}
var destX = 0, destY = 0;
destX = (canvas.width / 2) - (width / 2);
......@@ -4925,9 +5105,28 @@ CONTENTVIEW.flip = function(opt) {
context.clearRect(0, 0, canvas.width, canvas.height);
context.save();
if($(rotatebtnR).attr('angle') != '0'){
if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
context.translate(canvas.width/2,canvas.height/2);
context.rotate($(rotatebtnR).attr('angle')*Math.PI/180);
context.translate(-(canvas.width/2),-(canvas.height/2));
context.drawImage(offscreen,
CONTENTVIEW.srcRectPrev.left, CONTENTVIEW.srcRectPrev.top, CONTENTVIEW.srcRectPrev.right - CONTENTVIEW.srcRectPrev.left, CONTENTVIEW.srcRectPrev.bottom - CONTENTVIEW.srcRectPrev.top,
CONTENTVIEW.destRectPrev.left, CONTENTVIEW.destRectPrev.top, width, height);
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, (canvas.height - height)/2, width, height);
}else{
context.translate(canvas.width/2,canvas.height/2);
context.rotate($(rotatebtnR).attr('angle')*Math.PI/180);
context.translate(-(canvas.width/2),-(canvas.height/2));
context.drawImage(offscreen,
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, CONTENTVIEW.destRect.top, width, height);
}
}else{
context.drawImage(offscreen,
CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.top, CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left, CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top,
CONTENTVIEW.destRect.left, CONTENTVIEW.destRect.top, width, height);
}
context.restore();
}
};
......@@ -5376,6 +5575,7 @@ CONTENTVIEW.zoomIn = function() {
CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip();
CONTENTVIEW.flip();
//Start Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
if(CONTENTVIEW_GETDATA.getPageIndex() < CONTENTVIEW_GENERAL.totalPage - 1){
......@@ -5471,6 +5671,7 @@ CONTENTVIEW.zoomOut = function() {
CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip();
CONTENTVIEW.flip();
//Start Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
if(CONTENTVIEW_GETDATA.getPageIndex() < CONTENTVIEW_GENERAL.totalPage - 1){
......@@ -5497,6 +5698,119 @@ CONTENTVIEW.zoomOut = function() {
CONTENTVIEW.closeDialogResize();
};
CONTENTVIEW.rotateR = function() {
if($('#rotatebtnR').attr('angle') == '0'){
$('#rotatebtnR').attr('angle', '90');
}else if($('#rotatebtnR').attr('angle') == '90'){
$('#rotatebtnR').attr('angle', '180');
}else if($('#rotatebtnR').attr('angle') == '180'){
$('#rotatebtnR').attr('angle', '-90');
}else{
$('#rotatebtnR').attr('angle', '0');
}
//CONTENTVIEW.srcRect.width = 0;
CONTENTVIEW.changePageWithoutSlide($("#txtSlider").val() - 1);
CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip();
/* close dialog popuptext */
CONTENTVIEW.closeDialogPopUpText();
};
CONTENTVIEW.rotateL = function() {
if($('#rotatebtnR').attr('angle') == '0'){
$('#rotatebtnR').attr('angle', '-90');
}else if($('#rotatebtnR').attr('angle') == '-90'){
$('#rotatebtnR').attr('angle', '180');
}else if($('#rotatebtnR').attr('angle') == '180'){
$('#rotatebtnR').attr('angle', '90');
}else{
$('#rotatebtnR').attr('angle', '0');
}
//CONTENTVIEW.srcRect.width = 0;
CONTENTVIEW.changePageWithoutSlide($("#txtSlider").val() - 1);
CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
CONTENTVIEW.flip();
/* close dialog popuptext */
CONTENTVIEW.closeDialogPopUpText();
};
CONTENTVIEW.checkDisableButtonRotate = function() {
if($('#rotatebtnR').attr('angle') == '0'){
if (ClientData.IsDisplayMemo() == true) {
$('#imgmemo').removeClass();
$('#imgmemo').addClass('memoDisplay_hover');
$('#imgmemo').bind('click', CONTENTVIEW.handleMemo);
} else {
$('#imgmemo').removeClass();
$('#imgmemo').addClass('memoDisplay_device');
$('#imgmemo').bind('click', CONTENTVIEW.handleMemo);
}
if (ClientData.IsAddingMemo() == true) {
$('#imgaddmemo').removeClass();
$('#imgaddmemo').addClass('memoAdd_hover');
$('#imgaddmemo').bind('click', CONTENTVIEW_EVENTS.handleAddMemo);
} else {
$('#imgaddmemo').removeClass();
$('#imgaddmemo').addClass('memoAdd_device');
$('#imgaddmemo').bind('click', CONTENTVIEW_EVENTS.handleAddMemo);
}
if (ClientData.IsDisplayMarking() == true) {
$('#imgmarking').removeClass();
$('#imgmarking').addClass('marking_hover');
$('#imgmarking').bind('click', CONTENTVIEW_EVENTS.imgmarking_click);
} else {
$('#imgmarking').removeClass();
$('#imgmarking').addClass('marking_device');
$('#imgmarking').bind('click', CONTENTVIEW_EVENTS.imgmarking_click);
}
if (ClientData.serviceOpt_marking() == 'Y') {
if (ClientData.IsAddingMarking() == true) {
$('#imgmarkingtoolbar').removeClass();
$('#imgmarkingtoolbar').addClass('markingToolbar_hover');
$('#imgmarkingtoolbar').bind('click', CONTENTVIEW.handleDrawCanvas);
} else {
$('#imgmarkingtoolbar').removeClass();
$('#imgmarkingtoolbar').addClass('markingToolbar_device');
$('#imgmarkingtoolbar').bind('click', CONTENTVIEW.handleDrawCanvas);
}
}
}else{
/* imgage display memo */
$('#imgmemo').unbind('click');
$('#imgmemo').removeClass();
$('#imgmemo').addClass('memoDisplay_off');
/* image add memo */
$('#imgaddmemo').unbind('click');
$('#imgaddmemo').removeClass();
$('#imgaddmemo').addClass('memoAdd_off');
$('#imgmarking').unbind('click');
$('#imgmarking').removeClass();
$('#imgmarking').addClass('marking_off');
$('#imgmarkingtoolbar').unbind('click');
$('#imgmarkingtoolbar').removeClass();
$('#imgmarkingtoolbar').addClass('markingToolbar_off');
}
};
/* restore screen size */
CONTENTVIEW.screenFit = function() {
......@@ -5551,6 +5865,94 @@ CONTENTVIEW.changeScale = function(scale) {
var width = offScreen.width;
var height = offScreen.height;
var aspect = offScreen.width / offScreen.height;
if($(rotatebtnR).attr('angle') == '90' || $(rotatebtnR).attr('angle') == '-90'){
sw = offScreen.height;
sh = offScreen.width;
aspect = offScreen.height / offScreen.width;
if (canvas.width > canvas.height) {
width = canvas.height;
height = width * aspect;
/*if(width > canvas.width) {
width = canvas.width;
height = width / aspect;
}*/
} else {
height = canvas.width;
width = height / aspect;
}
if (width > canvas.height) {
var size = canvas.height / height;
height = canvas.height;
width = width * size;
}
if (height > canvas.width) {
var size = canvas.width / width;
width = canvas.width;
height = height * size;
}
if (height < canvas.width) {
aspect = offscreen.height / offscreen.width
if(offScreen.width < offScreen.height){
height = height * scale * aspect;
}else{
height = height * scale
}
//height = height * scale;
if (height > canvas.width) {
sh /= scale;
sw = sh / (canvas.height / canvas.width);
} else {
sh /= scale;
}
//}else if(height <= canvas.height){
} else if (width < canvas.height) {
width = width * scale;
if (height > canvas.height) {
sw /= scale;
sh = sw / (canvas.width / canvas.height);
} else {
sw /= scale;
}
} else {
sh /= scale;
sw /= scale;
}
CONTENTVIEW.srcRect.top = sc.y - Math.round(sw / 2);
CONTENTVIEW.srcRect.left = sc.x - Math.round(sh / 2);
CONTENTVIEW.srcRect.bottom = Math.round(CONTENTVIEW.srcRect.left + sw);
CONTENTVIEW.srcRect.right = Math.round(CONTENTVIEW.srcRect.top + sh);
CONTENTVIEW.srcRect.width = CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left;
CONTENTVIEW.srcRect.height = CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top;
if(scale == 1){
sw = offScreen.width, sh = offScreen.height;
CONTENTVIEW.srcRect.left = sc.x - Math.round(sw / 2);
CONTENTVIEW.srcRect.top = sc.y - Math.round(sh / 2);
CONTENTVIEW.srcRect.right = Math.round(CONTENTVIEW.srcRect.left + sw);
CONTENTVIEW.srcRect.bottom = Math.round(CONTENTVIEW.srcRect.top + sh);
CONTENTVIEW.srcRect.width = CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left;
CONTENTVIEW.srcRect.height = CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top;
}
}else{
if (canvas.width > canvas.height) {
height = canvas.height;
width = height * aspect;
......@@ -5614,6 +6016,7 @@ CONTENTVIEW.changeScale = function(scale) {
CONTENTVIEW.srcRect.width = CONTENTVIEW.srcRect.right - CONTENTVIEW.srcRect.left;
CONTENTVIEW.srcRect.height = CONTENTVIEW.srcRect.bottom - CONTENTVIEW.srcRect.top;
}
if( isZoom ){
//var tempRatioWidth = offScreen.width / CONTENTVIEW_GENERAL.widthEachPageApi;
......@@ -5851,6 +6254,8 @@ CONTENTVIEW.screenBack = function(){
setTimeout(HEADER.getPushMessageNew, HEADER.getTimeWaitCheckNewPushMessage());
}
$('#rotatebtnR').attr('angle', '0');
};
CONTENTVIEW.initScreen = function(){
......
abvw/js/contentview_CreateObjects.js
......@@ -2641,8 +2641,10 @@ 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) {
if($('#rotatebtnR').attr('angle') == '0'){
page.addPageObjects(pageObjects);
}
}
//End Function: No.12
/* load page */
page.load(onCompleteFunc);
......
abvw/js/contentview_Events.js
......@@ -970,10 +970,19 @@ CONTENTVIEW_EVENTS.mouseWheel_CanvasMain = function(event, detail) {
//var sx = 1 / CONTENTVIEW.userScale;
var sy = 1 / CONTENTVIEW.userScale;
if($(rotatebtnR).attr('angle') == '180'){
CONTENTVIEW.moveY = -Math.round(detail * sy * 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() {
......
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();
};
......
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);
......
custom/daihatsu/abvw/contentview.html
......@@ -122,6 +122,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 class="hdRcolumn">
<input id="txtSearch" type="text">
......
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{
......
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{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment