~ubuntu-branches/ubuntu/trusty/ginkgocadx/trusty

Viewing changes to src/cadxcore/main/controllers/streaming/streamingloader.cpp

Committer: Package Import Robot
Author(s): Dmitry Smirnov
Date: 2013-07-21 11:58:53 UTC
mfrom: (7.2.1 sid)
Revision ID: package-import@ubuntu.com-20130721115853-44e7n1xujqglu78e

Tags: 3.4.0.928.29+dfsg-1

* New upstream release [July 2013]
  + new B-D: "libjsoncpp-dev".
  + new patch "unbundle-libjsoncpp.patch" to avoid building bundled
    "libjsoncpp-dev".
  + new patch "fix-wx.patch" to avoid FTBFS due to missing
    "-lwx_gtk2u_html-2.8".
* Removed unnecessary versioned Build-Depends.
* Removed obsolete lintian override.
* Reference get-orig-source implementation for orig.tar clean-up and
  DFSG-repackaging.
* Upload to unstable.

files added:
.pc/fix-wx.patch

.pc/fix-wx.patch/src

.pc/fix-wx.patch/src/CMakeLists.txt

.pc/unbundle-libjsoncpp.patch

.pc/unbundle-libjsoncpp.patch/src

.pc/unbundle-libjsoncpp.patch/src/cadxcore

.pc/unbundle-libjsoncpp.patch/src/cadxcore/CMakeLists.txt

debian/patches/fix-wx.patch

debian/patches/unbundle-libjsoncpp.patch

src/cadxcore/api/cloud.h

src/cadxcore/api/controllers/icommandcontroller.cpp

src/cadxcore/api/controllers/icommandcontroller.h

src/cadxcore/api/dicom/icustomassociation.cpp

src/cadxcore/api/dicom/icustomassociation.h

src/cadxcore/commands/cloudcommand.cpp

src/cadxcore/commands/cloudcommand.h

src/cadxcore/commands/linkhistorycommand.cpp

src/cadxcore/commands/linkhistorycommand.h

src/cadxcore/commands/pacsdownloadcommand.cpp

src/cadxcore/commands/pacsdownloadcommand.h

src/cadxcore/commands/pdfextractercommand.cpp

src/cadxcore/commands/pdfextractercommand.h

src/cadxcore/commands/secondarycapturedicomizecommand.cpp

src/cadxcore/commands/secondarycapturedicomizecommand.h

src/cadxcore/commands/synchronizationcommand.cpp

src/cadxcore/commands/synchronizationcommand.h

src/cadxcore/eventos/scgenerated.h

src/cadxcore/export/tools/iaddfiletohistorytool.cpp

src/cadxcore/export/tools/iaddfiletohistorytool.h

src/cadxcore/export/tools/icopyimagetoclipboardtool.cpp

src/cadxcore/export/tools/icopyimagetoclipboardtool.h

src/cadxcore/export/tools/ipacsuploadtool.cpp

src/cadxcore/export/tools/ipacsuploadtool.h

src/cadxcore/export/tools/isecondarycapturetool.cpp

src/cadxcore/export/tools/isecondarycapturetool.h

src/cadxcore/export/tools/istartdicomizationtool.cpp

src/cadxcore/export/tools/istartdicomizationtool.h

src/cadxcore/main/controllers/commandcontroller.cpp

src/cadxcore/main/controllers/commandcontroller.h

src/cadxcore/main/controllers/windowattributescontroller.cpp

src/cadxcore/main/controllers/windowattributescontroller.h

src/cadxcore/main/gui/acquisition/downloadagaindialog.cpp

src/cadxcore/main/gui/acquisition/downloadagaindialog.h

src/cadxcore/main/gui/anonymize/anonymizepanel.cpp

src/cadxcore/main/gui/anonymize/anonymizepanel.h

src/cadxcore/main/gui/ginkgocloud

src/cadxcore/main/gui/ginkgocloud/downloadcloud.fbp

src/cadxcore/main/gui/ginkgocloud/downloadcloudbase.cpp

src/cadxcore/main/gui/ginkgocloud/downloadcloudbase.h

src/cadxcore/main/gui/ginkgocloud/filelinkdialog.cpp

src/cadxcore/main/gui/ginkgocloud/filelinkdialog.h

src/cadxcore/main/gui/ginkgocloud/ginkgocloudsearchdialog.cpp

src/cadxcore/main/gui/ginkgocloud/ginkgocloudsearchdialog.h

src/cadxcore/main/gui/ginkgocloud/openginkgoclouddialog.cpp

src/cadxcore/main/gui/ginkgocloud/openginkgoclouddialog.h

src/cadxcore/main/gui/ginkgocloud/wxtreelistctrlcloud.h

src/cadxcore/main/gui/history3/synchronizedialog.cpp

