You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(182) |
Dec
(183) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(214) |
Feb
(17) |
Mar
(21) |
Apr
(153) |
May
(159) |
Jun
(126) |
Jul
(309) |
Aug
(256) |
Sep
(162) |
Oct
(39) |
Nov
(29) |
Dec
(1) |
2003 |
Jan
|
Feb
(42) |
Mar
(95) |
Apr
(26) |
May
(38) |
Jun
(52) |
Jul
(106) |
Aug
(15) |
Sep
(83) |
Oct
(36) |
Nov
(117) |
Dec
(140) |
2004 |
Jan
(80) |
Feb
(246) |
Mar
(211) |
Apr
(140) |
May
(98) |
Jun
(115) |
Jul
(141) |
Aug
(110) |
Sep
(106) |
Oct
(147) |
Nov
(184) |
Dec
(384) |
2005 |
Jan
(274) |
Feb
(225) |
Mar
(242) |
Apr
(176) |
May
(100) |
Jun
(243) |
Jul
(131) |
Aug
(381) |
Sep
(289) |
Oct
(291) |
Nov
(317) |
Dec
(295) |
2006 |
Jan
(157) |
Feb
(317) |
Mar
(264) |
Apr
(335) |
May
(398) |
Jun
(433) |
Jul
(491) |
Aug
(332) |
Sep
(292) |
Oct
(253) |
Nov
(292) |
Dec
(155) |
2007 |
Jan
(229) |
Feb
(370) |
Mar
(317) |
Apr
(341) |
May
(227) |
Jun
(251) |
Jul
(204) |
Aug
(176) |
Sep
(276) |
Oct
(157) |
Nov
(201) |
Dec
(56) |
2008 |
Jan
(162) |
Feb
(77) |
Mar
(55) |
Apr
(118) |
May
(98) |
Jun
(217) |
Jul
(116) |
Aug
(221) |
Sep
(341) |
Oct
(578) |
Nov
(604) |
Dec
(543) |
2009 |
Jan
(488) |
Feb
(522) |
Mar
(547) |
Apr
(542) |
May
(589) |
Jun
(170) |
Jul
(110) |
Aug
(87) |
Sep
(141) |
Oct
(133) |
Nov
(105) |
Dec
(97) |
2010 |
Jan
(158) |
Feb
(125) |
Mar
(170) |
Apr
(255) |
May
(168) |
Jun
(226) |
Jul
(156) |
Aug
(132) |
Sep
(98) |
Oct
(186) |
Nov
(222) |
Dec
(159) |
2011 |
Jan
(167) |
Feb
(195) |
Mar
(234) |
Apr
(140) |
May
(161) |
Jun
(115) |
Jul
(95) |
Aug
(139) |
Sep
(154) |
Oct
(142) |
Nov
(211) |
Dec
(106) |
2012 |
Jan
(86) |
Feb
(49) |
Mar
(138) |
Apr
(42) |
May
(35) |
Jun
(46) |
Jul
(34) |
Aug
(124) |
Sep
(167) |
Oct
(155) |
Nov
(95) |
Dec
(113) |
2013 |
Jan
(57) |
Feb
(29) |
Mar
(77) |
Apr
(36) |
May
(60) |
Jun
(68) |
Jul
(64) |
Aug
(57) |
Sep
(43) |
Oct
(52) |
Nov
(39) |
Dec
(14) |
2014 |
Jan
(56) |
Feb
(26) |
Mar
(29) |
Apr
(11) |
May
(9) |
Jun
(8) |
Jul
(14) |
Aug
(11) |
Sep
(28) |
Oct
(28) |
Nov
(9) |
Dec
(4) |
2015 |
Jan
(17) |
Feb
(2) |
Mar
(5) |
Apr
(18) |
May
(17) |
Jun
(8) |
Jul
(1) |
Aug
(1) |
Sep
(8) |
Oct
(23) |
Nov
(18) |
Dec
(5) |
2016 |
Jan
(23) |
Feb
(6) |
Mar
(3) |
Apr
(27) |
May
(28) |
Jun
(13) |
Jul
(14) |
Aug
(1) |
Sep
(18) |
Oct
(8) |
Nov
(12) |
Dec
|
2017 |
Jan
(11) |
Feb
|
Mar
(9) |
Apr
(1) |
May
(7) |
Jun
(18) |
Jul
(1) |
Aug
(5) |
Sep
(1) |
Oct
(3) |
Nov
(8) |
Dec
(18) |
2018 |
Jan
(22) |
Feb
(2) |
Mar
(2) |
Apr
(13) |
May
(13) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(5) |
Oct
|
Nov
(8) |
Dec
(4) |
2019 |
Jan
(8) |
Feb
(4) |
Mar
(3) |
Apr
(2) |
May
(5) |
Jun
(4) |
Jul
(6) |
Aug
(4) |
Sep
(9) |
Oct
(3) |
Nov
(11) |
Dec
(4) |
2020 |
Jan
(14) |
Feb
(3) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(11) |
Sep
(3) |
Oct
|
Nov
(1) |
Dec
|
2021 |
Jan
(3) |
Feb
(14) |
Mar
(19) |
Apr
|
May
(5) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(3) |
Oct
(8) |
Nov
|
Dec
|
2022 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2024 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <pra...@us...> - 2024-04-23 04:57:03
|
Revision: 18999 http://sourceforge.net/p/dcm4che/svn/18999 Author: prakashj Date: 2024-04-23 04:56:51 +0000 (Tue, 23 Apr 2024) Log Message: ----------- Oviyam 2.8.2 - release source code - tagged Added Paths: ----------- oviyam/oviyam/tags/oviyam_2_8_2_release/.classpath oviyam/oviyam/tags/oviyam_2_8_2_release/.project oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/ oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/.jsdtscope oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/org.eclipse.jdt.core.prefs oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/org.eclipse.ltk.core.refactoring.prefs oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/org.eclipse.wst.common.component oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/org.eclipse.wst.common.project.facet.core.xml oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/org.eclipse.wst.jsdt.ui.superType.container oviyam/oviyam/tags/oviyam_2_8_2_release/.settings/org.eclipse.wst.jsdt.ui.superType.name oviyam/oviyam/tags/oviyam_2_8_2_release/LICENSE.txt oviyam/oviyam/tags/oviyam_2_8_2_release/build.xml oviyam/oviyam/tags/oviyam_2_8_2_release/src/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/conf/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/conf/oviyam2-7-config.xml oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/services/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/services/CDimseService.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/services/ConfigProperties.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/services/StorageService.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/services/StorageServiceAdapter.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/services/StorageServiceEvent.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/de/iftm/dcm4che/services/StorageServiceEventListener.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/ImageInfo.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/PatientInfo.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/SeriesDetails.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/SeriesInfo.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/delegate/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/delegate/EchoService.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/delegate/ImageOrientation.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/delegate/ReceiveDelegate.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/handler/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/handler/DownloadHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/handler/ImageHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/handler/PatientInfoHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/handler/SeriesDetailsHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/handler/StudyInfoHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/model/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/model/DownloadModel.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/model/InstanceModel.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/model/PatientQueryModel.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/model/SeriesModel.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/model/StudyModel.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/AutoRefreshStudies.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/DcmImage.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/DicomNodes.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/DicomRetrieve.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/DirectUrlLaunch.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/DownloadConfiguration.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/DownloadServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/DownloadStudyServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/EchoServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/IOviyamContext.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/InstanceServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/LanguageServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/ListenerServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/NameDisplayConfigSevlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/OtherStudiesInfo.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/OverlayConfigServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/PixelDataServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/QueryParams.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/SeriesServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/ServerConfigServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/StudyInfoServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/UserConfiguration.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/servlet/WadoServlet.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/threed/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/threed/CopyDicomFiles.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/threed/surfaceJson.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/InstanceComparator.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/ParseImgFileData.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/ReadXMLFile.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/RequestEncodeFilter.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/SeriesComparator.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/StreamFile.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/Configuration.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/DcmRcv.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/MoveScu.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/MoveScu.properties oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/SendStgCmtResult.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/StgCmtSCP.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/util/core/StorageSCP.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/DownloadConfigHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/IOviyamCxtHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/LanguageHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/ListenerHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/NameDisplayConfigHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/OverlayTextHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/QueryParamHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/ServerHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/UserHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/handler/XMLFileHandler.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/Button.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/Configuration.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/ImageLaterality.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/Language.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/Listener.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/NameDisplayConfig.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/OverlayText.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/SearchParams.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/Server.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/Servers.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/User.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/in/raster/oviyam/xml/model/Users.java oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/CDimseService.cfg oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/EchoService.cfg oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/Image.cfg oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/Series.cfg oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/i18n/ oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/i18n/Messages.properties oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/i18n/Messages_ta_IN.properties oviyam/oviyam/tags/oviyam_2_8_2_release/src/resources/movescu.cfg oviyam/oviyam/tags/oviyam_2_8_2_release/web/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/Study.jsp oviyam/oviyam/tags/oviyam_2_8_2_release/web/TileContent.html oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/jboss-web.xml oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/commons-cli-1.2.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/commons-compress-1.18.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/dcm4che-core-2.0.27.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/dcm4che-filecache-2.0.27.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/dcm4che-image-2.0.27.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/dcm4che-imageio-2.0.27.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/dcm4che-net-2.0.27.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/dcm4che-tool-dcmqr-2.0.27.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/dcm4che.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/getopt.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/jboss-system.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/json.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/json_simple-1.1.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/jsp-api.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/jstl.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/log4j-1.2.13.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/servlet-api.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/simple-xml-2.6.7.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/slf4j-api-1.4.3.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/slf4j-log4j12-1.4.3.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/standard.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/lib/vtk.jar oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/sun-web.xml oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/tlds/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/tlds/ImageInfo.tld oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/tlds/PatientInfo.tld oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/tlds/SeriesDetails.tld oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/tlds/StudyInfo.tld oviyam/oviyam/tags/oviyam_2_8_2_release/web/WEB-INF/web.xml oviyam/oviyam/tags/oviyam_2_8_2_release/web/about.jsp oviyam/oviyam/tags/oviyam_2_8_2_release/web/config.html oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/demo_table_jui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/demos.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/HELP-US-OUT.txt oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/css/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/css/font-awesome.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/css/font-awesome.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/fonts/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/fonts/FontAwesome.otf oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/fonts/fontawesome-webfont.eot oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/fonts/fontawesome-webfont.svg oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/fonts/fontawesome-webfont.ttf oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/fonts/fontawesome-webfont.woff oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/fonts/fontawesome-webfont.woff2 oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/animated.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/bordered-pulled.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/core.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/fixed-width.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/font-awesome.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/icons.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/larger.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/list.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/mixins.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/path.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/rotated-flipped.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/screen-reader.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/stacked.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/less/variables.less oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_animated.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_bordered-pulled.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_core.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_fixed-width.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_icons.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_larger.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_list.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_mixins.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_path.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_rotated-flipped.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_screen-reader.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_stacked.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/_variables.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/font-awesome/scss/font-awesome.scss oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/frameContent.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/echo.gif oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/expand.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/gradient_red.jpg oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/important.gif oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/info.gif oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/selected.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_black_matte.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_black_tie.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_blitzer.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_cupertino.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_dark_hive.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_dot_luv.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_eggplant.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_excite_bike.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_flick.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_hot_sneaks.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_humanity.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_le_frog.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_mint_choco.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_overcast.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_pepper_grinder.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_smoothness.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_south_street.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_start_menu.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_sunny.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_swanky_purse.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_trontastic.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_ui_dark.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_ui_light.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/themeGallery/theme_30_windoze.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_black_matte.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_black_tie.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_blitzer.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_cupertino.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_dark_hive.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_dot_luv.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_eggplant.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_excite_bike.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_flick.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_hot_sneaks.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_humanity.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_le_frog.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_mint_choco.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_overcast.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_pepper_grinder.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_smoothness.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_south_street.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_start_menu.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_sunny.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_swanky_purse.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_trontastic.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_ui_dark.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_ui_light.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/theme_30_windoze.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/title.gif oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/tracker.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/tracker_black.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/tracker_simple.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_diagonals-thick_8_333333_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_diamond_10_4f4221_10x8.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_diamond_25_675423_10x8.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_diamond_8_261803_10x8.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_diamond_8_443113_10x8.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_flat_0_aaaaaa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_flat_65_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_flat_75_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_glass_40_111111_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_glass_55_1c1c1c_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_glass_55_fbf9ee_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_glass_65_ffffff_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_glass_75_dadada_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_glass_75_e6e6e6_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_glass_95_fef1ec_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-icons_222222_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-icons_2e83ff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-icons_454545_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-icons_888888_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/images/ui-icons_cd0a0a_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jqcontextmenu.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery-gentleSelect.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery-ui(1).css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery-ui(2).css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.alerts.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ambiance.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.contextMenu.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.multiselect.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.noty.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/layout-default-latest.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/login.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/modal.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/noty_theme_default.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/preferences.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/settings.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/smartslider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_flat_75_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_glass_65_ffffff_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_glass_75_dadada_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-icons_222222_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-icons_2e83ff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-icons_454545_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-icons_888888_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/images/ui-icons_cd0a0a_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery-ui.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.accordion.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.all.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.autocomplete.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.base.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.button.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.core.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.datepicker.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.dialog.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.progressbar.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.resizable.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.selectable.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.slider.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.tabs.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/base/minified/jquery.ui.theme.min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_diagonals-thick_8_333333_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_flat_65_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_glass_40_111111_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_glass_55_1c1c1c_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_inset-hard_45_cd0a0a_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-bg_inset-hard_55_ffeb80_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-icons_222222_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-icons_4ca300_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-icons_bbbbbb_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-icons_ededed_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-icons_ffcf29_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/black-tie/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_flat_0_333333_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_flat_65_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_flat_75_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-icons_004276_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-icons_cc0000_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/blitzer/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_glass_50_3baae3_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-icons_2694e8_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-icons_2e83ff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-icons_3d80b3_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-icons_72a7cf_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/cupertino/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/animated-overlay.gif oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_flat_30_333333_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_flat_50_333333_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_flat_75_2A2A2A_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_flat_75_aaaaaa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_glass_50_003147_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_highlight-hard_65_fee4bd_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_highlight-soft_20_333333_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-bg_highlight-soft_30_0972a5_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-icons_FF8A00_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-icons_cb672b_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-icons_f35f07_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/images/ui-icons_ff7519_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/jquery-ui-min.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dark-hive/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_diagonals-thick_15_0b3e6f_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_dots-medium_30_0b58a2_4x4.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_dots-small_20_333333_2x2.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_dots-small_30_a32d00_2x2.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_dots-small_40_00498f_2x2.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_flat_0_aaaaaa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_flat_40_292929_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-bg_gloss-wave_20_111111_500x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-icons_00498f_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-icons_98d2fb_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-icons_9ccdfc_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/dot-luv/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_flat_0_aaaaaa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_flat_0_eeeeee_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_flat_55_994d53_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_flat_55_fafafa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_gloss-wave_30_3d3644_500x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_highlight-soft_100_dcd9de_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_highlight-soft_100_eae6ea_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_highlight-soft_25_30273a_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-bg_highlight-soft_45_5f5964_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-icons_454545_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-icons_734d99_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-icons_8d78a5_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-icons_a8a3ae_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-icons_ebccce_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/eggplant/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_diagonals-small_25_c5ddfc_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_diagonals-thick_20_e69700_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_diagonals-thick_22_1484e6_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_diagonals-thick_26_2293f7_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_flat_0_e69700_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_flat_0_e6b900_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_highlight-soft_100_f9f9f9_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-bg_inset-hard_100_eeeeee_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-icons_0a82eb_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-icons_0b54d5_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-icons_5fa5e3_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-icons_fcdd4a_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/excite-bike/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_flat_0_aaaaaa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_flat_0_eeeeee_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_flat_55_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_flat_75_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_glass_65_ffffff_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-icons_0073ea_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-icons_454545_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-icons_666666_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-icons_ff0084_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/flick/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_diagonals-small_40_db4865_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_diagonals-small_50_93c3cd_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_diagonals-small_50_ff3853_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_diagonals-small_75_ccd232_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_dots-medium_80_ffff38_4x4.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_dots-small_35_35414f_2x2.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_flat_75_ba9217_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_flat_75_ffffff_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-bg_white-lines_85_f7f7ba_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-icons_454545_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-icons_88a206_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-icons_c02669_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-icons_e1e463_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-icons_ffeb33_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/hot-sneaks/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_glass_25_cb842e_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_glass_70_ede4d4_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-icons_c47a23_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-icons_cb672b_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-icons_f08000_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-icons_f35f07_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-icons_ff7519_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/images/ui-icons_ffffff_256x240.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery-ui.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.accordion.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.all.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.autocomplete.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.base.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.button.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.core.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.datepicker.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.dialog.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.progressbar.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.resizable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.selectable.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.slider.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.tabs.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/humanity/jquery.ui.theme.css oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_diagonals-thick_15_444444_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_glass_55_fbf5d0_1x400.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_highlight-soft_50_4eb305_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_highlight-soft_60_4ca20b_1x100.png oviyam/oviyam/tags/oviyam_2_8_2_release/web/css/themes/le-frog/images/ui-bg_inset-soft_10_285c00_1x100.png oviyam/oviyam/tags/oviy... [truncated message content] |
From: <pra...@us...> - 2024-04-23 04:40:26
|
Revision: 18998 http://sourceforge.net/p/dcm4che/svn/18998 Author: prakashj Date: 2024-04-23 04:40:24 +0000 (Tue, 23 Apr 2024) Log Message: ----------- Oviyam 2.8.2 - Release - Source code - folder created Added Paths: ----------- oviyam/oviyam/tags/oviyam_2_8_2_release/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 18997 http://sourceforge.net/p/dcm4che/svn/18997 Author: javawilli Date: 2022-06-28 12:44:55 +0000 (Tue, 28 Jun 2022) Log Message: ----------- MPPS forward: Fixed hardcoded final COMPLETED state Modified Paths: -------------- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java Modified: dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java =================================================================== --- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java 2022-06-27 07:15:30 UTC (rev 18996) +++ dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java 2022-06-28 12:44:55 UTC (rev 18997) @@ -93,13 +93,13 @@ String cuid = UID.ModalityPerformedProcedureStepSOPClass; String iuid = mpps.getString(Tag.SOPInstanceUID); - + String finalState = mpps.getString(Tag.PerformedProcedureStepStatus); mpps.putString(Tag.PerformedProcedureStepStatus, VR.CS, "IN PROGRESS"); if ( !mpps.contains(Tag.ReferencedPatientSequence ) ) mpps.putSequence( Tag.ReferencedPatientSequence ); as.ncreate(cuid, iuid, mpps, pc.getTransferSyntax(), rspHandler); - mpps.putString(Tag.PerformedProcedureStepStatus, VR.CS, "COMPLETED"); + mpps.putString(Tag.PerformedProcedureStepStatus, VR.CS, finalState); as.nset(cuid, iuid, mpps.subSet(MPPS_SET_TAGS), pc.getTransferSyntax(), rspHandler); as.waitForDimseRSP(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 18996 http://sourceforge.net/p/dcm4che/svn/18996 Author: javawilli Date: 2022-06-27 07:15:30 +0000 (Mon, 27 Jun 2022) Log Message: ----------- Fixed wrong ReferencedPerformedProcedureStepSequence after receiving MPPS COMPLETE Modified Paths: -------------- dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/MPPSManagerBean.java Modified: dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/MPPSManagerBean.java =================================================================== --- dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/MPPSManagerBean.java 2022-06-27 07:00:34 UTC (rev 18995) +++ dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/MPPSManagerBean.java 2022-06-27 07:15:30 UTC (rev 18996) @@ -269,7 +269,8 @@ Dataset ds1 = s.getAttributes(true); DcmElement sq = ds1.putSQ(Tags.RefPPSSeq); Dataset item = sq.addNewItem(); - item.putUI(Tags.SOPInstanceUID, mpps.getSopIuid()); + item.putUI(Tags.RefSOPClassUID, UIDs.ModalityPerformedProcedureStep); + item.putUI(Tags.RefSOPInstanceUID, mpps.getSopIuid()); ds1.putDA(Tags.PPSStartDate, mpps.getPpsStartDateTime()); ds1.putTM(Tags.PPSStartTime, mpps.getPpsStartDateTime()); s.setAttributes(ds1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 18995 http://sourceforge.net/p/dcm4che/svn/18995 Author: javawilli Date: 2022-06-27 07:00:34 +0000 (Mon, 27 Jun 2022) Log Message: ----------- Fixed missing Attributes in N-CREATE dataset of MPPS Forward Modified Paths: -------------- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java Modified: dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java =================================================================== --- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java 2022-06-24 13:18:24 UTC (rev 18994) +++ dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-sar/dcm4chee-web-sar-mppsforward/src/main/java/org/dcm4chee/web/service/mppsforward/MppsForwardService.java 2022-06-27 07:00:34 UTC (rev 18995) @@ -57,18 +57,6 @@ */ public class MppsForwardService extends AbstractScuService { - private static final int[] MPPS_CREATE_TAGS = { Tag.SpecificCharacterSet, - Tag.Modality, Tag.ProcedureCodeSequence, - Tag.ReferencedPatientSequence, Tag.PatientName, Tag.PatientID, - Tag.IssuerOfPatientID, Tag.PatientBirthDate, Tag.PatientSex, - Tag.StudyID, Tag.PerformedStationAETitle, Tag.PerformedStationName, - Tag.PerformedLocation, Tag.PerformedProcedureStepStartDate, - Tag.PerformedProcedureStepStartTime, Tag.PerformedProcedureStepEndDate, - Tag.PerformedProcedureStepEndTime, Tag.PerformedProcedureStepStatus, - Tag.PerformedProcedureStepID, Tag.PerformedProcedureStepDescription, - Tag.PerformedProcedureTypeDescription, Tag.PerformedProtocolCodeSequence, - Tag.ScheduledStepAttributesSequence }; - private static final int[] MPPS_SET_TAGS = { Tag.SpecificCharacterSet, Tag.PerformedProcedureStepEndDate, Tag.PerformedProcedureStepEndTime, Tag.PerformedProcedureStepStatus, @@ -107,7 +95,9 @@ String iuid = mpps.getString(Tag.SOPInstanceUID); mpps.putString(Tag.PerformedProcedureStepStatus, VR.CS, "IN PROGRESS"); - as.ncreate(cuid, iuid, mpps.subSet(MPPS_CREATE_TAGS), pc.getTransferSyntax(), rspHandler); + if ( !mpps.contains(Tag.ReferencedPatientSequence ) ) + mpps.putSequence( Tag.ReferencedPatientSequence ); + as.ncreate(cuid, iuid, mpps, pc.getTransferSyntax(), rspHandler); mpps.putString(Tag.PerformedProcedureStepStatus, VR.CS, "COMPLETED"); as.nset(cuid, iuid, mpps.subSet(MPPS_SET_TAGS), pc.getTransferSyntax(), rspHandler); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jav...@us...> - 2022-06-24 13:18:26
|
Revision: 18994 http://sourceforge.net/p/dcm4che/svn/18994 Author: javawilli Date: 2022-06-24 13:18:24 +0000 (Fri, 24 Jun 2022) Log Message: ----------- Prevent QC on NEARLINE data with IOCM enabled Modified Paths: -------------- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/MoveEntitiesPage.java dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/delegate/ContentEditDelegate.java dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_de.properties Modified: dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/MoveEntitiesPage.java =================================================================== --- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/MoveEntitiesPage.java 2022-02-18 11:57:52 UTC (rev 18993) +++ dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/MoveEntitiesPage.java 2022-06-24 13:18:24 UTC (rev 18994) @@ -231,6 +231,15 @@ if (m.getPatient().equals(patModel)) { return MSGID_ERR_SELECTION_MOVE_SAME_PARENT; } + try { + if (Availability.valueOf(m.getAvailability()) != Availability.ONLINE + && ContentEditDelegate.getInstance().isUseIOCM()) { + return MSGID_ERR_SELECTION_MOVE_NOT_ONLINE; + } + } catch (Exception x) { + log.error("Failed to get ContentEdit.isUseIOCM attribute! Move source not online available!"); + return MSGID_ERR_SELECTION_MOVE_NOT_ONLINE; + } } srcModels = selected.getStudies(); } Modified: dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/delegate/ContentEditDelegate.java =================================================================== --- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/delegate/ContentEditDelegate.java 2022-02-18 11:57:52 UTC (rev 18993) +++ dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/delegate/ContentEditDelegate.java 2022-06-24 13:18:24 UTC (rev 18994) @@ -42,6 +42,7 @@ import java.util.Collection; import java.util.List; +import javax.management.AttributeNotFoundException; import javax.management.InstanceNotFoundException; import javax.management.MBeanException; import javax.management.ObjectName; @@ -323,6 +324,10 @@ new String[]{DicomObject.class.getName()}); } + public boolean isUseIOCM() throws InstanceNotFoundException, MBeanException, ReflectionException, IOException, AttributeNotFoundException { + return (Boolean) server.getAttribute( serviceObjectName, "UseIOCM" ); + } + private AbstractDicomModel getModelOfLevel(AbstractDicomModel m, int level) { if (m.levelOfModel() < level) return null; Modified: dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_de.properties =================================================================== --- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_de.properties 2022-02-18 11:57:52 UTC (rev 18993) +++ dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_de.properties 2022-06-24 13:18:24 UTC (rev 18994) @@ -29,12 +29,12 @@ move.message.del_src_failed=Die urspr\xFCnglich gew\xE4hlten Eintr\xE4ge konnten nicht entfernt werden! Bitte l\xF6schen sie diese manuell! move.message.concurrentMove=Die gew\xE4hlten Eintr\xE4ge k\xF6nnen nicht verschoben werden! Ein oder mehrere Eintr\xE4ge werden gerade verschoben! move.message.moveNothing=Die gew\xE4hlten Eintr\xE4ge sind entweder nicht mehr vorhanden (gel\xF6scht/verschoben) oder enthalten keine Objekte! -move.message.error.moveSelectionSrcLevel=Die gew\xE4hlten Eintr\xE4ge k\xF6nnten nicht verschoben werden. Die Objekte liegen nicht auf einer Ebene -move.message.error.moveSelectionDest=Die gew\xE4hlten Eintr\xE4ge k\xF6nnten nicht verschoben werden. Es wurden mehrere Ziele gew\xE4hlt +move.message.error.moveSelectionSrcLevel=Die gew\xE4hlten Eintr\xE4ge k\xF6nnen nicht verschoben werden. Die Objekte liegen nicht auf einer Ebene +move.message.error.moveSelectionDest=Die gew\xE4hlten Eintr\xE4ge k\xF6nnen nicht verschoben werden. Es wurden mehrere Ziele gew\xE4hlt move.message.error.moveNoSelection=Keine Auswahl zum Verschieben von Eintr\xE4gen move.message.error.moveNoSource=Die gew\xE4hlten Eintr\xE4ge k\xF6nnen nicht verschoben werden. Keine Quelle unterhalb des Ziels gew\xE4hlt move.message.error.movePPS=PPS Eintr\xE4ge k\xF6nnen nicht verschoben werden -move.message.error.moveNotOnline=Die gew\xE4hlten Eintr\xE4ge k\xF6nnten nicht verschoben werden. Alle Eintr\xE4ge m\xFCssen ONLINE verf\xFCgbar sein +move.message.error.moveNotOnline=Die gew\xE4hlten Eintr\xE4ge k\xF6nnen nicht verschoben werden. Alle Eintr\xE4ge m\xFCssen ONLINE verf\xFCgbar sein move.message.error.moveSameParent=Die gew\xE4hlten Eintr\xE4ge liegen bereits im Ziel. #preview messages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2022-02-18 11:57:54
|
Revision: 18993 http://sourceforge.net/p/dcm4che/svn/18993 Author: asgarhussain Date: 2022-02-18 11:57:52 +0000 (Fri, 18 Feb 2022) Log Message: ----------- OV-250 - On windowing changes - Prefetch other images (WADO) of the series in the background applying changed windowing values. Modified Paths: -------------- oviyam/oviyam/trunk/web/Study.jsp oviyam/oviyam/trunk/web/WEB-INF/web.xml oviyam/oviyam/trunk/web/js/TileContent.js oviyam/oviyam/trunk/web/js/features.js oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/js/toolactivator.js oviyam/oviyam/trunk/web/viewImages.jsp Modified: oviyam/oviyam/trunk/web/Study.jsp =================================================================== --- oviyam/oviyam/trunk/web/Study.jsp 2022-01-19 12:54:39 UTC (rev 18992) +++ oviyam/oviyam/trunk/web/Study.jsp 2022-02-18 11:57:52 UTC (rev 18993) @@ -155,6 +155,9 @@ $("#" + seriesId + " tr:last").children().children().each(function() { if (imgCount == 0) { $(this).css('display', 'inline'); + $(this).children().each(function() { + $(this).css('display','inline'); + }); } else { $(this).css('display', 'none'); } @@ -184,6 +187,9 @@ serImgs.each(function() { if (imgCount == 0 || imgCount == Math.round(serInsCnt / 2) - 1 || imgCount == serInsCnt - 1) { $(this).css('display', 'inline'); + $(this).children().each(function() { + $(this).css('display','inline'); + }); } else { $(this).css('display', 'none'); } @@ -202,6 +208,9 @@ $("#" + seriesId + " tr:last").children().children().each(function() { $(this).css('display', 'inline'); + $(this).children().each(function() { + $(this).css('display','none'); + }); }); } } Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2022-01-19 12:54:39 UTC (rev 18992) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2022-02-18 11:57:52 UTC (rev 18993) @@ -7,7 +7,7 @@ </context-param> <context-param> <param-name>REVISION_NUMBER</param-name> - <param-value>R(18992-19012022)</param-value> + <param-value>R(18993-18022022)</param-value> </context-param> <context-param> Modified: oviyam/oviyam/trunk/web/js/TileContent.js =================================================================== --- oviyam/oviyam/trunk/web/js/TileContent.js 2022-01-19 12:54:39 UTC (rev 18992) +++ oviyam/oviyam/trunk/web/js/TileContent.js 2022-02-18 11:57:52 UTC (rev 18993) @@ -217,6 +217,7 @@ } loadInit(); + }); loadContextMenu(); jQuery(document).mouseup(function(e) { @@ -1071,8 +1072,8 @@ } } } - modifiedWC = undefined; - modifiedWW = undefined; + // modifiedWC = undefined; + // modifiedWW = undefined; } /** @@ -1087,6 +1088,9 @@ var imgSrc = null; var winCenter = $('#winCenter').text(); var winWidth = $('#winWidth').text(); + + //if (window.parent.pat.serverURL.indexOf('wado') > 0 && modifiedWC != undefined && modifiedWW != undefined && (modifiedWC != windowCenter || modifiedWW != windowWidth) && ( (winCenter != undefined && modifiedWC != winCenter) || winWidth != undefined && modifiedWW != winWidth) ) { + if ((window.parent.pat.serverURL.indexOf('wado') > 0 && modifiedWC != undefined && modifiedWW != undefined && (modifiedWC != windowCenter || modifiedWW != windowWidth)) || ((winCenter != undefined && winCenter != null) || (winWidth != undefined && winWidth != null))) { if (!isMultiframe) { imgSrc = jQuery('#' + (seriesUid + "_" + iNo).replace(/\./g, '_'), window.parent.document).attr('src'); Modified: oviyam/oviyam/trunk/web/js/features.js =================================================================== --- oviyam/oviyam/trunk/web/js/features.js 2022-01-19 12:54:39 UTC (rev 18992) +++ oviyam/oviyam/trunk/web/js/features.js 2022-02-18 11:57:52 UTC (rev 18993) @@ -268,7 +268,8 @@ // To view in fullscreen function doFullScreen(fullscreenDiv) { var fsImg = jQuery(fullscreenDiv).children().get(0); - var viewContent = document.getElementById('optional-container'); + var viewContent = document.documentElement; + if(!window.fullScreenApi.isFullScreen()) { window.fullScreenApi.requestFullScreen(viewContent); fsImg.src = 'images/fullscreen0.png'; Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2022-01-19 12:54:39 UTC (rev 18992) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2022-02-18 11:57:52 UTC (rev 18993) @@ -195,6 +195,16 @@ } loadMeasurement(iNo); + var tmpInsNo = parseInt(getParameter(src,'instanceNumber'))+1; + var actImgSrc = jQuery('#' + (seriesUid+"_"+tmpInsNo).replace(/\./g,'_'), window.parent.document).get(0); + + var tmpWC = getParameter(actImgSrc.src, "windowCenter"); + var tmpWW = getParameter(actImgSrc.src, "windowWidth"); + + if (tmpWC != null && tmpWW != null) { + reloadSeriesImgs(); + } + }); jQuery(document).mouseup(function(e) { Modified: oviyam/oviyam/trunk/web/js/toolactivator.js =================================================================== --- oviyam/oviyam/trunk/web/js/toolactivator.js 2022-01-19 12:54:39 UTC (rev 18992) +++ oviyam/oviyam/trunk/web/js/toolactivator.js 2022-02-18 11:57:52 UTC (rev 18993) @@ -201,20 +201,23 @@ for (var i = 0; i < iframe.length; i++) { firstTry = true; var tmpWindow = iframe[i].contentWindow; - var frameSrc = jQuery('#frameSrc', tmpWindow.document).text(); - var total = 0; - var iNo = 0; - total = getParameter(frameSrc, 'numberOfFrames'); - iNo = total ? getParameter(frameSrc, 'frameNumber') : getParameter(frameSrc, 'instanceNumber'); - total = total ? total : getParameter(frameSrc, 'images'); - iNo = parseInt(iNo); - total = parseInt(total); - if (total > iNo || toolid == 'vflip' || toolid == 'hflip' || toolid == 'rotateLeft' || toolid == 'rotateRight' || toolid == 'reset') { - callingFunction(toolid, tmpWindow); - } else if(tmpWindow.location.href.indexOf('frameContent') >= 0 &&(toolid == 'zoom' + if (tmpWindow.document.body.style.border === '1px solid rgb(255, 138, 0)') { + var frameSrc = jQuery('#frameSrc', tmpWindow.document).text(); + var total = 0; + var iNo = 0; + total = getParameter(frameSrc, 'numberOfFrames'); + iNo = total ? getParameter(frameSrc, 'frameNumber') : getParameter(frameSrc, 'instanceNumber'); + total = total ? total : getParameter(frameSrc, 'images'); + iNo = parseInt(iNo); + total = parseInt(total); + if (total > iNo || toolid == 'vflip' || toolid == 'hflip' || toolid == 'rotateLeft' || toolid == 'rotateRight' || toolid == 'reset') { + callingFunction(toolid, tmpWindow); + } else if(tmpWindow.location.href.indexOf('frameContent') >= 0 &&(toolid == 'zoom' || toolid == 'move' || toolid == 'windowing' || toolid == 'magnify')){ callingFunction(toolid, tmpWindow); - } + } + break; + } } } else { firstTry = true; @@ -950,7 +953,7 @@ if(isMultiframe){ imageData = JSON.parse(sessionStorage[seriesUid])[0]; }else{ - imageData = JSON.parse(sessionStorage[seriesUid])[imgInc - 1]; + imageData = JSON.parse(sessionStorage[seriesUid])[iNo - 1]; } } else { imageData = getImageData(); @@ -1546,8 +1549,7 @@ mouseLocY = evt.pageY; jQuery('#canvasLayer2').mouseup(function(evt) { - reloadSeriesImgs(); - + if(evt.which==1) { state.drag = false; state.mouseDown = false; @@ -1556,10 +1558,15 @@ var iframe = window.parent.document.getElementsByTagName('iframe'); if (iframe.length > 1 && iframe[0].src.indexOf('TileContent.html') >= 0) { for (var i = 0; i < iframe.length; i++) { - var tmpWindow = iframe[i].contentWindow; - tmpWindow.modifiedWC = modifiedWC; - tmpWindow.modifiedWW = modifiedWW; + tmpWindow = iframe[i].contentWindow; + if (tmpWindow.document.body.style.border === '1px solid rgb(255, 138, 0)') { + tmpWindow.modifiedWC = modifiedWC; + tmpWindow.modifiedWW = modifiedWW; + break; + } } + } else { + reloadSeriesImgs(); } } }); @@ -1951,7 +1958,7 @@ imgTmpSrc = imgTmpSrc.substring(0, imgTmpSrc.indexOf('windowCenter')-1); } if (modifiedWC != null) { - imgTmpSrc += "&windowCenter=" + modifiedWC + "&windowWidth=" + modifiedWW; + imgTmpSrc += "&windowCenter=" + parseInt(modifiedWC) + "&windowWidth=" + parseInt(modifiedWW); } imgTmp.attr('src', imgTmpSrc); } @@ -1963,7 +1970,7 @@ imgTmpSrc1 = imgTmpSrc1.substring(0, imgTmpSrc1.indexOf('windowCenter')-1); } if (modifiedWC != null) { - imgTmpSrc1 += "&windowCenter=" + modifiedWC + "&windowWidth=" + modifiedWW; + imgTmpSrc1 += "&windowCenter=" + parseInt(modifiedWC) + "&windowWidth=" + parseInt(modifiedWW); } imgTmp1.attr('src', imgTmpSrc1); Modified: oviyam/oviyam/trunk/web/viewImages.jsp =================================================================== --- oviyam/oviyam/trunk/web/viewImages.jsp 2022-01-19 12:54:39 UTC (rev 18992) +++ oviyam/oviyam/trunk/web/viewImages.jsp 2022-02-18 11:57:52 UTC (rev 18993) @@ -72,6 +72,13 @@ -ms-user-select: none; user-select: none; } + + .seriesImgsDiv { + position: relative; + width: 30%; + display: inline-block; + } + </style> <script type="text/javascript"> @@ -189,7 +196,10 @@ <c:otherwise> <c:choose> <c:when test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==param.numberOfImages)}"> - <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" class="image img-width" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" onload="loadFirstSeriesInViewer(this, '${instanceNumber}', '${param.firstSeries}');" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + <div class="seriesImgsDiv"> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_t${instanceNumber}" style="${thumbSize} position: absolute;" class="image img-width" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" onload="loadFirstSeriesInViewer(this, '${instanceNumber}', '${param.firstSeries}');" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);"/> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" class="image img-width" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" onload="loadFirstSeriesInViewer(this, '${instanceNumber}', '${param.firstSeries}');" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + </div> </c:when> <c:otherwise> <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" class="other image img-width" style="${thumbSize} display: none;" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" onload='showProgress("${param.series}","${instanceNumber}");' /> @@ -247,7 +257,10 @@ <c:otherwise> <c:if test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==param.numberOfImages)}"> - <img name="${instanceNumber}" id="${fn:replace(param.param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.param.series}&object=${imageId}&contentType=${contentType}" ondblclick="openSeriesInViewer(this);" /> + <div class="seriesImgsDiv"> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_t${instanceNumber}" style="${thumbSize} position: absolute;" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&contentType=${contentType}" ondblclick="openSeriesInViewer(this);" /> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&contentType=${contentType}" ondblclick="openSeriesInViewer(this);" /> + </div> </c:if> </c:otherwise> </c:choose> @@ -265,4 +278,3 @@ </c:choose> </body> </html> - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2022-01-19 12:54:40
|
Revision: 18992 http://sourceforge.net/p/dcm4che/svn/18992 Author: asgarhussain Date: 2022-01-19 12:54:39 +0000 (Wed, 19 Jan 2022) Log Message: ----------- OV-250 - On windowing changes - Prefetch other images (WADO) of the series applying changed windowing values in the background. Modified Paths: -------------- oviyam/oviyam/trunk/web/Study.jsp oviyam/oviyam/trunk/web/WEB-INF/web.xml oviyam/oviyam/trunk/web/index.html oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/js/toolactivator.js oviyam/oviyam/trunk/web/js/viewer.js oviyam/oviyam/trunk/web/viewer.html oviyam/oviyam/trunk/web/westContainer1.jsp Added Paths: ----------- oviyam/oviyam/trunk/web/viewImages.jsp Modified: oviyam/oviyam/trunk/web/Study.jsp =================================================================== --- oviyam/oviyam/trunk/web/Study.jsp 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/Study.jsp 2022-01-19 12:54:39 UTC (rev 18992) @@ -362,6 +362,10 @@ <c:when test="${param.previewmode=='single'}"> <ser:Series patientId="${param.patient}" study="${param.study}" dcmURL="${param.dcmURL}" serverURL="${param.wadoUrl}"> + + <c:set var="middle" value="${(numberOfImages+0.5)/2}" /> + <fmt:formatNumber var="middle" maxFractionDigits="0" value="${middle}" /> + <script type="text/javascript"> series.push({ "seriesUID": '${seriesId}', @@ -374,20 +378,7 @@ "studyDesc": '${param.studyDesc}', "studyDate": '${param.studyDate}' }); - - // to load the instance details in background - if (!sessionStorage['${seriesId}']) { - var paramData = { - "patientId" : '${param.patient}', - "studyUID" : '${param.study}', - "seriesUID" : '${seriesId}', - "dcmURL" : '${param.dcmURL}', - "serverURL" : '${param.wadoUrl}' - }; - - this.getInstanceDetails(paramData); - } - </script> + </script> <c:choose> <c:when test="${param.series==seriesId}"> <jsp:include @@ -400,8 +391,7 @@ <tbody> <tr style="cursor: default;"> <td>${seriesDesc}</td> - <td align="right"><div id="totalImgs">${numberOfImages} - Imgs</div></td> + <td align="right"><div id="totalImgs">${numberOfImages} Imgs</div></td> </tr> <tr style="cursor: default; text-align: center;"> @@ -423,9 +413,58 @@ <c:otherwise> <ser:Series patientId="${param.patient}" study="${param.study}" dcmURL="${param.dcmURL}" serverURL="${param.wadoUrl}"> - <jsp:include - page="instance.jsp?patientId='${param.patient}'&study=${param.study}&seriesNo=${seriesNumber}&seriesDate=${seriesDate}&seriesDesc=${seriesDesc}&modality=${modality}&numberOfImages=${numberOfImages}&series=${seriesId}&dcmURL=${param.dcmURL}&wadoUrl=${param.wadoUrl}&previewmode=viewer"></jsp:include> + <c:set var="middle" value="${(numberOfImages+0.5)/2}" /> + <fmt:formatNumber var="middle" maxFractionDigits="0" value="${middle}" /> + + <table class="seriesTable noselect" id="${fn:replace(seriesId, '.','_')}_table"> + <tbody> +<tr style="cursor: default; color: #FF8A00"> + <td>${seriesDesc}</td> + <td align="right"> + <div id="totalImgs">${numberOfImages} Imgs </div> + </td> + </tr> + + <tr> + <td colspan="2"> + <table style="table-layout: fixed; width: 100%;"> + <tr> + <td id="${fn:replace(seriesId, '.','_')}" class="seriesImgsIndex" style="width: 94%;"> + <c:forEach var="i" begin="1" end="${numberOfImages}"> + <c:choose> + <c:when test="${(i == middle) || (i==1) || (i==numberOfImages)}"> + <div style="background: #00F; width: 5px; height: 5px; float: left;margin: 0 1px 1px;"></div> + </c:when> + <c:otherwise> + <div id="${fn:replace(seriesId, '.','-')}_${i}" style="background: #464646; width: 5px; height: 5px; float: left;margin: 0 1px 1px;" class="waiting"></div> + </c:otherwise> + </c:choose> + </c:forEach> + </td> + <td align="right" style="vertical-align: top;"> + <c:choose> + <c:when test="${numberOfImages > 3}"> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" class="toggleImgView" src="images/three.png" name="${seriesId} | ${numberOfImages}" onclick="changeImgView(this)" /> + </c:when> + <c:otherwise> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" class="toggleImgView" src="images/all.png" name="${seriesId} | ${numberOfImages}" /> + </c:otherwise> + </c:choose> + </td> + </tr> + </table> + </td> + </tr> + + <tr style="height: 70px;"> + <td colspan="2" id="${fn:replace(seriesId, '.','_')}_td"> + </td> + </tr> + + </tbody> + </table> + <script type="text/javascript"> series.push({ "seriesUID": '${seriesId}', @@ -438,26 +477,15 @@ "studyDesc": '${param.studyDesc}', "studyDate": '${param.studyDate}' }); - - // to load the instance details in background - if (!sessionStorage['${seriesId}']) { - var paramData = { - "patientId" : '${param.patient}', - "studyUID" : '${param.study}', - "seriesUID" : '${seriesId}', - "dcmURL" : '${param.dcmURL}', - "serverURL" : '${param.wadoUrl}' - }; - - this.getInstanceDetails(paramData); - } </script> </ser:Series> </c:otherwise> </c:choose> - </div> <script type="text/javascript"> + + var check = 0; + var studyId = '${param.study}'; if (sessionStorage[studyId] == undefined) { var study = { @@ -477,6 +505,71 @@ sessionStorage["${param.patient1}"] = JSON.stringify(studyData); } sessionStorage[studyId] = JSON.stringify(series); + + var length = (series.length <=4) ? series.length : 4; + + for(i=0; i< length; i++) { + var serIdTmp = series[i].seriesUID; + var serIdTmpContent = "./viewImages.jsp?patientId=${param.patient1}&study=${param.study}&seriesNo=" + + series[i].seriesNumber + "&seriesDate=" + series[i].seriesDate + "&seriesDesc=" + series[i].seriesDesc + + "&modality=" + series[i].modality + "&numberOfImages=" + series[i].totalInstances + "&series=" + series[i].seriesUID + + "&dcmURL=${param.dcmURL}&wadoUrl=${param.wadoUrl}&contentType=image/jpeg&previewmode=viewer"; + + if (i == 0) { + serIdTmpContent += "&firstSeries=true"; + } + + $('#' + serIdTmp.replace(/\./g, '_') + '_td').load(encodeURI(serIdTmpContent), function() { + check = check + 1; + + if (check == series.length-1) { + // to load the instance details in background + for(j=0; j<series.length; j++) { + if (!sessionStorage['${seriesId}']) { + var paramData = { + "patientId" : '${param.patient}', + "studyUID" : '${param.study}', + "seriesUID" : series[j].seriesUID, + "dcmURL" : '${param.dcmURL}', + "serverURL" : '${param.wadoUrl}' + }; + + getInstanceDetails(paramData); + } + } + } + }); + } + + for(i=4; i<series.length; i++) { + var serIdTmp = series[i].seriesUID; + var serIdTmpContent = "./viewImages.jsp?patientId=${param.patient1}&study=${param.study}&seriesNo=" + + series[i].seriesNumber + "&seriesDate=" + series[i].seriesDate + "&seriesDesc=" + series[i].seriesDesc + + "&modality=" + series[i].modality + "&numberOfImages=" + series[i].totalInstances + "&series=" + series[i].seriesUID + + "&dcmURL=${param.dcmURL}&wadoUrl=${param.wadoUrl}&contentType=image/jpeg&previewmode=viewer"; + + $('#' + serIdTmp.replace(/\./g, '_') + '_td').load(encodeURI(serIdTmpContent), function(e) { + check = check + 1; + + if (check == series.length-1) { + // to load the instance details in background + for(j=0; j<series.length; j++) { + if (!sessionStorage['${seriesId}']) { + var paramData = { + "patientId" : '${param.patient}', + "studyUID" : '${param.study}', + "seriesUID" : series[j].seriesUID, + "dcmURL" : '${param.dcmURL}', + "serverURL" : '${param.wadoUrl}' + }; + + getInstanceDetails(paramData); + } + } + } + }); + } + </script> -</body> + </body> </html> Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2022-01-19 12:54:39 UTC (rev 18992) @@ -7,7 +7,7 @@ </context-param> <context-param> <param-name>REVISION_NUMBER</param-name> - <param-value>R(18991-27102021)</param-value> + <param-value>R(18992-19012022)</param-value> </context-param> <context-param> Modified: oviyam/oviyam/trunk/web/index.html =================================================================== --- oviyam/oviyam/trunk/web/index.html 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/index.html 2022-01-19 12:54:39 UTC (rev 18992) @@ -289,19 +289,10 @@ <script type="text/javascript"> -document.getElementById("browser").innerHTML = -$.browser.name + " " + $.browser.version; -document.getElementById("osName").innerHTML = -navigator.platform; - function displayInfo() { - $('#info-content').load('about.jsp'); - console.log('*************************8'); - $('#infoModal').show(); - // setTimeout(() => { - - // }, 100); - - } + function displayInfo() { + $('#info-content').load('about.jsp'); + $('#infoModal').show(); + } </script> Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2022-01-19 12:54:39 UTC (rev 18992) @@ -17,7 +17,6 @@ var brightnessVal = 0, contrastVal = 0; - jQuery('#ImagePane').ready(function() { var ht = jQuery(window).height(); @@ -779,7 +778,7 @@ function loadImg(isMultiframe,iNo) { var imgSrc = null; - if(window.parent.pat.serverURL.indexOf('wado')>0 && modifiedWC!=undefined && modifiedWW!=undefined && (modifiedWC!=windowCenter || modifiedWW!=windowWidth)) { + if(window.parent.pat.serverURL.indexOf('wado')>0 && modifiedWC!=undefined && modifiedWW!=undefined && (modifiedWC!=windowCenter || modifiedWW!=windowWidth) && !window.parent.seriesImgsLoadedAgain) { if(!isMultiframe) { imgSrc = jQuery('#' + (seriesUid + "_" + iNo).replace(/\./g,'_'), window.parent.document).attr('src'); this.imgInc = iNo; @@ -1243,7 +1242,7 @@ } function getCurrentImage() { - if(window.parent.pat.serverURL.indexOf('wado')>0 && modifiedWC!=undefined && modifiedWW!=undefined && (modifiedWC!=windowCenter || modifiedWW!=windowWidth)) { + if(window.parent.pat.serverURL.indexOf('wado')>0 && modifiedWC!=undefined && modifiedWW!=undefined && (modifiedWC!=windowCenter || modifiedWW!=windowWidth) && !window.parent.seriesImgsLoadedAgain) { return jQuery("#wltmpImg").get(0); } else { var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0; Modified: oviyam/oviyam/trunk/web/js/toolactivator.js =================================================================== --- oviyam/oviyam/trunk/web/js/toolactivator.js 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/js/toolactivator.js 2022-01-19 12:54:39 UTC (rev 18992) @@ -578,6 +578,7 @@ console.log('Dicom Image NOT AVAILABLE'); } resetMap(); + reloadSeriesImgs(); } } @@ -1063,8 +1064,12 @@ tmpWindow.doMouseWheel = (window.parent.pat.serverURL.indexOf("wado")>0); jQuery('#thickLocationPanel', tmpWindow.document).hide(); - doLoop(false); - window.parent.document.getElementById('loopChkBox').checked = false; + + if(jQuery('#multiframe').css('visibility') === "hidden") { + doLoop(false); + window.parent.document.getElementById('loopChkBox').checked = false; + } + tmpWindow.getPixelData(true); sessionStorage["tools"] = "windowing"; } else { @@ -1519,36 +1524,11 @@ huDisplay.show(); if(firstTime) { - jQuery('#canvasLayer2').mouseup(function(evt) { - - // loadContextMenu(); - - if(evt.which==1) { - state.drag = false; - state.mouseDown = false; - jQuery('.contextMenu').hide(); - evt.target.style.cursor = "default"; -// jQuery('.selected').removeClass('selected'); - var iframe = window.parent.document.getElementsByTagName('iframe'); - if (iframe.length > 1 && iframe[0].src.indexOf('TileContent.html') >= 0) { - for (var i = 0; i < iframe.length; i++) { - var tmpWindow = iframe[i].contentWindow; - tmpWindow.modifiedWC = modifiedWC; - tmpWindow.modifiedWW = modifiedWW; - } - } - } - - }); jQuery('#canvasLayer2').mousedown(function(evt) { - // loadContextMenu(); - // loadContextMenu(); - + window.parent.seriesImgsLoadedAgain = false; evt.target.style.cursor = "default"; if(evt.which==1) { windowingChanged = true; -// var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0; -// var iNo = isMultiframe ? frameInc : imgInc; var inst_text = jQuery("#totalImages").text().split("/"); var iNo = inst_text[0].split(":")[1]; @@ -1555,95 +1535,101 @@ if(state.winPtr!=iNo || (isNaN(modifiedWC) && isNaN(modifiedWW))) { state.windowing = true; getPixelData(false); - // evt.target.style.cursor = "url(images/wincursor.png), auto"; } else { state.drag = true; } state.mouseDown = true; evt.target.style.cursor = "url(images/wincursor.png), auto"; - } - - // if(evt.which==3) { - // evt.target.style.cursor = "default"; - // } - // console.log('*****************' + evt.target.style.cursor ); + mouseLocX = evt.pageX; mouseLocY = evt.pageY; - // evt.target.focus(); - evt.preventDefault(); - evt.stopPropagation(); - + + jQuery('#canvasLayer2').mouseup(function(evt) { + reloadSeriesImgs(); + + if(evt.which==1) { + state.drag = false; + state.mouseDown = false; + jQuery('.contextMenu').hide(); + evt.target.style.cursor = "default"; + var iframe = window.parent.document.getElementsByTagName('iframe'); + if (iframe.length > 1 && iframe[0].src.indexOf('TileContent.html') >= 0) { + for (var i = 0; i < iframe.length; i++) { + var tmpWindow = iframe[i].contentWindow; + tmpWindow.modifiedWC = modifiedWC; + tmpWindow.modifiedWW = modifiedWW; + } + } + } + }); + + return false; }); + jQuery('#canvasLayer2').mousemove(function(evt) { - - // evt.target.style.cursor = "default"; + if(evt.which==1) { jQuery('#contextmenu1').hide(); -// jQuery('.selected',window.parent.document).removeClass('selected'); -// var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0; -// var iNo = isMultiframe ? frameInc : imgInc; - var inst_text = jQuery("#totalImages").text().split("/"); - iNo = inst_text[0].split(":")[1].trim(); - var isMultiframe = (inst_text[0].indexOf("Frame") >= 0); - if (isMultiframe) { - frameInc = iNo; - } else { - imgInc = iNo; - } - /*var x = parseInt(evt.pageX/state.scale); - var y = parseInt(evt.pageY/state.scale);*/ - if(state.winPtr==iNo && state.rotate==0) { - var x = parseInt((evt.pageX-state.translationX)/state.scale); - var y = parseInt((evt.pageY-state.translationY)/state.scale); + var inst_text = jQuery("#totalImages").text().split("/"); + iNo = inst_text[0].split(":")[1].trim(); + var isMultiframe = (inst_text[0].indexOf("Frame") >= 0); + if (isMultiframe) { + frameInc = iNo; + } else { + imgInc = iNo; + } - huDisplay.html("X :"+x+" Y :"+y+" HU :"+lookupObj.getPixelAt(pixelBuffer[(y*imageData['nativeColumns'])+x])); - } else { // May be a different image - huDisplay.html(""); - } + if(state.winPtr==iNo && state.rotate==0) { + var x = parseInt((evt.pageX-state.translationX)/state.scale); + var y = parseInt((evt.pageY-state.translationY)/state.scale); + + huDisplay.html("X :"+x+" Y :"+y+" HU :"+lookupObj.getPixelAt(pixelBuffer[(y*imageData['nativeColumns'])+x])); + } else { // May be a different image + huDisplay.html(""); + } - var diffX = parseInt(evt.pageX-mouseLocX); - var diffY = parseInt(evt.pageY-mouseLocY); + var diffX = parseInt(evt.pageX-mouseLocX); + var diffY = parseInt(evt.pageY-mouseLocY); - currentEvent = evt; - var diff = calcAcceleration(diffX, diffY); + currentEvent = evt; + var diff = calcAcceleration(diffX, diffY); - diffX = diff.X; - diffY = diff.Y; + diffX = diff.X; + diffY = diff.Y; - if(state.drag && state.winPtr==iNo) { - jQuery('.selected',window.parent.document).removeClass('selected'); + if(state.drag && state.winPtr==iNo) { + jQuery('.selected',window.parent.document).removeClass('selected'); - modifiedWC=parseInt(modifiedWC)+diffY; - modifiedWW=parseInt(modifiedWW)+diffX; + modifiedWC=parseInt(modifiedWC)+diffY; + modifiedWW=parseInt(modifiedWW)+diffX; - if(modifiedWW < 1) { - modifiedWW = 1; - } + if(modifiedWW < 1) { + modifiedWW = 1; + } - lookupObj.setWindowingdata(modifiedWC,modifiedWW); - iterateOverPixels(); - renderImg(); + lookupObj.setWindowingdata(modifiedWC,modifiedWW); + iterateOverPixels(); + renderImg(); - mouseLocX=evt.pageX; - mouseLocY=evt.pageY; + mouseLocX=evt.pageX; + mouseLocY=evt.pageY; - wlDisplay.html("WL: "+modifiedWC+" / WW: "+modifiedWW); - } else if (state.mouseDown) { - modifiedWC = parseInt(modifiedWC) + diffY; - modifiedWW = parseInt(modifiedWW) + diffX; + wlDisplay.html("WL: "+modifiedWC+" / WW: "+modifiedWW); + } else if (state.mouseDown) { + modifiedWC = parseInt(modifiedWC) + diffY; + modifiedWW = parseInt(modifiedWW) + diffX; - if (modifiedWW < 1) { - modifiedWW = 1; + if (modifiedWW < 1) { + modifiedWW = 1; + } + mouseLocX = evt.pageX; + mouseLocY = evt.pageY; + wlDisplay.html("WL: " + modifiedWC + " / WW: " + modifiedWW); } - mouseLocX = evt.pageX; - mouseLocY = evt.pageY; - wlDisplay.html("WL: " + modifiedWC + " / WW: " + modifiedWW); + } else { + evt.target.style.cursor = "default"; } - } else { - evt.target.style.cursor = "default"; - // loadContextMenu(); - } }); window.parent.enableWindowingContext(); } @@ -1727,6 +1713,7 @@ lookupObj.setWindowingdata(windowCenter, windowWidth); jQuery('#windowLevel', tmpWindow.document).html("WL: " + windowCenter + " / WW: " + windowWidth); } + window.parent.seriesImgsLoadedAgain = false; var inst_text = jQuery("#totalImages", tmpWindow.document).text().split("/"); var isMultiframe = inst_text[0].indexOf("Frame") >= 0; tmpWindow.loadImg(isMultiframe, parseInt(inst_text[0].split(":")[1])); @@ -1950,3 +1937,39 @@ showPreview(e1); } } + +function reloadSeriesImgs() { + var inst_text = jQuery("#totalImages").text().split("/"); + var iNo = parseInt(inst_text[0].split(":")[1]); + + if(total > 1) { + for(var i=iNo, j=iNo+1; i>0 || j<=total; i--, j++) { + if (i > 0) { + var imgTmp = $("#" + (seriesUid + "_" + i).replace(/\./g,'_'), window.parent.document); + var imgTmpSrc = imgTmp.attr('src'); + if (imgTmpSrc.indexOf('windowCenter') > 0) { + imgTmpSrc = imgTmpSrc.substring(0, imgTmpSrc.indexOf('windowCenter')-1); + } + if (modifiedWC != null) { + imgTmpSrc += "&windowCenter=" + modifiedWC + "&windowWidth=" + modifiedWW; + } + imgTmp.attr('src', imgTmpSrc); + } + + if (j <= total) { + var imgTmp1 = $("#" + (seriesUid + "_" + j).replace(/\./g,'_'), window.parent.document); + var imgTmpSrc1 = imgTmp1.attr('src'); + if (imgTmpSrc1.indexOf('windowCenter') > 0) { + imgTmpSrc1 = imgTmpSrc1.substring(0, imgTmpSrc1.indexOf('windowCenter')-1); + } + if (modifiedWC != null) { + imgTmpSrc1 += "&windowCenter=" + modifiedWC + "&windowWidth=" + modifiedWW; + } + + imgTmp1.attr('src', imgTmpSrc1); + } + + } + window.parent.seriesImgsLoadedAgain = true; + } +} \ No newline at end of file Modified: oviyam/oviyam/trunk/web/js/viewer.js =================================================================== --- oviyam/oviyam/trunk/web/js/viewer.js 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/js/viewer.js 2022-01-19 12:54:39 UTC (rev 18992) @@ -1,5 +1,6 @@ var pat = null; var directLaunch = false; +var seriesImgsLoadedAgain = false; var loadedStudy = []; var rulerMap = new Map(); Added: oviyam/oviyam/trunk/web/viewImages.jsp =================================================================== --- oviyam/oviyam/trunk/web/viewImages.jsp (rev 0) +++ oviyam/oviyam/trunk/web/viewImages.jsp 2022-01-19 12:54:39 UTC (rev 18992) @@ -0,0 +1,268 @@ +<!-- +/* ***** BEGIN LICENSE BLOCK ***** +* Version: MPL 1.1/GPL 2.0/LGPL 2.1 +* +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License. +* +* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images +* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip +* +* The Initial Developer of the Original Code is +* Raster Images +* Portions created by the Initial Developer are Copyright (C) 2014 +* the Initial Developer. All Rights Reserved. +* +* Contributor(s): +* Babu Hussain A +* Balamurugan R +* Devishree V +* Guruprasath R +* Karthikeyan S +* Meer Asgar Hussain B +* Prakash J +* Suresh V +* Yogapraveen K +* +* Alternatively, the contents of this file may be used under the terms of +* either the GNU General Public License Version 2 or later (the "GPL"), or +* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +* in which case the provisions of the GPL or the LGPL are applicable instead +* of those above. If you wish to allow use of your version of this file only +* under the terms of either the GPL or the LGPL, and not to allow others to +* use your version of this file under the terms of the MPL, indicate your +* decision by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL or the LGPL. If you do not delete +* the provisions above, a recipient may use your version of this file under +* the terms of any one of the MPL, the GPL or the LGPL. +* +* ***** END LICENSE BLOCK ***** */ +--> + +<!-- Loads a set of images under the series --> +<%@page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" isELIgnored="false"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@taglib prefix="img" uri="/WEB-INF/tlds/ImageInfo.tld"%> + +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + +<% + request.setAttribute("contentType",application.getInitParameter("contentType")); + request.setCharacterEncoding("UTF-8"); +%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <style type="text/css"> + .noselect { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + </style> + + <script type="text/javascript"> + function loadFirstSeriesInViewer(img, insNo, isFirstSeries) { + //var wcChanged = img.src.indexOf('windowCenter'); + if (isFirstSeries == 'true' && insNo == 1 && !window.parent.seriesImgsLoadedAgain) { // && wcChanged == -1) { + changeSeries(img); + } + } + + function loadFirstMultiFrameInViewer(img, seriesId, frameNumber, isFirstSeries) { + if (isFirstSeries == 'true' && frameNumber == 1) { + changeSeries(img); + } + $('#' + seriesId.replace(/\./g, '_') + '_table').find('tr').first().hide(); + $('#' + seriesId.replace(/\./g, '_') + '_table').find('tr:eq(1)').hide(); + } + + </script> + </head> + <body> + + <c:choose> + <c:when test="${param.previewmode == 'viewer'}"> + + <c:set var="middle" value="${(param.numberOfImages+0.5)/2}" /> + <fmt:formatNumber var="middle" maxFractionDigits="0" value="${middle}" /> +<fmt:formatNumber var="middle" maxFractionDigits="0" value="${middle}" /> + <fmt:parseNumber var="total" type="number" value="${param.numberOfImages}" /> + + <table class="seriesTable noselect" id="${fn:replace(param.series, '.','_')}_table"> + <tbody> + <img:Image patientId="${param.patient}" study="${param.study}" series="${param.series}" dcmURL="${param.dcmURL}" serverURL="${param.wadoUrl}"> + <c:choose> + <c:when test="${multiframe=='yes'}"> + <tr style="cursor: default; color: #FF8A00; font-size: 12px;"> + <td>Multiframe-${instanceNumber}</td> + <td align="right"> + <div id="totalImgs" style="width: 90px;">${numberOfFrames} Frames </div> + </td> + </tr> + <tr> + <td colspan="2"> + <table style="table-layout: fixed; width: 100%;"> + <tr> + <td id="${fn:replace(imageId, '.','_')}" class="seriesImgsIndex" style="width: 94%;" name="${imageId}"> + <div id="${fn:replace(imageId, '.','-')}_${i}" style="background: #00F; width: 5px; height: 5px; float: left;margin: 0 1px 1px;"></div> + </td> + <td align="right" style="vertical-align: top;"> + <img class="toggleImgView" src="images/all.png" name="Multiframe" /> + </td> + </tr> + + <tr> + <td colspan="2"> + <c:choose> + <c:when test="${param.wadoUrl == 'C-GET' || param.wadoUrl == 'C-MOVE'}"> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" class="image" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${param.series}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&frameNumber=1" + onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + + <c:forEach var="i" begin="1" end="${numberOfFrames}"> + <img name="${i}" id="${fn:replace(imageId, '.','_')}_${i}" style="${thumbSize} display: none;" class="other_multiframe" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${param.series}&object=${imageId}&retrieveType=${param.wadoUrl}&frameNumber=${i}" /> + </c:forEach> + </c:when> + <c:otherwise> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&frameNumber=1&dicomURL=${param.dcmURL}" class="image" onload="loadFirstMultiFrameInViewer(this, '${param.series}', '${instanceNumber}', '${param.firstSeries}');" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + <c:forEach var="i" begin="1" end="${numberOfFrames}"> + <img name="${i}" id="${fn:replace(imageId, '.','_')}_${i}" style="${thumbSize} display: none;" class="other_multiframe" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&frameNumber=${i}&dicomURL=${param.dcmURL}" /> + </c:forEach> + </c:otherwise> + </c:choose> + </td> + </tr> + </table> + </tr> + </c:when> + + <c:otherwise> + <c:if test="${instanceNumber==1}"> + <tr> + <td colspan="2"> + </c:if> + <c:choose> + <c:when test="${param.modality == 'SR'}"> + <!-- Structured Report --> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="height: 75px;" src="images/SR_Latest.png" class="image" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&dicomURL=${param.dcmURL}" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + </c:when> + + <c:when test="${sopClassUID == '1.2.840.10008.5.1.4.1.1.104.1'}"> + <!-- Enacpsulated PDF --> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" class="image" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&dicomURL=${param.dcmURL}" onload="loadFirstSeriesInViewer(this, '${instanceNumber}', '${param.firstSeries}');" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + </c:when> + + <c:when test="${fn:contains(sopClassUID,'1.2.840.10008.5.1.4.1.1.9')}"> + <!-- Wave Forms --> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" class="image" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&rid=true&dicomURL=${param.dcmURL}" onload="loadFirstSeriesInViewer(this, '${instanceNumber}', '${param.firstSeries}');" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + </c:when> + + <c:when test="${sopClassUID == '1.2.840.10008.5.1.4.1.1.66'}"> + <!-- Raw Data Storage --> + <img name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/rawdata.png" onclick="showRawDataAlert();" /> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="${param.wadoUrl == 'C-GET' || param.wadoUrl == 'C-MOVE'}"> + <c:choose> + <c:when test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==param.numberOfImages)}"> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" class="image img-width" style="${thumbSize};" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${param.series}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + </c:when> + <c:otherwise> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" class="other img-width" class="image" style="${thumbSize}; display: none;" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${param.series}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" onload='showProgress("${param.series}","${instanceNumber}");' /> + </c:otherwise> + </c:choose> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==param.numberOfImages)}"> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" class="image img-width" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" onload="loadFirstSeriesInViewer(this, '${instanceNumber}', '${param.firstSeries}');" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" /> + </c:when> + <c:otherwise> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(param.series, '.','_')}_${instanceNumber}" class="other image img-width" style="${thumbSize} display: none;" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.series}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${param.seriesDesc}&images=${param.numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" onload='showProgress("${param.series}","${instanceNumber}");' /> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> + </c:otherwise> + </c:choose> + + <c:if test="${instanceNumber==param.numberOfImages}"> + </td> + </tr> + </c:if> + </c:otherwise> + </c:choose> + </img:Image> + </tbody> + </table> + </c:when> + + <c:otherwise> + <c:set var="middle" value="${param.numberOfImages/2}" /> + <fmt:formatNumber var="middle" maxFractionDigits="0" value="${middle}" /> + + <table class="seriesTable" id="${fn:replace(param.param.series, '.','_')}_table"> + <tbody> + <tr class='ui-widget-content'> + <td>${param.seriesDesc}</td> + <td align="right">${param.numberOfImages} Imgs</td> + </tr> + <tr> + <td colspan="2"> + <table style="table-layout:fixed; width:100%;"> + <tbody> + <tr> + <td colspan="2"> + <img:Image patientId="${param.patient}" study="${param.study}" series="${param.param.series}" dcmURL="${param.dcmURL}"> + <c:choose> + <c:when test="${modality == 'SR'}"> + <img name="${instanceNumber}" id="${fn:replace(param.param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/SR_Latest.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.param.series}&object=${imageId}" ondblclick="openSeriesInViewer(this)" /> + </c:when> + + <c:when test="${sopClassUID == '1.2.840.10008.5.1.4.1.1.104.1'}"> + <img name="${instanceNumber}" id="${fn:replace(param.param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.param.series}&object=${imageId}" ondblclick="openSeriesInViewer(this)" /> + </c:when> + + <c:when test="${fn:contains(sopClassUID,'1.2.840.10008.5.1.4.1.1.9')}"> <!-- Wave Forms --> + <img name="${instanceNumber}" id="${fn:replace(param.param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.param.series}&object=${imageId}&rid=true" ondblclick="openSeriesInViewer(this)" /> + </c:when> + + <c:when test="${sopClassUID == '1.2.840.10008.5.1.4.1.1.66'}"> <!-- Raw Data Storage --> + <img name="${instanceNumber}" id="${fn:replace(param.param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/rawdata.png"/> + </c:when> + + <c:otherwise> + <c:if test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==param.numberOfImages)}"> + <img name="${instanceNumber}" id="${fn:replace(param.param.series, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${param.param.series}&object=${imageId}&contentType=${contentType}" ondblclick="openSeriesInViewer(this);" /> + </c:if> + </c:otherwise> + </c:choose> + </img:Image> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + </tbody> + </table> + <br> + </c:otherwise> + </c:choose> + </body> +</html> + Modified: oviyam/oviyam/trunk/web/viewer.html =================================================================== --- oviyam/oviyam/trunk/web/viewer.html 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/viewer.html 2022-01-19 12:54:39 UTC (rev 18992) @@ -181,7 +181,7 @@ //createTables(); //checkStudyAvailability(); - getStudyDetails(); + // getStudyDetails(); //var queryString = window.top.location.search.substring(1); @@ -234,4 +234,4 @@ <div id="totRow" style="display: none"></div> <div id="totColumn" style="display: none"></div> </body> -</html> \ No newline at end of file +</html> Modified: oviyam/oviyam/trunk/web/westContainer1.jsp =================================================================== --- oviyam/oviyam/trunk/web/westContainer1.jsp 2021-10-27 07:45:59 UTC (rev 18991) +++ oviyam/oviyam/trunk/web/westContainer1.jsp 2022-01-19 12:54:39 UTC (rev 18992) @@ -292,7 +292,9 @@ <img:Image patientId="${param.patient}" study="${param.study}" series="${seriesId}" dcmURL="${param.dcmURL}" serverURL="${param.wadoUrl}"> <c:choose> <c:when test="${modality == 'SR'}"> - <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/SR_Latest.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" /> + <c:if test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==numberOfImages)}"> + <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/SR_Latest.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" /> + </c:if> </c:when> <c:when test="${sopClassUID == '1.2.840.10008.5.1.4.1.1.104.1'}"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kar...@us...> - 2021-10-27 07:46:02
|
Revision: 18991 http://sourceforge.net/p/dcm4che/svn/18991 Author: karthikeyansan Date: 2021-10-27 07:45:59 +0000 (Wed, 27 Oct 2021) Log Message: ----------- OV-242 - Add provision to disable/enable guideline window shown during pan/zoom operation. Modified Paths: -------------- oviyam/oviyam/trunk/web/WEB-INF/web.xml oviyam/oviyam/trunk/web/frameContent.html oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/js/toolactivator.js oviyam/oviyam/trunk/web/viewer_tools.html Added Paths: ----------- oviyam/oviyam/trunk/web/images/hide-preview-orange.png oviyam/oviyam/trunk/web/images/show-icon-orange.png Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-26 12:54:33 UTC (rev 18990) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-27 07:45:59 UTC (rev 18991) @@ -7,7 +7,7 @@ </context-param> <context-param> <param-name>REVISION_NUMBER</param-name> - <param-value>R(18990-26102021)</param-value> + <param-value>R(18991-27102021)</param-value> </context-param> <context-param> Modified: oviyam/oviyam/trunk/web/frameContent.html =================================================================== --- oviyam/oviyam/trunk/web/frameContent.html 2021-10-26 12:54:33 UTC (rev 18990) +++ oviyam/oviyam/trunk/web/frameContent.html 2021-10-27 07:45:59 UTC (rev 18991) @@ -91,8 +91,8 @@ <canvas id="imageCanvas" style="z-index:1; position:absolute; margin:auto;">Your browser doesn't support canvas.</canvas> <canvas id="canvasLayer1" style="z-index:2; position:absolute; margin:auto;">Your browser doesn't support canvas.</canvas> <canvas id="canvasLayer2" style="z-index:3; position:absolute; margin:auto;">Your browser doesn't support canvas.</canvas> - <canvas id="previewCanvas" class="preview" style="z-index:4; position:absolute; top: 52px; right: 2px;"></canvas> - <canvas id="highlightCanvas" class="preview" style="z-index:5; position:absolute; top: 52px; right: 2px;"></canvas> + <canvas id="previewCanvas" class="preview" style="z-index:4; position:absolute; top: 52px; right: 2px; visibility: hidden;"></canvas> + <canvas id="highlightCanvas" class="preview" style="z-index:5; position:absolute; top: 52px; right: 2px; visibility: hidden;"></canvas> <canvas id="zoom" class="circleBase circle preview" width="300" height="300" style="z-index: 7;position:absolute; top:0; left:0; display:none"></canvas> </div> Added: oviyam/oviyam/trunk/web/images/hide-preview-orange.png =================================================================== (Binary files differ) Index: oviyam/oviyam/trunk/web/images/hide-preview-orange.png =================================================================== --- oviyam/oviyam/trunk/web/images/hide-preview-orange.png 2021-10-26 12:54:33 UTC (rev 18990) +++ oviyam/oviyam/trunk/web/images/hide-preview-orange.png 2021-10-27 07:45:59 UTC (rev 18991) Property changes on: oviyam/oviyam/trunk/web/images/hide-preview-orange.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oviyam/oviyam/trunk/web/images/show-icon-orange.png =================================================================== (Binary files differ) Index: oviyam/oviyam/trunk/web/images/show-icon-orange.png =================================================================== --- oviyam/oviyam/trunk/web/images/show-icon-orange.png 2021-10-26 12:54:33 UTC (rev 18990) +++ oviyam/oviyam/trunk/web/images/show-icon-orange.png 2021-10-27 07:45:59 UTC (rev 18991) Property changes on: oviyam/oviyam/trunk/web/images/show-icon-orange.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-26 12:54:33 UTC (rev 18990) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-27 07:45:59 UTC (rev 18991) @@ -1150,8 +1150,8 @@ var imageCanvas = document.getElementById("imageCanvas"); if(needPreview(imageCanvas.width,imageCanvas.height)) { var highlightCanvas = document.getElementById('highlightCanvas'); - jQuery('#previewCanvas').show(); - jQuery(highlightCanvas).show(); + jQuery('#previewCanvas').css('visibility', 'visible'); + jQuery(highlightCanvas).css('visibility', 'visible'); var x = -state.translationX * getScreenNavImageWidth()/getScreenImageWidth(); var y = -state.translationY * getScreenNavImageHeight()/getScreenImageHeight(); var w = imageCanvas.width * getScreenNavImageWidth()/getScreenImageWidth(); @@ -1175,9 +1175,6 @@ context.strokeStyle="#FF8A00"; context.lineWidth = 2; context.strokeRect(x,y,w,h); - } else { - jQuery('#previewCanvas').hide(); - jQuery('#highlightCanvas').hide(); } } Modified: oviyam/oviyam/trunk/web/js/toolactivator.js =================================================================== --- oviyam/oviyam/trunk/web/js/toolactivator.js 2021-10-26 12:54:33 UTC (rev 18990) +++ oviyam/oviyam/trunk/web/js/toolactivator.js 2021-10-27 07:45:59 UTC (rev 18991) @@ -3,6 +3,7 @@ var probeEnabled = false, loadingPixelData = false, windowingChanged = false; var huValue; var speed; +var preview = true; function enableTool(tool) { jQuery('#tool').text(tool); @@ -148,7 +149,10 @@ break; case 'close': setImageOnToggle(); - break; + break; + case 'hide': + doShowHidePreview(this); + break; } } } @@ -1919,3 +1923,30 @@ loadImg(isMultiframe,iNo); drawAllShapes(); } + +function hidePreview() { + var iFrameVal = window.parent.document.getElementsByTagName('iframe'); + for(var i=0; i < iFrameVal.length; i++) { + jQuery(iFrameVal[i]).contents().find('#previewCanvas, #highlightCanvas').hide(); + } + jQuery(jQuery("#hide",window.parent.document).children().get(0)).attr("src","images/show-icon-orange.png"); + preview = false; +} + +function showPreview() { + var iFrameVal = window.parent.document.getElementsByTagName('iframe'); + for(var i=0; i < iFrameVal.length; i++) { + jQuery(iFrameVal[i]).contents().find('#previewCanvas, #highlightCanvas').show(); + } + jQuery(jQuery("#hide",window.parent.document).children().get(0)).attr("src","images/hide-preview-orange.png"); + preview = true; +} + +function doShowHidePreview(e1) { + if (preview) { + hidePreview(e1); + drawoutline(); + } else { + showPreview(e1); + } +} Modified: oviyam/oviyam/trunk/web/viewer_tools.html =================================================================== --- oviyam/oviyam/trunk/web/viewer_tools.html 2021-10-26 12:54:33 UTC (rev 18990) +++ oviyam/oviyam/trunk/web/viewer_tools.html 2021-10-27 07:45:59 UTC (rev 18991) @@ -565,6 +565,10 @@ <div class="toolbarButton" align="center" id="downloadStudy" onclick="doDownload();"> <img src="images/downloadStudy.png" id="lblDownload" class="imgOff" alt="Download Study" title="Download Study"> </div> + + <div class="toolbarButton" align="center" id="hide"> + <img width="27" src="images/hide-preview-orange.png" class="imgOff" title="Hide Preview" onclick="doTool($(this).parent().attr('id'));" /> + </div> <div class="toggleButton" align="center" id="measure"> <img src="images/ruler.png" id="lblLines" class="imgOff" alt="Draw measurement lines" title="Draw Measurements" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-10-26 12:54:35
|
Revision: 18990 http://sourceforge.net/p/dcm4che/svn/18990 Author: asgarhussain Date: 2021-10-26 12:54:33 +0000 (Tue, 26 Oct 2021) Log Message: ----------- OV-249 - Some functionalities in viewer page are not working when Oviyam is embedded into an another web application using iframe tag. - Resolved. Modified Paths: -------------- oviyam/oviyam/trunk/web/Study.jsp oviyam/oviyam/trunk/web/WEB-INF/web.xml oviyam/oviyam/trunk/web/css/jquery.contextMenu.css oviyam/oviyam/trunk/web/js/TileContent.js oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/js/toolactivator.js oviyam/oviyam/trunk/web/viewer.html Modified: oviyam/oviyam/trunk/web/Study.jsp =================================================================== --- oviyam/oviyam/trunk/web/Study.jsp 2021-10-23 13:32:45 UTC (rev 18989) +++ oviyam/oviyam/trunk/web/Study.jsp 2021-10-26 12:54:33 UTC (rev 18990) @@ -385,7 +385,7 @@ "serverURL" : '${param.wadoUrl}' }; - window.parent.getInstanceDetails(paramData); + this.getInstanceDetails(paramData); } </script> <c:choose> @@ -449,7 +449,7 @@ "serverURL" : '${param.wadoUrl}' }; - window.parent.getInstanceDetails(paramData); + this.getInstanceDetails(paramData); } </script> </ser:Series> Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-23 13:32:45 UTC (rev 18989) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-26 12:54:33 UTC (rev 18990) @@ -7,7 +7,7 @@ </context-param> <context-param> <param-name>REVISION_NUMBER</param-name> - <param-value>R(18989-23102021)</param-value> + <param-value>R(18990-26102021)</param-value> </context-param> <context-param> Modified: oviyam/oviyam/trunk/web/css/jquery.contextMenu.css =================================================================== --- oviyam/oviyam/trunk/web/css/jquery.contextMenu.css 2021-10-23 13:32:45 UTC (rev 18989) +++ oviyam/oviyam/trunk/web/css/jquery.contextMenu.css 2021-10-26 12:54:33 UTC (rev 18990) @@ -86,4 +86,9 @@ .contextMenu LI.paste A { background-image: url(images/page_white_paste.png); } .contextMenu LI.delete A { background-image: url(images/page_white_delete.png); } .contextMenu LI.quit A { background-image: url(images/door.png); } -.contextMenu LI.echo A { background-image: url(images/echo.gif); } \ No newline at end of file +.contextMenu LI.echo A { background-image: url(images/echo.gif); } + +ul.contextMenu a:hover { + background-color: #3399FF; + color: #fff; +} \ No newline at end of file Modified: oviyam/oviyam/trunk/web/js/TileContent.js =================================================================== --- oviyam/oviyam/trunk/web/js/TileContent.js 2021-10-23 13:32:45 UTC (rev 18989) +++ oviyam/oviyam/trunk/web/js/TileContent.js 2021-10-26 12:54:33 UTC (rev 18990) @@ -659,7 +659,10 @@ function loadTextOverlay() { var src = jQuery('#frameSrc').html(); - src = decodeURI(src); + try { + src = decodeURI(src); + } catch(e) { } + total = parseInt(getParameter(src, 'images')); if (Number.isNaN(total)) { Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-23 13:32:45 UTC (rev 18989) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-26 12:54:33 UTC (rev 18990) @@ -547,7 +547,10 @@ function loadTextOverlay() { var src = jQuery('#frameSrc').html(); - src = decodeURI(src); + try { + src = decodeURI(src); + } catch(e) { } + total = parseInt(getParameter(src,'images')); if (Number.isNaN(total)) { Modified: oviyam/oviyam/trunk/web/js/toolactivator.js =================================================================== --- oviyam/oviyam/trunk/web/js/toolactivator.js 2021-10-23 13:32:45 UTC (rev 18989) +++ oviyam/oviyam/trunk/web/js/toolactivator.js 2021-10-26 12:54:33 UTC (rev 18990) @@ -851,8 +851,14 @@ } else { selThick = ""; } - var selLoc = selThickLoc.match("Loc:(.*)mm")[1]; - + + var selLoc = selThickLoc.match("Loc:(.*)mm"); + if (selLoc != null) { + selLoc = selLoc[1]; + } else { + selLoc = ""; + } + return {from:parseFloat(selLoc) - parseFloat(selThick), to:parseFloat(selLoc) + parseFloat(selThick),sliceLoc:parseFloat(selLoc)}; } Modified: oviyam/oviyam/trunk/web/viewer.html =================================================================== --- oviyam/oviyam/trunk/web/viewer.html 2021-10-23 13:32:45 UTC (rev 18989) +++ oviyam/oviyam/trunk/web/viewer.html 2021-10-26 12:54:33 UTC (rev 18990) @@ -189,6 +189,10 @@ } function getParameter(queryString, parameterName) { + if(queryString == null) { + queryString = window.location.href; + } + //Add "=" to the parameter name (i.e. parameterName=value); var parameterName = parameterName + "="; if(queryString.length > 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-10-23 13:32:48
|
Revision: 18989 http://sourceforge.net/p/dcm4che/svn/18989 Author: asgarhussain Date: 2021-10-23 13:32:45 +0000 (Sat, 23 Oct 2021) Log Message: ----------- [OV-248] - Minor bugfixes and UI enhancements. Modified Paths: -------------- oviyam/oviyam/trunk/web/Study.jsp oviyam/oviyam/trunk/web/WEB-INF/web.xml oviyam/oviyam/trunk/web/about.jsp oviyam/oviyam/trunk/web/default.jsp oviyam/oviyam/trunk/web/error.jsp oviyam/oviyam/trunk/web/js/TileContent.js oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/login.jsp oviyam/oviyam/trunk/web/studyList.jsp oviyam/oviyam/trunk/web/viewer_tools.html Modified: oviyam/oviyam/trunk/web/Study.jsp =================================================================== --- oviyam/oviyam/trunk/web/Study.jsp 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/Study.jsp 2021-10-23 13:32:45 UTC (rev 18989) @@ -410,8 +410,7 @@ seriesNo='${seriesNumber}' seriesDate='${seriesDate}' seriesDesc='${seriesDesc}' modality='${modality}' numberOfImages='${numberOfImages}' - onclick="loadSelectedSeries(this); getInstances('${param.patient1}', '${param.study}', '${seriesId}');">Not - selected</td> + onclick="loadSelectedSeries(this); getInstances('${param.patient1}', '${param.study}', '${seriesId}'); this.title='';">Not selected</td> </tr> </tbody> </table> Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-23 13:32:45 UTC (rev 18989) @@ -7,7 +7,7 @@ </context-param> <context-param> <param-name>REVISION_NUMBER</param-name> - <param-value>R(18988-21102021)</param-value> + <param-value>R(18989-23102021)</param-value> </context-param> <context-param> Modified: oviyam/oviyam/trunk/web/about.jsp =================================================================== --- oviyam/oviyam/trunk/web/about.jsp 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/about.jsp 2021-10-23 13:32:45 UTC (rev 18989) @@ -1,3 +1,51 @@ +<!-- +/* ***** BEGIN LICENSE BLOCK ***** +* Version: MPL 1.1/GPL 2.0/LGPL 2.1 +* +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License. +* +* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images +* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip +* +* The Initial Developer of the Original Code is +* Raster Images +* Portions created by the Initial Developer are Copyright (C) 2014 +* the Initial Developer. All Rights Reserved. +* +* Contributor(s): +* Babu Hussain A +* Balamurugan R +* Devishree V +* Guruprasath R +* Karthikeyan S +* Meer Asgar Hussain B +* Prakash J +* Suresh V +* Yogapraveen K +* +* Alternatively, the contents of this file may be used under the terms of +* either the GNU General Public License Version 2 or later (the "GPL"), or +* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +* in which case the provisions of the GPL or the LGPL are applicable instead +* of those above. If you wish to allow use of your version of this file only +* under the terms of either the GPL or the LGPL, and not to allow others to +* use your version of this file under the terms of the MPL, indicate your +* decision by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL or the LGPL. If you do not delete +* the provisions above, a recipient may use your version of this file under +* the terms of any one of the MPL, the GPL or the LGPL. +* +* ***** END LICENSE BLOCK ***** */ +--> + <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false"%> <%@ page errorPage="ErrorPage.jsp" %> <% @@ -89,6 +137,7 @@ .popup ul li span{ display: inline-block; width: 40%; + text-transform: capitalize; } </style> <script type="text/javascript" src="js/LoadLanguage.js"></script> Modified: oviyam/oviyam/trunk/web/default.jsp =================================================================== --- oviyam/oviyam/trunk/web/default.jsp 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/default.jsp 2021-10-23 13:32:45 UTC (rev 18989) @@ -1 +1,49 @@ +<!-- +/* ***** BEGIN LICENSE BLOCK ***** +* Version: MPL 1.1/GPL 2.0/LGPL 2.1 +* +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License. +* +* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images +* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip +* +* The Initial Developer of the Original Code is +* Raster Images +* Portions created by the Initial Developer are Copyright (C) 2014 +* the Initial Developer. All Rights Reserved. +* +* Contributor(s): +* Babu Hussain A +* Balamurugan R +* Devishree V +* Guruprasath R +* Karthikeyan S +* Meer Asgar Hussain B +* Prakash J +* Suresh V +* Yogapraveen K +* +* Alternatively, the contents of this file may be used under the terms of +* either the GNU General Public License Version 2 or later (the "GPL"), or +* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +* in which case the provisions of the GPL or the LGPL are applicable instead +* of those above. If you wish to allow use of your version of this file only +* under the terms of either the GPL or the LGPL, and not to allow others to +* use your version of this file under the terms of the MPL, indicate your +* decision by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL or the LGPL. If you do not delete +* the provisions above, a recipient may use your version of this file under +* the terms of any one of the MPL, the GPL or the LGPL. +* +* ***** END LICENSE BLOCK ***** */ +--> + <jsp:include page="index.html"></jsp:include> \ No newline at end of file Modified: oviyam/oviyam/trunk/web/error.jsp =================================================================== --- oviyam/oviyam/trunk/web/error.jsp 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/error.jsp 2021-10-23 13:32:45 UTC (rev 18989) @@ -1,3 +1,51 @@ +<!-- +/* ***** BEGIN LICENSE BLOCK ***** +* Version: MPL 1.1/GPL 2.0/LGPL 2.1 +* +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License. +* +* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images +* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip +* +* The Initial Developer of the Original Code is +* Raster Images +* Portions created by the Initial Developer are Copyright (C) 2014 +* the Initial Developer. All Rights Reserved. +* +* Contributor(s): +* Babu Hussain A +* Balamurugan R +* Devishree V +* Guruprasath R +* Karthikeyan S +* Meer Asgar Hussain B +* Prakash J +* Suresh V +* Yogapraveen K +* +* Alternatively, the contents of this file may be used under the terms of +* either the GNU General Public License Version 2 or later (the "GPL"), or +* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +* in which case the provisions of the GPL or the LGPL are applicable instead +* of those above. If you wish to allow use of your version of this file only +* under the terms of either the GPL or the LGPL, and not to allow others to +* use your version of this file under the terms of the MPL, indicate your +* decision by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL or the LGPL. If you do not delete +* the provisions above, a recipient may use your version of this file under +* the terms of any one of the MPL, the GPL or the LGPL. +* +* ***** END LICENSE BLOCK ***** */ +--> + <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> Modified: oviyam/oviyam/trunk/web/js/TileContent.js =================================================================== --- oviyam/oviyam/trunk/web/js/TileContent.js 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/js/TileContent.js 2021-10-23 13:32:45 UTC (rev 18989) @@ -870,7 +870,9 @@ if (isMultiframe) { $('#totalImages', iFrameDoc).html(total > 1 ? 'Frames:' + (iNo) + '/' + total : 'Frame:' + (iNo) + '/' + total); } else { - $('#totalImages', iFrameDoc).html(total > 1 ? 'Images:' + (iNo) + '/' + total : 'Image:' + (iNo) + '/' + total); + if (!Number.isNaN(total)) { + $('#totalImages', iFrameDoc).html(total > 1 ? 'Images:' + (iNo) + '/' + total : 'Image:' + (iNo) + '/' + total); + } } var serId = $('#serId', iFrameDoc).html(); Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-23 13:32:45 UTC (rev 18989) @@ -329,6 +329,18 @@ function showImage(imgSrc,image) { var image = imgSrc!=null ? jQuery('#' + imgSrc.replace(/\./g,'_'), window.parent.document).get(0) : image; + + var imgNatHeight = image.naturalHeight; + var imgNatWidth = image.naturalWidth; + + if (imgNatWidth == 0 || imgNatHeight == 0) { + var seriesData = JSON.parse(sessionStorage[getParameter(image.src, 'series')]); + imgNatWidth = seriesData[0].nativeColumns; + imgNatHeight = seriesData[0].nativeRows; + } + + + var canvas = document.getElementById('imageCanvas'); @@ -361,14 +373,24 @@ }; } - state.scale = Math.min(canvas.width/image.naturalWidth, canvas.height/image.naturalHeight); - state.translationX = (canvas.width- parseInt(state.scale * image.naturalWidth))/2; - state.translationY = (canvas.height- parseInt(state.scale * image.naturalHeight))/2; + state.scale = Math.min(canvas.width/imgNatWidth, canvas.height/imgNatHeight); + state.translationX = (canvas.width- parseInt(state.scale * imgNatWidth))/2; + state.translationY = (canvas.height- parseInt(state.scale * imgNatHeight))/2; showImg(null,image,true); } function showImg(imgSrc,img,updatePreview) { var image = imgSrc!=null ? jQuery('#'+imgSrc.replace(/\./g,'_'), window.parent.document).get(0) : img; + + var imgNatHeight = image.naturalHeight; + var imgNatWidth = image.naturalWidth; + + if (imgNatWidth == 0 || imgNatHeight == 0) { + var seriesData = JSON.parse(sessionStorage[getParameter(image.src, 'series')]); + imgNatWidth = seriesData[0].nativeColumns; + imgNatHeight = seriesData[0].nativeRows; + } + if(image.src.indexOf('rawdata.png')>=0) { throw 'rawdata'; return; @@ -416,7 +438,7 @@ if(updatePreview===true) { jQuery('#zoomPercent').html('Zoom: ' + parseInt(state.scale * 100) + '%'); - jQuery('#imageSize').html('Image size:' + image.naturalWidth + "x" + image.naturalHeight); + jQuery('#imageSize').html('Image size:' + imgNatWidth + "x" + imgNatHeight); jQuery('#viewSize').html('View size:' + canvas.width + "x" + canvas.height); loadPreview(image); } @@ -1168,35 +1190,40 @@ var cxtContent = '<ul id="contextmenu1" class="menu"'; if(isCompatible()) { - // console.log("Context menu if if" + seriesData.length ); for(var i=0;i<seriesData.length;i++) { var series = seriesData[i]; -// jQuery('#studyDesc').html(series['studyDesc']); -// jQuery('#studyDate').html(series['studyDate']); - var seriesDesc = convertSplChars(series['seriesDesc']); - if(seriesDesc== undefined && seriesDesc==='') { - seriesDesc = 'UNKNOWN'; - } - cxtContent+= '<li><a class="cmenuItem" href="#" link="frameContent.html?study=' + study + '&series=' + series['seriesUID'] + '&seriesDesc=' + series['seriesDesc'] + '&images=' + series['totalInstances'] + '&modality='+ series['modality'] + '" onclick="triggerContext(jQuery(this));">' + seriesDesc + ' </a></li>'; - } + var seriesComp = jQuery("#" + series['seriesUID'].replace(/\./g,'_')+"_table", window.parent.document); + if(seriesComp.length == 1) { + // jQuery('#studyDesc').html(series['studyDesc']); + // jQuery('#studyDate').html(series['studyDate']); + var seriesDesc = convertSplChars(series['seriesDesc']); + if(seriesDesc== undefined && seriesDesc==='') { + seriesDesc = 'UNKNOWN'; + } + cxtContent+= '<li><a class="cmenuItem" href="#" link="frameContent.html?study=' + study + '&series=' + series['seriesUID'] + '&seriesDesc=' + series['seriesDesc'] + '&images=' + series['totalInstances'] + '&modality='+ series['modality'] + '" onclick="triggerContext(jQuery(this));">' + seriesDesc + ' </a></li>'; + } + } cxtContent+='</ul>'; } else { for(var i=0;i<seriesData.length;i++) { var series = seriesData[i]; -// jQuery('#studyDesc').html(series['studyDesc']); -// jQuery('#studyDate').html(series['studyDate']); - var seriesDesc = convertSplChars(series['seriesDesc']); - if(seriesDesc==undefined && seriesDesc==='') { - seriesDesc = 'UNKNOWN'; - } - cxtContent +='<li><a href="#" link="frameContent.html?serverURL='; - cxtContent += getParameter(queryString, 'serverURL'); - cxtContent += '&study=' + study; - cxtContent += '&series=' + series['seriesUID']; - cxtContent += '&seriesDesc=' + series['seriesDesc']; - cxtContent += '&images=' + series['totalInstances']; - cxtContent += '&modality=' + series['modality'] + '" onclick="triggerContext(jQuery(this));">' + seriesDesc + '</a></li>'; + var seriesComp = jQuery("#" + series['seriesUID'].replace(/\./g,'_')+"_table", window.parent.document); + if(seriesComp.length == 1) { + // jQuery('#studyDesc').html(series['studyDesc']); + // jQuery('#studyDate').html(series['studyDate']); + var seriesDesc = convertSplChars(series['seriesDesc']); + if(seriesDesc==undefined && seriesDesc==='') { + seriesDesc = 'UNKNOWN'; + } + cxtContent +='<li><a href="#" link="frameContent.html?serverURL='; + cxtContent += getParameter(queryString, 'serverURL'); + cxtContent += '&study=' + study; + cxtContent += '&series=' + series['seriesUID']; + cxtContent += '&seriesDesc=' + series['seriesDesc']; + cxtContent += '&images=' + series['totalInstances']; + cxtContent += '&modality=' + series['modality'] + '" onclick="triggerContext(jQuery(this));">' + seriesDesc + '</a></li>'; + } } cxtContent+='</ul>'; } Modified: oviyam/oviyam/trunk/web/login.jsp =================================================================== --- oviyam/oviyam/trunk/web/login.jsp 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/login.jsp 2021-10-23 13:32:45 UTC (rev 18989) @@ -1,3 +1,51 @@ +<!-- +/* ***** BEGIN LICENSE BLOCK ***** +* Version: MPL 1.1/GPL 2.0/LGPL 2.1 +* +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License. +* +* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images +* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip +* +* The Initial Developer of the Original Code is +* Raster Images +* Portions created by the Initial Developer are Copyright (C) 2014 +* the Initial Developer. All Rights Reserved. +* +* Contributor(s): +* Babu Hussain A +* Balamurugan R +* Devishree V +* Guruprasath R +* Karthikeyan S +* Meer Asgar Hussain B +* Prakash J +* Suresh V +* Yogapraveen K +* +* Alternatively, the contents of this file may be used under the terms of +* either the GNU General Public License Version 2 or later (the "GPL"), or +* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +* in which case the provisions of the GPL or the LGPL are applicable instead +* of those above. If you wish to allow use of your version of this file only +* under the terms of either the GPL or the LGPL, and not to allow others to +* use your version of this file under the terms of the MPL, indicate your +* decision by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL or the LGPL. If you do not delete +* the provisions above, a recipient may use your version of this file under +* the terms of any one of the MPL, the GPL or the LGPL. +* +* ***** END LICENSE BLOCK ***** */ +--> + <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-1"%> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -61,9 +109,12 @@ }); $('#loginButton').button(); - $(document).attr('title', languages['PageTitle']); - $("#loginButton").val(languages['Login']); - }); + $(document).attr('title', languages['PageTitle']); + $("#loginButton").val(languages['Login']); + + $('[name="j_username"]').attr('placeholder', languages['UserName']); + $('[name="j_password"]').attr('placeholder', languages['Password']); + }); function setCookie(name, value, expires, path, domain, secure) { var curCookie = name + "=" + escape(value) + Modified: oviyam/oviyam/trunk/web/studyList.jsp =================================================================== --- oviyam/oviyam/trunk/web/studyList.jsp 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/studyList.jsp 2021-10-23 13:32:45 UTC (rev 18989) @@ -1,3 +1,51 @@ +<!-- +/* ***** BEGIN LICENSE BLOCK ***** +* Version: MPL 1.1/GPL 2.0/LGPL 2.1 +* +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License. +* +* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images +* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip +* +* The Initial Developer of the Original Code is +* Raster Images +* Portions created by the Initial Developer are Copyright (C) 2014 +* the Initial Developer. All Rights Reserved. +* +* Contributor(s): +* Babu Hussain A +* Balamurugan R +* Devishree V +* Guruprasath R +* Karthikeyan S +* Meer Asgar Hussain B +* Prakash J +* Suresh V +* Yogapraveen K +* +* Alternatively, the contents of this file may be used under the terms of +* either the GNU General Public License Version 2 or later (the "GPL"), or +* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +* in which case the provisions of the GPL or the LGPL are applicable instead +* of those above. If you wish to allow use of your version of this file only +* under the terms of either the GPL or the LGPL, and not to allow others to +* use your version of this file under the terms of the MPL, indicate your +* decision by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL or the LGPL. If you do not delete +* the provisions above, a recipient may use your version of this file under +* the terms of any one of the MPL, the GPL or the LGPL. +* +* ***** END LICENSE BLOCK ***** */ +--> + <!-- Study list pgae - One patient id,multiple studies (When the study UID is not given in URL) --> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> Modified: oviyam/oviyam/trunk/web/viewer_tools.html =================================================================== --- oviyam/oviyam/trunk/web/viewer_tools.html 2021-10-21 13:23:41 UTC (rev 18988) +++ oviyam/oviyam/trunk/web/viewer_tools.html 2021-10-23 13:32:45 UTC (rev 18989) @@ -233,6 +233,11 @@ /* Safari */ transition-duration: 0.4s; } + + .toggleButton .contextMenu A { + min-height: 20px; + height: auto; + } </style> <script type="text/javascript"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-10-21 13:23:42
|
Revision: 18988 http://sourceforge.net/p/dcm4che/svn/18988 Author: asgarhussain Date: 2021-10-21 13:23:41 +0000 (Thu, 21 Oct 2021) Log Message: ----------- [OV-247] - Release 2.8.2 (Revision number changed). Modified Paths: -------------- oviyam/oviyam/trunk/.settings/org.eclipse.jdt.core.prefs oviyam/oviyam/trunk/web/WEB-INF/web.xml Modified: oviyam/oviyam/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- oviyam/oviyam/trunk/.settings/org.eclipse.jdt.core.prefs 2021-10-21 13:17:51 UTC (rev 18987) +++ oviyam/oviyam/trunk/.settings/org.eclipse.jdt.core.prefs 2021-10-21 13:23:41 UTC (rev 18988) @@ -1,11 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-21 13:17:51 UTC (rev 18987) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-21 13:23:41 UTC (rev 18988) @@ -7,7 +7,7 @@ </context-param> <context-param> <param-name>REVISION_NUMBER</param-name> - <param-value>R(18986-21102021)</param-value> + <param-value>R(18988-21102021)</param-value> </context-param> <context-param> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-10-21 13:17:53
|
Revision: 18987 http://sourceforge.net/p/dcm4che/svn/18987 Author: asgarhussain Date: 2021-10-21 13:17:51 +0000 (Thu, 21 Oct 2021) Log Message: ----------- [OV-247] - Release 2.8.2. Modified Paths: -------------- oviyam/oviyam/trunk/web/WEB-INF/web.xml oviyam/oviyam/trunk/web/js/i18n/Bundle.js oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-21 11:58:11 UTC (rev 18986) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-21 13:17:51 UTC (rev 18987) @@ -3,11 +3,11 @@ <context-param> <param-name>VERSION</param-name> - <param-value>2.8.1</param-value> + <param-value>2.8.2</param-value> </context-param> <context-param> <param-name>REVISION_NUMBER</param-name> - <param-value>R(18973-19032021)</param-value> + <param-value>R(18986-21102021)</param-value> </context-param> <context-param> Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle.js 2021-10-21 11:58:11 UTC (rev 18986) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle.js 2021-10-21 13:17:51 UTC (rev 18987) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8.1", + VersionNo:"2.8.2", UserName: "User Name", Password: "Password", Login: "Login", - Footer: "Oviyam 2.8.1 requires latest version of Google Chrome / Safari / Mozila Firefox.", + Footer: "Oviyam 2.8.2 requires latest version of Google Chrome / Safari / Mozila Firefox.", PatientName: "Patient Name", PatientId: "Patient ID", BirthDate: "Birth Date", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js 2021-10-21 11:58:11 UTC (rev 18986) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js 2021-10-21 13:17:51 UTC (rev 18987) @@ -1,6 +1,6 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8.1", + VersionNo:"2.8.2", UserName: "Benutzername", Password: "Passwort", Login: "Anmeldung", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js 2021-10-21 11:58:11 UTC (rev 18986) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js 2021-10-21 13:17:51 UTC (rev 18987) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo: "2.8.1", + VersionNo: "2.8.2", UserName: "usuario", Password: "contraseña", Login: "iniciar sesión", - Footer: "Oviyam 2.8.1 requiere la última versión de Google Chrome / Safari / Mozila Firefox.", + Footer: "Oviyam 2.8.2 requiere la última versión de Google Chrome / Safari / Mozila Firefox.", PatientName: "Nombre del paciente", PatientId: "ID del paciente", BirthDate: "Fecha de nacimiento", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js 2021-10-21 11:58:11 UTC (rev 18986) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js 2021-10-21 13:17:51 UTC (rev 18987) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8.1", + VersionNo:"2.8.2", UserName: "ユーザ名", Password: "パスワード", Login: "ログイン", - Footer: "Oviyam 2.8.1 は Google Chrome もしくは Safari の最新バージョンが必要です", + Footer: "Oviyam 2.8.2 は Google Chrome もしくは Safari の最新バージョンが必要です", PatientName: "患者名", PatientId: "患者ID", BirthDate: "生年月日", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js 2021-10-21 11:58:11 UTC (rev 18986) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js 2021-10-21 13:17:51 UTC (rev 18987) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8.1", + VersionNo:"2.8.2", UserName: "Имя пользователя", Password: "Пароль", Login: "Логин", - Footer: "Для Oviyam 2.8.1 требуется последняя версия Google Chrome / Safari / Mozila Firefox.", + Footer: "Для Oviyam 2.8.2 требуется последняя версия Google Chrome / Safari / Mozila Firefox.", PatientName: "Имя пациета", PatientId: "ID Пациента", BirthDate: "Дата рождения", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js 2021-10-21 11:58:11 UTC (rev 18986) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js 2021-10-21 13:17:51 UTC (rev 18987) @@ -1,10 +1,10 @@ var languages = { PageTitle: "ஓவியம்", - VersionNo:"2.8.1", + VersionNo:"2.8.2", UserName: "பயனர் பெயர்", Password: "கடவுச்சொல்", Login: "உள்நுழைக", - Footer: "ஓவியம் 2.8.1 -க்கு தேவை Google Chrome / Safari / Mozila Firefox புதிய பதிப்பு. ", + Footer: "ஓவியம் 2.8.2 -க்கு தேவை Google Chrome / Safari / Mozila Firefox புதிய பதிப்பு. ", PatientName: "நோயாளியின் பெயர்", PatientId: "நோயாளியின் எண்", BirthDate: "பிறந்த தேதி", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-10-21 11:58:14
|
Revision: 18986 http://sourceforge.net/p/dcm4che/svn/18986 Author: asgarhussain Date: 2021-10-21 11:58:11 +0000 (Thu, 21 Oct 2021) Log Message: ----------- [OV-248] - Minor bugfixes and UI enhancements. Modified Paths: -------------- oviyam/oviyam/trunk/web/TileContent.html oviyam/oviyam/trunk/web/WEB-INF/web.xml oviyam/oviyam/trunk/web/frameContent.html oviyam/oviyam/trunk/web/index.html oviyam/oviyam/trunk/web/js/LoadLanguage.js oviyam/oviyam/trunk/web/js/TileContent.js oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/js/i18n/Bundle.js oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js oviyam/oviyam/trunk/web/js/toolactivator.js oviyam/oviyam/trunk/web/viewer_tools.html Added Paths: ----------- oviyam/oviyam/trunk/web/about.jsp oviyam/oviyam/trunk/web/js/lib/jquery.browser.min.js Modified: oviyam/oviyam/trunk/web/TileContent.html =================================================================== --- oviyam/oviyam/trunk/web/TileContent.html 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/TileContent.html 2021-10-21 11:58:11 UTC (rev 18986) @@ -128,7 +128,7 @@ <div id="tool" style="display:none;"></div> <div id="serId" style="display:none;"></div> <div id="studyId" style="display:none;"></div> - <div id='textOverlay' style='display: none'></div> + <div id="textOverlay" style="display:none;"></div> <div id="progressbar"></div> <div id="progresslbl"></div> Modified: oviyam/oviyam/trunk/web/WEB-INF/web.xml =================================================================== --- oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/WEB-INF/web.xml 2021-10-21 11:58:11 UTC (rev 18986) @@ -1,6 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> +<context-param> + <param-name>VERSION</param-name> + <param-value>2.8.1</param-value> + </context-param> + <context-param> + <param-name>REVISION_NUMBER</param-name> + <param-value>R(18973-19032021)</param-value> + </context-param> + <context-param> <param-name>imgLateralityDisplay</param-name> <param-value>Yes</param-value> Added: oviyam/oviyam/trunk/web/about.jsp =================================================================== --- oviyam/oviyam/trunk/web/about.jsp (rev 0) +++ oviyam/oviyam/trunk/web/about.jsp 2021-10-21 11:58:11 UTC (rev 18986) @@ -0,0 +1,123 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false"%> +<%@ page errorPage="ErrorPage.jsp" %> +<% + String version = getServletContext().getInitParameter("VERSION"); + String revisionNumber = getServletContext().getInitParameter("REVISION_NUMBER"); +%> +<html> +<style> + .about { + font-size: 13px; + color: #ff8a00; + text-align: center; + } + + .font-20px { + font-size: 20px; + } + + .font-14px { + font-size: 14px; + } + + .mb-0px { + margin-bottom: 0px; + } + + .pt-25px { + padding-top: 25px; + } + + .white-bg { + background: white; + } + + .maxheight-44p { + max-width: 44%; + } + .popup { + margin: 70px auto; + padding: 0; + background: #313131; + border-radius: 0; + width: 40%; + position: relative; + transition: all 5s ease-in-out; + border: 1px solid #c76312; +} + +.popup h2 { + margin-top: 0; + color: #333; + font-family: Tahoma, Arial, sans-serif; +} +.popup .close { + position: absolute; + top: 5px; + right: 11px; + transition: all 200ms; + font-size: 30px; + font-weight: bold; + text-decoration: none; + color: #ff8a00; + cursor: pointer; +} +.popup .close:hover { + color: #06D85F; +} +.popup .content { + overflow: auto; + padding: 0px 20px 20px; +} + +.popup h3{ + font-size: 18px; + margin: 0 0 20px; + color: #fff; +} +.popup h2{ + font-size: 22px; + background-color: #000; + padding: 10px; + color: #ff8a00!important; +} +.popup ul li{ + font-size: 15px; + margin-bottom: 10px; + color: #fff; +} +.popup ul li span{ + display: inline-block; + width: 40%; +} +</style> +<script type="text/javascript" src="js/LoadLanguage.js"></script> +<body> + + <div class="popup"> + <h2><span id='lblOviyamAbout'></h2> + <a class="close" onclick="closeInfo()">×</a> + <div class="content"> + <h3><span id='lblVersionInfo'></span></h3> + <ul> + <li><span id='lblVersion'></span> <span><%=version%></span></li> + <li><span id='lblBuild'></span> <%=revisionNumber%></li> + <li><span id='lblBrowser'></span> <span id="browser"></span></li> + <li><span id='lblOs'></span> <span id="osName"></span></li> + </ul> + </div> + </div> + + <script type="text/javascript"> + +document.getElementById("browser").innerHTML = +$.browser.name + " " + $.browser.version; +document.getElementById("osName").innerHTML = +navigator.platform; +function closeInfo() { + $('#infoModal').hide(); + } + </script> +</body> + +</html> \ No newline at end of file Modified: oviyam/oviyam/trunk/web/frameContent.html =================================================================== --- oviyam/oviyam/trunk/web/frameContent.html 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/frameContent.html 2021-10-21 11:58:11 UTC (rev 18986) @@ -128,6 +128,7 @@ <div id="tool" style="display:none;"></div> <div id="serId" style="display:none;"></div> <div id="studyId" style="display:none;"></div> + <div id="textOverlay" style="display:none;"></div> <div id="progressbar"></div> <div id="progresslbl"></div> Modified: oviyam/oviyam/trunk/web/index.html =================================================================== --- oviyam/oviyam/trunk/web/index.html 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/index.html 2021-10-21 11:58:11 UTC (rev 18986) @@ -18,6 +18,8 @@ expiresAt: cookiesExp }); }, 'text'); + + </script> <link rel="icon" type="image/png" href="images/favicon.png" /> @@ -133,6 +135,30 @@ padding: 6px; width: 54%; } + +.downloadModal{ + position: absolute; + top: 0px; + left: 0px; + right: 0px; + display: none; + height: 100%; + background: #00000054; +} +.downloadModal-content{ + height: 100%; + background: #00000045; + position: absolute; + width: 100%; +} +@media screen and (max-width: 700px){ + .box{ + width: 70%; + } + .popup{ + width: 70%; + } +} </style> <script type="text/javascript" src="js/lib/jquery-ui-latest.js"></script> @@ -154,7 +180,7 @@ <script type="text/javascript" src="js/filehandle.js"></script> <script type="text/javascript" src="js/home.js"></script> <script type="text/javascript" src="js/LoadLanguage.js"></script> - + <script type="text/javascript" src="js/lib/jquery.browser.min.js"></script> <link href="css/jquery-ui.css" type="text/css" rel="Stylesheet" class="ui-theme"> <link href="css/jquery-ui(1).css" type="text/css" rel="Stylesheet" class="ui-theme"> <link href="css/jquery-ui(2).css" type="text/css" rel="Stylesheet" class="ui-theme"> @@ -184,6 +210,9 @@ <i class="fa fa-user-circle-o fa-3x" aria-hidden="true"></i> </div> <ul class="the_menu" style="width:auto;background-color:initial;"> + <li id="about"> + <a onclick="displayInfo()"><span> <i class="fa fa-info" style="font-size:16px; margin-right: 6px;margin-left: 4px;" aria-hidden="true"></i> </span> <span id='lblAbout'></span></a> + </li> <li id="liConfig"> <a href=""><span> <i class="fa fa-wrench" style="font-size:16px;" aria-hidden="true"></i> </span> <span id='lblSettings'></span></a> </li> @@ -234,6 +263,48 @@ </ul> </div> + + <!-- <div class="popup"> + <h2>About OVIYAM</h2> + <a class="close" href="#">×</a> + <div class="content"> + <h3>Version Information</h3> + <ul> + <li><span>Version Number</span> <span id="aboutVersion"></span></li> + <li><span>Build Number</span> 0</li> + <li><span>Browser</span> <span id="browser"></span></li> + <li><span>OS</span> <span id="osName"></span></li> + </ul> + </div> + </div> --> + <div id="infoModal" class="downloadModal"> + <!-- Modal content --> + <div class="downloadModal-content" id="info"> + + <div id="info-content" style=" height: 45%;"></div> + + </div> + + </div> + + <script type="text/javascript"> + +document.getElementById("browser").innerHTML = +$.browser.name + " " + $.browser.version; +document.getElementById("osName").innerHTML = +navigator.platform; + function displayInfo() { + $('#info-content').load('about.jsp'); + console.log('*************************8'); + $('#infoModal').show(); + // setTimeout(() => { + + // }, 100); + + } + + </script> + </body> </html> \ No newline at end of file Modified: oviyam/oviyam/trunk/web/js/LoadLanguage.js =================================================================== --- oviyam/oviyam/trunk/web/js/LoadLanguage.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/LoadLanguage.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -19,6 +19,7 @@ //index.html $(document).attr('title', languages['PageTitle']); $('#productName').html(languages['PageTitle'] + "<br><span class='versionSpan' style='font-size:10px; '>" + languages['Version'] + " " + languages['VersionNo'] + "</span> "); + $('#aboutVersion').html(languages['VersionNo']); $('#lblPatientName').html(languages['PatientName']); $('#lblPatientID').html(languages['PatientId']); $('#lblDOB').html(languages['BirthDate']); @@ -28,6 +29,13 @@ $('#lblModality').html(languages['Modality']); $('#lblInstanceCount').html(languages['InstanceCount']); $('#lblSettings').html(languages.Settings); + $('#lblAbout').html(languages.About); + $('#lblOviyamAbout').html(languages.OviyamAbout); + $('#lblVersionInfo').html(languages.VersionInfo); + $('#lblVersion').html(languages.VersionNoTxt); + $('#lblBuild').html(languages.BuildNo); + $('#lblBrowser').html(languages.Browser); + $('#lblOs').html(languages.Os); $('#lblLogout').html(languages.logout); //Tools.html Modified: oviyam/oviyam/trunk/web/js/TileContent.js =================================================================== --- oviyam/oviyam/trunk/web/js/TileContent.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/TileContent.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -304,12 +304,14 @@ var img = jQuery('#' + (seriesUid + "_" + imgInc).replace(/\./g, '_'), window.parent.document).get(0); - if (img.src.indexOf('SR_Latest.png') >= 0) { - loadSR(jQuery(img).attr('imgSrc')); - } else if (img.src.indexOf('pdf.png') >= 0) { - loadPDF(jQuery(img).attr('imgSrc')); - } else { - eliminateRawData(); + if(img) { + if (img.src.indexOf('SR_Latest.png') >= 0) { + loadSR(jQuery(img).attr('imgSrc')); + } else if (img.src.indexOf('pdf.png') >= 0) { + loadPDF(jQuery(img).attr('imgSrc')); + } else { + eliminateRawData(); + } } jQuery('#loadingView', window.parent.document).hide(); jQuery('iframe', window.parent.document).css('visibility', 'visible'); @@ -656,15 +658,22 @@ function loadTextOverlay() { + var src = jQuery('#frameSrc').html(); + src = decodeURI(src); + total = parseInt(getParameter(src, 'images')); + + if (Number.isNaN(total)) { + return; + } + + jQuery('#patName').html(window.parent.pat.pat_Name); jQuery('#patID').html(window.parent.pat.pat_ID); jQuery("#patGender").html(window.parent.pat.pat_gender); - var src = jQuery('#frameSrc').html(); - src = decodeURI(src); jQuery('#seriesDesc').html(getParameter(src, 'seriesDesc')); jQuery('#modalityDiv').html(getParameter(src, 'modality')); - total = parseInt(getParameter(src, 'images')); + jQuery('#totalImages').html(total > 1 ? 'Images:' + (imgInc) + '/ ' + total : 'Image:' + (imgInc) + '/ ' + total); loadSlider(); @@ -685,6 +694,10 @@ } function loadInstanceText(checkForUpdate, autoplay) { + if (Number.isNaN(total)) { + return; + } + data = sessionStorage[seriesUid]; if (data) { // try { @@ -1076,7 +1089,10 @@ } else { imgSrc = jQuery('#' + (getParameter(jQuery('#frameSrc', iFrame).html(), 'object') + "_" + iNo).replace(/\./g, '_'), window.parent.document).attr('src'); this.frameInc = iNo; - } + } + if(!imgSrc) { + return; + } if (imgSrc.indexOf('windowCenter') >= 0) { imgSrc = imgSrc.substring(0, imgSrc.indexOf('&windowCenter=')); } @@ -1307,7 +1323,7 @@ divContent += '<td><iframe id="frame' + cnt; divContent += '" height="100%" width="100%" frameBorder="0" scrolling="yes" '; - divContent += 'src="TileContent.html?serverURL=' + pat['serverURL'] + 'study=' + studyUID + '&series=' + currSer + + divContent += 'src="frameContent.html?serverURL=' + pat['serverURL'] + 'study=' + studyUID + '&series=' + currSer + '&object=' + ser_Info['SopUID'] + '&sopClassUID=' + ser_Info['SopClassUID'] + '&seriesDesc=' + selectedSeriesData['seriesDesc'] + '&images=' + selectedSeriesData['totalInstances'] + '&modality=' + selectedSeriesData['modality']; if(!multiframe){ @@ -1345,7 +1361,7 @@ divContent += '<td><iframe id="frame' + cnt; divContent += '" height="100%" width="100%" frameBorder="0" scrolling="yes" '; if (totalImages > cnt) { - divContent += 'src="TileContent.html?serverURL=' + pat['serverURL'] + 'study=' + studyUID + '&series=' + currSer + + divContent += 'src="frameContent.html?serverURL=' + pat['serverURL'] + 'study=' + studyUID + '&series=' + currSer + '&object=' + ser_Info['SopUID'] + '&sopClassUID=' + ser_Info['SopClassUID'] + '&seriesDesc=' + selectedSeriesData['seriesDesc'] + '&images=' + selectedSeriesData['totalInstances'] + '&modality=' + selectedSeriesData['modality']; if(!multiframe){ @@ -1359,7 +1375,7 @@ } divContent += '" style="background:#000; visibility: hidden;"></iframe></td>'; } else { - divContent += ' ' + 'style="background:#000"src ="TileContent.html?study=' + pat.studyUID + '"></iframe></td>'; + divContent += ' ' + 'style="background:#000"src ="frameContent.html?study=' + pat.studyUID + '"></iframe></td>'; } cnt++; @@ -1722,7 +1738,16 @@ } function triggerContext(contextItem) { - window.location.href = contextItem.attr('link'); + var link = contextItem.attr('link'); + + var baseURI = contextItem.get(0).baseURI; + var src = "Image.do?" + baseURI.substring(baseURI.indexOf('html?')+5, baseURI.length); + var imgId = link.substring(link.indexOf("series=")+7, link.indexOf('&seriesDesc')).replace(/\./g, '_'); + + var img = document.createElement('img'); + img.src = src; + img.setAttribute("id", imgId + "_1"); + window.parent.changeSeries(img); } function getCurrentImage() { Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -303,13 +303,15 @@ var img = jQuery('#' + (seriesUid+"_"+imgInc).replace(/\./g,'_'), window.parent.document).get(0); - if(img.src.indexOf('SR_Latest.png')>=0) { - loadSR(jQuery(img).attr('imgSrc')); - } else if(img.src.indexOf('pdf.png')>=0) { - loadPDF(jQuery(img).attr('imgSrc')); - } else { - eliminateRawData(); - } + if (img) { + if(img.src.indexOf('SR_Latest.png')>=0) { + loadSR(jQuery(img).attr('imgSrc')); + } else if(img.src.indexOf('pdf.png')>=0) { + loadPDF(jQuery(img).attr('imgSrc')); + } else { + eliminateRawData(); + } + } jQuery('#loadingView', window.parent.document).hide(); jQuery('iframe',window.parent.document).css('visibility','visible'); } @@ -522,18 +524,26 @@ } function loadTextOverlay() { + var src = jQuery('#frameSrc').html(); + src = decodeURI(src); + total = parseInt(getParameter(src,'images')); + + if (Number.isNaN(total)) { + return; + } + jQuery('#patName').html(window.parent.pat.pat_Name); jQuery('#patID').html(window.parent.pat.pat_ID); jQuery("#patGender").html(window.parent.pat.pat_gender); - var src = jQuery('#frameSrc').html(); - src = decodeURI(src); + jQuery('#seriesDesc').html(getParameter(src, 'seriesDesc')); jQuery('#modalityDiv').html(getParameter(src,'modality')); - total = parseInt(getParameter(src,'images')); + + jQuery('#totalImages').html(total>1 ? 'Images:' + (imgInc) + '/' + total :'Image:' + (imgInc) + '/' + total); loadSlider(); - + var studyData = JSON.parse(sessionStorage[window.parent.pat.pat_ID]); var thisStudy = getParameter(window.location.href,"study"); @@ -551,6 +561,10 @@ } function loadInstanceText(checkForUpdate,autoplay) { + if (Number.isNaN(total)) { + return; + } + data = sessionStorage[seriesUid]; if(data) { // try { @@ -1214,4 +1228,4 @@ return jQuery("#" + getParameter(jQuery('#frameSrc').html(),'object').replace(/\./g,'_')+"_"+iNo,window.parent.document).get(0); } } -} \ No newline at end of file +} Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -83,6 +83,13 @@ Gender: "Gender", Tools: "Tools", Settings: "Settings", + About: "About", + OviyamAbout: "About OVIYAM", + VersionInfo: "Version Information", + VersionNoTxt: "Version Number", + BuildNo: "Build Number", + Browser: "Browser", + Os: "OS", logout: "Logout", language: "Language", country: "Select Country", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -83,6 +83,13 @@ Gender: "Geschlecht", Tools: "Werkzeuge", Settings: "Einstellungen", + About: "Om", + OviyamAbout: "Om OVIYAM", + VersionInfo: "Version oplysninger", + VersionNoTxt: "Versionsnummer", + BuildNo: "Bygge nummer", + Browser: "Browser", + Os: "OS", logout: "Ausloggen", language: "Sprache", country: "Land auswählen", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -83,6 +83,13 @@ Gender: "Género", Tools: "herramientas", Settings: "Ajustes", + About: "Sobre", + OviyamAbout: "Sobre OVIYAM", + VersionInfo: "Información de versión", + VersionNoTxt: "Número de versión", + BuildNo: "Número de compilación", + Browser: "Navegadora", + Os: "USTED", logout: "Cerrar sesión", language: "Idioma", country: "Seleccionar país", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -85,6 +85,13 @@ Gender: "性別", Tools: "ツール", Settings: "設定", + About: "だいたい", + OviyamAbout: "OVIYAMについて", + VersionInfo: "バージョン情報", + VersionNoTxt: "バージョンナンバー", + BuildNo: "ビルド番号", + Browser: "ブラウザ", + Os: "OS", logout: "ログアウト", language: "言語", country: "国を選択", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -83,6 +83,13 @@ Gender: "Пол", Tools: "Инструменты", Settings: "Настройки", + About: "О", + OviyamAbout: "Об ОВИЯМ", + VersionInfo: "Информация о версии", + VersionNoTxt: "Номер версии", + BuildNo: "Номер сборки", + Browser: "Браузер", + Os: "Операционные системы", logout: "Смена пользователя", language: "Язык", country: "Выбор страны", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -83,6 +83,13 @@ Gender: "பாலினம்", Tools: "கருவிகள்", Settings: "அமைப்புகள்", + About: "பற்றி", + OviyamAbout: "ஓவியம் பற்றி", + VersionInfo: "பதிப்பு தகவல்", + VersionNoTxt: "பதிப்பு எண்", + BuildNo: "உருவாக்க எண்", + Browser: "உலாவி", + Os: "OS", logout: "வெளியேறு", language: "மொழி", country: "நாட்டினை தேர்வுசெய்", Added: oviyam/oviyam/trunk/web/js/lib/jquery.browser.min.js =================================================================== --- oviyam/oviyam/trunk/web/js/lib/jquery.browser.min.js (rev 0) +++ oviyam/oviyam/trunk/web/js/lib/jquery.browser.min.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -0,0 +1,14 @@ +/*! + * jQuery Browser Plugin 0.1.0 + * https://github.com/gabceb/jquery-browser-plugin + * + * Original jquery-browser code Copyright 2005, 2015 jQuery Foundation, Inc. and other contributors + * http://jquery.org/license + * + * Modifications Copyright 2015 Gabriel Cebrian + * https://github.com/gabceb + * + * Released under the MIT license + * + * Date: 23-11-2015 + */!function(a){"function"==typeof define&&define.amd?define(["jquery"],function(b){return a(b)}):"object"==typeof module&&"object"==typeof module.exports?module.exports=a(require("jquery")):a(window.jQuery)}(function(a){"use strict";function b(a){void 0===a&&(a=window.navigator.userAgent),a=a.toLowerCase();var b=/(edge)\/([\w.]+)/.exec(a)||/(opr)[\/]([\w.]+)/.exec(a)||/(chrome)[ \/]([\w.]+)/.exec(a)||/(iemobile)[\/]([\w.]+)/.exec(a)||/(version)(applewebkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+).*(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("trident")>=0&&/(rv)(?::| )([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[],c=/(ipad)/.exec(a)||/(ipod)/.exec(a)||/(windows phone)/.exec(a)||/(iphone)/.exec(a)||/(kindle)/.exec(a)||/(silk)/.exec(a)||/(android)/.exec(a)||/(win)/.exec(a)||/(mac)/.exec(a)||/(linux)/.exec(a)||/(cros)/.exec(a)||/(playbook)/.exec(a)||/(bb)/.exec(a)||/(blackberry)/.exec(a)||[],d={},e={browser:b[5]||b[3]||b[1]||"",version:b[2]||b[4]||"0",versionNumber:b[4]||b[2]||"0",platform:c[0]||""};if(e.browser&&(d[e.browser]=!0,d.version=e.version,d.versionNumber=parseInt(e.versionNumber,10)),e.platform&&(d[e.platform]=!0),(d.android||d.bb||d.blackberry||d.ipad||d.iphone||d.ipod||d.kindle||d.playbook||d.silk||d["windows phone"])&&(d.mobile=!0),(d.cros||d.mac||d.linux||d.win)&&(d.desktop=!0),(d.chrome||d.opr||d.safari)&&(d.webkit=!0),d.rv||d.iemobile){var f="msie";e.browser=f,d[f]=!0}if(d.edge){delete d.edge;var g="msedge";e.browser=g,d[g]=!0}if(d.safari&&d.blackberry){var h="blackberry";e.browser=h,d[h]=!0}if(d.safari&&d.playbook){var i="playbook";e.browser=i,d[i]=!0}if(d.bb){var j="blackberry";e.browser=j,d[j]=!0}if(d.opr){var k="opera";e.browser=k,d[k]=!0}if(d.safari&&d.android){var l="android";e.browser=l,d[l]=!0}if(d.safari&&d.kindle){var m="kindle";e.browser=m,d[m]=!0}if(d.safari&&d.silk){var n="silk";e.browser=n,d[n]=!0}return d.name=e.browser,d.platform=e.platform,d}return window.jQBrowser=b(window.navigator.userAgent),window.jQBrowser.uaMatch=b,a&&(a.browser=window.jQBrowser),window.jQBrowser}); \ No newline at end of file Modified: oviyam/oviyam/trunk/web/js/toolactivator.js =================================================================== --- oviyam/oviyam/trunk/web/js/toolactivator.js 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/js/toolactivator.js 2021-10-21 11:58:11 UTC (rev 18986) @@ -42,10 +42,25 @@ if(e.detail.tool==="txtOverlay") { if (jQuery('#textOverlay').hasClass('active')) { jQuery('#textOverlay').removeClass('active'); + + var iNo = 0; + var src = jQuery('#frameSrc').text(); + iNo = getParameter(src, 'frameNumber'); + total = parseInt(getParameter(src, 'numberOfFrames')); + if (!iNo) { + iNo = getParameter(src, 'instanceNumber'); + total = parseInt(getParameter(src, 'images')); + } + + if (total > iNo) { + jQuery('.textOverlay').show(); + jQuery('#huDisplayPanel').hide(); + } } else { jQuery('#textOverlay').addClass('active'); + jQuery('.textOverlay').hide(); } - jQuery('.textOverlay:not(#huDisplayPanel)').toggle(); + //jQuery('.textOverlay:not(#huDisplayPanel)').toggle(); } else if(e.detail.tool==="loop") { doLoop(e.detail.isLoop); } @@ -1103,7 +1118,6 @@ } function activateMeasure(toolId) { - console.log('&&&&&&&&&&&' + toolId); if(jQuery('#tool').html()!=toolId) { disableOtherTools(toolId); enableTool(toolId); @@ -1451,6 +1465,11 @@ function doWindowing(imageData,huDisplay,wlDisplay, firstTime) { + + if (imageData['SopUID'] === undefined) { + return; + } + var rescaleSlope = parseFloat(imageData['rescaleSlope']), rescaleIntercept = parseFloat(imageData['rescaleIntercept']); windowCenter = imageData['windowCenter'],windowWidth = imageData['windowWidth']; @@ -1495,7 +1514,6 @@ // loadContextMenu(); if(evt.which==1) { - console.log('111111111'); state.drag = false; state.mouseDown = false; jQuery('.contextMenu').hide(); @@ -1513,7 +1531,6 @@ }); jQuery('#canvasLayer2').mousedown(function(evt) { - console.log('222222222'+ evt.which); // loadContextMenu(); // loadContextMenu(); @@ -1549,8 +1566,7 @@ }); jQuery('#canvasLayer2').mousemove(function(evt) { - console.log('****************'+ evt.which); - + // evt.target.style.cursor = "default"; if(evt.which==1) { jQuery('#contextmenu1').hide(); @@ -1793,7 +1809,18 @@ let zoom = document.getElementById('zoom'); canvas.addEventListener('mousedown', activateMagnifier); zoom.addEventListener('mouseup', function () { - canvas.removeEventListener('mousemove', magnify); + magnifyHandler(); + }); + + zoom.addEventListener('mouseleave', function () { + magnifyHandler(); + }); +} + +function magnifyHandler() { + let canvas = document.getElementById('canvasLayer2'); + let zoom = document.getElementById('zoom'); + canvas.removeEventListener('mousemove', magnify); zoom.removeEventListener('mousemove', magnify); zoom.style.display = 'none'; zoom.style.border = '2px solid #FF8A00'; @@ -1800,7 +1827,6 @@ zoom.style.cursor = 'none'; canvas.style.cursor = 'default'; state.drag = false; - }); } /** Modified: oviyam/oviyam/trunk/web/viewer_tools.html =================================================================== --- oviyam/oviyam/trunk/web/viewer_tools.html 2021-10-14 06:34:44 UTC (rev 18985) +++ oviyam/oviyam/trunk/web/viewer_tools.html 2021-10-21 11:58:11 UTC (rev 18986) @@ -389,6 +389,15 @@ ww: ww }); } + + function doDefaultPreset() { + var currSelFrame = getActiveFrame(); + currSelFrame = currSelFrame.contentDocumnet || currSelFrame.contentWindow.document; + var str = jQuery('#serId', currSelFrame).text(); + str = str.substring(0, str.lastIndexOf('_')); + var ser_Info = JSON.parse(sessionStorage[str]); + doPreset(ser_Info[0].windowCenter, ser_Info[0].windowWidth); + } function loop(isLoop) { createEvent('ToolSelection', { @@ -491,7 +500,7 @@ <li><a href="#" id="bone" class="cmenuItem" onclick="doPreset(480,2500); jQuery(this).addClass('selected');">Bone</a></li> <li><a href="#" id="head" class="cmenuItem" onclick="doPreset(90,350); jQuery(this).addClass('selected');">Head/Neck</a></li> <li type='separator' style="height: 2px; background-color: #00CC66;"></li> - <li><a href="#" id="defaultWin" class="selected cmenuItem" onclick="doPreset(); jQuery(this).addClass('selected');">Default</a></li> + <li><a href="#" id="defaultWin" class="selected cmenuItem" onclick="doDefaultPreset(); jQuery(this).addClass('selected');">Default</a></li> </ul> </div> <div class="toggleButton" align="center" id="zoom" onclick="doTool(this.id);"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-10-14 06:34:47
|
Revision: 18985 http://sourceforge.net/p/dcm4che/svn/18985 Author: asgarhussain Date: 2021-10-14 06:34:44 +0000 (Thu, 14 Oct 2021) Log Message: ----------- [OV-245]-Option to load only selected series of a study and other series on demand in viewer. Modified Paths: -------------- oviyam/oviyam/trunk/src/in/raster/oviyam/model/SeriesModel.java oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/SeriesServlet.java oviyam/oviyam/trunk/web/Study.jsp oviyam/oviyam/trunk/web/css/demo_table_jui.css oviyam/oviyam/trunk/web/js/viewer.js oviyam/oviyam/trunk/web/seriesDetails.jsp oviyam/oviyam/trunk/web/westContainer1.jsp Added Paths: ----------- oviyam/oviyam/trunk/src/in/raster/oviyam/SeriesDetails.java oviyam/oviyam/trunk/web/instance.jsp Added: oviyam/oviyam/trunk/src/in/raster/oviyam/SeriesDetails.java =================================================================== --- oviyam/oviyam/trunk/src/in/raster/oviyam/SeriesDetails.java (rev 0) +++ oviyam/oviyam/trunk/src/in/raster/oviyam/SeriesDetails.java 2021-10-14 06:34:44 UTC (rev 18985) @@ -0,0 +1,168 @@ +/* ***** BEGIN LICENSE BLOCK ***** +* Version: MPL 1.1/GPL 2.0/LGPL 2.1 +* +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License. +* +* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images +* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip +* +* The Initial Developer of the Original Code is +* Raster Images +* Portions created by the Initial Developer are Copyright (C) 2014 +* the Initial Developer. All Rights Reserved. +* +* Contributor(s): +* Babu Hussain A +* Devishree V +* Meer Asgar Hussain B +* Prakash J +* Suresh V +* +* Alternatively, the contents of this file may be used under the terms of +* either the GNU General Public License Version 2 or later (the "GPL"), or +* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +* in which case the provisions of the GPL or the LGPL are applicable instead +* of those above. If you wish to allow use of your version of this file only +* under the terms of either the GPL or the LGPL, and not to allow others to +* use your version of this file under the terms of the MPL, indicate your +* decision by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL or the LGPL. If you do not delete +* the provisions above, a recipient may use your version of this file under +* the terms of any one of the MPL, the GPL or the LGPL. +* +* ***** END LICENSE BLOCK ***** */ + +package in.raster.oviyam; + +import de.iftm.dcm4che.services.CDimseService; +import de.iftm.dcm4che.services.ConfigProperties; +import de.iftm.dcm4che.services.StorageService; +import in.raster.oviyam.model.SeriesModel; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.ArrayList; +import java.util.Vector; +import org.apache.log4j.Logger; +import org.dcm4che.util.DcmURL; +import java.text.ParseException; +import java.util.HashMap; +import org.dcm4che.data.Dataset; +import org.dcm4che.dict.Tags; + +/** + * + * @author asgar + */ +public class SeriesDetails { + + // Initialize Looger + private static Logger log = Logger.getLogger(SeriesDetails.class); + + //private ArrayList<SeriesModel> seriesList; + private HashMap<Integer, SeriesModel> series; + + //Constructor + public SeriesDetails() { + //seriesList = new ArrayList<SeriesModel>(); + series = new HashMap<Integer, SeriesModel>(); + } + + /** + * Queries (cFIND) the Series information from the machine (dcmProtocol://aeTitle@hostname:port + * @param patientID + * @param studyInstanceUID + */ + public void callFindWithQuery(String patientID, String studyInstanceUID, String seriesInstanceUID, String dcmURL) { + + ConfigProperties cfgProperties; + boolean isOpen; + Vector dsVector; + CDimseService cDimseService; + + try { + cfgProperties = new ConfigProperties(StorageService.class.getResource("/resources/Series.cfg")); + } catch(IOException ioe) { + log.error("Error while loading configuration properties"); + return; + } + + DcmURL url = new DcmURL(dcmURL); + + cfgProperties.put("key.PatientID", patientID); + cfgProperties.put("key.StudyInstanceUID", studyInstanceUID); + + if(seriesInstanceUID != null && seriesInstanceUID.length() > 0) { + cfgProperties.put("key.SeriesInstanceUID", seriesInstanceUID); + } + + try { + cDimseService = new CDimseService(cfgProperties, url); + } catch(ParseException pe) { + log.error("Unable to create instance of CDimseService", pe); + return; + } + + // Open association + try { + isOpen = cDimseService.aASSOCIATE(); + if(!isOpen) { + return; + } + } catch(IOException ioe) { + log.error("Error while opening association ", ioe); + return; + } catch(GeneralSecurityException gse) { + log.error("Error while opeing association ", gse); + return; + } + + //query result using cFIND + try { + dsVector = cDimseService.cFIND(); + } catch(Exception e) { + log.error("Error while querying... ", e); + return; + } + + // Get the Dataset from the dsVector and add it to the seriesList + for(int i=0; i<dsVector.size(); i++) { + try { + Dataset dataSet = (Dataset) dsVector.elementAt(i); + if(!dataSet.getString(Tags.Modality).equals("PR")) { + //Create the SeriesModel instance and adds it to the seriesList + SeriesModel sm = new SeriesModel(dataSet); + series.put(i, sm); + } + } catch(Exception e) { + log.error("Error while adding SeriesModel in HashMap series ", e); + return; + } + } + + //close association + try { + cDimseService.aRELEASE(true); + } catch(IOException e) { + log.error("Error while releasing association ", e); + } catch(InterruptedException ie) { + log.error("Error while releasing association ", ie); + } + } + + /** + * It returns the collections of SeriesModel. + * @returns ArrayList<SeriesModel> + */ + public ArrayList<SeriesModel> getSeriesList() { + return new ArrayList<SeriesModel>(series.values()); + } + +} \ No newline at end of file Modified: oviyam/oviyam/trunk/src/in/raster/oviyam/model/SeriesModel.java =================================================================== --- oviyam/oviyam/trunk/src/in/raster/oviyam/model/SeriesModel.java 2021-10-04 06:06:42 UTC (rev 18984) +++ oviyam/oviyam/trunk/src/in/raster/oviyam/model/SeriesModel.java 2021-10-14 06:34:44 UTC (rev 18985) @@ -46,6 +46,7 @@ package in.raster.oviyam.model; import java.io.Serializable; +import java.util.Calendar; import org.dcm4che.data.Dataset; import org.dcm4che.dict.Tags; @@ -70,8 +71,13 @@ private String numberOfInstances; private String bodyPartExamined; private String studyDescription; + private String patientName; + private String patientGender; + private String refPhysicianName; + private String studyDate; + private Calendar parsedDate = null; + private String numberOfSeries; - //Constructor /** * Used to create a instance of SeriesModel. @@ -82,11 +88,17 @@ setSeriesNumber(ds.getString(Tags.SeriesNumber)); setSeriesDate(ds.getString(Tags.SeriesDate)); setSeriesTime(ds.getString(Tags.SeriesTime)); - setSeriesDescription(ds.getString(Tags.SeriesDescription)); - setStudyDescription(ds.getString(Tags.StudyDescription)); + setSeriesDescription(ds.getString(Tags.SeriesDescription)!=null? strSanitizer(ds.getString(Tags.SeriesDescription)) : "[No series description]"); + setStudyDescription(ds.getString(Tags.StudyDescription) != null ? strSanitizer(ds.getString(Tags.StudyDescription)) : "[No study description]"); setModality(ds.getString(Tags.Modality)); setNumberOfInstances(ds.getString(Tags.NumberOfSeriesRelatedInstances)); setBodyPartExamined(ds.getString(Tags.BodyPartExamined)); + setPatientName(ds.getString(Tags.PatientName)); + setPatientGender(ds.getString(Tags.PatientSex)); + setRefPhysicianName(ds.getString(Tags.ReferringPhysicianName)); + setStudyDate(ds.getString(Tags.StudyDate)); + setParsedDate(); + setNumberOfSeries(ds.getString(Tags.NumberOfStudyRelatedSeries) !=null ? ds.getString(Tags.NumberOfStudyRelatedSeries) : ""); } public SeriesModel(){ @@ -200,4 +212,105 @@ this.bodyPartExamined = bodyPart; } + /** + * Getter for property patientName + * @return Value of property patientName + */ + public String getPatientName() { + return patientName; + } + + public void setPatientName(String patientName) { + this.patientName = patientName; + } + + /** + * Getter for property refPhysicianName + * @return Value of property refPhysicianName + */ + + public String getRefPhysicianName() { + return refPhysicianName; + } + + public void setRefPhysicianName(String refPhysicianName) { + this.refPhysicianName = refPhysicianName; + } + + /** + * Getter for property studyDate + * @param studyDate Value of property studyDate + */ + public void setStudyDate(String studyDate) { + this.studyDate = studyDate; + } + + public String getStudyDate() { + return studyDate != null ? studyDate : "[No study date]"; + } + + /** + * Getter for property patientGender + * @return Value of property patientGender + */ + public String getPatientGender() { + return patientGender; + } + + public void setPatientGender(String patientGender) { + this.patientGender = patientGender; + } + + /** + * Getter for property parsedDate + * @return Value of property parsedDate + */ + public Calendar getParsedDate() { + return parsedDate; + } + + public void setParsedDate() { + parsedDate = Calendar.getInstance(); + + if (studyDate != null && !studyDate.contains("[No study date]")) { + try { + + String studyDate = this.studyDate.replace("-","").replace(":", "").replace(" ", "").replace(".", ""); + + parsedDate.set(Integer.parseInt(studyDate.substring(0, 4)), + Integer.parseInt(studyDate.substring(4, 6)) - 1, + Integer.parseInt(studyDate.substring(6, 8))); + } catch (Exception ex) { + ex.printStackTrace(); + parsedDate = null; + } + } else { + parsedDate = null; + } + } + + /** + * Getter for property numberOfSeries + * @return Value of property numberOfSeries + */ + public String getNumberOfSeries() { + return numberOfSeries; + } + + public void setNumberOfSeries(String numberOfSeries) { + this.numberOfSeries = numberOfSeries; + } + + /** + * Used to remove or replace the unwanted characters from the string + * + * @param value + * @return string + */ + private String strSanitizer(String value) { + value = value.replace("^", " "); + value = value.replaceAll("\'", "\\\\\'"); + return value; + } + } \ No newline at end of file Modified: oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java =================================================================== --- oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java 2021-10-04 06:06:42 UTC (rev 18984) +++ oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java 2021-10-14 06:34:44 UTC (rev 18985) @@ -154,7 +154,8 @@ if(totalStudies == 1) { StudyModel sm = (StudyModel) studiesList.get(0); forwardUrl = "viewer.html?" + "patientID=" + sm.getPatientID() - + "&studyUID=" + sm.getStudyInstanceUID(); + + "&studyUID=" + sm.getStudyInstanceUID() + + "&serverName=" + serverName; } else if(totalStudies > 1) { forwardUrl = "studyList.jsp?"; Modified: oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/SeriesServlet.java =================================================================== --- oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/SeriesServlet.java 2021-10-04 06:06:42 UTC (rev 18984) +++ oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/SeriesServlet.java 2021-10-14 06:34:44 UTC (rev 18985) @@ -1,61 +1,69 @@ /* ***** BEGIN LICENSE BLOCK ***** -* Version: MPL 1.1/GPL 2.0/LGPL 2.1 -* -* The contents of this file are subject to the Mozilla Public License Version -* 1.1 (the "License"); you may not use this file except in compliance with -* the License. You may obtain a copy of the License at -* http://www.mozilla.org/MPL/ -* -* Software distributed under the License is distributed on an "AS IS" basis, -* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -* for the specific language governing rights and limitations under the -* License. -* -* The Original Code is part of Oviyam, an web viewer for DICOM(TM) images -* hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip -* -* The Initial Developer of the Original Code is -* Raster Images -* Portions created by the Initial Developer are Copyright (C) 2014 -* the Initial Developer. All Rights Reserved. -* -* Contributor(s): -* Babu Hussain A -* Devishree V -* Meer Asgar Hussain B -* Prakash J -* Suresh V -* -* Alternatively, the contents of this file may be used under the terms of -* either the GNU General Public License Version 2 or later (the "GPL"), or -* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -* in which case the provisions of the GPL or the LGPL are applicable instead -* of those above. If you wish to allow use of your version of this file only -* under the terms of either the GPL or the LGPL, and not to allow others to -* use your version of this file under the terms of the MPL, indicate your -* decision by deleting the provisions above and replace them with the notice -* and other provisions required by the GPL or the LGPL. If you do not delete -* the provisions above, a recipient may use your version of this file under -* the terms of any one of the MPL, the GPL or the LGPL. -* -* ***** END LICENSE BLOCK ***** */ + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is part of Oviyam, an web viewer for DICOM(TM) images + * hosted at http://skshospital.net/pacs/webviewer/oviyam_0.6-src.zip + * + * The Initial Developer of the Original Code is + * Raster Images + * Portions created by the Initial Developer are Copyright (C) 2014 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Babu Hussain A + * Devishree V + * Meer Asgar Hussain B + * Prakash J + * Suresh V + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ package in.raster.oviyam.servlet; -import in.raster.oviyam.SeriesInfo; +import in.raster.oviyam.SeriesDetails; import in.raster.oviyam.model.SeriesModel; import in.raster.oviyam.util.SeriesComparator; +import in.raster.oviyam.xml.handler.LanguageHandler; +import in.raster.oviyam.xml.handler.ListenerHandler; +import in.raster.oviyam.xml.handler.ServerHandler; +import in.raster.oviyam.xml.handler.XMLFileHandler; +import in.raster.oviyam.xml.model.Server; +import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.log4j.Logger; -import org.json.JSONArray; +import org.json.JSONException; import org.json.JSONObject; /** @@ -63,73 +71,133 @@ * @author asgar */ public class SeriesServlet extends HttpServlet { - - /** + + private static final long serialVersionUID = 1L; + + // Initialize the Logger. + private static Logger log = Logger.getLogger(SeriesServlet.class); + + // <editor-fold defaultstate="collapsed" + // desc="HttpServlet methods. Click on the + sign on the left to edit the code."> + /** + * Handles the HTTP <code>GET</code> method. * + * @param request + * servlet request + * @param response + * servlet response + * @throws ServletException + * if a servlet-specific error occurs + * @throws IOException + * if an I/O error occurs */ - private static final long serialVersionUID = 1L; - //Initialize the Logger. - private static Logger log = Logger.getLogger(SeriesServlet.class); + @Override + protected void doGet(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { + String patID = request.getParameter("patientID"); + String studyUID = request.getParameter("studyUID"); + String seriesUID = request.getParameter("seriesUID"); + String serverName = request.getParameter("serverName"); - // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code."> - /** - * Handles the HTTP <code>GET</code> method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String patID = request.getParameter("patientID"); - String studyUID = request.getParameter("studyUID"); - String dcmURL = request.getParameter("dcmURL"); - - SeriesInfo series = new SeriesInfo(); + SeriesDetails series = new SeriesDetails(); - series.callFindWithQuery(patID, studyUID, dcmURL); - ArrayList<SeriesModel> seriesList = series.getSeriesList(); - Collections.sort(seriesList, new SeriesComparator()); + if (LanguageHandler.source == null) { + File tempDir = (File) getServletContext().getAttribute( + "javax.servlet.context.tempdir"); + LanguageHandler.source = new File( + new XMLFileHandler().getXMLFilePath(tempDir.getParent())); + } - JSONArray jsonArray = new JSONArray(); - JSONObject jsonObj = null; + ServerHandler sh = new ServerHandler(); + Server server = null; + if (serverName != null && !serverName.isEmpty()) { + server = sh.findServerByName(serverName); + } else { + server = sh.findServerByName(""); + } - try { - for(int i=0; i<seriesList.size(); i++) { - SeriesModel sm = (SeriesModel) seriesList.get(i); - jsonObj = new JSONObject(); - jsonObj.put("seriesUID", sm.getSeriesIUID()); - jsonObj.put("seriesNumber", sm.getSeriesNumber()); - jsonObj.put("modality", sm.getModality()); - jsonObj.put("seriesDesc", sm.getSeriesDescription()); - jsonObj.put("bodyPart", sm.getBodyPartExamined()); - jsonObj.put("totalInstances", sm.getNumberOfInstances()); - jsonObj.put("patientId", patID); - jsonObj.put("studyUID", studyUID); + PrintWriter out = response.getWriter(); + JSONObject jsonObj = new JSONObject(); - jsonArray.put(jsonObj); + if (server != null) { + // Get calling aet + ListenerHandler lh = new ListenerHandler(); + String callingAET = lh.getListener().getAetitle(); + if (!(callingAET != null && callingAET.length() > 0)) { + callingAET = "OVIYAM2"; + } + String dcmURL = "DICOM://" + server.getAetitle() + ":" + callingAET + + "@" + server.getHostname() + ":" + server.getPort(); + + String serverURL = ""; + + if(server.getRetrieve().equals("WADO")) { + serverURL = "http://" + server.getHostname() + ":" + server.getWadoport() + "/" + server.getWadocontext(); + } else { + serverURL = server.getRetrieve(); } + + String imageType = "jpeg"; + if(server.getImageType()!=null) { + imageType = server.getImageType().toLowerCase(); + } + + series.callFindWithQuery(patID, studyUID, seriesUID, dcmURL); + + ArrayList<SeriesModel> seriesList = series.getSeriesList(); + Collections.sort(seriesList, new SeriesComparator()); + + try { + for (int i = 0; i < seriesList.size(); i++) { + SeriesModel sm = (SeriesModel) seriesList.get(i); + jsonObj.put("seriesUID", sm.getSeriesIUID()); + jsonObj.put("seriesNumber", sm.getSeriesNumber()); + jsonObj.put("modality", sm.getModality()); + jsonObj.put("seriesDesc", sm.getSeriesDescription()); + jsonObj.put("totalSeries", sm.getNumberOfSeries()); + jsonObj.put("bodyPart", sm.getBodyPartExamined()); + jsonObj.put("totalIns", sm.getNumberOfInstances()); + jsonObj.put("pat_ID", patID); + jsonObj.put("pat_Name", sm.getPatientName()); + jsonObj.put("pat_gender", sm.getPatientGender()); + jsonObj.put("studyUID", studyUID); + jsonObj.put("studyDesc", sm.getStudyDescription()); + jsonObj.put("studyDate", sm.getStudyDate()); + jsonObj.put("refPhysician", sm.getRefPhysicianName()); + jsonObj.put("dicomURL", dcmURL); + jsonObj.put("serverURL", serverURL); + jsonObj.put("imgType", imageType); + jsonObj.put("bgColor", "rgb(0, 0, 0)"); + } + } catch (Exception ex) { + log.error(ex.toString()); + } + } else { + try { + jsonObj.put("error", "Server not found"); + } catch (JSONException ex) { + log.error(ex); + } + } + out.print(jsonObj); + } - PrintWriter out = response.getWriter(); - out.print(jsonArray); - out.close(); - } catch (Exception ex) { - log.error(ex.toString()); - } + /** + * Handles the HTTP <code>POST</code> method. + * + * @param request + * servlet request + * @param response + * servlet response + * @throws ServletException + * if a servlet-specific error occurs + * @throws IOException + * if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { + doGet(request, response); + } - } - - /** - * Handles the HTTP <code>POST</code> method. - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - doGet(request, response); - } - } \ No newline at end of file Modified: oviyam/oviyam/trunk/web/Study.jsp =================================================================== --- oviyam/oviyam/trunk/web/Study.jsp 2021-10-04 06:06:42 UTC (rev 18984) +++ oviyam/oviyam/trunk/web/Study.jsp 2021-10-14 06:34:44 UTC (rev 18985) @@ -48,520 +48,436 @@ <%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false"%> - <%@page errorPage="ErrorPage.jsp"%> - <%@taglib prefix="ser" uri="/WEB-INF/tlds/SeriesDetails.tld"%> - <%@taglib prefix="img" uri="/WEB-INF/tlds/ImageInfo.tld"%> - <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> - <%@ page import="java.net.URLDecoder"%> - <% - String studyDesc = request.getParameter("studyDesc"); - studyDesc = URLDecoder.decode(studyDesc,"UTF-8"); - %> - <html> +<%@page errorPage="ErrorPage.jsp"%> +<%@taglib prefix="ser" uri="/WEB-INF/tlds/SeriesDetails.tld"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ page import="java.net.URLDecoder"%> +<% + String studyDesc = request.getParameter("studyDesc"); + studyDesc = URLDecoder.decode(studyDesc, "UTF-8"); +%> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<style type="text/css"> +.not-selected-btn { + border: 1px solid #FF8A00; + padding: 5px 10px; + width: auto; + display: inline-block; + float: left; + cursor: pointer; +} - <head> - <script type="text/javascript"> - var series = new Array(); - var studyId = '${param.study}'; - - $(document).ready(function() { - $($('.image').get(0)).load(function() { - $($('.image').get(0)).click(); - }); +.error-test { + width: 32% !important; + height: 70px; +} +</style> - jQuery('.other').each(function() { - $(this).attr('src', $(this).attr('link')); - }); +<script type="text/javascript"> + var series = new Array(); + var studyId = '${param.study}'; + + $(document).ready(function() { + $($('.image').get(0)).load(function() { + $($('.image').get(0)).click(); + }); - jQuery('.other_multiframe').each(function() { - $(this).attr('src', $(this).attr('link')); - }); + jQuery('.other').each(function() { + $(this).attr('src', $(this).attr('link')); + }); - var lastImg = $('.other').last(); - if (lastImg.length == 0) { // All images are Multiframe - lastImg = $('.other_multiframe').last(); - if (lastImg.length == 0) { - lastImg = $('.image').last(); - } - } + jQuery('.other_multiframe').each(function() { + $(this).attr('src', $(this).attr('link')); + }); - setTimeout(() => { - if ($("#otherStudies").children().length == 0) { - fetchOtherStudies(); - } - }, 2000); + var lastImg = $('.other').last(); + if (lastImg.length == 0) { // All images are Multiframe + lastImg = $('.other_multiframe').last(); + if (lastImg.length == 0) { + lastImg = $('.image').last(); + } + } - setTimeout(() => { - if ($("#otherStudies").children().length == 1) { - $( ".selectedStudy" ).css("max-height","60vh" ); - } else if ($("#otherStudies").children().length == 2) { - $( ".selectedStudy" ).css("max-height", "60vh" ); - } else if ($("#otherStudies").children().length == 3) { - $( ".selectedStudy" ).css("max-height", "56vh" ); - } else if ($("#otherStudies").children().length == 4) { - $( ".selectedStudy" ).css("max-height", "49vh" ); - } else if ($("#otherStudies").children().length >= 5) { - $( ".selectedStudy" ).css("max-height", "46vh" ); - } else { - $( ".selectedStudy" ).css("max-height", "74vh" ); - } - }, 3000); - }); //document.ready + setTimeout(() => { + if ($("#otherStudies").children().length == 0) { + fetchOtherStudies(); + } + }, 2000); - $(document).mouseup(function(e) { - createEvent("ToolSelection", { - tool: "mouseup" - }); - }); + setTimeout(() => { + if ($("#otherStudies").children().length == 1) { + $( ".selectedStudy" ).css("max-height","60vh" ); + } else if ($("#otherStudies").children().length == 2) { + $( ".selectedStudy" ).css("max-height", "60vh" ); + } else if ($("#otherStudies").children().length == 3) { + $( ".selectedStudy" ).css("max-height", "56vh" ); + } else if ($("#otherStudies").children().length == 4) { + $( ".selectedStudy" ).css("max-height", "49vh" ); + } else if ($("#otherStudies").children().length >= 5) { + $( ".selectedStudy" ).css("max-height", "46vh" ); + } else { + $( ".selectedStudy" ).css("max-height", "74vh" ); + } + }, 3000); + }); //document.ready - function changeImgView(but) { - var imgBut = $(but).attr('src'); - var imgCount = 0; + $(document).mouseup(function(e) { + createEvent("ToolSelection", { + tool: "mouseup" + }); + }); - if (imgBut.indexOf("all.png") >= 0) { - $(but).attr('src', 'images/one.png'); + function changeImgView(but) { + var imgBut = $(but).attr('src'); + var imgCount = 0; - $(but).parent().prev().children().each(function() { - if (imgCount == 0) { - $(this).css('background-color', '#00F'); - } else { - $(this).css('background-color', !$(this).hasClass('waiting') ? '#a6a6a6' : '#464646'); - } - imgCount++; - }); + if (imgBut.indexOf("all.png") >= 0) { + $(but).attr('src', 'images/one.png'); - imgCount = 0; - var seriesId = $(but).attr("name"); - seriesId = seriesId.substring(0, seriesId.indexOf("|") - 1); - seriesId = seriesId.replace(/\./g, '_') + "_table"; + $(but).parent().prev().children().each(function() { + if (imgCount == 0) { + $(this).css('background-color', '#00F'); + } else { + $(this).css('background-color', !$(this).hasClass('waiting') ? '#a6a6a6' : '#464646'); + } + imgCount++; + }); - $("#" + seriesId + " tr:last").children().children().each(function() { - if (imgCount == 0) { - $(this).css('display', 'inline'); - } else { - $(this).css('display', 'none'); - } - imgCount++; - }); - } else if (imgBut.indexOf("one.png") >= 0) { - $(but).attr('src', 'images/three.png'); - var serDivs = $(but).parent().prev().children(); - var totserDivs = serDivs.length; - serDivs.each(function() { - if (imgCount == 0 || imgCount == Math.round(totserDivs / 2) - 1 || imgCount == totserDivs - 1) { - $(this).css('background-color', '#00F'); - } else { - $(this).css('background-color', !$(this).hasClass('waiting') ? '#a6a6a6' : '#464646'); - } - imgCount++; - }); + imgCount = 0; + var seriesId = $(but).attr("name"); + seriesId = seriesId.substring(0, seriesId.indexOf("|") - 1); + seriesId = seriesId.replace(/\./g, '_') + "_table"; - imgCount = 0; - var seriesId = $(but).attr("name"); - seriesId = seriesId.substring(0, seriesId.indexOf("|") - 1); - seriesId = seriesId.replace(/\./g, '_') + "_table"; + $("#" + seriesId + " tr:last").children().children().each(function() { + if (imgCount == 0) { + $(this).css('display', 'inline'); + } else { + $(this).css('display', 'none'); + } + imgCount++; + }); + } else if (imgBut.indexOf("one.png") >= 0) { + $(but).attr('src', 'images/three.png'); + var serDivs = $(but).parent().prev().children(); + var totserDivs = serDivs.length; + serDivs.each(function() { + if (imgCount == 0 || imgCount == Math.round(totserDivs / 2) - 1 || imgCount == totserDivs - 1) { + $(this).css('background-color', '#00F'); + } else { + $(this).css('background-color', !$(this).hasClass('waiting') ? '#a6a6a6' : '#464646'); + } + imgCount++; + }); - var serImgs = $("#" + seriesId + " tr:last").children().children(); - var serInsCnt = serImgs.length; + imgCount = 0; + var seriesId = $(but).attr("name"); + seriesId = seriesId.substring(0, seriesId.indexOf("|") - 1); + seriesId = seriesId.replace(/\./g, '_') + "_table"; - serImgs.each(function() { - if (imgCount == 0 || imgCount == Math.round(serInsCnt / 2) - 1 || imgCount == serInsCnt - 1) { - $(this).css('display', 'inline'); - } else { - $(this).css('display', 'none'); - } - imgCount++; - }); - } else { - $(but).attr('src', 'images/all.png'); + var serImgs = $("#" + seriesId + " tr:last").children().children(); + var serInsCnt = serImgs.length; - $(but).parent().prev().children().each(function() { - $(this).css('background-color', !$(this).hasClass('waiting') ? '#00F' : '#464646'); - }); + serImgs.each(function() { + if (imgCount == 0 || imgCount == Math.round(serInsCnt / 2) - 1 || imgCount == serInsCnt - 1) { + $(this).css('display', 'inline'); + } else { + $(this).css('display', 'none'); + } + imgCount++; + }); + } else { + $(but).attr('src', 'images/all.png'); - var seriesId = $(but).attr("name"); - seriesId = seriesId.substring(0, seriesId.indexOf("|") - 1); - seriesId = seriesId.replace(/\./g, '_') + "_table"; + $(but).parent().prev().children().each(function() { + $(this).css('background-color', !$(this).hasClass('waiting') ? '#00F' : '#464646'); + }); - $("#" + seriesId + " tr:last").children().children().each(function() { - $(this).css('display', 'inline'); - }); - } - } + var seriesId = $(but).attr("name"); + seriesId = seriesId.substring(0, seriesId.indexOf("|") - 1); + seriesId = seriesId.replace(/\./g, '_') + "_table"; - function changeSeries(image) { - var imgSrc = image.src; + $("#" + seriesId + " tr:last").children().children().each(function() { + $(this).css('display', 'inline'); + }); + } + } - if (imgSrc.indexOf('images/SR_Latest.png') > 0) { - imgSrc = jQuery(image).attr('imgSrc'); - } + function changeSeries(image) { + var imgSrc = image.src; - if (imgSrc.indexOf('images/pdf.png') > 0) { - imgSrc = jQuery(image).attr('imgSrc'); - } + if (imgSrc.indexOf('images/SR_Latest.png') > 0) { + imgSrc = jQuery(image).attr('imgSrc'); + } - parent.selectedFrame = null; //For IE - var iFrame = window.parent.document.getElementsByTagName('iframe'); + if (imgSrc.indexOf('images/pdf.png') > 0) { + imgSrc = jQuery(image).attr('imgSrc'); + } - if (iFrame.length > 1 && $(iFrame[0]).attr('src').indexOf('TileContent.html') >= 0) { - var total = getTotalInstance(image); - var currSer = getCurrentSeries(image); - var selectedSeriesData = getSelectedSeries(currSer, studyId); + parent.selectedFrame = null; //For IE + var iFrame = window.parent.document.getElementsByTagName('iframe'); - var divElement = window.parent.document.getElementById('tabs_div'); + if (iFrame.length > 1 && $(iFrame[0]).attr('src').indexOf('TileContent.html') >= 0) { + var total = getTotalInstance(image); + var currSer = getCurrentSeries(image); + var selectedSeriesData = getSelectedSeries(currSer, studyId); - var rowIndex = 0; - var colIndex = 0; + var divElement = window.parent.document.getElementById('tabs_div'); - if (!(image.src.indexOf('images/pdf.png') > 0 || image.src.indexOf('images/SR_Latest.png') > 0)) { - rowIndex = jQuery('#totRow', window.parent.document).text(); - colIndex = jQuery('#totColumn', window.parent.document).text(); - } - if (total == 1)(rowIndex = 0, colIndex = 0); + var rowIndex = 0; + var colIndex = 0; - var cnt = image.name - 1; - var totFrame = ((parseInt(rowIndex) + 1) * (parseInt(colIndex) + 1)); - jQuery('#selectedFrame', window.parent.document).text(cnt); - if ((cnt + 1) == total || cnt > (total - totFrame)) { - cnt = total - totFrame; - } - if (cnt < 0) cnt = 0; + if (!(image.src.indexOf('images/pdf.png') > 0 || image.src.indexOf('images/SR_Latest.png') > 0)) { + rowIndex = jQuery('#totRow', window.parent.document).text(); + colIndex = jQuery('#totColumn', window.parent.document).text(); + } + if (total == 1)(rowIndex = 0, colIndex = 0); - var ser_Info = JSON.parse(sessionStorage[currSer]); - ser_Info = ser_Info[0]; - var multiframe = ser_Info['multiframe']; - - divContent = '<table width="100%" height="100%" cellspacing="2" cellpadding="0" border="0" >'; - var count = 0; - for (x = 0; x <= rowIndex; x++) { - divContent += '<tr>'; - for (y = 0; y <= colIndex; y++) { - cnt = cnt % total; - count++; - divContent += '<td><iframe id="frame' + cnt; - divContent += '" height="100%" width="100%" frameBorder="0" scrolling="yes" '; - if (total >= count) { - divContent += 'src="TileContent.html?serverURL=' + window.parent.pat.serverURL + 'study=' + studyId + '&series=' + currSer + - '&object=' + ser_Info['SopUID'] + '&sopClassUID=' + ser_Info['SopClassUID'] + '&seriesDesc=' + selectedSeriesData['seriesDesc'] + - '&images=' + selectedSeriesData['totalInstances'] + '&modality=' + selectedSeriesData['modality']; - divContent += '&contentType=image/jpeg' + '&instanceNumber='; - if (multiframe) { - divContent += '0&numberOfFrames=' + ser_Info['numberOfFrames'] + '&frameNumber=' + cnt; - } else { - divContent += cnt; - } - divContent += '" style="background:#000; visibility: hidden;"></iframe></td>'; - } else { - divContent += ' ' + 'style="background:#000" src ="TileContent.html?study=' + studyId + '"></iframe></td>'; - } - cnt++; - } - divContent += '</tr>'; - } - divContent += '</table>'; - divElement.innerHTML = divContent; - } else { - var url = 'frameContent.html?'; - url += imgSrc.substring(imgSrc.indexOf('?') + 1); - url += '&instanceNumber=' + parseInt(image.name - 1); - - var actFrame = getActiveFrame(); - $(actFrame).css("visibility", "hidden"); - jQuery('#loadingView', window.parent.document).show(); - actFrame.src = url; - $('.toggleOff').removeClass('toggleOff'); - $('.imgOn').addClass('imgOff').removeClass('imgOn'); - } - } - - function getTotalInstance(image) { - var imgID = ''; - imgID = image.id; - imgID = imgID.substring(0, imgID.lastIndexOf('_')); - var table = imgID + "_table"; + var cnt = image.name - 1; + var totFrame = ((parseInt(rowIndex) + 1) * (parseInt(colIndex) + 1)); + jQuery('#selectedFrame', window.parent.document).text(cnt); + if ((cnt + 1) == total || cnt > (total - totFrame)) { + cnt = total - totFrame; + } + if (cnt < 0) cnt = 0; - var totalImg = $('#' + table).find('#totalImgs').text(); - totalImg = totalImg.substring(0, totalImg.lastIndexOf(' ')); - var total = parseInt(totalImg); - return total; - } + var ser_Info = JSON.parse(sessionStorage[currSer]); + ser_Info = ser_Info[0]; + var multiframe = ser_Info['multiframe']; + + divContent = '<table width="100%" height="100%" cellspacing="2" cellpadding="0" border="0" >'; + var count = 0; + for (x = 0; x <= rowIndex; x++) { + divContent += '<tr>'; + for (y = 0; y <= colIndex; y++) { + cnt = cnt % total; + count++; + divContent += '<td><iframe id="frame' + cnt; + divContent += '" height="100%" width="100%" frameBorder="0" scrolling="yes" '; + if (total >= count) { + divContent += 'src="TileContent.html?serverURL=' + window.parent.pat.serverURL + 'study=' + studyId + '&series=' + currSer + + '&object=' + ser_Info['SopUID'] + '&sopClassUID=' + ser_Info['SopClassUID'] + '&seriesDesc=' + selectedSeriesData['seriesDesc'] + + '&images=' + selectedSeriesData['totalInstances'] + '&modality=' + selectedSeriesData['modality']; + divContent += '&contentType=image/jpeg' + '&instanceNumber='; + if (multiframe) { + divContent += '0&numberOfFrames=' + ser_Info['numberOfFrames'] + '&frameNumber=' + cnt; + } else { + divContent += cnt; + } + divContent += '" style="background:#000; visibility: hidden;"></iframe></td>'; + } else { + divContent += ' ' + 'style="background:#000" src ="TileContent.html?study=' + studyId + '"></iframe></td>'; + } + cnt++; + } + divContent += '</tr>'; + } + divContent += '</table>'; + divElement.innerHTML = divContent; + } else { + var url = 'frameContent.html?'; + url += imgSrc.substring(imgSrc.indexOf('?') + 1); + url += '&instanceNumber=' + parseInt(image.name - 1); - function getCurrentSeries(image) { - var imgID = ''; - imgID = image.id; - imgID = imgID.substring(0, imgID.lastIndexOf('_')); - var seriesID = imgID.replace(/_/g, '\.') - return (seriesID); - } + var actFrame = getActiveFrame(); + $(actFrame).css("visibility", "hidden"); + jQuery('#loadingView', window.parent.document).show(); + actFrame.src = url; + $('.toggleOff').removeClass('toggleOff'); + $('.imgOn').addClass('imgOff').removeClass('imgOn'); + } + } + + function getTotalInstance(image) { + var imgID = ''; + imgID = image.id; + imgID = imgID.substring(0, imgID.lastIndexOf('_')); + var table = imgID + "_table"; - var selectedFrame; + var totalImg = $('#' + table).find('#totalImgs').text(); + totalImg = totalImg.substring(0, totalImg.lastIndexOf(' ')); + var total = parseInt(totalImg); + return total; + } - function clearSelectedFrames() { - var frames = jQuery(parent.document).find('iframe'); - for (var k = 0; k < frames.length; k++) { - if (jQuery(frames[k]).contents().find('body').css('border-top-color') == 'rgb(255, 138, 0)') { - selectedFrame = frames[k]; - } - jQuery(frames[k]).contents().find('body').css('border', 'none'); - } - } + function getCurrentSeries(image) { + var imgID = ''; + imgID = image.id; + imgID = imgID.substring(0, imgID.lastIndexOf('_')); + var seriesID = imgID.replace(/_/g, '\.') + return (seriesID); + } - function changeOnDrag(image) { - var actFrame = getActiveFrame(); - if (actFrame != null && actFrame != undefined) { - changeSeries(image); - } else { - jQuery(selectedFrame).contents().find('body').css('border', '1px solid rgb(255, 138, 0)'); - } - } + var selectedFrame; - function showRawDataAlert() { - jAlert('Raw data storage cannot be shown in viewer!', 'ERROR'); - } + function clearSelectedFrames() { + var frames = jQuery(parent.document).find('iframe'); + for (var k = 0; k < frames.length; k++) { + if (jQuery(frames[k]).contents().find('body').css('border-top-color') == 'rgb(255, 138, 0)') { + selectedFrame = frames[k]; + } + jQuery(frames[k]).contents().find('body').css('border', 'none'); + } + } - function showProgress(ser_id, lbl_id) { - var lbl = jQuery('#' + ser_id.replace(/\./g, '-') + "_" + lbl_id); - var imgToggleMode = jQuery(lbl).parent().next().find('img').attr('src'); - if (imgToggleMode == "images/three.png" || imgToggleMode == "images/one.png") { - lbl.css('background', '#a6a6a6'); - } else { - lbl.css('background', '#00F'); - } - lbl.removeClass('waiting'); - } + function changeOnDrag(image) { + var actFrame = getActiveFrame(); + if (actFrame != null && actFrame != undefined) { + changeSeries(image); + } else { + jQuery(selectedFrame).contents().find('body').css('border', '1px solid rgb(255, 138, 0)'); + } + } + function showRawDataAlert() { + jAlert('Raw data storage cannot be shown in viewer!', 'ERROR'); + } - - </script> - <style type="text/css"> - .error-test{ - width: 32%!important; - height: 70px; - } - </style> - </head> + function showProgress(ser_id, lbl_id) { + var lbl = jQuery('#' + ser_id.replace(/\./g, '-') + "_" + lbl_id); + var imgToggleMode = jQuery(lbl).parent().next().find('img').attr('src'); + if (imgToggleMode == "images/three.png" || imgToggleMode == "images/one.png") { + lbl.css('background', '#a6a6a6'); + } else { + lbl.css('background', '#00F'); + } + lbl.removeClass('waiting'); + } + </script> +</head> +<body> + <c:if test="${param.descDisplay=='true'}"> + <div id='${param.study}' class="accordion open" title="${tooltip}" + onclick="acc(jQuery(this));">${param.modality} + - + <%=studyDesc%></div> + </c:if> + <div class="scrollable selectedStudy" + style="overflow-x: hidden; overflow-y: auto; width: 100%; margin-bottom: 2%; height: auto;"> - <body> - <c:if test="${param.descDisplay=='true'}"> - <div id='${param.study}' class="accordion open" title="${tooltip}" onclick="acc(jQuery(this));">${param.modality} - <%=studyDesc%></div> - </c:if> - <div class="scrollable selectedStudy" style="overflow-x: hidden; overflow-y: auto; width:100%; margin-bottom: 2%; height: auto;"> - <ser:Series patientId="${param.patient}" study="${param.study}" dcmURL="${param.dcmURL}" serverURL="${param.wadoUrl}"> - <c:set var="middle" value="${(numberOfImages+0.5)/2}" /> - <fmt:formatNumber var="middle" maxFractionDigits="0" value="${middle}" /> - <fmt:parseNumber var="total" type="number" value="${numberOfImages}" /> + <c:choose> + <c:when test="${param.previewmode=='single'}"> + <ser:Series patientId="${param.patient}" study="${param.study}" + dcmURL="${param.dcmURL}" serverURL="${param.wadoUrl}"> + <script type="text/javascript"> + series.push({ + "seriesUID": '${seriesId}', + "totalInstances": '${numberOfImages}', + "seriesDesc": '${seriesDesc}', + ... [truncated message content] |
From: <asg...@us...> - 2021-10-04 06:06:43
|
Revision: 18984 http://sourceforge.net/p/dcm4che/svn/18984 Author: asgarhussain Date: 2021-10-04 06:06:42 +0000 (Mon, 04 Oct 2021) Log Message: ----------- [OV-244] Scrolling is not working in image tiling layout - Resolved. Modified Paths: -------------- oviyam/oviyam/trunk/web/TileContent.html oviyam/oviyam/trunk/web/js/TileContent.js Modified: oviyam/oviyam/trunk/web/TileContent.html =================================================================== --- oviyam/oviyam/trunk/web/TileContent.html 2021-09-30 12:52:22 UTC (rev 18983) +++ oviyam/oviyam/trunk/web/TileContent.html 2021-10-04 06:06:42 UTC (rev 18984) @@ -25,8 +25,8 @@ <script type="text/javascript" src="js/dicom/DicomParser.js"></script> <script type="text/javascript" src="js/dicom/LookupTable.js"></script> + <script type="text/javascript" src="js/toolactivator.js"></script> <script type="text/javascript" src="js/TileContent.js"></script> - <script type="text/javascript" src="js/toolactivator.js"></script> <script type="text/javascript" src="js/oviyam.js"></script> <script type="text/javascript" src="js/line.js"></script> <script type="text/javascript" src="js/rect.js"></script> Modified: oviyam/oviyam/trunk/web/js/TileContent.js =================================================================== --- oviyam/oviyam/trunk/web/js/TileContent.js 2021-09-30 12:52:22 UTC (rev 18983) +++ oviyam/oviyam/trunk/web/js/TileContent.js 2021-10-04 06:06:42 UTC (rev 18984) @@ -1711,8 +1711,11 @@ } var div = document.createElement("div"); div.innerHTML = cxtContent; - document.body.appendChild(div); - jQuery("#canvasLayer2").contextMenu({ menu: 'contextmenu1' }); + + if(document.body != null) { + document.body.appendChild(div); + jQuery("#canvasLayer2").contextMenu({ menu: 'contextmenu1' }); + } } else { setTimeout("loadContextMenu", 100); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-09-30 12:52:24
|
Revision: 18983 http://sourceforge.net/p/dcm4che/svn/18983 Author: asgarhussain Date: 2021-09-30 12:52:22 +0000 (Thu, 30 Sep 2021) Log Message: ----------- [OV-243] Image loading takes longer time to respond on series layout selection - Resolved. Modified Paths: -------------- oviyam/oviyam/trunk/web/Study.jsp oviyam/oviyam/trunk/web/js/features.js oviyam/oviyam/trunk/web/js/viewer.js Added Paths: ----------- oviyam/oviyam/trunk/web/js/instance_worker.js Modified: oviyam/oviyam/trunk/web/Study.jsp =================================================================== --- oviyam/oviyam/trunk/web/Study.jsp 2021-09-30 06:43:42 UTC (rev 18982) +++ oviyam/oviyam/trunk/web/Study.jsp 2021-09-30 12:52:22 UTC (rev 18983) @@ -365,6 +365,20 @@ "studyDesc": '${param.studyDesc}', "studyDate": '${param.studyDate}' }); + + // to load the instance details in background + if (!sessionStorage['${seriesId}']) { + var paramData = { + "patientId" : '${param.patient}', + "studyUID" : '${param.study}', + "seriesUID" : '${seriesId}', + "dcmURL" : '${param.dcmURL}', + "serverURL" : '${param.wadoUrl}' + }; + + window.parent.getInstanceDetails(paramData); + } + </script> <table class="seriesTable" id="${fn:replace(seriesId, '.','_')}_table"> Modified: oviyam/oviyam/trunk/web/js/features.js =================================================================== --- oviyam/oviyam/trunk/web/js/features.js 2021-09-30 06:43:42 UTC (rev 18982) +++ oviyam/oviyam/trunk/web/js/features.js 2021-09-30 12:52:22 UTC (rev 18983) @@ -48,6 +48,7 @@ } function doLayout() { + let frameSources; try { jQuery('#loadingView', window.parent.document).hide(); jQuery('.toggleOff').removeClass('toggleOff'); @@ -57,6 +58,9 @@ var seriesData = JSON.parse(sessionStorage[pat.studyUID]); var cnt = 0,divContent='<table width="100%" height="100%" cellspacing="2" cellpadding="0" border="0" >'; + let totalFrames = (rowIndex+1) * (colIndex+1); + frameSources = [totalFrames]; + for(var x=0; x<rowIndex+1;x++) { divContent+='<tr>'; for(var y=0;y<colIndex+1;y++) { @@ -69,19 +73,22 @@ cnt+=1; data = seriesData[cnt]; } - if (!sessionStorage[data['seriesUID']]) { + /*if (!sessionStorage[data['seriesUID']]) { window.parent.getInstances(pat.pat_ID, pat.studyUID, data['seriesUID']); } var ser_Info = JSON.parse(sessionStorage[data['seriesUID']]); - ser_Info = ser_Info[0]; + ser_Info = ser_Info[0];*/ if(cnt<seriesData.length) { - divContent += 'src="frameContent.html?serverURL=' + pat.serverURL + '&study=' + pat.studyUID + '&series=' + data['seriesUID'] + - '&object=' + ser_Info['SopUID'] + '&sopClassUID=' + ser_Info['SopClassUID'] + '&seriesDesc=' + data['seriesDesc'] + + frameSources[cnt] = 'frameContent.html?serverURL=' + pat.serverURL + '&study=' + pat.studyUID + '&series=' + data['seriesUID'] + + //'&object=' + ser_Info['SopUID'] + '&sopClassUID=' + ser_Info['SopClassUID'] + + '&seriesDesc=' + data['seriesDesc'] + '&images=' + data['totalInstances'] + '&modality=' + data['modality'] + - '&contentType=' + pat.imgType + '&instanceNumber=0" style="background:#000; visibility: hidden;"></iframe></td>'; + '&contentType=' + pat.imgType + '&instanceNumber=0'; + + divContent += 'style="background:#000;"></iframe></td>'; } else { - divContent += ' ' + 'style="background:#000; visibility: hidden;"></iframe></td>'; + divContent += ' ' + 'style="background:#000;"></iframe></td>'; } cnt+=1; } else { @@ -92,8 +99,13 @@ } // End of row iteration divContent += '</table>'; divElement.innerHTML = divContent; + + frameSources.forEach(function(item, index, array) { + jQuery("#frame"+index, document).prop('src',item); + }); + } catch (error) { - jQuery('#loadingView', window.parent.document).show(); + //jQuery('#loadingView', window.parent.document).show(); setTimeout("doLayout()", 200); } } Added: oviyam/oviyam/trunk/web/js/instance_worker.js =================================================================== --- oviyam/oviyam/trunk/web/js/instance_worker.js (rev 0) +++ oviyam/oviyam/trunk/web/js/instance_worker.js 2021-09-30 12:52:22 UTC (rev 18983) @@ -0,0 +1,15 @@ +self.onmessage = function(e) { + getInstancesDetails(e.data); +} + +function getInstancesDetails(paramJson) { + var paramData = "?patientId=" + paramJson.patientId + "&studyUID=" + paramJson.studyUID + "&seriesUID=" + paramJson.seriesUID; + paramData += "&dcmURL=" + paramJson.dcmURL + "&serverURL=" + paramJson.serverURL; + + var xhr = new XMLHttpRequest(); + xhr.open("GET", "../Instance.do" + paramData, true); + xhr.onload = function() { + self.postMessage(xhr.responseText); + }; + xhr.send(); +} Modified: oviyam/oviyam/trunk/web/js/viewer.js =================================================================== --- oviyam/oviyam/trunk/web/js/viewer.js 2021-09-30 06:43:42 UTC (rev 18982) +++ oviyam/oviyam/trunk/web/js/viewer.js 2021-09-30 12:52:22 UTC (rev 18983) @@ -255,6 +255,17 @@ }); } +function getInstanceDetails(paramData) { + var instanceWorker = new Worker('js/instance_worker.js'); + instanceWorker.addEventListener('message', function(e) { + sessionStorage[paramData.seriesUID] = JSON.stringify(JSON.parse(e.data)); + instanceWorker.terminate(); + }, false); + + //send data to worker + instanceWorker.postMessage(paramData); +} + function fetchOtherStudies() { $.get("UserConfig.do", { 'settings': 'prefetch', 'todo': 'READ' }, function(data) { var doFetch = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-09-30 06:43:43
|
Revision: 18982 http://sourceforge.net/p/dcm4che/svn/18982 Author: asgarhussain Date: 2021-09-30 06:43:42 +0000 (Thu, 30 Sep 2021) Log Message: ----------- [OV-246] Show suitable error/exception page instead of a blank page when there is no matching patient study found in direct URL launching - Resolved. Modified Paths: -------------- oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java Added Paths: ----------- oviyam/oviyam/trunk/web/page404.html Modified: oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java =================================================================== --- oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java 2021-09-16 07:12:27 UTC (rev 18981) +++ oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java 2021-09-30 06:43:42 UTC (rev 18982) @@ -168,6 +168,8 @@ forwardUrl += "&accessionNumber=" + accessionNumber; } forwardUrl += "&dcmURL=" + dcmURL; + } else { + forwardUrl = "page404.html"; } } else { throw new Exception("Server Not Found"); Added: oviyam/oviyam/trunk/web/page404.html =================================================================== --- oviyam/oviyam/trunk/web/page404.html (rev 0) +++ oviyam/oviyam/trunk/web/page404.html 2021-09-30 06:43:42 UTC (rev 18982) @@ -0,0 +1,30 @@ +<html> + <head> + <title>Patient/Study Not Found - Error Page</title> + <style> + h1 { + font-size:80px; + font-weight:800; + text-align:center; + font-family: 'Roboto', sans-serif; + } + h2 { + font-size:28px; + text-align:center; + font-family: 'Roboto', sans-serif; + margin-top:-40px; + } + .container { + width:350px; + margin: 0 auto; + margin-top:15%; + } + </style> + </head> + <body> + <div class="container"> + <h1>404</h1> + <h2>Patient / Study Not Found</h2> + </div> + </body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asg...@us...> - 2021-09-16 07:12:28
|
Revision: 18981 http://sourceforge.net/p/dcm4che/svn/18981 Author: asgarhussain Date: 2021-09-16 07:12:27 +0000 (Thu, 16 Sep 2021) Log Message: ----------- OV-241 - Accession Number filter in direct URL launching is not working - Resolved. Modified Paths: -------------- oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java Added Paths: ----------- oviyam/oviyam/trunk/web/images/viewer.png oviyam/oviyam/trunk/web/studyList.jsp Modified: oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java =================================================================== --- oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java 2021-07-22 05:48:03 UTC (rev 18980) +++ oviyam/oviyam/trunk/src/in/raster/oviyam/servlet/DirectUrlLaunch.java 2021-09-16 07:12:27 UTC (rev 18981) @@ -44,6 +44,7 @@ import in.raster.oviyam.PatientInfo; import in.raster.oviyam.model.PatientQueryModel; +import in.raster.oviyam.model.StudyModel; import in.raster.oviyam.xml.handler.LanguageHandler; import in.raster.oviyam.xml.handler.ListenerHandler; import in.raster.oviyam.xml.handler.ServerHandler; @@ -52,6 +53,7 @@ import java.io.File; import java.io.IOException; +import java.util.List; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; @@ -80,6 +82,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String patId = request.getParameter("patientID"); String studyId = request.getParameter("studyUID"); + String accessionNumber = request.getParameter("accessionNumber"); String serverName = request.getParameter("serverName"); if(studyId == null || studyId.length() == 0) { @@ -86,6 +89,10 @@ studyId = ""; } + if (accessionNumber == null || accessionNumber.length() == 0) { + accessionNumber = ""; + } + String[] patIDs = null; if(patId == null || patId.length() == 0) { patId = ""; @@ -98,9 +105,7 @@ if(LanguageHandler.source == null || !LanguageHandler.source.exists()) { File tempDir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir"); LanguageHandler.source = new File(new XMLFileHandler().getXMLFilePath(tempDir.getParent())); -// forwardUrl = "/confirmation.jsp?"; } -// else { ServerHandler sh = new ServerHandler(); Server server = null; if(serverName != null && !serverName.isEmpty()) { @@ -117,54 +122,60 @@ callingAET = "OVIYAM2"; } String dcmURL = "DICOM://" + server.getAetitle() + ":" + callingAET + "@" + server.getHostname() + ":" + server.getPort(); - String serverURL = null; - - if(server.getRetrieve().equals("WADO")) { - serverURL = "http://" + server.getHostname() + ":" + server.getWadoport() + "/" + server.getWadocontext(); - } else { - serverURL = server.getRetrieve(); - } - + PatientInfo patientInfo = new PatientInfo(); - if(patIDs==null || patIDs.length == 1) { - PatientQueryModel patientQueryModel = new PatientQueryModel(); + PatientQueryModel patientQueryModel = new PatientQueryModel(); + + if(patIDs != null && patIDs.length == 1) { patientQueryModel.setPatientID(patId); patientQueryModel.setStudyID(studyId); - patientQueryModel.setDcmUrl(dcmURL);; + patientQueryModel.setDcmUrl(dcmURL); + if (accessionNumber != null && accessionNumber.length() > 0) { + patientQueryModel.setAccessionNumber(accessionNumber); + } patientInfo.callFindWithQuery(patientQueryModel); - } else { + } else if(studyId != null && studyId.length() > 0) { + patientQueryModel.setStudyID(studyId); + patientQueryModel.setDcmUrl(dcmURL); + patientInfo.callFindWithQuery(patientQueryModel); + } else if (patIDs.length > 1) { for(int i=0; i<patIDs.length; i++) { - PatientQueryModel patientQueryModel = new PatientQueryModel(); + patientQueryModel = new PatientQueryModel(); patientQueryModel.setPatientID(patIDs[i]); patientQueryModel.setStudyID(studyId); patientQueryModel.setDcmUrl(dcmURL); - patientInfo.callFindWithQuery(patientQueryModel); + patientInfo.callFindWithQuery(patientQueryModel); } } - - int totalStudies = patientInfo.getStudyList().size(); - + + List<StudyModel> studiesList = patientInfo.getStudyList(); + int totalStudies = studiesList.size(); + if(totalStudies == 1) { - forwardUrl = "/viewer.html?"; + StudyModel sm = (StudyModel) studiesList.get(0); + forwardUrl = "viewer.html?" + "patientID=" + sm.getPatientID() + + "&studyUID=" + sm.getStudyInstanceUID(); } else if(totalStudies > 1) { - forwardUrl = "/index.html?"; + forwardUrl = "studyList.jsp?"; + + if(patId != null && patId.length() > 0) { + forwardUrl += "patientId=" + patId; + } + if(studyId != null && studyId.length() > 0) { + forwardUrl += "&studyUID=" + studyId; + } + if (accessionNumber != null && accessionNumber.length() > 0) { + forwardUrl += "&accessionNumber=" + accessionNumber; + } + forwardUrl += "&dcmURL=" + dcmURL; } - - if(patId != null && patId.length() > 0) { - forwardUrl += "patientID=" + patId; - } - if(studyId != null && studyId.length() > 0) { - forwardUrl += "&studyUID=" + studyId; - } - if(serverName != null && serverName.length() > 0) { - forwardUrl += "&serverName=" + serverName; - } } else { throw new Exception("Server Not Found"); } -// } - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(forwardUrl); - dispatcher.forward(request,response); + System.out.println("##********** FORWARD URL ********## " + forwardUrl); + if(forwardUrl.trim().length() > 0) { + response.sendRedirect(forwardUrl); + } } catch(Exception ex) { ex.printStackTrace(); } Added: oviyam/oviyam/trunk/web/images/viewer.png =================================================================== (Binary files differ) Index: oviyam/oviyam/trunk/web/images/viewer.png =================================================================== --- oviyam/oviyam/trunk/web/images/viewer.png 2021-07-22 05:48:03 UTC (rev 18980) +++ oviyam/oviyam/trunk/web/images/viewer.png 2021-09-16 07:12:27 UTC (rev 18981) Property changes on: oviyam/oviyam/trunk/web/images/viewer.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: oviyam/oviyam/trunk/web/studyList.jsp =================================================================== --- oviyam/oviyam/trunk/web/studyList.jsp (rev 0) +++ oviyam/oviyam/trunk/web/studyList.jsp 2021-09-16 07:12:27 UTC (rev 18981) @@ -0,0 +1,152 @@ +<!-- Study list pgae - One patient id,multiple studies (When the study UID is not given in URL) --> +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<%@taglib prefix="pat" uri="/WEB-INF/tlds/PatientInfo.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> + +<fmt:setBundle basename="resources.i18n.Messages" var="lang" /> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Oviyam2</title> + <script type="text/javascript" src="js/lib/jquery-latest.js"></script> + <script type="text/javascript" src="js/lib/jquery.dataTables.js"></script> + + <link rel="icon" type="image/png" href="images/favicon.png"/> + <link rel="stylesheet" type="text/css" href="css/jquery.ui.all.css" /> + <link href="css/demo_table_jui.css" rel="stylesheet" type="text/css"> + + <link href="css/jquery-ui.css" type="text/css" rel="Stylesheet" class="ui-theme"> + <link href="css/jquery-ui(1).css" type="text/css" rel="Stylesheet" class="ui-theme"> + <link href="css/jquery-ui(2).css" type="text/css" rel="Stylesheet" class="ui-theme"> + + <style> + html { + height: 98%; + } + + body { + background: #262626; + } + + thead { + font-size: 15px; + } + + .ui-widget-header { + background: #484848 !important; + } + + tbody tr { + height: 35px !important; + font-size: 15px; + } + </style> + + <script type="text/javascript"> + var dTable; + $(document).ready(function() { + dTable = $("#data_table").dataTable({ + "bJQueryUI": true, + "bPaginate": false, + "oLanguage": { + "sSearch": "Filter:" + }, + "sScrollY": "90%", + "bScrollCollapse": true, + "bAutoWidth": false, + "sScrollX": "100%", + + "aoColumns": [ { "sWidth": "7%" }, { "sWidth": "12%" }, { "sWidth": "10%" }, { "sWidth": "15%" }, { "sWidth": "7%" }, { "sWidth": "7%" }, { "sWidth": "10%" }, {"bVisible": false}, {"bVisible": false}, {"bVisible": false}, {"bVisible": false}] + }); + + var rowData = dTable.fnGetData(0); + var div = "<div style='font-size: 20px;'>" + "Patient ID" + " - " + rowData[0] + "</div>"; + $($(".dataTables_filter").parent()).append(div); + + highlightModalities(); + + $('.display tbody td img').live('click', function() { + var nTrContent = dTable.fnGetData(this.parentNode.parentNode); + window.location.href = "oviyam?patientID=" + nTrContent[0] + "&studyUID=" + nTrContent[7]; + }); + + $('.display tbody tr').live("dblclick", function() { + var nTrContent = dTable.fnGetData(this); + window.location.href = "oviyam?patientID=" + nTrContent[0] + "&studyUID=" + nTrContent[7]; + }); + + $('.display tbody tr').live("click", function() { + if($(this).hasClass('row_selected')) { + return; + } else { + dTable.$('tr.row_selected').removeClass('row_selected'); + $(this).addClass('row_selected'); + } + }); + }); + + function highlightModalities() { + $('[class^="CT"]').css("background","#9932CC"); + $('[class^="CR"]').css("background","#008080"); + $('[class^="MR"]').css("background","#B22222"); + $('[class^="DX"]').css("background","#FF6347"); + $('[class^="XA"]').css("background","#FF6347"); + $('[class^="PX"]').css("background","#FF6347"); + $('[class^="SC"]').css("background","#FF6347"); + $('[class^="OT"]').css("background","#FF6347"); + $('[class^="XC"]').css("background","#FF6347"); + $('[class^="SR"]').css("background","#FF6347"); + $('[class^="US"]').css("background","#C71585"); + $('[class^="ES"]').css("background","#C71585"); + $('[class^="ECG"]').css("background","#C71585"); + $('[class^="PR"]').css("background","#008080"); + } + </script> + </head> + + <body> + <div style="width: 100%; height: 100%;"> + <table class="display" id="data_table" style="font-size: 12px;"> + <thead> + <tr> + <th><fmt:message key='patientID' bundle="${lang}" /></th> + <th><fmt:message key='patientName' bundle="${lang}" /></th> + <th><fmt:message key='studyDate' bundle="${lang}" /></th> + <th><fmt:message key='studyDescription' bundle="${lang}" /></th> + <th>Modality</th> + <th><fmt:message key="instanceCount" bundle="${lang}" /></th> + <th>Tools</th> + <th>Study Instance UID</th> + <th>Refer Physician</th> + <th>Series Count</th> + <th>Gender</th> + </tr> + </thead> + + <tbody> + <pat:Patient patientId="${param.patientId}" accessionNumber="${param.accessionNumber}" dcmURL="${param.dcmURL}"> + <tr> + <td>${patientId}</td> + <td>${patientName}</td> + <td>${studyDate}</td> + <td>${studyDescription}</td> + <td align="center"><div class="${modality}" style="color: #fff; font-weight: bold; display:inline; padding: 3px; text-align: center;">${modality}</div></td> + <td align="right" style="font-weight: bold;">${totalInstances}</td> + <td align="center"> + <img title="View in web viewer" src="images/viewer.png"/> + </td> + <td>${studyIUID}</td> + <td>${referPhysician}</td> + <td>${totalSeries}</td> + <td>${patientGender}</td> + </tr> + </pat:Patient> + </tbody> + </table> + </div> + </body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jav...@us...> - 2021-07-22 05:48:10
|
Revision: 18980 http://sourceforge.net/p/dcm4che/svn/18980 Author: javawilli Date: 2021-07-22 05:48:03 +0000 (Thu, 22 Jul 2021) Log Message: ----------- [DSRV-1735] ORBIS: Corrected SR's are stored as separated Instances/Series Modified Paths: -------------- dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORUService.java Modified: dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORUService.java =================================================================== --- dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORUService.java 2021-06-21 16:26:05 UTC (rev 18979) +++ dcm4chee/dcm4chee-arc/branches/DCM4CHEE_2_18_0-RC/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORUService.java 2021-07-22 05:48:03 UTC (rev 18980) @@ -188,11 +188,18 @@ for (int i = 0, n = identicalDocumentsSeq.countItems(); i < n; i++) { Dataset studyItem = identicalDocumentsSeq.getItem(i); - Dataset seriesItem = studyItem.putSQ(Tags.RefSeriesSeq).addNewItem(); - seriesItem.putUI(Tags.SeriesInstanceUID, uidgen.createUID()); - Dataset sopItem = seriesItem.putSQ(Tags.RefSOPSeq).addNewItem(); - sopItem.putUI(Tags.RefSOPInstanceUID, uidgen.createUID()); - sopItem.putUI(Tags.RefSOPClassUID, cuid); + Dataset seriesItem = studyItem.getItem(Tags.RefSeriesSeq); + if (seriesItem == null) + { + seriesItem = studyItem.putSQ(Tags.RefSeriesSeq).addNewItem(); + seriesItem.putUI(Tags.SeriesInstanceUID, uidgen.createUID()); + } + if (seriesItem.getItem(Tags.RefSOPSeq) == null) + { + Dataset sopItem = seriesItem.putSQ(Tags.RefSOPSeq).addNewItem(); + sopItem.putUI(Tags.RefSOPInstanceUID, uidgen.createUID()); + sopItem.putUI(Tags.RefSOPClassUID, cuid); + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 18979 http://sourceforge.net/p/dcm4che/svn/18979 Author: javawilli Date: 2021-06-21 16:26:05 +0000 (Mon, 21 Jun 2021) Log Message: ----------- fixed issue with single quote in MoveEntitiesPage_fr.properties Modified Paths: -------------- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_fr.properties Modified: dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_fr.properties =================================================================== --- dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_fr.properties 2021-05-13 10:45:50 UTC (rev 18978) +++ dcm4chee/dcm4chee-web/branches/DCM4CHEE_WEB_3_0_4-RC/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/MoveEntitiesPage_fr.properties 2021-06-21 16:26:05 UTC (rev 18979) @@ -15,8 +15,8 @@ # Series level: ${pPS.study.patient.name}, ${pPS.study.patient.id}, ${pPS.study.patient.birthdate} # Instance level: ${series.pPS.study.patient.name}, ${series.pPS.study.patient.id}, ${series.pPS.study.patient.birthdate} move.selectedToMove_study.text={0} examens du patient\xA0: ${patient.name} (${patient.idAndIssuer}) -move.selectedToMove_series.text={0} s\xE9ries du patient\xA0: ${pPS.study.patient.name} (${pPS.study.patient.idAndIssuer}) Num\xE9ro d'acc\xE8s\xA0: ${pPS.study.accessionNumber} -move.selectedToMove_instance.text={0} instances du patient\xA0: ${series.pPS.study.patient.name} (${series.pPS.study.patient.idAndIssuer}) Num\xE9ro d'acc\xE8s\xA0: ${series.pPS.study.accessionNumber} +move.selectedToMove_series.text={0} s\xE9ries du patient\xA0: ${pPS.study.patient.name} (${pPS.study.patient.idAndIssuer}) Num\xE9ro d''acc\xE8s\xA0: ${pPS.study.accessionNumber} +move.selectedToMove_instance.text={0} instances du patient\xA0: ${series.pPS.study.patient.name} (${series.pPS.study.patient.idAndIssuer}) Num\xE9ro d''acc\xE8s\xA0: ${series.pPS.study.accessionNumber} #confirmation messages move.message.confirmMove=Voulez-vous d\xE9placer les entr\xE9es s\xE9lectionn\xE9es\xA0? S\xE9lectionn\xE9e(s)\xA0: {0} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kar...@us...> - 2021-05-13 10:45:50
|
Revision: 18978 http://sourceforge.net/p/dcm4che/svn/18978 Author: karthikeyansan Date: 2021-05-13 10:45:50 +0000 (Thu, 13 May 2021) Log Message: ----------- OV-240 - fixed issue after using the Cobb's angle tool, other measurement tools are required multiple clicks to select Modified Paths: -------------- oviyam/oviyam/trunk/web/js/TileContent.js oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/js/measure.js oviyam/oviyam/trunk/web/js/toolactivator.js oviyam/oviyam/trunk/web/viewer_tools.html Modified: oviyam/oviyam/trunk/web/js/TileContent.js =================================================================== --- oviyam/oviyam/trunk/web/js/TileContent.js 2021-05-07 12:21:17 UTC (rev 18977) +++ oviyam/oviyam/trunk/web/js/TileContent.js 2021-05-13 10:45:50 UTC (rev 18978) @@ -57,9 +57,9 @@ loadImage(); loadTextOverlay(); - if (jQuery('#selectedFrame', window.parent.document).text()) { - setSelectedFrame(); - } + // if (jQuery('#selectedFrame', window.parent.document).text()) { + // setSelectedFrame(); + // } disableTool('windowing'); disableTool('pan'); @@ -146,6 +146,8 @@ }); jQuery("#canvasLayer2").dblclick(function(e) { + // console.log('**************double click**************'); + // loadContextMenu(); var src = jQuery('#frameSrc').text(); var frameNumber = getParameter(src, 'frameNumber'); var instanceNo = getParameter(src, 'instanceNumber'); @@ -160,24 +162,7 @@ } }); $( "#canvasLayer2" ).contextmenu(function() { - // loadContextMenu(); - var tools = sessionStorage['tools']; - if (tools === 'zoom') { - activateTools(tools, activateZoom); - } else if (tools === 'move') { - activateTools(tools, activateMove); - } else if (tools === 'magnify') { - activateTools(tools, activateMagnify); - } else if (tools === 'probe') { - doProbe("probe", true); - } else if (tools === 'stackImage') { - activatestack(tools) - } else if(tools === 'windowing') { - activateTools("windowing", activateWindowing); loadContextMenu(); - } else { - // loadContextMenu(); - } }); window.addEventListener('resize', resizeCanvas, false); @@ -193,22 +178,24 @@ window.parent.createEvent('sync', { forUid: jQuery('#forUIDPanel').html(), fromTo: getFromToLoc() }); } - // var tools = sessionStorage['tools']; - // if (tools === 'zoom') { - // activateTools(tools, activateZoom); - // } else if (tools === 'move') { - // activateTools(tools, activateMove); - // } else if (tools === 'magnify') { - // activateTools(tools, activateMagnify); - // } else if (tools === 'probe') { - // doProbe("probe", true); - // } else if (tools === 'stackImage') { - // activatestack(tools) - // } else if(tools === 'windowing') { - // activateTools("windowing", activateWindowing); - // } else { - // console.log("ELSE....."); - // } + var tools = sessionStorage['tools']; + if (tools === 'zoom') { + activateTools(tools, activateZoom); + } else if (tools === 'move') { + activateTools(tools, activateMove); + } else if (tools === 'magnify') { + activateTools(tools, activateMagnify); + } else if (tools === 'probe') { + doProbe("probe", true); + } else if (tools === 'stackImage') { + activatestack(tools) + } else if(tools === 'windowing') { + activateTools("windowing", activateWindowing); + loadContextMenu(); + } else { + // console.log("ELSE....."); + loadContextMenu(); + } if (window.parent.rulerMap.has(seriesUid)) { rulerMap = window.parent.rulerMap.get(seriesUid); @@ -228,10 +215,10 @@ if (window.parent.cobbMap.has(seriesUid)) { cobbMap = window.parent.cobbMap.get(seriesUid); } - loadContextMenu(); + loadInit(); }); - +loadContextMenu(); jQuery(document).mouseup(function(e) { window.parent.createEvent("ToolSelection", { tool: "mouseup" }); if (brightnessVal == 0 && contrastVal == 0) { @@ -1226,13 +1213,16 @@ var tool = jQuery('#tool').text(); jQuery('.toggleOff', window.parent.document).not('#scoutLine').removeClass('toggleOff'); if (tool != '') { - jQuery('#' + tool, window.parent.document).addClass('toggleOff'); + jQuery('#'+tool,window.parent.document).removeClass('toggleOff'); + $('#measure').disableContextMenu(); } + if (tool == 'measure') { init(jQuery('#totalImages').html().indexOf('Frame') >= 0 ? frameInc : imgInc); } } else { jQuery('body').css('border', 'none'); + $('#measure').enableContextMenu(); } } @@ -1379,6 +1369,10 @@ } divContent += '</table>'; divElement.innerHTML = divContent; + // loadContextMenu(); + $( "#canvasLayer2" ).contextmenu(function() { + loadContextMenu(); + }); } function toggleResolution() { Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2021-05-07 12:21:17 UTC (rev 18977) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-05-13 10:45:50 UTC (rev 18978) @@ -126,6 +126,7 @@ jQuery("#canvasLayer2").dblclick(function(e) { // toggleResolution(); toggleLayout(); + // loadContextMenu(); }); // jQuery("#canvasLayer2").click(function(e) { // loadContextMenu(); @@ -171,7 +172,7 @@ activateTools("windowing", activateWindowing); loadContextMenu(); } else { - loadContextMenu(); + // loadContextMenu(); } var iNo = parseInt(jQuery("#totalImages").text().split("/")[0].split(":")[1]); @@ -814,13 +815,16 @@ var tool = jQuery('#tool').text(); jQuery('.toggleOff',window.parent.document).not('#scoutLine').removeClass('toggleOff'); if(tool!='') { - jQuery('#'+tool,window.parent.document).addClass('toggleOff'); + jQuery('#'+tool,window.parent.document).removeClass('toggleOff'); + $('#measure').disableContextMenu(); } + if(tool=='measure') { init(jQuery('#totalImages').html().indexOf('Frame')>=0 ? frameInc : imgInc); } } else { jQuery('body').css('border','none'); + $('#measure').enableContextMenu(); } } @@ -1143,13 +1147,15 @@ var queryString = window.location.href; var study = getParameter(queryString,'study'); var data = sessionStorage[study]; - console.log(data); - if(data!=undefined) { + // console.log(data); + if(data != undefined) { + var seriesData = JSON.parse(data); var cxtContent = '<ul id="contextmenu1" class="menu"'; if(isCompatible()) { - for(var i=0;i<seriesData.length;i++) { + // console.log("Context menu if if" + seriesData.length ); + for(var i=0;i<seriesData.length;i++) { var series = seriesData[i]; // jQuery('#studyDesc').html(series['studyDesc']); // jQuery('#studyDate').html(series['studyDate']); @@ -1161,6 +1167,7 @@ } cxtContent+='</ul>'; } else { + for(var i=0;i<seriesData.length;i++) { var series = seriesData[i]; // jQuery('#studyDesc').html(series['studyDesc']); @@ -1182,9 +1189,10 @@ var div = document.createElement("div"); div.innerHTML = cxtContent; document.body.appendChild(div); - //jQuery("#canvasLayer2").css('cursor','pointer'); + // jQuery("#canvasLayer2").css('cursor','pointer'); jQuery("#canvasLayer2").contextMenu({menu: 'contextmenu1'}); } else { + // console.log("Context menu else"); setTimeout("loadContextMenu", 100); } } Modified: oviyam/oviyam/trunk/web/js/measure.js =================================================================== --- oviyam/oviyam/trunk/web/js/measure.js 2021-05-07 12:21:17 UTC (rev 18977) +++ oviyam/oviyam/trunk/web/js/measure.js 2021-05-13 10:45:50 UTC (rev 18978) @@ -158,6 +158,12 @@ function activateCobb(iNo, columns, toolClicked) { if (toolClicked) { tool = "cobb"; + // if (toolId === 'cobb'){ + // $('.toggleOff').removeClass('toggleOff'); + // jQuery('#measure', parent.document).removeClass('toggleOff'); + // $('#measure').disableContextMenu(); + // console.log("dsfffffffffff" + toolId); + // } } init(iNo); var data = jQuery(drawCanvas).data('events'); @@ -166,6 +172,8 @@ nativeColumns = columns; if (cobb == null) { cobb = new ovm.shape.cobb(); + jQuery('#measure', parent.document).removeClass('toggleOff'); + $('#measure').disableContextMenu(); } if (!toolClicked && cobbMap.has(iNo)) { cobb.setCobbList(cobbMap.get(iNo)); @@ -270,6 +278,7 @@ } function mouseDownHandler(evt) { + console.log(evt.which + '***********'); if(evt.which==1) { jQuery('.contextMenu',window.parent.dcoument).hide(); state.drag = true; @@ -317,11 +326,12 @@ probe.huValue = huValue; probe.initNewProbe(huValue); } + } } - evt.stopPropagation(); - evt.preventDefault(); + // evt.stopPropagation(); + // evt.preventDefault(); evt.target.style.cursor = selectedShape!=null? 'move' : 'crosshair'; } } @@ -375,6 +385,7 @@ } function mouseUpHandler(evt) { + console.log('*************' + evt.which); if(selectedShape==null) { // New Shape var inst_text = jQuery("#totalImages").text().split("/"); var iNo = parseInt(inst_text[0].split(":")[1]); Modified: oviyam/oviyam/trunk/web/js/toolactivator.js =================================================================== --- oviyam/oviyam/trunk/web/js/toolactivator.js 2021-05-07 12:21:17 UTC (rev 18977) +++ oviyam/oviyam/trunk/web/js/toolactivator.js 2021-05-13 10:45:50 UTC (rev 18978) @@ -1041,19 +1041,15 @@ doLoop(false); window.parent.document.getElementById('loopChkBox').checked = false; tmpWindow.getPixelData(true); - console.log("********************IF"); sessionStorage["tools"] = "windowing"; - } else { - console.log("********************Else"); sessionStorage["tools"] = ""; tmpWindow.unbindWindowing(toolId); - } - // loadContextMenu(); } catch (e) { console.log('Dicom Image NOT AVAILABLE'); } + // loadContextMenu(); } function unbindWindowing(toolId) { @@ -1084,7 +1080,7 @@ totalImages = inst_text[1]; doUnbindWindowing(toolId, isMultiframe, iNo, totalImages, window); } - loadContextMenu(); + // loadContextMenu(); } function doUnbindWindowing(toolId, isMultiframe, iNo, totalImages, tmpWindow) { @@ -1103,15 +1099,17 @@ tmpWindow.loadImg(isMultiframe, iNo); } } - loadContextMenu(); + // loadContextMenu(); } function activateMeasure(toolId) { + console.log('&&&&&&&&&&&' + toolId); if(jQuery('#tool').html()!=toolId) { disableOtherTools(toolId); enableTool(toolId); doMouseWheel = false; - + + //jQuery('#' + tool, parent.document).removeClass('toggleOff'); jQuery('#thickLocationPanel').hide(); jQuery('#loadingView', window.parent.document).show(); doLoop(false); @@ -1239,6 +1237,7 @@ } catch (e) { console.error(e); } + } function getDICOM() { @@ -1365,7 +1364,7 @@ state.drag = true; mouseLocX = evt.pageX; mouseLocY = evt.pageY; - // evt.target.style.cursor = "url(images/wincursor.png), auto"; + evt.target.style.cursor = "url(images/wincursor.png), auto"; evt.preventDefault(); evt.stopPropagation(); }).mousemove(function(evt) { @@ -1492,10 +1491,11 @@ if(firstTime) { jQuery('#canvasLayer2').mouseup(function(evt) { - console.log('111111111'); - //loadContextMenu(); + // loadContextMenu(); + if(evt.which==1) { + console.log('111111111'); state.drag = false; state.mouseDown = false; jQuery('.contextMenu').hide(); @@ -1514,8 +1514,10 @@ }); jQuery('#canvasLayer2').mousedown(function(evt) { console.log('222222222'+ evt.which); - // loadContextMenu(); + // loadContextMenu(); + + evt.target.style.cursor = "default"; if(evt.which==1) { windowingChanged = true; // var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0; @@ -1532,12 +1534,13 @@ } state.mouseDown = true; evt.target.style.cursor = "url(images/wincursor.png), auto"; + } - if(evt.which==3) { - evt.target.style.cursor = "default"; - } - + // if(evt.which==3) { + // evt.target.style.cursor = "default"; + // } + // console.log('*****************' + evt.target.style.cursor ); mouseLocX = evt.pageX; mouseLocY = evt.pageY; // evt.target.focus(); @@ -1546,11 +1549,11 @@ }); jQuery('#canvasLayer2').mousemove(function(evt) { - loadContextMenu(); + console.log('****************'+ evt.which); + // evt.target.style.cursor = "default"; if(evt.which==1) { - - + jQuery('#contextmenu1').hide(); // jQuery('.selected',window.parent.document).removeClass('selected'); // var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0; // var iNo = isMultiframe ? frameInc : imgInc; @@ -1611,6 +1614,9 @@ mouseLocY = evt.pageY; wlDisplay.html("WL: " + modifiedWC + " / WW: " + modifiedWW); } + } else { + evt.target.style.cursor = "default"; + // loadContextMenu(); } }); window.parent.enableWindowingContext(); Modified: oviyam/oviyam/trunk/web/viewer_tools.html =================================================================== --- oviyam/oviyam/trunk/web/viewer_tools.html 2021-05-07 12:21:17 UTC (rev 18977) +++ oviyam/oviyam/trunk/web/viewer_tools.html 2021-05-13 10:45:50 UTC (rev 18978) @@ -333,6 +333,7 @@ } }); } + }); function showMeasureContext() { @@ -347,9 +348,38 @@ }); // for document.ready function doTool(toolId) { + // console.log("dsfffffffffff" + toolId); createEvent("ToolSelection", { tool: toolId }); + // jQuery('.toggleOff').removeClass('toggleOff'); + // jQuery('#measure').css('pointer-events', 'none'); + // jQuery('#measure').disableContextMenu(); + + $("#measureContext li a").click(function(){ + + if (toolId === 'cobb'){ + // $('.toggleOff').css('background', 'transparent!important'); + jQuery('.toggleOff', parent.document).css('background', 'transparent!important'); + $('#measure').disableContextMenu(); + jQuery('#'+tool,window.parent.document).removeClass('toggleOff'); + console.log("dsfffffffffff" + toolId); + } else { + jQuery('#measure', parent.document).addClass('toggleOff'); + $('#measure').enableContextMenu(); + } + + // jQuery('#tool').html(''); + + // jQuery('#canvasDiv').css('cursor',"default"); + + + }); + // else { + // $('#measure').removeClass('toggleOff'); + // $('#measure').enableContextMenu(); + // } + } function doPreset(wc, ww) { @@ -529,7 +559,7 @@ <li><a id="rectangle" href="#" class="cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('rectangle');">Rectangle</a></li> <li><a id="oval" href="#" class="cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('oval'); ">Oval</a></li> <li><a id="angle" href="#" class="cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('angle'); ">Angle</a></li> - <li><a id="cobb" href="#" class="cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('cobb'); ">Cobb's Angle</a></li> + <li><a id="cobb" href="#" class="cmenuItem" onclick="jQuery('.selectedshape').removeClass('selectedshape'); jQuery(this).addClass('selectedshape'); doTool('cobb');">Cobb's Angle</a></li> <li type='separator' style="height: 2px; background-color: #00CC66;"></li> <li><a href="#" id="delete" class="cmenuItem" onclick="doTool('delete');">Delete </a></li> <li><a href="#" id="deleteAll" class="cmenuItem" onclick="doTool('clearAll');">Delete All </a></li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kar...@us...> - 2021-05-07 12:21:18
|
Revision: 18977 http://sourceforge.net/p/dcm4che/svn/18977 Author: karthikeyansan Date: 2021-05-07 12:21:17 +0000 (Fri, 07 May 2021) Log Message: ----------- OV-234 - Series list context menu on image is not shown. Modified Paths: -------------- oviyam/oviyam/trunk/web/js/TileContent.js oviyam/oviyam/trunk/web/js/framecontent.js oviyam/oviyam/trunk/web/js/toolactivator.js Modified: oviyam/oviyam/trunk/web/js/TileContent.js =================================================================== --- oviyam/oviyam/trunk/web/js/TileContent.js 2021-05-07 12:17:59 UTC (rev 18976) +++ oviyam/oviyam/trunk/web/js/TileContent.js 2021-05-07 12:21:17 UTC (rev 18977) @@ -160,7 +160,24 @@ } }); $( "#canvasLayer2" ).contextmenu(function() { + // loadContextMenu(); + var tools = sessionStorage['tools']; + if (tools === 'zoom') { + activateTools(tools, activateZoom); + } else if (tools === 'move') { + activateTools(tools, activateMove); + } else if (tools === 'magnify') { + activateTools(tools, activateMagnify); + } else if (tools === 'probe') { + doProbe("probe", true); + } else if (tools === 'stackImage') { + activatestack(tools) + } else if(tools === 'windowing') { + activateTools("windowing", activateWindowing); loadContextMenu(); + } else { + // loadContextMenu(); + } }); window.addEventListener('resize', resizeCanvas, false); @@ -176,22 +193,22 @@ window.parent.createEvent('sync', { forUid: jQuery('#forUIDPanel').html(), fromTo: getFromToLoc() }); } - var tools = sessionStorage['tools']; - if (tools === 'zoom') { - activateTools(tools, activateZoom); - } else if (tools === 'move') { - activateTools(tools, activateMove); - } else if (tools === 'magnify') { - activateTools(tools, activateMagnify); - } else if (tools === 'probe') { - doProbe("probe", true); - } else if (tools === 'stackImage') { - activatestack(tools) - } else if(tools === 'windowing') { - activateTools("windowing", activateWindowing); - } else { - console.log("ELSE....."); - } + // var tools = sessionStorage['tools']; + // if (tools === 'zoom') { + // activateTools(tools, activateZoom); + // } else if (tools === 'move') { + // activateTools(tools, activateMove); + // } else if (tools === 'magnify') { + // activateTools(tools, activateMagnify); + // } else if (tools === 'probe') { + // doProbe("probe", true); + // } else if (tools === 'stackImage') { + // activatestack(tools) + // } else if(tools === 'windowing') { + // activateTools("windowing", activateWindowing); + // } else { + // console.log("ELSE....."); + // } if (window.parent.rulerMap.has(seriesUid)) { rulerMap = window.parent.rulerMap.get(seriesUid); Modified: oviyam/oviyam/trunk/web/js/framecontent.js =================================================================== --- oviyam/oviyam/trunk/web/js/framecontent.js 2021-05-07 12:17:59 UTC (rev 18976) +++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-05-07 12:21:17 UTC (rev 18977) @@ -130,8 +130,13 @@ // jQuery("#canvasLayer2").click(function(e) { // loadContextMenu(); // }); + // jQuery(document).on("rightclick" , "#canvasLayer2", function(){ + // console.log("**********"); + // // loadContextMenu(); + // }); $( "#canvasLayer2" ).contextmenu(function() { loadContextMenu(); + }); window.addEventListener('resize', resizeCanvas, false); jQuery('#tool').html(''); @@ -164,8 +169,9 @@ activatestack(tools) } else if(tools === 'windowing') { activateTools("windowing", activateWindowing); + loadContextMenu(); } else { - console.log("ELSE....."); + loadContextMenu(); } var iNo = parseInt(jQuery("#totalImages").text().split("/")[0].split(":")[1]); @@ -1133,9 +1139,11 @@ } function loadContextMenu() { + var queryString = window.location.href; var study = getParameter(queryString,'study'); var data = sessionStorage[study]; + console.log(data); if(data!=undefined) { var seriesData = JSON.parse(data); var cxtContent = '<ul id="contextmenu1" class="menu"'; @@ -1174,6 +1182,7 @@ var div = document.createElement("div"); div.innerHTML = cxtContent; document.body.appendChild(div); + //jQuery("#canvasLayer2").css('cursor','pointer'); jQuery("#canvasLayer2").contextMenu({menu: 'contextmenu1'}); } else { setTimeout("loadContextMenu", 100); Modified: oviyam/oviyam/trunk/web/js/toolactivator.js =================================================================== --- oviyam/oviyam/trunk/web/js/toolactivator.js 2021-05-07 12:17:59 UTC (rev 18976) +++ oviyam/oviyam/trunk/web/js/toolactivator.js 2021-05-07 12:21:17 UTC (rev 18977) @@ -1041,11 +1041,16 @@ doLoop(false); window.parent.document.getElementById('loopChkBox').checked = false; tmpWindow.getPixelData(true); + console.log("********************IF"); sessionStorage["tools"] = "windowing"; + } else { + console.log("********************Else"); sessionStorage["tools"] = ""; tmpWindow.unbindWindowing(toolId); + } + // loadContextMenu(); } catch (e) { console.log('Dicom Image NOT AVAILABLE'); } @@ -1079,6 +1084,7 @@ totalImages = inst_text[1]; doUnbindWindowing(toolId, isMultiframe, iNo, totalImages, window); } + loadContextMenu(); } function doUnbindWindowing(toolId, isMultiframe, iNo, totalImages, tmpWindow) { @@ -1097,6 +1103,7 @@ tmpWindow.loadImg(isMultiframe, iNo); } } + loadContextMenu(); } function activateMeasure(toolId) { @@ -1358,7 +1365,7 @@ state.drag = true; mouseLocX = evt.pageX; mouseLocY = evt.pageY; - evt.target.style.cursor = "url(images/wincursor.png), auto"; + // evt.target.style.cursor = "url(images/wincursor.png), auto"; evt.preventDefault(); evt.stopPropagation(); }).mousemove(function(evt) { @@ -1485,11 +1492,14 @@ if(firstTime) { jQuery('#canvasLayer2').mouseup(function(evt) { + console.log('111111111'); + //loadContextMenu(); + if(evt.which==1) { state.drag = false; state.mouseDown = false; + jQuery('.contextMenu').hide(); evt.target.style.cursor = "default"; - jQuery('.contextMenu').hide(); // jQuery('.selected').removeClass('selected'); var iframe = window.parent.document.getElementsByTagName('iframe'); if (iframe.length > 1 && iframe[0].src.indexOf('TileContent.html') >= 0) { @@ -1500,7 +1510,12 @@ } } } - }).mousedown(function(evt) { + + }); + jQuery('#canvasLayer2').mousedown(function(evt) { + console.log('222222222'+ evt.which); + + // loadContextMenu(); if(evt.which==1) { windowingChanged = true; // var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0; @@ -1511,19 +1526,31 @@ if(state.winPtr!=iNo || (isNaN(modifiedWC) && isNaN(modifiedWW))) { state.windowing = true; getPixelData(false); + // evt.target.style.cursor = "url(images/wincursor.png), auto"; } else { state.drag = true; } state.mouseDown = true; + evt.target.style.cursor = "url(images/wincursor.png), auto"; } + + if(evt.which==3) { + evt.target.style.cursor = "default"; + } mouseLocX = evt.pageX; mouseLocY = evt.pageY; - evt.target.style.cursor = "url(images/wincursor.png), auto"; + // evt.target.focus(); evt.preventDefault(); evt.stopPropagation(); - }).mousemove(function(evt) { + }); + jQuery('#canvasLayer2').mousemove(function(evt) { + loadContextMenu(); + // evt.target.style.cursor = "default"; + if(evt.which==1) { + + // jQuery('.selected',window.parent.document).removeClass('selected'); // var isMultiframe = jQuery('#totalImages').html().indexOf('Frame')>=0; // var iNo = isMultiframe ? frameInc : imgInc; @@ -1584,6 +1611,7 @@ mouseLocY = evt.pageY; wlDisplay.html("WL: " + modifiedWC + " / WW: " + modifiedWW); } + } }); window.parent.enableWindowingContext(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kar...@us...> - 2021-05-07 12:18:00
|
Revision: 18976 http://sourceforge.net/p/dcm4che/svn/18976 Author: karthikeyansan Date: 2021-05-07 12:17:59 +0000 (Fri, 07 May 2021) Log Message: ----------- OVM-72 - Release Oviyam 2.8.1 Modified Paths: -------------- oviyam/oviyam/trunk/web/error.jsp oviyam/oviyam/trunk/web/js/i18n/Bundle.js oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js Modified: oviyam/oviyam/trunk/web/error.jsp =================================================================== --- oviyam/oviyam/trunk/web/error.jsp 2021-05-06 05:22:50 UTC (rev 18975) +++ oviyam/oviyam/trunk/web/error.jsp 2021-05-07 12:17:59 UTC (rev 18976) @@ -43,6 +43,14 @@ }); + var lang = $.cookies.get( 'language' ); + var bundleName = ''; + if (lang == null || lang.trim() == 'en_GB') { + bundleName = 'js/i18n/Bundle.js'; + } else { + bundleName = 'js/i18n/' + "Bundle_" + lang + ".js"; + } + document.write('<script type="text/javascript" src="' + bundleName + '"><\/script>'); </script> </head> <body class="ui-widget-content" style="border:none;" onload="document.login.j_username.focus()"> @@ -51,7 +59,9 @@ <form name="login" id="login" action="j_security_check" method="POST"> <fieldset> <legend><font>Login</font></legend> - <h1>Oviyam 2</h1> <h4>DICOM Web Workstation - Version 2.8</h4> + <h1><script>document.write(languages['PageTitle']) </script> 2</h1> <h4><script>document.write(languages['Workstation']) </script> - + <script>document.write(languages['Version']);</script> + <script> document.write(languages['VersionNo']); </script></h4> <label><font>Username </font><span class="mandatory"><font>*</font></span><font></font></label> <input type="text" name="j_username" class="textInput" placeholder="Username" required> @@ -62,6 +72,6 @@ </fieldset> </form> </section> - <footer style="text-align: center;">OVIYAM 2.8 requires latest version of Google Chrome / Safari / Mozila Firefox.</footer> + <footer style="text-align: center;"> <script> document.write(languages['Footer']); </script></footer> </body> </html> \ No newline at end of file Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle.js 2021-05-06 05:22:50 UTC (rev 18975) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle.js 2021-05-07 12:17:59 UTC (rev 18976) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8", + VersionNo:"2.8.1", UserName: "User Name", Password: "Password", Login: "Login", - Footer: "Oviyam2.8 requires latest version of Google Chrome / Safari.", + Footer: "Oviyam 2.8.1 requires latest version of Google Chrome / Safari / Mozila Firefox.", PatientName: "Patient Name", PatientId: "Patient ID", BirthDate: "Birth Date", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js 2021-05-06 05:22:50 UTC (rev 18975) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_de_DE.js 2021-05-07 12:17:59 UTC (rev 18976) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8", + VersionNo:"2.8.1", UserName: "Benutzername", Password: "Passwort", Login: "Anmeldung", - Footer: "Dieser Viewer benötigt Google Chrome / Safari.", + Footer: "Dieser Viewer benötigt Google Chrome / Safari / Mozila Firefox.", PatientName: "Patienten Name", PatientId: "Patienten ID", BirthDate: "Geburtsdatum", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js 2021-05-06 05:22:50 UTC (rev 18975) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_es_ES.js 2021-05-07 12:17:59 UTC (rev 18976) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo: "2.8", + VersionNo: "2.8.1", UserName: "usuario", Password: "contraseña", Login: "iniciar sesión", - Footer: "Oviyam2.8 requiere la última versión de Google Chrome / Safari.", + Footer: "Oviyam 2.8.1 requiere la última versión de Google Chrome / Safari / Mozila Firefox.", PatientName: "Nombre del paciente", PatientId: "ID del paciente", BirthDate: "Fecha de nacimiento", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js 2021-05-06 05:22:50 UTC (rev 18975) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ja_JP.js 2021-05-07 12:17:59 UTC (rev 18976) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8", + VersionNo:"2.8.1", UserName: "ユーザ名", Password: "パスワード", Login: "ログイン", - Footer: "Oviyam2.8 は Google Chrome もしくは Safari の最新バージョンが必要です", + Footer: "Oviyam 2.8.1 は Google Chrome もしくは Safari の最新バージョンが必要です", PatientName: "患者名", PatientId: "患者ID", BirthDate: "生年月日", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js 2021-05-06 05:22:50 UTC (rev 18975) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ru_RU.js 2021-05-07 12:17:59 UTC (rev 18976) @@ -1,10 +1,10 @@ var languages = { PageTitle: "Oviyam", - VersionNo:"2.8", + VersionNo:"2.8.1", UserName: "Имя пользователя", Password: "Пароль", Login: "Логин", - Footer: "Для Oviyam2.8 требуется последняя версия Google Chrome / Safari.", + Footer: "Для Oviyam 2.8.1 требуется последняя версия Google Chrome / Safari / Mozila Firefox.", PatientName: "Имя пациета", PatientId: "ID Пациента", BirthDate: "Дата рождения", @@ -104,7 +104,7 @@ iOviyamUpdateError: "Ошибка при обновлении контекста iOviyam!!!", downloadUpdateSuccess: "Загрузка настройки исследования успешно обновлены!!!", downloadUpdateError: "Ошибка при обновлении настроек Загрузки исследования!!!", - nameConfigUpdateSuccess: "Конфигурация отображения имени успешно обновлена !!!", + nameConfigUpdateSuccess: "Конфигурация отображения имени успешно обновлена !!!", nameConfigUpdateError: "Ошибка при обновлении конфигурации отображения имени !!!", modalityValidError: "Пожалуйста, введите правильный модальный список", overlayReadError: "Не удалось прочитать настройки наложения текста", Modified: oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js =================================================================== --- oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js 2021-05-06 05:22:50 UTC (rev 18975) +++ oviyam/oviyam/trunk/web/js/i18n/Bundle_ta_IN.js 2021-05-07 12:17:59 UTC (rev 18976) @@ -1,10 +1,10 @@ var languages = { PageTitle: "ஓவியம்", - VersionNo:"2.8", + VersionNo:"2.8.1", UserName: "பயனர் பெயர்", Password: "கடவுச்சொல்", Login: "உள்நுழைக", - Footer: "ஓவியம்2.8 -க்கு தேவை google chrome / safari புதிய பதிப்பு. ", + Footer: "ஓவியம் 2.8.1 -க்கு தேவை Google Chrome / Safari / Mozila Firefox புதிய பதிப்பு. ", PatientName: "நோயாளியின் பெயர்", PatientId: "நோயாளியின் எண்", BirthDate: "பிறந்த தேதி", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kar...@us...> - 2021-05-06 05:22:50
|
Revision: 18975 http://sourceforge.net/p/dcm4che/svn/18975 Author: karthikeyansan Date: 2021-05-06 05:22:50 +0000 (Thu, 06 May 2021) Log Message: ----------- OV-237 - Unable to reposition or extend angle measurement drawn. Modified Paths: -------------- oviyam/oviyam/trunk/web/js/measure.js Modified: oviyam/oviyam/trunk/web/js/measure.js =================================================================== --- oviyam/oviyam/trunk/web/js/measure.js 2021-05-06 03:41:01 UTC (rev 18974) +++ oviyam/oviyam/trunk/web/js/measure.js 2021-05-06 05:22:50 UTC (rev 18975) @@ -189,7 +189,8 @@ drawCanvas.removeEventListener('mousedown', cobbMouseDown); drawCanvas.removeEventListener('mouseup', cobbMouseUp); drawCanvas.removeEventListener('mousemove', cobbMouseMove); - selectedShape = null; + if (tool === 'cobb') + selectedShape = null; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |