← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/visualizator/visualizator/wxvtk/reconstruction/surface.cpp

  • Committer: Package Import Robot
  • Author(s): Andreas Tille
  • Date: 2012-05-19 11:37:14 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120519113714-13jwx5svm7d4fnsq
Tags: 2.12.0.4889-1
* New upstream version
* debian/control: Standards-Version: 3.9.3 (no changes needed)
* debhelper 9 (control+compat)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/visualizator/visualizator/wxvtk/reconstruction/surface.cpp
1
1
/*
2
2
 *
3
 
 *  $Id: surface.cpp 4361 2011-11-02 13:23:30Z carlos $
 
3
 *  $Id: surface.cpp 4782 2012-03-08 11:01:25Z carlos $
4
4
 *  Ginkgo CADx Project
5
5
 *
6
6
 *  Copyright 2008-10 MetaEmotion S.L. All rights reserved.
38
38
 
39
39
#include "../../exportacion/tagsprivados.h"
40
40
#include <export/tagsprivadoscomunes.h>
41
 
#include "../../comandos/comandodicomizacionintegracion.h"
 
41
#include <commands/dicomizecommand.h>
42
42
 
43
43
 
44
44
#include <visualizator/resources/aprimresourcemanager.h>
232
232
        wxString fileNameExport = wxNuevoDirTemp + wxFileName::GetPathSeparator() + wxT("1.jpg");
233
233
        Pipeline->Print(std::string(TOPATH(fileNameExport)));
234
234
 
235
 
        GnkPtr<GNKVisualizator::GUI::TipoWizardImportacion> pPersistentData(new GNKVisualizator::GUI::TipoWizardImportacion(NULL));
 
235
        GnkPtr<GNC::GUI::ImportationData> pPersistentData(new GNC::GUI::ImportationData());
236
236
 
237
 
        GNKVisualizator::GUI::TipoWizardImportacion::TFicheroDicomizacionGNKVisualizator ficheroADicomizar;
238
 
        ficheroADicomizar.pathImagen = TOPATH(fileNameExport);
239
 
        pPersistentData->m_listaFicherosADicomizar.push_back(ficheroADicomizar);
 
237
        pPersistentData->m_SourceFiles.push_back(std::string(TOPATH(fileNameExport)));
240
238
 
241
239
        //institucion
242
240
        std::string tag;
243
241
        if (GNC::GCS::ConfigurationController::Instance()->readStringGeneral("/GinkgoCore/Estacion", "CentroNombre", tag)) {
244
 
                pPersistentData->baseImagenes.tags[std::string("0008|0080")] = tag;
 
242
                pPersistentData->baseImages.tags[std::string("0008|0080")] = tag;
245
243
        }
246
244
 
247
245
        //nombre del medico responsable de la institucion
248
246
        if (GNC::GCS::ConfigurationController::Instance()->readStringUser("/GinkgoCore/Estacion", "NombreMedico", tag)) {
249
 
                pPersistentData->baseImagenes.tags[std::string("0008|0090")] = tag;
 
247
                pPersistentData->baseImages.tags[std::string("0008|0090")] = tag;
250
248
        }
251
249
 
252
 
        pPersistentData->baseImagenes.tags[std::string("0008|0070")] = EXT_PROVIDER;
 
250
        pPersistentData->baseImages.tags[std::string("0008|0070")] = EXT_PROVIDER;
253
251
 
254
 
        pPersistentData->baseImagenes.tags[std::string("0008|1090")] = EXT_NAME;
 
252
        pPersistentData->baseImages.tags[std::string("0008|1090")] = EXT_NAME;
255
253
 
256
254
        //uid de aprimaria
257
 
        pPersistentData->baseImagenes.tags[std::string("0018|1030")] = EXT_IMPORTER_SID;
 
255
        pPersistentData->baseImages.tags[std::string("0018|1030")] = EXT_IMPORTER_SID;
258
256
 
259
257
        //study data
260
258
        //date
261
259
        std::string tmp;
262
260
        RefStudy->GetTagImagenActiva("0008|0020", tmp);
263
 
        pPersistentData->baseImagenes.tags[std::string("0008|0020")] = tmp;
 
261
        pPersistentData->baseImages.tags[std::string("0008|0020")] = tmp;
264
262
        //time
265
263
        RefStudy->GetTagImagenActiva("0008|0030", tmp);
266
 
        pPersistentData->baseImagenes.tags[std::string("0008|0030")] = tmp;
 
264
        pPersistentData->baseImages.tags[std::string("0008|0030")] = tmp;
267
265
        //description
268
266
        RefStudy->GetTagImagenActiva("0008|1030", tmp);
269
 
        pPersistentData->baseImagenes.tags[std::string("0008|1030")] = tmp;
 
267
        pPersistentData->baseImages.tags[std::string("0008|1030")] = tmp;
270
268
        //uid
271
269
        RefStudy->GetTagImagenActiva("0020|000d", tmp);
272
 
        pPersistentData->baseImagenes.tags[std::string("0020|000d")] = tmp;
273
 
        pPersistentData->StudyInstanceUID = tmp;
 
270
        pPersistentData->baseImages.tags[std::string("0020|000d")] = tmp;
274
271
 
275
272
        //serie and image data
276
273
        //date
277
 
        pPersistentData->baseImagenes.tags[std::string("0008|0022")] = pPersistentData->baseImagenes.tags[std::string("0008|0021")] = wxDateTime::Now().Format(wxT("%Y%m%d")).ToUTF8();
 
274
        pPersistentData->baseImages.tags[std::string("0008|0022")] = pPersistentData->baseImages.tags[std::string("0008|0021")] = wxDateTime::Now().Format(wxT("%Y%m%d")).ToUTF8();
278
275
        //time
279
 
        pPersistentData->baseImagenes.tags[std::string("0008|0032")] = pPersistentData->baseImagenes.tags[std::string("0008|0031")] = wxDateTime::Now().Format(wxT("%H%M%S")).ToUTF8();
 
276
        pPersistentData->baseImages.tags[std::string("0008|0032")] = pPersistentData->baseImages.tags[std::string("0008|0031")] = wxDateTime::Now().Format(wxT("%H%M%S")).ToUTF8();
280
277
        //description
281
 
        pPersistentData->baseImagenes.tags[std::string("0020|4000")] = pPersistentData->baseImagenes.tags[std::string("0008|103e")] = _Std("3D Surface");
 
278
        pPersistentData->baseImages.tags[std::string("0020|4000")] = pPersistentData->baseImages.tags[std::string("0008|103e")] = _Std("3D Surface");
282
279
 
283
280
        //patient
284
281
        //name
285
282
        RefStudy->GetTagImagenActiva("0010|0010", tmp);
286
 
        pPersistentData->baseImagenes.tags[std::string("0010|0010")] = tmp;
 
283
        pPersistentData->baseImages.tags[std::string("0010|0010")] = tmp;
287
284
        //id
288
285
        RefStudy->GetTagImagenActiva("0010|0020", tmp);
289
 
        pPersistentData->baseImagenes.tags[std::string("0010|0020")] = tmp;
 
286
        pPersistentData->baseImages.tags[std::string("0010|0020")] = tmp;
290
287
        //age
291
288
        RefStudy->GetTagImagenActiva("0010|1010", tmp);
292
 
        pPersistentData->baseImagenes.tags[std::string("0010|1010")] = tmp;
 
289
        pPersistentData->baseImages.tags[std::string("0010|1010")] = tmp;
293
290
        //birth date
294
291
        RefStudy->GetTagImagenActiva("0010|0030", tmp);
295
 
        pPersistentData->baseImagenes.tags[std::string("0010|0030")] = tmp;
 
292
        pPersistentData->baseImages.tags[std::string("0010|0030")] = tmp;
296
293
        //sex
297
294
        RefStudy->GetTagImagenActiva("0010|0040", tmp);
298
 
        pPersistentData->baseImagenes.tags[std::string("0010|0040")] = tmp;
 
295
        pPersistentData->baseImages.tags[std::string("0010|0040")] = tmp;
299
296
 
300
 
        GNKVisualizator::GADAPI::ComandoDicomizacionIntegracionParams* pDicomParams = new GNKVisualizator::GADAPI::ComandoDicomizacionIntegracionParams(pPersistentData,RefStudy->Entorno, std::string(TOPATH(wxNuevoDirTemp)));
301
 
        GNKVisualizator::GADAPI::ComandoDicomizacionIntegracion* pDicomCmd = new GNKVisualizator::GADAPI::ComandoDicomizacionIntegracion(pDicomParams);
 
297
        GADAPI::DicomizeCommandParams* pDicomParams = new GADAPI::DicomizeCommandParams(pPersistentData,std::string(TOPATH(wxNuevoDirTemp)));
 
298
        GADAPI::DicomizeCommand* pDicomCmd = new GADAPI::DicomizeCommand(pDicomParams);
302
299
        RefStudy->Entorno->GetControladorComandos()->ProcessAsync(_Std("Performing tasks of integration ..."),pDicomCmd,NULL);
303
300
 
304
301
        #if defined (_WINDOWS)