src/cadxcore/main/gui/history3/synchronizedialog.h

src/cadxcore/main/gui/pacsupload

src/cadxcore/main/gui/pacsupload/PACSUpload.fbp

src/cadxcore/main/gui/pacsupload/pacsuploaddialog.cpp

src/cadxcore/main/gui/pacsupload/pacsuploaddialog.h

src/cadxcore/main/gui/pacsupload/pacsuploaddialogbase.cpp

src/cadxcore/main/gui/pacsupload/pacsuploaddialogbase.h

src/cadxcore/main/tools/addfiletohistorytool.cpp

src/cadxcore/main/tools/addfiletohistorytool.h

src/cadxcore/main/tools/copyimagetoclipboardtool.cpp

src/cadxcore/main/tools/copyimagetoclipboardtool.h

src/cadxcore/main/tools/openginkgocloudlinktool.cpp

src/cadxcore/main/tools/openginkgocloudlinktool.h

src/cadxcore/main/tools/pacsuploadtool.cpp

src/cadxcore/main/tools/pacsuploadtool.h

src/cadxcore/main/tools/searchginkgocloudtool.cpp

src/cadxcore/main/tools/searchginkgocloudtool.h

src/cadxcore/main/tools/secondarycapturetool.cpp

src/cadxcore/main/tools/secondarycapturetool.h

src/cadxcore/main/tools/startdicomizationtool.cpp

src/cadxcore/main/tools/startdicomizationtool.h

src/cadxcore/resources/files/big_icons/ico_default_dicomizer.png

src/cadxcore/resources/files/big_icons/ico_search_ginkgocloud.png

src/cadxcore/resources/files/big_icons/ico_search_ginkgocloud.svg

src/cadxcore/resources/files/history/ico_local_file.png

src/cadxcore/resources/files/history/ico_local_linked.png

src/cadxcore/resources/files/history/ico_wado_linked.png

src/cadxcore/resources/files/history/ico_wado_linked_preview.png

src/cadxcore/resources/files/menu_icons/ico_paste.png

src/cadxcore/resources/files/tool_icons/ico_copy.png

src/cadxcore/resources/files/tool_icons/ico_download_cloud.png

src/cadxcore/resources/files/tool_icons/ico_search_cloud.png

src/cadxcore/widgets/wstaticrule.cpp

src/cadxcore/widgets/wstaticrule.h

src/ginkgocadx/ginkgocadx_vs2012.sln

files removed:
.pc/fix-desktop.patch

.pc/fix-desktop.patch/src

.pc/fix-desktop.patch/src/ginkgocadx

.pc/fix-desktop.patch/src/ginkgocadx/ginkgocadx.desktop

.pc/fix-spelling.patch

.pc/fix-spelling.patch/src

.pc/fix-spelling.patch/src/cadxcore

.pc/fix-spelling.patch/src/cadxcore/api

.pc/fix-spelling.patch/src/cadxcore/api/icommand.cpp

.pc/fix-spelling.patch/src/cadxcore/sqlite

.pc/fix-spelling.patch/src/cadxcore/sqlite/sqlite3.c

debian/patches/fix-desktop.patch

debian/patches/fix-spelling.patch

src/cadxcore/api/controllers/icommandscontroller.cpp

src/cadxcore/api/controllers/icommandscontroller.h

src/cadxcore/api/dicom/imodelodicomreferencial.h

src/cadxcore/cadxcore.vcproj

src/cadxcore/eventos/estilo.h

src/cadxcore/eventos/filehistory.h

src/cadxcore/eventos/handledicom.h

src/cadxcore/eventos/herramientas.h

src/cadxcore/ginkgopro

src/cadxcore/ginkgopro/ginkgo_pro_defines.h

src/cadxcore/ginkgopro/ico_logo_splash.h

src/cadxcore/ginkgopro/ico_logo_splash.png

src/cadxcore/ginkgopro/ico_logo_splash.svg

src/cadxcore/ginkgopro/icons.h

src/cadxcore/main/controllers/controladorcomandos.cpp

src/cadxcore/main/controllers/controladorcomandos.h

src/cadxcore/main/gui/acquisition/downloadelementcontainerpanel.cpp

src/cadxcore/main/gui/acquisition/downloadelementcontainerpanel.h

src/cadxcore/main/tools/herramientascore.h

src/cadxcore/resources/files/history/ico_linked.png

src/ginkgocadx/ginkgo.sln

src/ginkgocadx/ginkgocadx.vcproj

src/install_open_source/install_open_source.vcproj

src/visualizator/visualizator.vcproj

src/visualizator/visualizator/commands

src/visualizator/visualizator/commands/pdfextractercommand.cpp

src/visualizator/visualizator/commands/pdfextractercommand.h

