~ubuntu-branches/ubuntu/wily/ginkgocadx/wily-proposed

« back to all changes in this revision

Viewing changes to src/cadxcore/main/controllers/parserxmlenglish.cpp

Committer: Package Import Robot
Author(s): Dmitry Smirnov
Date: 2014-01-09 07:37:09 UTC
mfrom: (1.2.3)
Revision ID: package-import@ubuntu.com-20140109073709-rpuh5x3p3finvtze

Tags: 3.6.0.1228.33+dfsg-1

New upstream release [December 2013]

files added:
src/cadxcore/api/controllers/anonusagestatsids.h

src/cadxcore/api/dicom/idicom.cpp

src/cadxcore/api/iannotator.cpp

src/cadxcore/api/iannotator.h

src/cadxcore/commands/acquirefromurlcommand.cpp

src/cadxcore/commands/acquirefromurlcommand.h

src/cadxcore/main/controllers/anonusagestats.cpp

src/cadxcore/main/controllers/anonusagestats.h

src/cadxcore/main/controllers/modalitysettingscontroller.cpp

src/cadxcore/main/controllers/modalitysettingscontroller.h

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

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

files removed:
src/cadxcore/api/ianotador.h

files modified:
.pc/fix-wx.patch/src/CMakeLists.txt

changelog_opensource.txt

debian/changelog

debian/copyright

doc/DICOM_Conformance-GinkgoCADx.pdf

doc/ReadMe-Compilation.pdf

src/CMakeLists.txt

src/Versions.nsh

src/cadxcore/api/controllers/icontroladorpermisos.h

src/cadxcore/api/controllers/ipacscontroller.cpp

src/cadxcore/api/controllers/ipacscontroller.h

src/cadxcore/api/dicom/dicomdataset.cpp

src/cadxcore/api/dicom/dicomdataset.h

src/cadxcore/api/dicom/idicom.h

src/cadxcore/api/initwx.cpp

src/cadxcore/api/iwidgetsmanager.cpp

src/cadxcore/api/iwidgetsmanager.h

src/cadxcore/api/math/geometry3d.h

src/cadxcore/cadxcore.vcxproj

src/cadxcore/cadxcore.vcxproj.filters

src/cadxcore/commands/autocleaningcommand.cpp

src/cadxcore/commands/openremovableunit.cpp

src/cadxcore/export/contracts/ipixelsbluringcontract.cpp

src/cadxcore/export/contracts/iwidgetscontract.cpp

src/cadxcore/export/contracts/iwidgetscontract.h

src/cadxcore/export/contracts/iwindowlevelcontract.cpp

src/cadxcore/export/tools/ishowtagstool.cpp

src/cadxcore/lang/cadxcore.pot

src/cadxcore/lang/es/cadxcore.mo

src/cadxcore/lang/es/cadxcore.po

src/cadxcore/main/controllers/configurationcontroller.cpp

src/cadxcore/main/controllers/controladorbbddhl7.cpp

src/cadxcore/main/controllers/dcmtk/libi2d/i2dplvlp.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/integrationcontroller.cpp

src/cadxcore/main/controllers/pacscontroller.cpp

src/cadxcore/main/controllers/parserxmlenglish.cpp

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

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

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

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

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

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

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/localdatabaseconfigurationpanel.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/cadxcore/main/license.h

src/cadxcore/main/managers/widgetsmanager.cpp

src/cadxcore/main/managers/widgetsmanager.h

src/cadxcore/main/tools/brightnesscontrasttool.cpp

src/cadxcore/main/tools/cornerannotationstool.cpp

src/cadxcore/main/tools/pointertool.cpp

src/cadxcore/main/tools/showtagshistorytool.cpp

src/cadxcore/resources/conformance.xml

src/cadxcore/widgets/wanotacionesquina.cpp

src/cadxcore/widgets/wanotacionesquina.h

src/cadxcore/widgets/wanotacionposicion.cpp

src/cadxcore/widgets/wanotacionposicion.h

src/cadxcore/widgets/welipse.cpp

src/cadxcore/widgets/wstaticrule.h

src/cadxcore/wx/ginkgostyle/ginkgostyle.cpp

src/cadxcore/wx/ginkgostyle/ginkgostyle.h

src/ginkgocadx/ginkgocadx.vcxproj

src/visualizator/lang/es/visualizator.mo

src/visualizator/lang/es/visualizator.po

src/visualizator/resources/visualizatorresourcesmanager.cpp

src/visualizator/visualizator/controllers/visualizatorcontroller.cpp

src/visualizator/visualizator/estudios/ecgstudy.cpp

src/visualizator/visualizator/vistas/waveformview.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/simpleviewexportdelegate.cpp

Show diffs side-by-side

added added

removed removed

src/cadxcore/main/controllers/parserxmlenglish.cpp

342

}

343

}

344

345

modelo->GlobalVariables.InsertVariable(GKDI_HCE_ID, "defaultHCE");

346

345

347

//recorremos los hijos de las gnkworkflows

346

348

for (wxXmlNode* hijo = nodo->GetChildren(); hijo != NULL; hijo = hijo->GetNext()) {

347

349

//files...

459

461

LOG_DEBUG("ParserXMLEnglish","application id unespecified, using \"defaultHCE\"");

460

462

modelo->GlobalVariables.InsertVariable(GKDI_HCE_ID, "defaultHCE");

461

463

}

462

} else {

463

LOG_DEBUG("ParserXMLEnglish","application id unespecified, using \"defaultHCE\"");

464

modelo->GlobalVariables.InsertVariable(GKDI_HCE_ID, "defaultHCE");

465

}

464

}

466

465

467

466

if (hijo->GetName().CmpNoCase(wxT("metadata")) == 0) {

468

467

std::string codigo;

545

544

LOG_DEBUG("ParserXMLEnglish", "\"petition-id\" attribute not specified");

546

545

}

547

546

} else if (modelo->accion == GIL::IModeloIntegracion::TA_Obtener) {

548

if (modelo->TagsDICOMOverwrite.tags.empty()) {

547

if (modelo->TagsDICOMOverwrite.tags.empty() && modelo->Files.empty()) {

549

548

throw IntegrationException(_Std("You must specify attributes you want to use in the query"), xpp, "CONF/template");

550

549

}

551

550

}

Older »