← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ginkgocadx/quantal

« back to all changes in this revision

Viewing changes to src/cadxcore/main/gui/progress/statusbarprogreso.cpp

  • Committer: Package Import Robot
  • Author(s): Andreas Tille
  • Date: 2011-11-09 12:29:00 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20111109122900-idkd9vvhr31whz8z
Tags: 2.6.0.0~rc-1
http://bugs.debian.org/647413
http://bugs.debian.org/648167
* New upstream version
  Closes: #647413
* Rebuild against recent insighttoolkit
  Closes: #648167

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/gui/progress/statusbarprogreso.cpp
1
1
/*
2
2
 *  
3
 
 *  $Id: statusbarprogreso.cpp 3526 2011-03-16 19:56:19Z carlos $
 
3
 *  $Id: statusbarprogreso.cpp 4366 2011-11-04 09:14:49Z tovar $
4
4
 *  Ginkgo CADx Project
5
5
 *
6
6
 *  Copyright 2008-10 MetaEmotion S.L. All rights reserved.
91
91
        m_pProgresoTarea = NULL;
92
92
}
93
93
 
94
 
void GNC::GUI::StatusBarProgreso::InsertarTarea(long taskId, const std::string& text) {
95
 
 
96
 
 
 
94
void GNC::GUI::StatusBarProgreso::InsertarTarea(long taskId, const std::string& text) 
 
95
{
97
96
        MapaTareasType::iterator it = m_MapaTareas.find(taskId);
98
97
        if (it == m_MapaTareas.end()) {
99
98
                m_pPanelTareas->Freeze();
100
99
 
101
 
                PanelTarea* pt = new PanelTarea(m_pPanelTareas, taskId);
 
100
                PanelTarea* pt = new PanelTarea(m_pPanelTareas->m_pTasks, taskId);
102
101
                wxString str = wxString::FromUTF8(text.c_str());
103
 
                pt->m_pTareaLabel->SetLabel(str);
104
 
                pt->m_pTareaProgreso->SetValue(0);
 
102
                pt->SetProgress(str, 0);
105
103
                m_MapaTareas[taskId] = pt;
106
104
                pt->Show();
107
 
                m_pPanelTareas->m_pSizerTareas->Add(pt, 0, wxEXPAND | wxDOWN, 10);
 
105
                m_pPanelTareas->m_pSizerTareas->Add(pt, 0, wxEXPAND | wxDOWN, 5);
 
106
                int ySize = pt->GetSize().y;
 
107
                m_pPanelTareas->m_pTasks->Layout();
 
108
                m_pPanelTareas->m_pTasks->SetVirtualSize(-1, ySize * m_MapaTareas.size());
 
109
                m_pPanelTareas->m_pTasks->AdjustScrollbars();
 
110
 
108
111
                m_pPanelTareas->Layout();
109
112
 
110
113
                ActualizarInterfaz();
119
122
                m_pPanelTareas->Freeze();
120
123
 
121
124
                pt = (*it).second;
 
125
                m_MapaTareas.erase(it);
122
126
 
123
127
                if (pt != NULL) {
124
128
                        m_pPanelTareas->m_pSizerTareas->Detach(pt);
 
129
                        int ySize = pt->GetSize().y;
125
130
                        pt->Destroy();
126
 
                        m_pPanelTareas->Layout();
 
131
                        m_pPanelTareas->m_pTasks->SetVirtualSize(-1, ySize * m_MapaTareas.size());
 
132
                        m_pPanelTareas->m_pTasks->AdjustScrollbars();
 
133
                        m_pPanelTareas->m_pTasks->Layout();
127
134
                }
128
135
 
129
 
                m_MapaTareas.erase(it);
130
136
                ActualizarInterfaz();
131
137
                m_pPanelTareas->Thaw();
132
138
        }
141
147
                m_pPanelTareas->Freeze();
142
148
                PanelTarea* pt = (*it).second;
143
149
                if (pt != NULL) {
144
 
                        int val = std::max<int>(0, std::min<int>(100, (int)(normalizedProgress * 100.0f)));
145
150
                        wxString str = wxString::FromUTF8(text.c_str());
146
 
                        pt->m_pTareaLabel->SetLabel(str);
147
 
                        pt->m_pTareaProgreso->SetValue(val);
 
151
                        pt->SetProgress(str, normalizedProgress);
148
152
                }
149
153
 
150
154
                ActualizarInterfaz();
161
165
                m_pIconoProgreso->Hide();
162
166
                m_pProgresoTarea->Hide();
163
167
                m_pIconoParado->Show(true);
164
 
                //SetStatusText(wxT(""),Field_TextoTarea);
 
168
 
165
169
                m_pMensajeTarea->SetLabel(_("0 running tasks."));
166
170
 
167
171
                if (!m_pPanelTareas->m_pSinTareas->IsShown()) {
171
175
        } else {
172
176
                if (m_pPanelTareas->m_pSinTareas->IsShown()) {
173
177
                        m_pPanelTareas->m_pSinTareas->Show(false);
 
178
                        m_pPanelTareas->m_pTasks->Layout();
174
179
                        m_pPanelTareas->Layout();
175
180
                }
176
181
                m_pIconoParado->Hide();
179
184
                        m_pIconoProgreso->Play();
180
185
                }
181
186
                if(m_MapaTareas.size() == 1) {
182
 
                        m_pMensajeTarea->SetLabel((*m_MapaTareas.begin()).second->m_pTareaLabel->GetLabel());
183
 
                        m_pProgresoTarea->SetValue((*m_MapaTareas.begin()).second->m_pTareaProgreso->GetValue());
 
187
                        m_pMensajeTarea->SetLabel((*m_MapaTareas.begin()).second->GetStatus()); 
 
188
 
 
189
                        m_pProgresoTarea->SetValue(((*m_MapaTareas.begin()).second->GetProgress() * 100));
184
190
                        if (!m_pProgresoTarea->IsShown()) {
185
191
                                m_pProgresoTarea->Show();
186
192
                        }