files modified:
.pc/applied-patches

changelog_opensource.txt

debian/changelog

debian/control

debian/copyright

debian/lintian-overrides

debian/patches/series

debian/rules

debian/watch

doc/DICOM_Conformance-GinkgoCADx.pdf

doc/ReadMe-Compilation.pdf

src/CMake/LinuxProperties.cmake

src/CMakeLists.txt

src/Versions.nsh

src/cadxcore/CMakeLists.txt

src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp

src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.h

src/cadxcore/api/controllers/icontroladorcarga.h

src/cadxcore/api/controllers/ihistorycontroller.cpp

src/cadxcore/api/controllers/ihistorycontroller.h

src/cadxcore/api/controllers/imodulecontroller.cpp

src/cadxcore/api/controllers/imodulecontroller.h

src/cadxcore/api/controllers/ipacscontroller.cpp

src/cadxcore/api/controllers/ipacscontroller.h

src/cadxcore/api/controllers/proxies/ipipelineproperties.h

src/cadxcore/api/dicom/imodelodicom.h

src/cadxcore/api/helpers/aetwildcards.cpp

src/cadxcore/api/helpers/helpertexto.cpp

src/cadxcore/api/ianotador.h

src/cadxcore/api/icommand.cpp

src/cadxcore/api/icommand.h

src/cadxcore/api/ientorno.h

src/cadxcore/api/iexception.cpp

src/cadxcore/api/ihistorytool.cpp

src/cadxcore/api/ihistorytool.h

src/cadxcore/api/ilock.cpp

src/cadxcore/api/ilock.h

src/cadxcore/api/imodelointegracion.h

src/cadxcore/api/initwx.cpp

src/cadxcore/api/istudycontext.cpp

src/cadxcore/api/istudycontext.h

src/cadxcore/api/ivista.cpp

src/cadxcore/api/ivista.h

src/cadxcore/api/iwaitqueue.cpp

src/cadxcore/api/iwaitqueue.h

src/cadxcore/api/iwidgetsrenderer.h

src/cadxcore/api/math/geometry3d.h

src/cadxcore/api/threads/thread.cpp

src/cadxcore/api/threads/thread.h

src/cadxcore/api/toolsystem/itool.cpp

src/cadxcore/api/toolsystem/itool.h

src/cadxcore/cadxcore.vcxproj

src/cadxcore/cadxcore.vcxproj.filters

src/cadxcore/commands/comandoexportacion.cpp

src/cadxcore/commands/comandoincluirhistorial.cpp

src/cadxcore/commands/comandopacs.cpp

src/cadxcore/commands/comandopacs.h

src/cadxcore/commands/dbmigrationcommand.cpp

src/cadxcore/commands/dicomizecommand.cpp

src/cadxcore/commands/dicomizecommand.h

src/cadxcore/commands/incomingdicomassociationcommand.cpp

src/cadxcore/commands/incomingdicomassociationcommand.h

src/cadxcore/commands/openremovableunit.cpp

src/cadxcore/commands/sendhl7command.cpp

src/cadxcore/commands/sendpacscommand.cpp

src/cadxcore/commands/thumbnailscommand.cpp

src/cadxcore/endpoint/endpoint.cpp

src/cadxcore/eventos/eventosginkgo.h

src/cadxcore/eventos/modificacionimagen.h

src/cadxcore/export/contracts/iimageexportcontract.cpp

src/cadxcore/export/contracts/iimageexportcontract.h

src/cadxcore/export/tools/iherramientascore.h

src/cadxcore/export/tools/iimageexporttool.cpp

src/cadxcore/export/tools/iimageprinttool.cpp

src/cadxcore/lang/cadxcore.pot

src/cadxcore/lang/de/cadxcore.mo

src/cadxcore/lang/de/cadxcore.po

src/cadxcore/lang/el/cadxcore.mo

src/cadxcore/lang/el/cadxcore.po

src/cadxcore/lang/es/cadxcore.mo

src/cadxcore/lang/es/cadxcore.po

src/cadxcore/lang/ja/cadxcore.mo

src/cadxcore/lang/ja/cadxcore.po

src/cadxcore/lang/pl/cadxcore.mo

src/cadxcore/lang/pl/cadxcore.po

src/cadxcore/lang/pt/cadxcore.mo

src/cadxcore/lang/pt/cadxcore.po

src/cadxcore/lang/tr/cadxcore.mo

src/cadxcore/lang/tr/cadxcore.po

src/cadxcore/main/controllers/configurationcontroller.cpp

src/cadxcore/main/controllers/configurationcontroller.h

src/cadxcore/main/controllers/controladorcarga.cpp

src/cadxcore/main/controllers/controladorenviohl7.cpp

src/cadxcore/main/controllers/controladorextensiones.cpp

