~ubuntu-branches/ubuntu/utopic/ginkgocadx/utopic-proposed

« back to all changes in this revision

Viewing changes to src/cadxcore/main/gui/import/selectimagesimportation.cpp

Committer: Package Import Robot
Author(s): Andreas Tille
Date: 2012-01-29 12:02:54 UTC
mfrom: (1.1.6)
Revision ID: package-import@ubuntu.com-20120129120254-nu7giync5p156icb

Tags: 2.8.0.4602-1

http://bugs.debian.org/657827

New upstream version (adapted patch, removed patch applied upstream)
Closes: #657827

files added:
src/cadxcore/api/ibutton.h

src/cadxcore/api/toolhandlers

src/cadxcore/api/toolhandlers/ipanhandler.h

src/cadxcore/api/toolhandlers/izoomhandler.h

src/cadxcore/commands/openremovableunit.cpp

src/cadxcore/commands/openremovableunit.h

src/cadxcore/export/itoolpan.h

src/cadxcore/export/itoolslider.h

src/cadxcore/export/itoolwindowlevel.h

src/cadxcore/export/itoolzoom.h

src/cadxcore/main/controllers/anonymizationcontroller.cpp

src/cadxcore/main/controllers/anonymizationcontroller.h

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

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

src/cadxcore/main/gui/open/OpenDialogs.fbp

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

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

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

src/cadxcore/main/gui/open/opendialogsbase.h

src/cadxcore/main/tools/toolpan.cpp

src/cadxcore/main/tools/toolpan.h

src/cadxcore/main/tools/toolslider.cpp

src/cadxcore/main/tools/toolslider.h

src/cadxcore/main/tools/toolwindowlevel.cpp

src/cadxcore/main/tools/toolwindowlevel.h

src/cadxcore/main/tools/toolzoom.cpp

src/cadxcore/main/tools/toolzoom.h

src/cadxcore/resources/iconosherramientas/ico_lupa.h

src/cadxcore/resources/iconosherramientas/ico_lupa.png

src/cadxcore/resources/iconosherramientas/ico_mouse_l.h

src/cadxcore/resources/iconosherramientas/ico_mouse_l.png

src/cadxcore/resources/iconosherramientas/ico_mouse_r.h

src/cadxcore/resources/iconosherramientas/ico_mouse_r.png

src/cadxcore/resources/iconosherramientas/ico_mouse_rl.h

src/cadxcore/resources/iconosherramientas/ico_mouse_rl.png

src/cadxcore/resources/iconosherramientas/ico_pan.h

src/cadxcore/resources/iconosherramientas/ico_pan.png

src/cadxcore/resources/iconosmenus/ico_open_disc.h

src/cadxcore/resources/iconosmenus/ico_open_disc.png

src/cadxcore/widgets/wpan.cpp

src/cadxcore/widgets/wpan.h

src/cadxcore/widgets/wzoom.cpp

src/cadxcore/widgets/wzoom.h

files removed:
.pc/vtkversion.patch

.pc/vtkversion.patch/src

.pc/vtkversion.patch/src/CMakeLists.txt

debian/patches/vtkversion.patch

src/cadxcore/.kdev4

src/cadxcore/export/iherramientaslider.h

src/cadxcore/export/iherramientawindowlevel.h

src/cadxcore/main/gui/open/DialogoDicomDir.fbp

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

src/cadxcore/main/gui/open/dialogodicomdirbase.h

src/cadxcore/main/tools/herramientaslider.cpp

src/cadxcore/main/tools/herramientaslider.h

src/cadxcore/main/tools/herramientawindowlevel.cpp

src/cadxcore/main/tools/herramientawindowlevel.h

src/cadxcore/net

src/cadxcore/net/DialogoAlmacenarCertificado.fbp

src/cadxcore/net/clientesoapintegracion.cpp

src/cadxcore/net/clientesoapintegracion.h

src/cadxcore/net/conexionopenssl.cpp

src/cadxcore/net/conexionopenssl.h

src/cadxcore/net/dialogoalmacenarcertificado.cpp

src/cadxcore/net/dialogoalmacenarcertificado.h

src/cadxcore/net/dialogoalmacenarcertificadobase.cpp

src/cadxcore/net/dialogoalmacenarcertificadobase.h

src/cadxcore/net/ginkgohttp.cpp

src/cadxcore/net/ginkgohttp.h

src/cadxcore/widgets/wchroma.cpp

src/cadxcore/widgets/wchroma.h

src/cadxcore/widgets/wgradiente.cpp

