X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fbackgroundmgr.cpp;h=5ba1b786d08e99104791d1caad4f922c716820a5;hp=12d337df3ff5ea52982b002b4e12aeaae685b220;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hpb=e081109a4a541c8780aaa253b874acada5957200

diff --git a/src/backgroundmgr.cpp b/src/backgroundmgr.cpp
index 12d337d..5ba1b78 100644
--- a/src/backgroundmgr.cpp
+++ b/src/backgroundmgr.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: backgroundmgr.cpp,v 1.1 2001/02/22 15:00:20 kevin Exp $
+**  $Id$
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -35,33 +35,47 @@
 #include "ctsim.h"
 #include "docs.h"
 #include "views.h"
-#include "threadrecon.h"
+#include "backgroundsupr.h"
 #include "backgroundmgr.h"
 
+#ifdef HAVE_WXTHREADS
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
+int BackgroundManager::s_iNextButtonID = 0;
 
 IMPLEMENT_DYNAMIC_CLASS(BackgroundManager, wxMiniFrame)
 BEGIN_EVENT_TABLE(BackgroundManager, wxMiniFrame)
+EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, BackgroundManager::OnAddTask)
+EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, BackgroundManager::OnRemoveTask)
+EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_UNIT_TICK, BackgroundManager::OnUnitTick)
 EVT_CLOSE(BackgroundManager::OnCloseWindow)
+EVT_COMMAND_RANGE(0, 30000, wxEVT_COMMAND_BUTTON_CLICKED, BackgroundManager::OnCancelButton)
 END_EVENT_TABLE()
 
+
 BackgroundManager::BackgroundManager ()
-  : wxMiniFrame (theApp->getMainFrame(), -1, _T("Background Tasks"), wxPoint(0,0), wxSize(200, 100)) //, wxTHICK_FRAME)
+  : wxMiniFrame (theApp->getMainFrame(), -1, _T("Background Tasks"), wxPoint(0,0), wxSize(210, 50))
 {
   m_iNumTasks = 0;
   m_pCanvas = new BackgroundManagerCanvas (this);
   theApp->setIconForFrame (this);
 
-  Show(true);
- // if (m_iNumTasks == 0)
- //   Show(false);
+  m_sizeGauge.Set (70, 20);
+  m_sizeLabel.Set (140, 20);
+  m_sizeBorder.Set (4, 4);
+  m_sizeCellSpacing.Set (3, 3);
+  m_sizeButton.Set (70, 20);
+
+  m_sizeCell.Set (m_sizeGauge.x + m_sizeLabel.x + m_sizeCellSpacing.x + m_sizeButton.x, 25);
+
+  theApp->getMainFrame()->SetFocus();
+  Show(false);
 }
 
 
+BackgroundManager::~BackgroundManager()
+{
+}
+
 void
 BackgroundManager::OnCloseWindow (wxCloseEvent& event)
 {
@@ -71,49 +85,182 @@ BackgroundManager::OnCloseWindow (wxCloseEvent& event)
     event.Veto();
 }
 
+void
+BackgroundManager::OnUnitTick (wxCommandEvent& event)
+{
+  int iUnits = event.GetInt();
+
+  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
+  if (pSupervisor == NULL) {
+    sys_error (ERR_SEVERE, "Received NULL task [BackgroundManager::OnUnitTick]");
+    return;
+  }
 
-wxGauge* 
-BackgroundManager::addTask (BackgroundTask* pTask, int iNumUnits)
+  BackgroundManagerTask* pTask = lookupTask (pSupervisor);
+  if (pTask == NULL) {
+          sys_error (ERR_SEVERE, "Error looking up task [BackgroundManager::OnUnitTick]");
+          return;
+  }
+  pTask->gauge()->SetValue (iUnits);
+}
+
+void
+BackgroundManager::OnAddTask (wxCommandEvent& event)
 {
-  wxSize size (50, 10);
-  wxPoint pos (4, 5);
+  int iNumUnits = event.GetInt();
+  const char* const pszTaskName = event.GetString().mb_str(wxConvUTF8);
+  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
+  if (pSupervisor == NULL) {
+    sys_error (ERR_SEVERE, "Received NULL supervisor [BackgroundManager::OnAddTask]");
+    return;
+  }
+
+  wxCriticalSectionLocker locker (m_criticalSection);
+
+  int iNumTasks = m_vecpTasks.size();
+  std::vector<bool> vecPositionUsed (iNumTasks);  //vector of used table positions
+  for (int iP = 0; iP < iNumTasks; iP++)
+    vecPositionUsed[iP] = false;
+
+  for (TaskContainer::iterator iT = m_vecpTasks.begin(); iT != m_vecpTasks.end(); iT++) {
+    int iPosUsed = (*iT)->position();
+    if (iPosUsed < iNumTasks)
+      vecPositionUsed[iPosUsed] = true;
+  }
 
-  wxGauge* pGauge = new wxGauge (m_pCanvas, -1, iNumUnits, pos, size);
-  m_vecpBackgroundTasks.push_back (pTask);
+  int iFirstUnusedPos = iNumTasks;  // default is just past current number of tasks
+  for (int i = 0; i < iNumTasks; i++)
+    if (! vecPositionUsed[i]) {
+      iFirstUnusedPos = i;
+      break;
+    }
+
+  wxPoint posGauge (m_sizeBorder.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y);
+  wxPoint posLabel (m_sizeBorder.x + m_sizeGauge.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y);
+  wxPoint posButton (m_sizeBorder.x + m_sizeGauge.x + m_sizeLabel.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y);
+  wxGauge* pGauge = new wxGauge (m_pCanvas, -1, iNumUnits, posGauge, m_sizeGauge);
+  wxStaticText* pLabel = new wxStaticText (m_pCanvas, -1, wxConvUTF8.cMB2WX(pszTaskName), posLabel, m_sizeLabel);
+  wxButton* pButton = new wxButton (m_pCanvas, s_iNextButtonID, _T("Cancel"), posButton, m_sizeButton, wxBU_LEFT);
+
+  BackgroundManagerTask* pTask = new BackgroundManagerTask (pSupervisor, pszTaskName,
+    iFirstUnusedPos, pGauge, pLabel, pButton, s_iNextButtonID);
+
+  m_vecpTasks.push_back (pTask);
   m_iNumTasks++;
-  return (pGauge);
+  s_iNextButtonID++;
+
+  resizeWindow();
+  if (m_iNumTasks == 1) {
+    m_pCanvas->SetFocus();
+    Show(true);
+  }
+}
+
+void
+BackgroundManager::OnRemoveTask (wxCommandEvent& event)
+{
+  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
+  if (pSupervisor == NULL) {
+    sys_error (ERR_SEVERE, "Received NULL task [BackgroundManager::OnRemoveTask]");
+    return;
+  }
+
+  wxCriticalSectionLocker locker (m_criticalSection);
+
+  bool bFound = false;
+  for (TaskContainer::iterator iTask = m_vecpTasks.begin(); iTask != m_vecpTasks.end(); iTask++) {
+    if ((*iTask)->supervisor() == pSupervisor) {
+          delete (*iTask)->gauge();
+            delete (*iTask)->label();
+            delete (*iTask)->button();
+      delete *iTask;
+      m_vecpTasks.erase (iTask);
+      m_iNumTasks--;
+            bFound = true;
+      break;
+    }
+  }
+  if (! bFound)  {
+          sys_error (ERR_SEVERE, "Unable to find supervisor [BackgroundManager::OnRemoveTask]");
+    return;
+  }
+  pSupervisor->ackRemoveBackgroundManager();
+  resizeWindow();
+  if (m_iNumTasks <= 0) {
+    m_pCanvas->SetFocus();
+    Show(false);
+  }
 }
 