src/cadxcore/main/controllers/controladorvistas.cpp

src/cadxcore/main/controllers/dcmtk/dicomassociation.cpp

src/cadxcore/main/controllers/dcmtk/dicomassociation.h

src/cadxcore/main/controllers/dcmtk/dicomcustomassociation.cpp

src/cadxcore/main/controllers/dcmtk/dicomcustomassociation.h

src/cadxcore/main/controllers/dcmtk/dicomfindassociation.cpp

src/cadxcore/main/controllers/dcmtk/dicomgetassociation.cpp

src/cadxcore/main/controllers/dcmtk/dicomgetassociation.h

src/cadxcore/main/controllers/dcmtk/dicommoveassociation.cpp

src/cadxcore/main/controllers/dcmtk/dicommoveassociation.h

src/cadxcore/main/controllers/dcmtk/dicomnetclient.h

src/cadxcore/main/controllers/dcmtk/dicomnetwork.cpp

src/cadxcore/main/controllers/dcmtk/dicomnetwork.h

src/cadxcore/main/controllers/dcmtk/dicomprintassociation.cpp

src/cadxcore/main/controllers/dcmtk/dicomprintassociation.h

src/cadxcore/main/controllers/dcmtk/dicomservers.cpp

src/cadxcore/main/controllers/dcmtk/dicomservers.h

src/cadxcore/main/controllers/dcmtk/dicomservice.cpp

src/cadxcore/main/controllers/dcmtk/dicomservice.h

src/cadxcore/main/controllers/dcmtk/dicomstoreassociation.cpp

src/cadxcore/main/controllers/dcmtk/dicomstoreassociation.h

src/cadxcore/main/controllers/dicommanager.cpp

src/cadxcore/main/controllers/hangingprotocolcontroller.cpp

src/cadxcore/main/controllers/hangingprotocolcontroller.h

src/cadxcore/main/controllers/historycontroller.cpp

src/cadxcore/main/controllers/historycontroller.h

src/cadxcore/main/controllers/inactivitycontroller.cpp

src/cadxcore/main/controllers/integrationcontroller.cpp

src/cadxcore/main/controllers/integrationcontroller.h

src/cadxcore/main/controllers/pacscontroller.cpp

src/cadxcore/main/controllers/pacscontroller.h

src/cadxcore/main/controllers/parserxmlenglish.cpp

src/cadxcore/main/controllers/parserxmlspanish.cpp

src/cadxcore/main/controllers/streaming/streamingloader.cpp

src/cadxcore/main/controllers/streaming/streamingloader.h

src/cadxcore/main/controllers/thumbnailcontroller.cpp

src/cadxcore/main/entorno.cpp

src/cadxcore/main/entorno.h

src/cadxcore/main/gui/acquisition/DialogoAdquisicion.fbp

src/cadxcore/main/gui/acquisition/dialogoadquisicion.cpp

src/cadxcore/main/gui/acquisition/dialogoadquisicion.h

src/cadxcore/main/gui/acquisition/dialogoadquisicionbase.cpp

src/cadxcore/main/gui/acquisition/dialogoadquisicionbase.h

src/cadxcore/main/gui/anonymize/AnonymizePanels.fbp

src/cadxcore/main/gui/anonymize/anonymizedialog.cpp

src/cadxcore/main/gui/anonymize/anonymizedialog.h

src/cadxcore/main/gui/anonymize/anonymizepanelbase.cpp

src/cadxcore/main/gui/anonymize/anonymizepanelbase.h

src/cadxcore/main/gui/callibration/procesarcalibrado.cpp

src/cadxcore/main/gui/callibration/wxwizardcalibradoginkgo.cpp

src/cadxcore/main/gui/configuration/PanelesConfiguracion.fbp

src/cadxcore/main/gui/configuration/dialogoconfiguracion.cpp

src/cadxcore/main/gui/configuration/hangingprotocolconfigurationpanel.cpp

src/cadxcore/main/gui/configuration/panelconfiguracionestacion.cpp

src/cadxcore/main/gui/configuration/panelconfiguraciongeneral.cpp

src/cadxcore/main/gui/configuration/panelconfiguracionpacs.cpp

src/cadxcore/main/gui/configuration/panelconfiguracionpacs.h

src/cadxcore/main/gui/configuration/panelesconfiguracionginkgobase.cpp

src/cadxcore/main/gui/configuration/panelesconfiguracionginkgobase.h

src/cadxcore/main/gui/dicombrowsercomponent.cpp

src/cadxcore/main/gui/dicomdirexport/exportdicomdir.cpp

src/cadxcore/main/gui/dicomdirmigration/DicomDirMigration.fbp

src/cadxcore/main/gui/dicomdirmigration/dicomdirmigration.cpp

