~ubuntu-branches/ubuntu/raring/ginkgocadx/raring-proposed

« back to all changes in this revision

Viewing changes to src/cadxcore/api/imodelointegracion.h

Committer: Package Import Robot
Author(s): Andreas Tille
Date: 2011-09-09 08:39:26 UTC
mfrom: (1.1.2 upstream)
Revision ID: package-import@ubuntu.com-20110909083926-iktecd132cnku5cd

Tags: 2.5.4.0~rc-1

New upstream version (patches were applied)

files added:
dll/Linux-x86/WX-2.8.11/gtk2-unicode-debug-2.8

dll/Linux-x86/WX-2.8.11/gtk2-unicode-debug-2.8/wx

dll/Windows-x86/Microsoft.vc90.crt

src/cadxcore/commands/sendhl7command.cpp

src/cadxcore/commands/sendhl7command.h

src/cadxcore/export/iherramientainterpolate.h

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

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

src/cadxcore/main/gui/countdownmessage

src/cadxcore/main/gui/countdownmessage/CountDownMessage.fbp

src/cadxcore/main/gui/countdownmessage/countdownmessage.cpp

src/cadxcore/main/gui/countdownmessage/countdownmessage.h

src/cadxcore/main/gui/countdownmessage/countdownmessagebase.cpp

src/cadxcore/main/gui/countdownmessage/countdownmessagebase.h

src/cadxcore/main/tools/herramientainterpolate.cpp

src/cadxcore/main/tools/herramientainterpolate.h

src/cadxcore/resources/barracine

src/cadxcore/resources/barracine/ico_bucle.h

src/cadxcore/resources/barracine/ico_bucle.png

src/cadxcore/resources/barracine/ico_cine.h

src/cadxcore/resources/barracine/ico_cine.png

src/cadxcore/resources/barracine/ico_no_bucle.h

src/cadxcore/resources/barracine/ico_no_bucle.png

src/cadxcore/resources/barracine/ico_pause.h

src/cadxcore/resources/barracine/ico_pause.png

src/cadxcore/resources/barracine/ico_play.h

src/cadxcore/resources/barracine/ico_play.png

src/cadxcore/resources/barracine/ico_stop.h

src/cadxcore/resources/barracine/ico_stop.png

src/cadxcore/resources/barracine/iconos.h

src/ginkgocadx-launcher.in

src/lightvisualizator/lang/de

src/lightvisualizator/lang/de/lightvisualizator.mo

src/lightvisualizator/lang/de/lightvisualizator.po

src/lightvisualizator/lang/lightvisualizator.pot

src/lightvisualizator/makepot.sh

files removed:
.pc

.pc/.version

.pc/applied-patches

.pc/drop_rpath.patch

.pc/drop_rpath.patch/src

.pc/drop_rpath.patch/src/lightvisualizator

.pc/drop_rpath.patch/src/lightvisualizator/CMakeLists.txt

debian/patches

debian/patches/drop_rpath.patch

debian/patches/series

src/cadxcore/commands/comandopublicacionhl7.cpp

src/cadxcore/commands/comandopublicacionhl7.h

src/visualizator/recursos/barracine

src/visualizator/recursos/barracine/ico_bucle.h

src/visualizator/recursos/barracine/ico_bucle.png

src/visualizator/recursos/barracine/ico_cine.h

src/visualizator/recursos/barracine/ico_cine.png

src/visualizator/recursos/barracine/ico_no_bucle.h

src/visualizator/recursos/barracine/ico_no_bucle.png

src/visualizator/recursos/barracine/ico_pause.h

src/visualizator/recursos/barracine/ico_pause.png

src/visualizator/recursos/barracine/ico_play.h

src/visualizator/recursos/barracine/ico_play.png

src/visualizator/recursos/barracine/ico_stop.h

src/visualizator/recursos/barracine/ico_stop.png

src/visualizator/recursos/barracine/iconos.h

files modified:
ReadMe-Compilation.pdf

debian/changelog

src/CMake/LinuxProperties.cmake

src/CMakeLists.txt

src/cadxcore/CMakeLists.txt

src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp

src/cadxcore/api/icontextoestudio.cpp

src/cadxcore/api/icontextoestudio.h

src/cadxcore/api/iherramienta.cpp

src/cadxcore/api/iherramienta.h

src/cadxcore/api/imgproxy.h

src/cadxcore/api/imodelointegracion.h

src/cadxcore/api/initwx.cpp

src/cadxcore/api/iwizard.h

src/cadxcore/cadxcore.vcproj

src/cadxcore/commands/commandsynchronizewithgui.cpp

src/cadxcore/commands/commandsynchronizewithgui.h

src/cadxcore/endpoint/endpoint.cpp

src/cadxcore/endpoint/endpoint.h

src/cadxcore/eventos/progresocomando.h

src/cadxcore/export/iherramientaanotacionesesquina.h

src/cadxcore/export/iherramientascore.h

src/cadxcore/lang/de/ginkgocadxcore.mo

src/cadxcore/lang/de/ginkgocadxcore.po

src/cadxcore/lang/es/ginkgocadxcore.mo

src/cadxcore/lang/es/ginkgocadxcore.po

src/cadxcore/lang/ginkgocadxcore.pot

src/cadxcore/lang/ja/ginkgocadxcore.mo

src/cadxcore/lang/ja/ginkgocadxcore.po

src/cadxcore/lang/tr/ginkgocadxcore.mo

src/cadxcore/lang/tr/ginkgocadxcore.po

src/cadxcore/main/controllers/controladorbbddhl7.cpp