src/cadxcore/widgets/wgradiente.h

src/cadxcore/widgets/wsemillas.cpp

files modified:
.pc/applied-patches

debian/changelog

debian/patches/fixwhatis.patch

debian/patches/series

src/CMakeLists.txt

src/cadxcore/api/controllers/ipacscontroller.h

src/cadxcore/api/iconfiguracion.h

src/cadxcore/api/icontextoestudio.cpp

src/cadxcore/api/icontextoestudio.h

src/cadxcore/api/icontroladorherramientas.h

src/cadxcore/api/icontroladormodulo.cpp

src/cadxcore/api/icontroladormodulo.h

src/cadxcore/api/ievento.h

src/cadxcore/api/iherramienta.cpp

src/cadxcore/api/iherramienta.h

src/cadxcore/api/imodelointegracion.h

src/cadxcore/api/initwx.cpp

src/cadxcore/api/iwidgets.cpp

src/cadxcore/api/iwidgets.h

src/cadxcore/api/iwidgetsmanager.cpp

src/cadxcore/api/iwidgetsmanager.h

src/cadxcore/cadxcore.vcproj

src/cadxcore/commands/comandocarga.cpp

src/cadxcore/commands/comandogenerarthumbnails.cpp

src/cadxcore/commands/comandopacs.cpp

src/cadxcore/commands/comandopacs.h

src/cadxcore/commands/exporttodicomdircommand.cpp

src/cadxcore/commands/exporttodicomdircommand.h

src/cadxcore/endpoint/endpoint.h

src/cadxcore/export/icontratoscore.h

src/cadxcore/export/iherramientalupa.h

src/cadxcore/export/iherramientapuntero.h

src/cadxcore/export/iherramientascore.h

src/cadxcore/export/tagsprivadoscomunes.h

src/cadxcore/lang/es/ginkgocadxcore.mo

src/cadxcore/lang/es/ginkgocadxcore.po

src/cadxcore/lang/ginkgocadxcore.pot

src/cadxcore/main/barraherramientasderecha.cpp

src/cadxcore/main/controllers/configurationcontroller.cpp

src/cadxcore/main/controllers/configurationcontroller.h

src/cadxcore/main/controllers/controladorcomandos.cpp

src/cadxcore/main/controllers/controladorextensiones.cpp

src/cadxcore/main/controllers/controladorherramientas.cpp

src/cadxcore/main/controllers/controladorherramientas.h

src/cadxcore/main/controllers/controladorhistorial.cpp

src/cadxcore/main/controllers/controladorhl7.cpp

src/cadxcore/main/controllers/controladorhl7.h

src/cadxcore/main/controllers/controladorlog.cpp

src/cadxcore/main/controllers/controladorpermisos.cpp

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

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

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

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

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

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

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

src/cadxcore/main/controllers/dcmtk/dicomservers.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/xmlrpccontroller.cpp

src/cadxcore/main/entorno.cpp

src/cadxcore/main/entorno.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/cadxcore/main/gui/dicombrowsercomponent.h

src/cadxcore/main/gui/dicomeditor/editordicom.cpp

src/cadxcore/main/gui/history/PanelHistorial2.fbp

src/cadxcore/main/gui/history/panelhistorial2.cpp

src/cadxcore/main/gui/history/panelhistorial2.h

src/cadxcore/main/gui/history/panelhistorial2base.cpp

src/cadxcore/main/gui/history/panelhistorial2base.h

src/cadxcore/main/gui/history/panelserie.cpp

src/cadxcore/main/gui/history/panelserie.h

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

src/cadxcore/main/gui/logcontrolwindow/ventanaControlLogs.fbp

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

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

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

src/cadxcore/main/gui/logcontrolwindow/ventanacontrollogsbase.h

src/cadxcore/main/gui/mainwindow/InterfazGinkgo.fbp

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

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

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

src/cadxcore/main/gui/mainwindow/ventanaprincipalbase.h

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

src/cadxcore/main/gui/paneltags/PanelTags.fbp

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

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

src/cadxcore/main/licencia.h

src/cadxcore/main/managers/widgetsmanager.cpp

src/cadxcore/main/tools/herramientaangulo.cpp

src/cadxcore/main/tools/herramientaangulo.h

src/cadxcore/main/tools/herramientaanotacionesesquina.cpp

src/cadxcore/main/tools/herramientaanotacionesesquina.h

src/cadxcore/main/tools/herramientacalibrado.cpp

src/cadxcore/main/tools/herramientacalibrado.h