+void
+BackgroundManager::OnCancelButton (wxCommandEvent& event)
+{
+  BackgroundManagerTask* pTask = lookupTask (event.GetId());
+  if (! pTask) {
+    sys_error (ERR_SEVERE, "Unable to lookup task for button");
+    return;
+  }
+
+  pTask->supervisor()->onCancel();
+}
+
+BackgroundManagerTask*
+BackgroundManager::lookupTask (BackgroundSupervisor* pSupervisor)
+{
+  BackgroundManagerTask* pTask = NULL;
+
+  wxCriticalSectionLocker locker (m_criticalSection);
+  for (TaskContainer::iterator iTask = m_vecpTasks.begin(); iTask != m_vecpTasks.end(); iTask++) {
+    if ((*iTask)->supervisor() == pSupervisor) {
+      pTask = *iTask;
+      break;
+    }
+  }
+
+  return pTask;
+}
 
-void 
-BackgroundManager::taskDone (BackgroundTask* pTask)
+BackgroundManagerTask*
+BackgroundManager::lookupTask (int iButtonID)
 {
-  m_iNumTasks--;
+  BackgroundManagerTask* pTask = NULL;
+
+  wxCriticalSectionLocker locker (m_criticalSection);
+  for (TaskContainer::iterator iTask = m_vecpTasks.begin(); iTask != m_vecpTasks.end(); iTask++) {
+    if ((*iTask)->buttonID() == iButtonID) {
+      pTask = *iTask;
+      break;
+    }
+  }
+
+  return pTask;
 }
 
-bool
-BackgroundManager::isCancelling (BackgroundTask* pTask)
+void
+BackgroundManager::resizeWindow()
 {
-  return false;
+  int iHighestPosition = -1;
+
+  wxCriticalSectionLocker lock (m_criticalSection);
+  for (TaskContainer::iterator i = m_vecpTasks.begin(); i != m_vecpTasks.end(); i++)
+    if (iHighestPosition < (*i)->position())
+      iHighestPosition = (*i)->position();
+
+  wxSize sizeWindow (m_sizeCell.x, m_sizeCell.y * (iHighestPosition + 1));
+  SetClientSize (sizeWindow);
+  m_pCanvas->Refresh();
 }
 
 
 
 IMPLEMENT_DYNAMIC_CLASS(BackgroundManagerCanvas, wxPanel)
 BEGIN_EVENT_TABLE(BackgroundManagerCanvas, wxPanel)
-EVT_PAINT(BackgroundManagerCanvas::OnPaint)
 END_EVENT_TABLE()
 
 BackgroundManagerCanvas::BackgroundManagerCanvas (BackgroundManager* pMgr)
-: m_pBackgroundManager(pMgr), wxPanel (pMgr)
+: wxPanel (pMgr), m_pBackgroundManager(pMgr)
 {
 }
 
 
-void
-BackgroundManagerCanvas::OnPaint (wxPaintEvent& event)
-{
-  wxPaintDC dc (this);
-//  dc.DrawLine (0, 0, 30, 30);
-//  dc.DrawLine (30,0, 0, 30);
-}
+#endif // HAVE_WXTHREADS