Skip to content
Commits on Source (42)
Hide whitespace changes
Inline Side-by-side
backend/Pianos4.php
View file @ d0667257
......@@ -34,6 +34,7 @@ abstract class ContentDriver extends Driver
$rs->getPage()->addScript( Application::get( 'jslib_jquery' ) );
$rs->getPage()->addScript( Application::get( 'jslib_jquery_ui' ) );
$rs->getPage()->addScript( Application::get( 'jslib_svg' ) );
$rs->getPage()->addScript( "js/shared.functions.js" );
......@@ -323,6 +324,7 @@ abstract class Pianos4 extends Application
'jslib_jquery_hotkeys' => '/cdn/jquery/js/jquery.hotkeys-0.8.min.js',
'jslib_jquery_mousewheel' => '/cdn/jquery/js/jquery.mousewheel-3.0.6.js',
'jslib_d3' => '/cdn/misc/d3.min.js',
'jslib_svg' => '/cdn/jquery/js/jquery.svg.js',
'csslib_jquery_ui' => '/cdn/jquery/css/smoothness/jquery-ui-1.9.1.custom.css',
'csslib_jquery_layout' => '/cdn/jquery/css/layout.css',
......@@ -348,7 +350,10 @@ abstract class Pianos4 extends Application
// View Tracking
'viewTracker' => false,
// Randomize the order of the cases list for users
'randomize_case_order' => false,
// Misc parameters
// ====================
......
backend/TE/AppDB.php
View file @ d0667257
......@@ -863,10 +863,12 @@ class AppDB_TE extends AppDB
exercise.folder = folder.id AND
object.creator = person.id
" . ( $_SESSION[ 'user' ][ 'isadmin' ] ? "": " AND checkACL( folder.id," . ( int ) $_SESSION[ 'user' ][ 'id' ] . " )" ) . "
" . ( $folderID ? 'AND folder.id = ' . ( int ) $folderID: '' ) . "
ORDER BY
md5( concat( exercise.name, person.name ) )
;";
" . ( $folderID ? 'AND folder.id = ' . ( int ) $folderID: '' );
if( Application::get( "randomize_case_order" ) )
$sql .= " ORDER BY md5( concat( exercise.name, person.name ) );";
else
$sql .= " ORDER BY exercise.name;";
$res = $this->query( $sql );
......
js/backend.admin.js
View file @ d0667257
......@@ -1873,7 +1873,7 @@ Pianos4Backend.ImageManager = function( parent, params )
var imageEditor = function( img )
{
$( '#imgeditordlg' ).remove();
$( '#image_editor_dialog' ).remove();
var oldres = img.resolution;
......@@ -1883,15 +1883,194 @@ Pianos4Backend.ImageManager = function( parent, params )
.css( 'grid-gap', '30px' )
.css( 'height', '100%' );
var ruler_size_mm = 200;
var ruler_size_px_per_mm = 10;
var image = $( '<div />' )
.css( 'align-self', 'center' )
.css( 'justify-self', 'center' )
.css( 'width', '100%' )
.css( 'height', '100%' )
.css( 'background-image', 'url( ?action=get_image&id=' + img.id + ' )' )
.css( 'background-repeat', 'no-repeat' )
.css( 'background-size', 'contain' )
.css( 'background-position', 'center' );
.attr( "id", "image_editor_img_svg" )
.attr( "width", "100%" )
.attr( "height", "100%" )
.svg( { onLoad:
function( svg ){
var imgg = svg.group( { "id": "gimg" } );
svg.image( imgg, 0, 0, "100%", "100%", "?action=get_image&id=" + img.id );
var lineg = svg.group( imgg, { "id": "gline", "stroke": 'red', "strokeWidth": 2 } );
svg.line( lineg, 0, 0, 0, 0 );
var gr = svg.group( { "id": "gruler", "transform-origin": "0 0" } );
var x = -0.5 * ruler_size_mm * ruler_size_px_per_mm;
var y = 0;
var height = ruler_size_mm * ruler_size_px_per_mm;
var width = 3 * ruler_size_px_per_mm;
svg.rect( gr, x, y, height, width, { fill: "#ffffff" } );
var alternate_indexes = [ 1, -1 ];
var ruler_normal_line_options = {
"stroke": "#000000",
"strokeWidth": 0.15 * ruler_size_px_per_mm
};
var ruler_main_line_options = {
"stroke": "#bb0000",
"fill": "#bb0000",
"strokeWidth": 0.15 * ruler_size_px_per_mm,
};
var rule_line_length = function( n )
{
if( n % 10 == 0 )
return 3;
else if( n % 5 == 0 )
return 2;
else
return 1;
}
svg.line( gr, 0, 0, 0, rule_line_length( 0 ) * ruler_size_px_per_mm, ruler_main_line_options );
svg.polygon( gr, [ [ 0, 0 ], [ -2, 5 ], [ 2, 5 ] ], ruler_main_line_options );
for( var i = 1; i < ruler_size_mm / 2; i++ )
{
for( var j = 0; j <= 1; j++ )
{
var x1 = i * alternate_indexes[ j ] * ruler_size_px_per_mm;
var y1 = 0;
var x2 = x1;
var y2 = rule_line_length( i ) * ruler_size_px_per_mm;
svg.line( gr, x1, y1, x2, y2, ruler_normal_line_options );
}
}
}
} );
var is_mouse_dragging = false;
var start_x = null;
var start_y = null;
var end_x = null;
var end_y = null;
var measured_resolution = null;
var ruler_offset = 0;
var ruler_mirror = false;
var img_ratio = null;
var draw_ruler = function()
{
if( start_x == null || start_y == null || end_x == null || end_y == null )
{
return;
} else {
var dx = end_x - start_x;
var dy = end_y - start_y;
var angle = Math.atan( dy / dx ) / Math.PI * 180;
var transform = [
"translate( " + start_x + " " + start_y + " )",
"rotate( " + angle + " )",
"translate( " + ruler_offset + " -1 )",
"scale( " + measured_resolution / 25.4 / ruler_size_px_per_mm + " )",
];
if( ruler_mirror )
{
transform.push( "translate( 0 2 )" );
transform.push( "scale( 1 -1 )" );
}
$( "#gruler" )
.attr( "transform", transform );
console.log( measured_resolution / img_ratio );
}
}
setTimeout( function(){
$( "#image_editor_img_svg > svg" )
.attr( "width", "100%" )
.attr( "height", "100%" );
$( "#gruler" ).hide();
var ratio_width = $( "#image_editor_img_svg > svg" ).width() / img.width;
var ratio_height = $( "#image_editor_img_svg > svg" ).height() / img.height;
img_ratio = Math.min( ratio_width, ratio_height );
measured_resolution = parseInt( img.resolution ) * img_ratio;
$( "#gruler" )
.on( "click", function( event )
{
ruler_mirror = !ruler_mirror;
draw_ruler();
} );
$( "#gimg" )
.on( "mousedown", function( event ){
event.preventDefault();
event.stopPropagation();
$( "#gline" ).show()
is_mouse_dragging = true;
$( "#gruler" ).hide();
start_x = event.originalEvent.offsetX;
start_y = event.originalEvent.offsetY;
$( "#gline > line" ).attr( "x1", start_x );
$( "#gline > line" ).attr( "y1", start_y );
} )
.on( "mousemove", function( event ){
event.preventDefault();
event.stopPropagation();
if( event.target.nodeName == "image" )
{
if( is_mouse_dragging )
{
end_x = event.originalEvent.offsetX;
end_y = event.originalEvent.offsetY;
$( "#gline > line" ).attr( "x2", end_x );
$( "#gline > line" ).attr( "y2", end_y );
}
}
} )
.on( "mouseup", function( event ){
event.preventDefault();
event.stopPropagation();
is_mouse_dragging = false;
var d = Math.sqrt( Math.pow( end_x - start_x, 2 ) + Math.pow( end_y - start_y, 2 ) );
if( d < 100 )
{
$( "#gruler" ).hide();
$( "#gline" ).hide()
} else {
$( "#gruler" ).show();
draw_ruler();
}
} );
$( "#image_editor_img_svg > svg" )
.on( "wheel", function( event ){
event.preventDefault();
event.stopPropagation();
var delta = Math.sign( event.originalEvent.deltaY );
if( event.shiftKey )
{
ruler_offset += 0.05 * delta * ruler_size_px_per_mm;
} else {
if( event.ctrlKey )
var diff = 0.1;
else
var diff = 2.5;
measured_resolution += diff * delta * ruler_size_px_per_mm;
}
draw_ruler();
} )
}, 0 );
var metadata = $( '<div />' )
.css( 'padding-top', '30px' )
......@@ -1928,33 +2107,40 @@ Pianos4Backend.ImageManager = function( parent, params )
$( '#newresolutionvalue' ).focus();
}
var ajaxChangeResolutionOut = function( res )
{
$.ajax( {
url: '?action=rpc&method=changeResolution',
type: "POST",
dataType: 'json',
data: {
id: img.id,
newResolution: parseInt( res )
},
success: function( data )
{
if( data.error === false )
{
toastr.success( "Resolution updates" );
} else {
toastr.error( "Database error" );
}
},
error: function( data )
{
toastr.error( "Network error" );
}
} );
}
var changeResolutionOut = function()
{
var res = $( '#newresolutionvalue' ).val();
if( $.isNumeric( res ) )
{
$.ajax( {
url: '?action=rpc&method=changeResolution',
type: "POST",
dataType: 'json',
data: { id: img.id, newResolution: res },
success: function( data )
{
if( data.error === false )
{
toastr.success( "Resolution updates" );
} else {
toastr.error( "Database error" );
}
},
error: function( data )
{
toastr.error( "Network error" );
}
} );
ajaxChangeResolutionOut( res );
} else {
res = oldres;
}
......@@ -1962,6 +2148,47 @@ Pianos4Backend.ImageManager = function( parent, params )
$( '#resolutionfield' ).html( genResField( res ) );
}
var get_help_set_resolution_ruler = function()
{
$( "<div />" )
.attr( "id", "set_resolution_ruler" )
.append(
$( "<div />" )
.css( "margin-bottom", "10px" )
.text( "The ruler shall be placed by click-and-drag on the ruler on the image. The orientation of the ruler can be switched by left-clicking the ruler." )
)
.append(
$( "<div />" )
.css( "margin-bottom", "10px" )
.text( "The resolution (size of the ruler) can be changed by using the wheele of your mouse. The Ctrl button allows you change the size of the ruler slowly." )
)
.append(
$( "<div />" )
.css( "margin-bottom", "10px" )
.text( "The location of the ruler can be changed by using the wheel of your mouse and holding the Shift button." )
)
.append(
$( "<div />" )
.css( "margin-bottom", "10px" )
.text( "The aim of this tool is to align the virtual ruler with the real ruler on the image. First, align the red arrow and the align the ticks on of the rulers. When the two rulers are aligned, click on the 'Set resolution' button." )
)
.dialog( {
title: "Set resolution tool",
width: Math.min( $( window ).width() * 0.5, 500 ),
modal: true,
buttons: {
"got it!": function()
{
$( this ).dialog( "close" );
},
},
close: function()
{
$( this ).remove();
}
} );
}
metadata.append( $( '<strong />' ).text( "Name" ) );
metadata.append( $( '<span />' ).text( "" ) );
metadata.append( $( '<span />' ).text( img.name ) );
......@@ -2016,18 +2243,31 @@ Pianos4Backend.ImageManager = function( parent, params )
var dlgopts = {
autoOpen: true,
modal: true,
width: $( window ).width() * 0.5,
height: $( window ).height() * 0.5,
width: $( window ).width() * 0.8,
height: $( window ).height() * 0.8,
resizable: true,
title: "Image metadata viewer",
open: function()
{
$( ".ui-widget-overlay" ).bind( "click", function()
{
$( "#imgeditordlg" ).dialog( "close" );
$( "#image_editor_dialog" ).dialog( "close" );
} );
},
buttons: {
help: {
class: "left_button",
text: "Get help!",
click: get_help_set_resolution_ruler
},
'Set resolution': function()
{
var new_resolution = measured_resolution / img_ratio;
new_resolution = parseInt( new_resolution );
$( "#newresolutionvalue" ).text( new_resolution );
ajaxChangeResolutionOut( new_resolution );
},
'Close': function()
{
$( this ).dialog( 'close' );
......@@ -2037,7 +2277,7 @@ Pianos4Backend.ImageManager = function( parent, params )
};
$( '<div />' )
.attr( 'id', 'imgeditordlg' )
.attr( 'id', 'image_editor_dialog' )
.addClass( 'pianos4_dialog' )
.append( editor )
.dialog( dlgopts );
......
js/backend.js
View file @ d0667257
......@@ -135,9 +135,6 @@ function Pianos4Backend(params)
layoutObj = mainDiv.layout({
defaults: {
fxName: 'none',
// spacing_open: params.layoutBorderWidth,
// spacing_closed: params.layoutBorderWidth,
// applyDefaultStyles: true,
},
center: {
onresize: function() { onWindowSizeChanged(false); },
......@@ -784,9 +781,6 @@ function Pianos4Backend(params)
});
}
// for (var i in $.browser)
// log('$.browser.'+i+' = '+$.browser[i]);
return div;
}
......@@ -894,7 +888,6 @@ function Pianos4Backend(params)
break;
case 'folder':
// if (params.user.tutor)
constructor = Pianos4Backend.AdminFolder;
opts = {
id: id,
......@@ -1390,7 +1383,6 @@ function Pianos4Backend(params)
$( "#get_default_password_list_for_users" ).remove();
} );
var password_list_content = "";
$.ajax( {
url: '?action=rpc&method=getDefaultPasswordForUsers',
type: 'POST',
......@@ -1401,10 +1393,13 @@ function Pianos4Backend(params)
success: function( data ){
if( ! data.error )
{
var password_list_content = "";
data.ret.forEach( function( user ){
password_list_content += user[ "username" ] + ";" + user[ "password" ] + "\n";
} );
$( "#password_list" ).val( password_list_content );
} else {
$( "#password_list" ).val( "Error while loading the list of password." );
}
},
error: function() {
......
js/pianos4_view.js
View file @ d0667257
......@@ -1864,8 +1864,14 @@ function Pianos4View(params)
{
event.preventDefault();
if( event.shiftKey === false )
if( event.shiftKey === true )
{
rotationView[ params.type ].theta += delta;
rotationView[ params.type ].theta = ( ( ( rotationView[ params.type ].theta +180 ) % 360 ) + 360 ) % 360 - 180;
$( '#rotationslider_' + params.type ).slider( 'value', rotationView[ params.type ].theta );
self.updateRotation();
} else {
var newFactor = 0.01 * pianos.getNewZoomFactor( zoom * 100.0, delta < 0 );
self.setZoomFactor( newFactor, [ event.clientX, event.clientY ] );
......@@ -1878,12 +1884,6 @@ function Pianos4View(params)
}
pianos.setOtherViewZoomFactor( self, newFactor, anchorOffset );
} else {
rotationView[ params.type ].theta += delta;
rotationView[ params.type ].theta = ( ( ( rotationView[ params.type ].theta +180 ) % 360 ) + 360 ) % 360 - 180;
$( '#rotationslider_' + params.type ).slider( 'value', rotationView[ params.type ].theta );
self.updateRotation();
}
}
......