src/cadxcore/main/tools/herramientadesencajar.cpp

src/cadxcore/main/tools/herramientadesencajar.h

src/cadxcore/main/tools/herramientadeshacer.cpp

src/cadxcore/main/tools/herramientadeshacer.h

src/cadxcore/main/tools/herramientaelevacion.cpp

src/cadxcore/main/tools/herramientainterpolate.cpp

src/cadxcore/main/tools/herramientainterpolate.h

src/cadxcore/main/tools/herramientalupa.cpp

src/cadxcore/main/tools/herramientamarcado.cpp

src/cadxcore/main/tools/herramientamarcado.h

src/cadxcore/main/tools/herramientanota.cpp

src/cadxcore/main/tools/herramientapaneltags.cpp

src/cadxcore/main/tools/herramientapaneltags.h

src/cadxcore/main/tools/herramientapuntero.cpp

src/cadxcore/main/tools/herramientaregla.cpp

src/cadxcore/main/tools/herramientarejillametrica.cpp

src/cadxcore/main/tools/herramientarejillametrica.h

src/cadxcore/main/tools/herramientareset.cpp

src/cadxcore/main/tools/herramientareset.h

src/cadxcore/main/tools/herramientascore.h

src/cadxcore/prvext/prvext.h

src/cadxcore/resources/conformance.xml

src/cadxcore/resources/ginkgoresourcemanager.cpp

src/cadxcore/resources/ginkgoresourcemanager.h

src/cadxcore/resources/iconosherramientas/ico_slider.h

src/cadxcore/resources/iconosherramientas/ico_slider.png

src/cadxcore/resources/iconosherramientas/iconos.h

src/cadxcore/resources/iconosmenus/iconos.h

src/cadxcore/vtk/interactor/ginkgointeractorstyleimage2d.cpp

src/cadxcore/widgets/wangulo.cpp

src/cadxcore/widgets/wangulo.h

src/cadxcore/widgets/wchromacomplejo.cpp

src/cadxcore/widgets/wchromacomplejo.h

src/cadxcore/widgets/welevacion.cpp

src/cadxcore/widgets/welevacion.h

src/cadxcore/widgets/welipse.cpp

src/cadxcore/widgets/welipse.h

src/cadxcore/widgets/wflecha.cpp

src/cadxcore/widgets/wflecha.h

src/cadxcore/widgets/wlupa.cpp

src/cadxcore/widgets/wlupa.h

src/cadxcore/widgets/wmarcadoarea.cpp

src/cadxcore/widgets/wmarcadoarea.h

src/cadxcore/widgets/wnota.cpp

src/cadxcore/widgets/wnota.h

src/cadxcore/widgets/wpoligono.cpp

src/cadxcore/widgets/wpoligono.h

src/cadxcore/widgets/wpunto.cpp

src/cadxcore/widgets/wpunto.h

src/cadxcore/widgets/wrectangulo.cpp

src/cadxcore/widgets/wrectangulo.h

src/cadxcore/widgets/wregla.cpp

src/cadxcore/widgets/wregla.h

src/cadxcore/widgets/wrejilla.cpp

src/cadxcore/widgets/wrejilla.h

src/cadxcore/widgets/wseleccion.cpp

src/cadxcore/widgets/wseleccion.h

src/cadxcore/widgets/wslider.cpp

src/cadxcore/widgets/wslider.h

src/cadxcore/widgets/wtrapezoide.cpp

src/cadxcore/widgets/wtrapezoide.h

src/cadxcore/widgets/wwindowlevel.cpp

src/cadxcore/widgets/wwindowlevel.h

src/cadxcore/wx/thumbnailctrl/thumbnailctrl.cpp

src/cadxcore/wx/thumbnailctrl/thumbnailctrl.h

src/cadxcore/wx/wizardginkgo/wxwizardginkgobase.h

src/deploy.sh

src/fooextension/fooextension.cpp

src/fooextension/fooextension.h

src/fooextension/fooextension.vcproj

src/fooextension/fooextension/controllers/fooextensioncontroller.cpp

src/fooextension/fooextension/gui/importation/generaldata.cpp

src/fooextension/fooextension/wxvtk/gfooextensionview.cpp

src/ginkgocadx-launcher.in

src/lightvisualizator/lang/lightvisualizator.pot

src/lightvisualizator/lightvisualizator/controllers/lightvisualizatorcontroller.cpp

src/lightvisualizator/lightvisualizator/export/itoolwindowlevellight.h