src/cadxcore/main/controllers/controladorcomandos.cpp

src/cadxcore/main/controllers/controladorcomandos.h

src/cadxcore/main/controllers/controladorenviohl7.cpp

src/cadxcore/main/controllers/controladorenviohl7.h

src/cadxcore/main/controllers/controladoreventos.cpp

src/cadxcore/main/controllers/controladorherramientas.cpp

src/cadxcore/main/controllers/controladorherramientas.h

src/cadxcore/main/controllers/controladorhl7.cpp

src/cadxcore/main/controllers/controladorhl7.h

src/cadxcore/main/controllers/controladorvistas.cpp

src/cadxcore/main/controllers/controladorvistas.h

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

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

src/cadxcore/main/controllers/pacscontroller.cpp

src/cadxcore/main/controllers/parserxmlenglish.cpp

src/cadxcore/main/controllers/parserxmlspanish.cpp

src/cadxcore/main/controllers/permisoscore.h

src/cadxcore/main/entorno.cpp

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/configuration/PanelesConfiguracion.fbp

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

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

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

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

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

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

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

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

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

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

src/cadxcore/main/gui/hl7controlwindow/ventanacontrolhl7.cpp

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

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

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

src/cadxcore/main/licencia.h

src/cadxcore/main/tools/herramientaangulo.cpp

src/cadxcore/main/tools/herramientaanotacionesesquina.cpp

src/cadxcore/main/tools/herramientamarcado.cpp

src/cadxcore/main/tools/herramientanota.cpp

src/cadxcore/main/tools/herramientapuntero.cpp

src/cadxcore/main/tools/herramientaregla.cpp

src/cadxcore/main/tools/herramientascore.h

src/cadxcore/main/tools/herramientawindowlevel.cpp

src/cadxcore/makepot.sh

src/cadxcore/prvext/prvext.h

src/cadxcore/resources/ginkgoresourcemanager.cpp

src/cadxcore/resources/ginkgoresourcemanager.h

src/cadxcore/vtk/vtkginkgoimageviewer.cpp

src/cadxcore/vtk/vtkginkgoimageviewer.h

src/cadxcore/widgets/wanotacionesquina.cpp

src/cadxcore/wx/ginkgostyle/ginkgostyle.cpp

src/cadxcore/wx/ginkgostyle/ginkgostyle.h

src/cadxcore/wx/thumbnailctrl/thumbnailctrl.cpp

src/cadxcore/wx/treelistctrl/treelistctrl.cpp

src/fooextension/fooextension.vcproj

src/fooextension/fooextension/controllers/fooextensioncontroller.cpp

src/fooextension/lang/es/fooextension.mo

src/fooextension/lang/es/fooextension.po

src/ginkgocadx/Ginkgo-CADx.sln

src/ginkgocadx/ginkgocadx.vcproj

src/lightvisualizator/lang/es/lightvisualizator.mo

src/lightvisualizator/lang/es/lightvisualizator.po

src/lightvisualizator/lightvisualizator.vcproj

src/lightvisualizator/lightvisualizatorextension.cpp

src/visualizator/lang/de/visualizator.mo

src/visualizator/lang/de/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/tr/visualizator.mo

src/visualizator/lang/tr/visualizator.po

src/visualizator/lang/visualizator.pot

src/visualizator/makepot.sh

src/visualizator/recursos/aprimresourcemanager.cpp

src/visualizator/recursos/aprimresourcemanager.h

src/visualizator/visualizator.cpp

src/visualizator/visualizator.vcproj

src/visualizator/visualizator/comandos/comandodicomizacionintegracion.cpp

src/visualizator/visualizator/comandos/comandodicomizacionintegracion.h

src/visualizator/visualizator/vistas/vista2d.cpp

src/visualizator/visualizator/wxvtk/gvistacompleja.cpp

Show diffs side-by-side

added added

removed removed

src/cadxcore/api/imodelointegracion.h

596

std::string Titulo;

597

std::string Ruta;

598

std::string Descripcion;

599

bool Monitorize;

600

bool CleanBefore;

601

bool CleanAfter;

599

602

600

603

Ubicacion()

601

604

{

602

605

603

606

}

604

607

605

Ubicacion(const std::string& titulo, const std::string& ruta, const std::string& descripcion)

608

Ubicacion(const std::string& titulo, const std::string& ruta, const std::string& descripcion, bool monitorize, bool cleanbefore, bool cleanafter)

606

609

{

607

610

this->Titulo = titulo;

608

Update(ruta, descripcion);

611

Update(ruta, descripcion, monitorize, cleanbefore, cleanafter);

609

612

610

613

}

611

614

619

622

620

623

}

621

624

622

void Update(const std::string& ruta, const std::string& desc)

625

void Update(const std::string& ruta, const std::string& desc, bool monitorize, bool cleanbefore, bool cleanafter)

623

626

{

624

627

this->Ruta = ruta;

625

628

this->Descripcion = desc;

629

this->Monitorize = monitorize;

630

this->CleanBefore = cleanbefore;

631

this->CleanAfter = cleanafter;

626

632

}

627

633

628

634

Ubicacion& operator=(const Ubicacion& otro)

630

636

this->Titulo = otro.Titulo;

631

637

this->Ruta = otro.Ruta;

632

638

this->Descripcion = otro.Descripcion;

639

this->Monitorize = otro.Monitorize;

640

this->CleanBefore = otro.CleanBefore;

641

this->CleanAfter = otro.CleanAfter;

633

642

634

643

return *this;

635

644

}

Older »