← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2013-10-24 21:28:17 UTC
  • mfrom: (1.2.2)
  • Revision ID: package-import@ubuntu.com-20131024212817-ej1skb9og09d3ht6
Tags: 3.5.0.1137.31+dfsg-1
New upstream release [October 2013]

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/gui/import/wxwizardimportacionginkgo.cpp
3
3
 *  $Id: wxwizardimportacionginkgo.cpp $
4
4
 *  Ginkgo CADx Project
5
5
 *
6
 
 *  Copyright 2008-12 MetaEmotion S.L. All rights reserved.
 
6
 *  Copyright 2008-14 MetaEmotion S.L. All rights reserved.
7
7
 *  http://ginkgo-cadx.com
8
8
 *
9
9
 *  This file is licensed under LGPL v3 license.
32
32
#include <main/gui/progress/statusbarprogreso.h>
33
33
#include <resources/ginkgoresourcesmanager.h>
34
34
#include <main/controllers/controladoreventos.h>
 
35
#include <main/controllers/windowattributescontroller.h>
35
36
 
36
37
#include <vector>
37
38
#include <sstream>
38
39
 
39
 
 
 
40
#define DICOMIZE_WIZARD_ID "DicomizeWizard"
40
41
 
41
42
namespace GNC {
42
43
        namespace GUI {
43
44
                wxWizardImportacionGinkgo::wxWizardImportacionGinkgo(wxWindow* pParent, GNC::GCS::Ptr<GIL::IModeloIntegracion> pModeloIntegracion, std::string uidModulo) : wxWizardGinkgoBase(pParent)
44
45
                {
 
46
                        //load attributes
 
47
                        GNC::GCS::WindowAttributesController::LoadWindowAttributes(DICOMIZE_WIZARD_ID, this, false);
 
48
                        //
45
49
                        wxWindowDisabler disabler;
46
50
                        SetTitle(_("Image Import Wizard"));
47
51
                        m_pModeloIntegracion = pModeloIntegracion;
116
120
                                        //////////TODOm_pModeloIntegracion->UIDModulo = m_pControladorModulo->GetUID();
117
121
                                }
118
122
 
119
 
                                for(std::list<IPasoWizard*>::iterator it=pasosModulo.begin();it!=pasosModulo.end();++it){
120
 
                                        m_ListaPasos.push_back(*it);
121
 
                                        (*it)->AsignarListaFicheros(m_ListaFicheros);
 
123
                                for(std::list<IPasoWizard*>::iterator it=pasosModulo.begin();it!=pasosModulo.end();++it) {
 
124
                                        if (!(*it)->IsSkipped()) {
 
125
                                                m_ListaPasos.push_back(*it);
 
126
                                                (*it)->AsignarListaFicheros(m_ListaFicheros);
 
127
                                        }
122
128
                                }
123
129
                                //
124
130
                        } else {
183
189
                wxWizardImportacionGinkgo::~wxWizardImportacionGinkgo()
184
190
                {
185
191
                        m_ListaPasos.clear();
 
192
                        
 
193
                        //save window attributes
 
194
                        GNC::GCS::WindowAttributesController::SaveWindowAttributes(DICOMIZE_WIZARD_ID, this);
186
195
                }
187
196
                
188
197
                void  wxWizardImportacionGinkgo::BorrarArchivosTemporales()
235
244
                
236
245
                void wxWizardImportacionGinkgo::OnSiguienteClick(wxCommandEvent&)
237
246
                {
238
 
                        if((*m_currentPaso)->Validar()){
 
247
                        if ((*m_currentPaso)->Validar()) 
 
248
                        {
239
249
                                Freeze();
240
250
                                
241
251
                                wxWindow* pCurrent = dynamic_cast<wxWindow*> (*m_currentPaso);
258
268
////////TODO                            m_pModeloIntegracion->UIDModulo = m_pControladorModulo->GetUID();
259
269
                                                }
260
270
                                                
261
 
                                                for(std::list<IPasoWizard*>::iterator it=pasosModulo.begin();it!=pasosModulo.end();++it){
262
 
                                                        m_ListaPasos.push_back(*it);
263
 
                                                        (*it)->AsignarListaFicheros(m_ListaFicheros);
 
271
                                                for(std::list<IPasoWizard*>::iterator it=pasosModulo.begin();it!=pasosModulo.end();++it) {
 
272
                                                        if (!(*it)->IsSkipped()) {
 
273
                                                                m_ListaPasos.push_back(*it);
 
274
                                                                (*it)->AsignarListaFicheros(m_ListaFicheros);
 
275
                                                        }
264
276
                                                }
265
277
                                                
266
278
                                                m_currentPaso = m_ListaPasos.begin();
267
279
                                                m_currentPasoIndex=1;
268
280
                                        } else {
269
 
                                                ++m_currentPasoIndex;
270
 
                                                ++m_currentPaso;
 
281
                                                do {
 
282
                                                        ++m_currentPasoIndex;
 
283
                                                        ++m_currentPaso;
 
284
                                                } while ((m_currentPaso != m_ListaPasos.end() && (*m_currentPaso)->IsSkipped()));
271
285
                                        }
272
286
                                        
273
287
                                        if(m_currentPaso==m_ListaPasos.end()){