src/cadxcore/main/gui/dicomdirmigration/dicomdirmigration.h

src/cadxcore/main/gui/dicomdirmigration/dicomdirmigrationbase.cpp

src/cadxcore/main/gui/dicomdirmigration/dicomdirmigrationbase.h

src/cadxcore/main/gui/droptargetmainwindow.cpp

src/cadxcore/main/gui/export/parametrosprincipales.cpp

src/cadxcore/main/gui/history3/HistoryPanel3.fbp

src/cadxcore/main/gui/history3/historypanel3.cpp

src/cadxcore/main/gui/history3/historypanel3.h

src/cadxcore/main/gui/history3/historypanel3base.cpp

src/cadxcore/main/gui/history3/historypanel3base.h

src/cadxcore/main/gui/history3/historytoolmenu.cpp

src/cadxcore/main/gui/history3/wxhistoryimagethumbnail.cpp

src/cadxcore/main/gui/history3/wxhistoryimagethumbnail.h

src/cadxcore/main/gui/history3/wxtreelistctrlhistory.h

src/cadxcore/main/gui/import/PasosImportacion.fbp

src/cadxcore/main/gui/import/generaldata.cpp

src/cadxcore/main/gui/import/pasoperfilimportacion.cpp

src/cadxcore/main/gui/import/pasoperfilimportacion.h

src/cadxcore/main/gui/import/pasosimportacionbase.cpp

src/cadxcore/main/gui/import/pasosimportacionbase.h

src/cadxcore/main/gui/import/selectimagesimportation.cpp

src/cadxcore/main/gui/import/selectimagesimportation.h

src/cadxcore/main/gui/import/wxwizardimportacionginkgo.cpp

src/cadxcore/main/gui/license/AboutDialog.fbp

src/cadxcore/main/gui/license/aboutdialog.cpp

src/cadxcore/main/gui/license/aboutdialog.h

src/cadxcore/main/gui/license/aboutdialogbase.cpp

src/cadxcore/main/gui/license/aboutdialogbase.h

src/cadxcore/main/gui/license/dialogolicenciasopensource.cpp

src/cadxcore/main/gui/license/dialogolicenciasopensource.h

src/cadxcore/main/gui/logcontrolwindow/ventanacontrollogs.cpp

src/cadxcore/main/gui/mainwindow/ventanaprincipal.cpp

src/cadxcore/main/gui/open/abrir.cpp

src/cadxcore/main/gui/open/opendialogs.cpp

src/cadxcore/main/gui/paneltags/paneltags.cpp

src/cadxcore/main/gui/paneltags/paneltags.h

src/cadxcore/main/gui/previewpanel/PreviewPanel.fbp

src/cadxcore/main/gui/previewpanel/leafpanel.cpp

src/cadxcore/main/gui/previewpanel/previewpanel.cpp

src/cadxcore/main/gui/previewpanel/previewpanelbase.cpp

src/cadxcore/main/gui/previewpanel/previewpanelbase.h

src/cadxcore/main/gui/previewpanel/previewpanelmodel.h

src/cadxcore/main/gui/progress/paneltarea.cpp

src/cadxcore/main/gui/progress/statusbarprogreso.cpp

src/cadxcore/main/gui/selectpacsserver/selectpacsserver.cpp

src/cadxcore/main/gui/startup/startupform.cpp

src/cadxcore/main/gui/taskcontrol/taskcontrol.cpp

src/cadxcore/main/license.h

src/cadxcore/main/managers/widgetsmanager.cpp

src/cadxcore/main/tools/anonymizetool.cpp

src/cadxcore/main/tools/anonymizetool.h

src/cadxcore/main/tools/coretools.cpp

src/cadxcore/main/tools/dicomizetool.cpp

src/cadxcore/main/tools/dicomizetool.h

src/cadxcore/main/tools/exportdicomdirtool.cpp

src/cadxcore/main/tools/exportdicomdirtool.h

src/cadxcore/main/tools/openremovabletool.cpp

src/cadxcore/main/tools/rotateandfliptool.cpp

src/cadxcore/main/tools/sendpacstool.cpp

src/cadxcore/main/tools/sendpacstool.h

src/cadxcore/main/tools/showhistorytool.cpp

src/cadxcore/main/tools/showtagstool.cpp

src/cadxcore/main/tools/toolzoom.cpp

src/cadxcore/main/toolsystem/toolcontroller.cpp

src/cadxcore/resources/files/history/ico_movie_preview.png

src/cadxcore/resources/files/history/ico_pdf_preview.png

src/cadxcore/resources/files/history/ico_unknown_file.png

src/cadxcore/resources/ginkgoresourcesmanager.cpp

src/cadxcore/resources/ginkgoresourcesmanager.h

src/cadxcore/singleinstance.h

