Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[18974] oviyam/oviyam/trunk
|
From: <kar...@us...> - 2021-05-06 03:41:00
|
Revision: 18974
http://sourceforge.net/p/dcm4che/svn/18974
Author: karthikeyansan
Date: 2021-05-06 03:41:01 +0000 (Thu, 06 May 2021)
Log Message:
-----------
OV-238 - Provision to enable/disable windowing tool selection on load.
Modified Paths:
--------------
oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/UserConfiguration.java
oviyam/oviyam/trunk/src/in/raster/oviyam/xml/model/User.java
oviyam/oviyam/trunk/web/js/TileContent.js
oviyam/oviyam/trunk/web/js/framecontent.js
oviyam/oviyam/trunk/web/js/viewer.js
oviyam/oviyam/trunk/web/preferenceTab.html
Modified: oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/UserConfiguration.java
===================================================================
--- oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/UserConfiguration.java 2021-03-22 18:27:20 UTC (rev 18973)
+++ oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/UserConfiguration.java 2021-05-06 03:41:01 UTC (rev 18974)
@@ -156,10 +156,17 @@
if(prefetch==null) {
prefetch = "No";
}
- str = "slider:" + user.getViewerSlider() + ",prefetch:" + prefetch;
+ String windowing = user.getWindowing();
+ if(windowing == null){
+ windowing = "Yes";
+ }
+ str = "slider:" + user.getViewerSlider() + ",prefetch:" + prefetch;
+ str += ",windowing:" + windowing;
} else if(settings.equals("prefetch")) {
str = user.getPrefetch();
- }
+ } else if(settings.equals("windowing")) {
+ str = user.getWindowing();
+ }
out.print(str);
} else if (actionToDo.equalsIgnoreCase("UPDATE")) {
if (settings.equals("theme")) {
@@ -176,6 +183,8 @@
user.setPrefetch(prefetch.trim());
// user.setViewerSlider(settingsValue.substring(settingsValue.indexOf("slider"), settingsValue.indexOf(",")).split(":")[1]);
// user.setPrefetch(settingsValue.substring(settingsValue.indexOf("prefetch")).split(":")[1]);
+ } else if(settings.equals("windowing")) {
+ user.setWindowing(settingsValue);
}
uh.updateUser(user);
out.println("Success");
Modified: oviyam/oviyam/trunk/src/in/raster/oviyam/xml/model/User.java
===================================================================
--- oviyam/oviyam/trunk/src/in/raster/oviyam/xml/model/User.java 2021-03-22 18:27:20 UTC (rev 18973)
+++ oviyam/oviyam/trunk/src/in/raster/oviyam/xml/model/User.java 2021-05-06 03:41:01 UTC (rev 18974)
@@ -70,6 +70,9 @@
@Element(name="prefetch",required=false)
private String prefetch;
+ @Element(name="windowing",required=false)
+ private String windowing;
+
public SearchParams getSearchParams() {
return searchParams;
}
@@ -117,4 +120,12 @@
public void setPrefetch(String prefetch) {
this.prefetch = prefetch;
}
+
+ public String getWindowing() {
+ return windowing;
+ }
+
+ public void setWindowing(String windowing) {
+ this.windowing = windowing;
+ }
}
\ No newline at end of file
Modified: oviyam/oviyam/trunk/web/js/TileContent.js
===================================================================
--- oviyam/oviyam/trunk/web/js/TileContent.js 2021-03-22 18:27:20 UTC (rev 18973)
+++ oviyam/oviyam/trunk/web/js/TileContent.js 2021-05-06 03:41:01 UTC (rev 18974)
@@ -187,8 +187,10 @@
doProbe("probe", true);
} else if (tools === 'stackImage') {
activatestack(tools)
+ } else if(tools === 'windowing') {
+ activateTools("windowing", activateWindowing);
} else {
- activateTools("windowing", activateWindowing);
+ console.log("ELSE.....");
}
if (window.parent.rulerMap.has(seriesUid)) {
Modified: oviyam/oviyam/trunk/web/js/framecontent.js
===================================================================
--- oviyam/oviyam/trunk/web/js/framecontent.js 2021-03-22 18:27:20 UTC (rev 18973)
+++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-05-06 03:41:01 UTC (rev 18974)
@@ -162,8 +162,10 @@
doProbe("probe", true);
} else if (tools === 'stackImage') {
activatestack(tools)
+ } else if(tools === 'windowing') {
+ activateTools("windowing", activateWindowing);
} else {
- activateTools("windowing", activateWindowing);
+ console.log("ELSE.....");
}
var iNo = parseInt(jQuery("#totalImages").text().split("/")[0].split(":")[1]);
Modified: oviyam/oviyam/trunk/web/js/viewer.js
===================================================================
--- oviyam/oviyam/trunk/web/js/viewer.js 2021-03-22 18:27:20 UTC (rev 18973)
+++ oviyam/oviyam/trunk/web/js/viewer.js 2021-05-06 03:41:01 UTC (rev 18974)
@@ -33,7 +33,19 @@
var patId = getParameter(queryString, "patientID");
var studyId = getParameter(queryString, "studyUID");
var serverName = getParameter(queryString, "serverName");
- sessionStorage["tools"] = "windowing";
+
+ $.get("UserConfig.do", {
+ 'settings': 'windowing',
+ 'todo': 'READ'
+ }, function(data) {
+ data = data.trim();
+ if (data === 'Yes') {
+ sessionStorage["tools"] = "windowing";
+ } else {
+ sessionStorage["tools"] = "";
+ }
+ }, 'text');
+
if (serverName == 'null') {
serverName = '';
}
Modified: oviyam/oviyam/trunk/web/preferenceTab.html
===================================================================
--- oviyam/oviyam/trunk/web/preferenceTab.html 2021-03-22 18:27:20 UTC (rev 18973)
+++ oviyam/oviyam/trunk/web/preferenceTab.html 2021-05-06 03:41:01 UTC (rev 18974)
@@ -99,8 +99,10 @@
// var prefetch = data.substring(data.indexOf("prefetch"));
var slider = value[0];
var prefetch = value[1];
+ var windowing = value[2];
$('#sliderVisibility').val(slider.split(":")[1]);
$('#prefetchStudies').val(prefetch.split(":")[1]);
+ $('#windowingSelect').val(windowing.split(":")[1]);
}, 'text');
$('#viewerPreferences').click(function() {
@@ -134,6 +136,37 @@
}, 'text');
});
+ $('#windowingPreferences').click(function() {
+ var msg = '';
+ var sliderVisible = $('#sliderVisibility').val();
+ if (sliderVisible == 'none') {
+ msg = "Please select valid visibility";
+ $.ambiance({
+ message: msg,
+ type: 'error'
+ });
+ return;
+ }
+
+ var prefetch = $('#windowingSelect').val();
+
+ if (prefetch == 'none') {
+ prefetch = "No";
+ }
+
+ $.get("UserConfig.do", {
+ 'settings': 'windowing',
+ 'settingsValue': prefetch,
+ 'todo': 'UPDATE'
+ }, function(data) {
+ if (data.trim() == 'Success') {
+ displayMsg('success', languages.updateSuccess);
+ } else {
+ displayMsg('error', languages.updateError);
+ }
+ }, 'text');
+ });
+
//for session timeout
$.get("UserConfig.do", {
'settings': 'sessTimeout',
@@ -289,15 +322,26 @@
<tr>
<td style="width: 60%"><span class="ui-widget-content" style="border:none;" name="lblPrefetch">Pre-fetch other studies of the selected patient</span></td>
- <td align="right" style="width:40%">
+ <td align="right" style="width:50%">
<select id="prefetchStudies" style="width:100px;">
<option value="Yes">Yes</option>
<option value="No">No</option>
</select>
</td>
- <td align="right" rowspan="2" style="width:20%"><button id="viewerPreferences" class="cssButton">Update</button></td>
+ <td align="right" rowspan="" style="width:30%"><button id="viewerPreferences" class="cssButton">Update</button></td>
</tr>
+ <tr>
+ <td style="width: 60%"><span class="ui-widget-content" style="border:none;" name="windowOption">Enable windowing tool onload</span></td>
+
+ <td align="right" style="width:50%">
+ <select id="windowingSelect" style="width:100px;">
+ <option value="Yes">Yes</option>
+ <option value="No">No</option>
+ </select>
+ </td>
+ <td align="right" rowspan="" style="width:30%"><button id="windowingPreferences" class="cssButton">Update</button></td>
+ </tr>
</tbody>
</table>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