src/lightvisualizator/lightvisualizator/tools/toolwindowlevellight.cpp

src/lightvisualizator/lightvisualizator/tools/toolwindowlevellight.h

src/lightvisualizator/lightvisualizator/wxvtk/glightvisualizatorview.cpp

src/lightvisualizator/lightvisualizatorextension.cpp

src/lightvisualizator/lightvisualizatorextension.h

src/visualizator/lang/es/visualizator.mo

src/visualizator/lang/es/visualizator.po

src/visualizator/lang/visualizator.pot

src/visualizator/visualizator.cpp

src/visualizator/visualizator.h

src/visualizator/visualizator/comandos/comandodicomizacionintegracion.cpp

src/visualizator/visualizator/controllers/visualizatorcontroller.cpp

src/visualizator/visualizator/dialogos/importacion/datospersistentesimportacion.h

src/visualizator/visualizator/dialogos/importacion/pasodatosgenerales.cpp

src/visualizator/visualizator/dialogos/importacion/pasodatosgenerales.h

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

src/visualizator/visualizator/vistas/vista2d.cpp

src/visualizator/visualizator/vistas/vista2d.h

src/visualizator/visualizator/vistas/waveformview.cpp

src/visualizator/visualizator/widgets/wecg.cpp

src/visualizator/visualizator/widgets/wecg.h

src/visualizator/visualizator/wxvtk/gvistacompleja.cpp

src/visualizator/visualizator/wxvtk/gvistacompleja.h

src/visualizator/visualizator/wxvtk/gvistasimple.cpp

src/visualizator/visualizator/wxvtk/gwaveformview.cpp

Show diffs side-by-side

added added

removed removed

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

* $Id: selectimagesimportation.cpp 4403 2011-11-14 10:59:24Z tovar $

* $Id: selectimagesimportation.cpp 4602 2012-01-26 07:23:02Z tovar $

* Ginkgo CADx Project

#include "selectimagesimportation.h"

#include <api/icontextoestudio.h>

#include <resources/ginkgoresourcemanager.h>

#include <main/controllers/controladorlog.h>

#include <vtkImageData.h>

#include <vtkUnsignedCharArray.h>

526

527

528

void SelectImagesImportation::UnCheckAll()

528

529

{

529

for (int i = 1; i < m_pButtonsBar->GetToolCount(); i++) {

530

for (unsigned int i = 1; i < m_pButtonsBar->GetToolCount(); i++) {

530

531

//uncheck ubicaciones

531

532

m_pButtonsBar->ToggleTool(i, false);

532

533

}

592

593

{

593

594

GNC::GCS::IEntorno::MapaUbicaciones& mapa = GNC::Entorno::Instance()->GetUbicaciones();

594

595

GNC::GCS::IEntorno::MapaUbicaciones::iterator it = mapa.begin();

595

for (int i = 1; i < m_pButtonsBar->GetToolCount() && it != mapa.end(); i++, ++it) {

596

for (unsigned int i = 1; i < m_pButtonsBar->GetToolCount() && it != mapa.end(); i++, ++it) {

596

597

if (m_pButtonsBar->GetToolToggled(i)) {

597

598

return &(*it).second;

598

599

}

610

611

GNC::GCS::ConfigurationController::Instance()->readStringUser("/GinkgoCore/Importacion", "LastLocation", lastLocation);

611

612

GNC::GCS::IEntorno::MapaUbicaciones& mapa = GNC::Entorno::Instance()->GetUbicaciones();

612

613

GNC::GCS::IEntorno::MapaUbicaciones::iterator it = mapa.begin();

613

int id = 1;

614

unsigned int id = 1;

614

615

for (; id < m_pButtonsBar->GetToolCount() && it != mapa.end(); id++, ++it) {

615

616

if ((*it).first == lastLocation) {

616

617

break;

704

705

//si existe se busca uno que no exista

705

706

nombreImagenTemporal= wxDirTmp + wxFileName::GetPathSeparator() + fileName.GetName() + wxString::Format(wxT("%d"),rand()) + wxT(".jpg");

706

707

}

707

wxCopyFile((*it), nombreImagenTemporal);

708

if (!wxCopyFile((*it), nombreImagenTemporal)) {

709

LOG_ERROR("SelectImagesImportation", "Error copying images from " << (*it).ToUTF8() << " TO " << nombreImagenTemporal.ToUTF8());

710

}

708

711

std::string path(TOPATH(nombreImagenTemporal));

709

712

m_pListaFicheros->push_back(path);

710

713

} else {

Older »