src/cadxcore/sqlite/ginkgosqlite.h

src/cadxcore/stdafx.cpp

src/cadxcore/vtk/vtkginkgoimageviewer.cpp

src/cadxcore/vtk/vtkginkgoimageviewer.h

src/cadxcore/widgets/observers/iobservadormarcadoarea.h

src/cadxcore/widgets/wanotacionesquina.cpp

src/cadxcore/widgets/wanotacionesquina.h

src/cadxcore/widgets/wslider.cpp

src/cadxcore/wx/propgrid/odcombo.cpp

src/cadxcore/wx/thumbnailctrl/thumbnailctrl.cpp

src/cadxcore/wx/thumbnailctrl/thumbnailctrl.h

src/cadxcore/wx/treelistctrl/treelistctrl.cpp

src/cadxcore/wx/wizardginkgo/DialogoWizard.fbp

src/cadxcore/wx/wizardginkgo/wxwizardginkgobasewx.cpp

src/cadxcore/wx/wizardginkgo/wxwizardginkgobasewx.h

src/ginkgocadx/CMakeLists.txt

src/ginkgocadx/ginkgocadx.vcxproj

src/ginkgocadx/main.cpp

src/install_open_source/InstallReleaseMonoliticOpenSource.bat

src/install_open_source/NsisInstaller.nsi

src/visualizator/lang/de/visualizator.mo

src/visualizator/lang/de/visualizator.po

src/visualizator/lang/el/visualizator.mo

src/visualizator/lang/el/visualizator.po

src/visualizator/lang/es/visualizator.mo

src/visualizator/lang/es/visualizator.po

src/visualizator/lang/ja/visualizator.mo

src/visualizator/lang/ja/visualizator.po

src/visualizator/lang/pl/visualizator.mo

src/visualizator/lang/pl/visualizator.po

src/visualizator/lang/pt/visualizator.mo

src/visualizator/lang/pt/visualizator.po

src/visualizator/lang/tr/visualizator.mo

src/visualizator/lang/tr/visualizator.po

src/visualizator/lang/visualizator.pot

src/visualizator/visualizator.vcxproj

src/visualizator/visualizator.vcxproj.filters

src/visualizator/visualizator/controllers/visualizatorcontroller.cpp

src/visualizator/visualizator/controllers/visualizatorcontroller.h

src/visualizator/visualizator/dialogos/importacion/selectimagesimportationvisualizator.cpp

src/visualizator/visualizator/estudios/ecgstudy.cpp

src/visualizator/visualizator/estudios/ecgstudy.h

src/visualizator/visualizator/estudios/visualizatorstudy.cpp

src/visualizator/visualizator/vistas/vista2d.cpp

src/visualizator/visualizator/wxvtk/gvistacompleja.cpp

src/visualizator/visualizator/wxvtk/gvistacompleja.h

src/visualizator/visualizator/wxvtk/gvistasimple.cpp

src/visualizator/visualizator/wxvtk/gvistasimple.h

src/visualizator/visualizator/wxvtk/gwaveformview.cpp

src/visualizator/visualizator/wxvtk/gwaveformview.h

src/visualizator/visualizator/wxvtk/previewpanelvisualizator.cpp

src/visualizator/visualizator/wxvtk/previewpanelvisualizator.h

Show diffs side-by-side

added added

removed removed

src/cadxcore/main/controllers/streaming/streamingloader.cpp

#include <api/icommand.h>

#include <api/dicom/idicommanager.h>

#include <api/controllers/icommandscontroller.h>

#include <main/controllers/commandcontroller.h>

#include <api/imodelointegracion.h>

#include <api/internationalization/internationalization.h>

#include <api/utils/iginkgomatrix4x4.h>

#include <vtkImageDataStreamer.h>

#include <itkImage.h>

#include <itkOrientedImage.h>

#include <itkCommand.h>

#include <itkMetaDataObject.h>

#include <itkImageFileReader.h>

#include <itkGDCMSeriesFileNames.h>

#include <itkVectorResampleImageFilter.h>

#include <itk/itkImageToVTKImageFilter.h>

#include <itkMetaDataDictionary.h>

#include <itkMetaDataObject.h>

#include <vtkAlgorithmOutput.h>

#include <vtkImageChangeInformation.h>

//#include <gdcmFilename.h>

//#include <gdcmSystem.h>

//#include <gdcmDirectory.h>

//#include <gdcmTrace.h>

//#include <gdcmVersion.h>

//#define DEBUG_PRINT_DIR_COSINES

class CargaItkProgressCallback : public itk::Command

158

154

//gdcm::ImageHelper::SetForceRescaleInterceptSlope(true);

159

155

//gdcm::ImageHelper::SetForcePixelSpacing(true);

160

156

161

m_GantryTilt = 0.0;

