Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MRI Violated scans] Have the minc file linked to brainbrowser (Redmine 10928) #2219

Merged
merged 6 commits into from
Oct 4, 2016
Merged

[MRI Violated scans] Have the minc file linked to brainbrowser (Redmine 10928) #2219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a15c7af
[MRI Violated scans] Have the minc file linked to brainbrowser (Redmi…
gluneau Sep 28, 2016
fff0e86
phpcs
gluneau Sep 28, 2016
ace9db3
proper path for mri_violations_log warnings
gluneau Sep 29, 2016
6f35074
added case where path starts with assembly
gluneau Oct 3, 2016
99d07e1
used $DB->quote() method for quoting
gluneau Oct 4, 2016
89ae9e6
else spacing
gluneau Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions modules/brainbrowser/ajax/minc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@

$headers = array();

$query = "select File from files where FileID = :MincID";
$minc_file = $DB->pselectOne($query, array('MincID' => $_REQUEST['minc_id']));
$minc_file = getMincLocation() . $minc_file;
$query = "select File from files where FileID = :MincID";

if (isset($_REQUEST['minc_location'])) {
$minc_file = ($_REQUEST['minc_location']);
} else {
$minc_file = $DB->pselectOne($query, array('MincID' => $_REQUEST['minc_id']));
$minc_file = getMincLocation() . $minc_file;
}

$header = $_REQUEST['minc_headers'];
$header_data = $_REQUEST['raw_data'];
Expand Down
36 changes: 25 additions & 11 deletions modules/brainbrowser/js/brainbrowser.loris.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,7 @@ $(function() {
viewer.volumes.forEach(function(volume) {
volume.setWorldCoords(x, y, z);
});
}
else {
} else {
viewer.volumes[vol_id].setWorldCoords(x, y, z);
}

Expand Down Expand Up @@ -781,24 +780,39 @@ $(function() {
}); // Should cursors in all panels be synchronized?

link = window.location.search;
var minc_tag;

minc_ids = getQueryVariable("minc_id");
if (minc_ids[0] === '[') {
// An array was passed. Get rid of the brackets and then split on ","
minc_ids = minc_ids.substring(1, minc_ids.length - 1);
minc_ids_arr = minc_ids.split(",");
if (getQueryVariable("minc_location")) {

} else {
// Only one passed
minc_ids = getQueryVariable("minc_location");
minc_ids_arr = [minc_ids];
minc_tag = "minc_location";
} else {

minc_ids = getQueryVariable("minc_id");
minc_tag = "minc_id";

if (minc_ids[0] === '[') {

// An array was passed. Get rid of the brackets and then split on ","
minc_ids = minc_ids.substring(1, minc_ids.length - 1);
minc_ids_arr = minc_ids.split(",");

} else {

// Only one passed
minc_ids_arr = [minc_ids];
}
}



for (i = 0; i < minc_ids_arr.length; i += 1) {

minc_volumes.push({
type: 'minc',
header_url: loris.BaseURL + "/brainbrowser/ajax/minc.php?minc_id=" + minc_ids_arr[i] + "&minc_headers=true",
raw_data_url: loris.BaseURL + "/brainbrowser/ajax/minc.php?minc_id=" + minc_ids_arr[i] + "&raw_data=true",
header_url: loris.BaseURL + "/brainbrowser/ajax/minc.php?" + minc_tag + "=" + minc_ids_arr[i] + "&minc_headers=true",
raw_data_url: loris.BaseURL + "/brainbrowser/ajax/minc.php?" + minc_tag + "=" + minc_ids_arr[i] + "&raw_data=true",
template: {
element_id: "volume-ui-template4d",
viewer_insert_class: "volume-viewer-display"
Expand Down
38 changes: 22 additions & 16 deletions modules/mri_violations/php/NDB_Menu_Filter_Form_mri_violations.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,16 @@ class NDB_Menu_Filter_Form_mri_violations extends NDB_Menu_Filter_Form
break;
}
// user input doesn't match DB, so we update the DB
else{
else {
$setArray = array('Resolved'=>(string)$val,'ChangeDate'=>date("Y-m-d H:i:s"));
$whereArray = array('hash'=>$hash);
$DB->update('violations_resolved', $setArray, $whereArray);
}
}
}
}
//if row is not found no resolve status was assigned,
// if selection<>0, then insert new row.
else{
} else {
//if row is not found no resolve status was assigned,
// if selection<>0, then insert new row.
// no need to insert to DB for Unresolved value.
if($val=='unresolved'){
continue;
Expand Down Expand Up @@ -138,21 +137,24 @@ class NDB_Menu_Filter_Form_mri_violations extends NDB_Menu_Filter_Form
// set the class variables
// create user object
$user =& User::singleton();
$DB =& Database::singleton();

$config =& NDB_Config::singleton();
$useProjects = $config->getSetting("useProjects");
if ($useProjects === "false") {
$useProjects = false;
}
else{
} else {
$useProjects = true;
}

$dir_path = $config->getSetting("imagePath");

$this->columns = array(
'v.PatientName',
'v.Site',
'v.TimeRun',
'v.MincFile',
'v.MincFileViolated',
'v.Series_Description as Series_Description_Or_Scan_Type',
'v.Problem',
'v.SeriesUID',
Expand All @@ -165,12 +167,18 @@ class NDB_Menu_Filter_Form_mri_violations extends NDB_Menu_Filter_Form
array_splice($this->columns, 2, 0, 'v.Subproject');
}

// Recreating the path (MincFileViolated field) to the minc file for the table mri_violations_log is more complicated
// because of the 3 cases that can occur as we pull the data from the db.
// 1. if the Mincfile starts with "assembly" then we need to add the directory path in front of it.
// 2. if the word "assembly" is there but not at the beginning, then uses it as is, the path is correct.
// 3. if it is not in the assembly dir, then it is in the trashbin, so we fix the path with that in mind.
$this->query = " FROM (
SELECT PatientName as PatientName,
time_run as TimeRun,
c.ProjectID as Project,
s.SubprojectID as Subproject,
minc_location as MincFile,
CONCAT_WS(''," . $DB->quote($dir_path) . ",'trashbin/',SUBSTRING_INDEX(minc_location, '/', -2)) as MincFileViolated,
series_description as Series_Description,
'Could not identify scan type' as Problem,
SeriesUID,
Expand All @@ -195,6 +203,7 @@ class NDB_Menu_Filter_Form_mri_violations extends NDB_Menu_Filter_Form
c.ProjectID as Project,
s.SubprojectID as Subproject,
MincFile,
IF(INSTR(`MincFile`, 'assembly'), IF(LEFT(`MincFile`, 8) = 'assembly',CONCAT_WS(''," . $DB->quote($dir_path) . ",`MincFile`),`MincFile`), CONCAT_WS(''," . $DB->quote($dir_path) . ",'trashbin/',SUBSTRING_INDEX(MincFile, '/', -2))) as MincFileViolated,
mri_scan_type.Scan_type,
'Protocol Violation',
SeriesUID,
Expand All @@ -221,6 +230,7 @@ class NDB_Menu_Filter_Form_mri_violations extends NDB_Menu_Filter_Form
c.ProjectID as Project,
s.SubprojectID as Subproject,
MincFile,
CONCAT_WS(''," . $DB->quote($dir_path) . ",'trashbin/',SUBSTRING_INDEX(MincFile, '/', -2)) as MincFileViolated,
null,
Reason,
SeriesUID,
Expand Down Expand Up @@ -328,8 +338,7 @@ class NDB_Menu_Filter_Form_mri_violations extends NDB_Menu_Filter_Form
if(is_array($sites)){
$sites = array('' => 'All') + $sites;
}
}
else {
} else {
// allow only to view own site data
$site =& Site::singleton($user->getData('CenterID'));
if ($site->isStudySite()) {
Expand Down Expand Up @@ -395,20 +404,17 @@ class NDB_Menu_Filter_Form_mri_violations extends NDB_Menu_Filter_Form
$this->form->form[$hash]['name'] = "resolvable[$hash]";
}
if ($key === 'Problem') {
if($val === "Could not identify scan type"){
if ($val === "Could not identify scan type") {
$this->tpl_data['join_tbl'] = "mri_protocol_violated_scans";
}
elseif($val === "Protocol Violation"){
} elseif ($val === "Protocol Violation") {
$this->tpl_data['join_tbl'] = "mri_violations_log";
}
else{
} else {
$this->tpl_data['join_tbl'] = "MRICandidateErrors";
}
}
if ($key === 'SeriesUID') {
$this->tpl_data['items'][$x]['series'] = $val;
}
else {
} else {
$this->tpl_data['items'][$x][$i]['name'] = $key;
$this->tpl_data['items'][$x][$i]['value'] = $val;
}
Expand Down
4 changes: 4 additions & 0 deletions modules/mri_violations/templates/menu_mri_violations.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@
{$items[item][piece].value}
</a>
</td>
{elseif $items[item][piece].name eq 'MincFileViolated'}
<td nowrap="nowrap" bgcolor="{$items[item][piece].bgcolor}">
<a href="#noID" onclick="window.open('{$baseurl}/brainbrowser/?minc_location={$items[item][piece].value}', 'BrainBrowser Volume Viewer', 'location = 0,width = auto, height = auto, scrollbars=yes')">{$items[item][piece].value}</a>
</td>
{elseif $items[item][piece].value eq 'Protocol Violation'}
<td nowrap="nowrap" bgcolor="{$items[item][piece].bgcolor}">
<a href="#" class="mri_violations" id="mri_protocol_check_violations" data-PatientName="{$items[item].PatientName}" "{if $items[item].series}" data-SeriesUID="{$items[item].series}{/if}">{{$items[item][piece].value}}</a>
Expand Down