162

157

m_SignalFile = false;

163

158

m_IO = ImageIO::New();

164

159

m_IO->SetLoadPrivateTags(false);

202

197

try {

203

198

m_CurrentFile = fichero;

204

199

m_IO->SetFileName(fichero);

200

m_IO->SetUseStreamedReading(true);

201

205

202

206

203

//correct a bug because this dictionary doesn't clear between consecutive loads

207

204

itk::MetaDataDictionary newDict;

208

205

m_IO->SetMetaDataDictionary(newDict);

209

206

210

207

m_IO->ReadImageInformation();

208

211

209

212

210

//std::string tagkey;

213

211

//std::string GantryTilt;

255

253

#endif

256

254

257

255

}

256

// char age[20];

258

257

for (int i=0; i < 3; i++) {

259

258

m_Spacing[i] = m_IO->GetSpacing(i);

260

259

m_Origin[i] = m_IO->GetOrigin(i);

261

260

}

261

//check if image data is coherent...

262

itk::MetaDataDictionary& dict = m_IO->GetMetaDataDictionary();

263

if (dict.HasKey("0028|0107") && dict.HasKey( "0028|0103") && dict.HasKey("0028|0102")) {

264

//get highBit

265

if(itk::MetaDataObject <std::string> * highBit =dynamic_cast<itk::MetaDataObject <std::string> *>(dict["0028|0102"].GetPointer()))

266

{

267

//get largest value

268

if(itk::MetaDataObject <std::string> * largestValue =dynamic_cast<itk::MetaDataObject <std::string> *>(dict["0028|0107"].GetPointer()))

269

{

270

//get pixel representation

271

if(itk::MetaDataObject <std::string> * pixelRepresentation =dynamic_cast<itk::MetaDataObject <std::string> *>(dict["0028|0103"].GetPointer()))

272

{

273

if (pixelRepresentation->GetMetaDataObjectValue() == "1") {//if its signed and largest value > (2^highbit)-1

274

if (atoi(largestValue->GetMetaDataObjectValue().c_str()) > (pow((double)2, atoi(highBit->GetMetaDataObjectValue().c_str())) -1)) {

275

throw GNC::GCS::ControladorCargaException( _Std("Error reading the study: Largest image pixel value data is not coherent with combination of Pixel Representation and High bit") , "ControladorCarga/CargaMultidimensional");

276

}

277

} else {

278

if (atoi(largestValue->GetMetaDataObjectValue().c_str()) > (pow((double)2, atoi(highBit->GetMetaDataObjectValue().c_str())+1) -1)) {

279

280

}

281

}

282

}

283

}

284

}

285

}//check if image data is coherent

262

286

}

263

287

264

288

if (m_CurrentNumberOfComponents != m_IO->GetNumberOfComponents() || m_CurrentComponentType != m_IO->GetComponentType() || m_CurrentPixelType != m_IO->GetPixelType() || m_CurrentDimensions[0] != m_IO->GetDimensions(0) || m_CurrentDimensions[1] != m_IO->GetDimensions(1) || m_CurrentDimensions[2] != m_IO->GetDimensions(2) )

273

297

case ImageIO::UCHAR:

274

298

{

275

299

typedef unsigned char TypedPixelType;

276

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

300

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

277

301

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

278

302

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

279

303

pTypedReader->SetFileName(fichero);

283

307

case ImageIO::CHAR:

284

308

{

285

309

typedef char TypedPixelType;

286

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

310

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

287

311

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

288

312

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

289

313

pTypedReader->SetFileName(fichero);

293

317

case ImageIO::USHORT:

294

318

{

295

319

typedef unsigned short TypedPixelType;

296

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

320

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

297

321

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

298

322

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

299

323

pTypedReader->SetFileName(fichero);

302

326

break;

303

327

case ImageIO::SHORT:

304

328

{

305

typedef short TypedPixelType;

306

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

329

typedef unsigned short TypedPixelType;

330

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

307

331

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

308

332

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

309

333

pTypedReader->SetFileName(fichero);

313

337

case ImageIO::UINT:

314

338

{

315

339

typedef unsigned int TypedPixelType;

316

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

340

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

317

341

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

318

342

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

319

343

pTypedReader->SetFileName(fichero);

323

347

case ImageIO::INT:

324

348

{

325

349

typedef int TypedPixelType;

326

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

350

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

327

351

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

328

352

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

329

353

pTypedReader->SetFileName(fichero);

333

357

case ImageIO::ULONG:

334

358

{

335

359

typedef unsigned long TypedPixelType;

336

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

360

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

337

361

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

338

362

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

339

363

pTypedReader->SetFileName(fichero);

343

367

case ImageIO::LONG:

344

368

{

345

369

typedef long TypedPixelType;

346

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

370

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

347

371

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

348

372

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

349

373

pTypedReader->SetFileName(fichero);

353

377

case ImageIO::FLOAT:

354

378

{

355

379

typedef float TypedPixelType;

356

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

380

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

357

381

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

358

382

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

359

383

pTypedReader->SetFileName(fichero);

362

386

case ImageIO::DOUBLE:

363

387

{

364

388

typedef double TypedPixelType;

365

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

389

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

366

390

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

367

391

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

368

392

pTypedReader->SetFileName(fichero);

384

408

{

385

409

typedef unsigned char TypedComponentType;

386

410

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

387

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

411

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

388

412

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

389

413

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

390

414

pTypedReader->SetFileName(fichero);

395

419

{

396

420

typedef char TypedComponentType;

397

421

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

398

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

422

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

399

423

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

400

424

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

401

425

pTypedReader->SetFileName(fichero);

406

430

{

407

431

typedef unsigned short TypedComponentType;

408

432

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

409

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

433

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

410

434

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

411

435

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

412

436

pTypedReader->SetFileName(fichero);

417

441

{

418

442

typedef short TypedComponentType;

419

443

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

420

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

444

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

421

445

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

422

446

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

423

447

pTypedReader->SetFileName(fichero);

428

452

{

429

453

typedef unsigned int TypedComponentType;

430

454

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

431

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

455

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

432

456

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

433

457

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

434

458

pTypedReader->SetFileName(fichero);

439

463

{

440

464

typedef int TypedComponentType;

441

465

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

442

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

466

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

443

467

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

444

468

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

445

469

pTypedReader->SetFileName(fichero);

450

474

{

451

475

typedef long TypedComponentType;

452

476

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

453

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

477

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

454

478

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

455

479

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

456

480

pTypedReader->SetFileName(fichero);

461

485

{

462

486

typedef unsigned long TypedComponentType;

463

487

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

464

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

488

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

465

489

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

466

490

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

467

491

pTypedReader->SetFileName(fichero);

472

496

{

473

497

typedef float TypedComponentType;

474

498

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

475

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

499

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

476

500

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

477

501

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

478

502

pTypedReader->SetFileName(fichero);

483

507

{

484

508

typedef double TypedComponentType;

485

509

typedef itk::RGBPixel<TypedComponentType> TypedPixelType;

486

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

510

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

487

511

typedef itk::ImageFileReader<TypedImageType> TypedReaderType;

488

512

TypedReaderType* pTypedReader = static_cast<TypedReaderType*>(m_pReader.GetPointer());

489

513

pTypedReader->SetFileName(fichero);

633

657

634

658

void GNC::StreamingLoader::SetOutputSpacing(double spacing[3])

635

659

{

660

if (spacing[0] <= 0 || spacing[1] <= 0) {

661

spacing[0] = spacing[1] = 1.0;

662

}

636

663

m_pOutput->SetOutputSpacing(spacing);

637

664

}

638

665

651

678

m_pOutput->GetOutputSpacing(spacing);

652

679

}

653

680

654

int GNC::StreamingLoader::GetCurrentSliceIndex()

681

int GNC::StreamingLoader::GetCurrentSliceIndex() const

655

682

{

656

683

return 0;

657

684

}

658

685

686

std::string GNC::StreamingLoader::GetPatientPosition()

687

{

688

std::string patientPositionTag;

689

bool ok = m_IO->GetValueFromTag("0018|5100", patientPositionTag);

690

if (ok) {

691

return patientPositionTag;

692

}

693

return "";

694

}

695

659

696

void GNC::StreamingLoader::RecomponerPipeline()

660

697

{

661

698

if (m_SignalFile) {

670

707

m_pOutput->RemoveAllInputs();

671

708

672

709

typedef unsigned short TypedPixelType;

673

typedef itk::OrientedImage<TypedPixelType, 3 > TypedImageType;

710

typedef itk::Image<TypedPixelType, 3 > TypedImageType;

674

711

typedef itk::ImageToVTKImageFilter<TypedImageType> TypedJoinerType;

675

712

676

713

TypedImageType::Pointer img = TypedImageType::New();

808

845

reader->SetImageIO(pIO);

809

846

reader->SetFileName(m_CurrentFile);

810

847

reader->SetUseStreaming(true);

848

811

849

m_pOutput->SetInputConnection(joiner->GetImporter()->GetOutputPort());

812

850

//reader->GetOutput()->ReleaseDataFlagOn();

813

851

1160

1198

}

1161

1199

if (m_pReader.IsNotNull() && m_pPipelineJoiner.IsNotNull()) {

1162

1200

m_pReader->Modified();

1201

1163

1202

m_pPipelineJoiner->Modified();

1164

1203

}

1165

1204

m_pOutput->Modified();

Older »