[Compbench-devel] CompBenchmarks++/Qt-4/Status Status.cpp, 1.2, 1.3 Status.h, 1.2, 1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Status
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25562/Status

Modified Files:
	Status.cpp Status.h 
Log Message:
Modifications due to changes in libcompbenchmarks. Commited to release BETA2.

Index: Status.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Status.h	16 May 2007 20:25:30 -0000	1.2
--- Status.h	29 Aug 2007 20:34:06 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----

  #include <UI/UI.h>
+ #include <UI/UI-Msg.h>

  #include <QWidget>
***************
*** 12,16 ****
  #include <Package/PackageHolder.h>

! Q_DECLARE_METATYPE(CBM::UI::State)

  namespace CQT {
--- 13,17 ----
  #include <Package/PackageHolder.h>

! Q_DECLARE_METATYPE(CBM::UIMsg)

  namespace CQT {
***************
*** 27,44 ****

    signals:
!     virtual void sigProgressInit(QString what);
!     virtual void sigProgress(float _p);
!     virtual void sigProgressDone(void);
!     virtual void sigUninstall(CBM::UI::State state);
!     virtual void sigCompilerAutodetect(CBM::UI::State state,
! 				       float _p);

    protected slots:
!     virtual void progressInit(QString what);
!     virtual void progress(float _p);
!     virtual void progressDone(void);
!     virtual void uninstall(CBM::UI::State state);
!     virtual void compilerAutodetect(CBM::UI::State state,
! 				    float _p);

    public:
--- 28,39 ----

    signals:
!     virtual void sigMessageShow(CBM::UIMsg *msg);
!     virtual void sigMessageProgress(CBM::UIMsg *msg);
!     virtual void sigMessageDone(CBM::UIMsg *msg);

    protected slots:
!     virtual void uiMessageShow(CBM::UIMsg *msg);
!     virtual void uiMessageProgress(CBM::UIMsg *msg);
!     virtual void uiMessageDone(CBM::UIMsg *msg);

    public:
***************
*** 46,57 ****

    public:
!     virtual void ProgressInit(std::string what);
!     virtual void Progress(float _p);
!     virtual void ProgressDone(void);
! 
!     virtual int Information(CBM::UI::Info type,
! 			    std::string   msg,
! 			    CBM::UI::State state,
! 			    float _progress = 0);

    public:
--- 41,47 ----

    public:
!     virtual void Display(CBM::UIMsg *_msg);
!     virtual void DisplayProgressUpdate(CBM::UIMsg *_msg);
!     virtual void DisplayDone(CBM::UIMsg *_msg);

    public:
***************
*** 59,80 ****
    };

!   class StatusLedText : public QWidget {
    private:
      Q_OBJECT

    public:
!     typedef enum { Waiting,
! 		   Running,
  		   OK,
                     KO } LedColor;
    private:
!     QPixmap  pixmapWaiting;
!     QPixmap  pixmapOK;
!     QPixmap  pixmapKO;
!     QPixmap  pixmapRunning;

!     LedColor ledColor;
!     QLabel   *icon;
!     QLabel   *label;

      QPixmap  *pixmapObject(LedColor _color);
--- 49,72 ----
    };

!   class StatusAction : public QWidget {
    private:
      Q_OBJECT

    public:
!     typedef enum { Running,
! 		   Fatal,
  		   OK,
                     KO } LedColor;
    private:
!     QPixmap      pixmapOK;
!     QPixmap      pixmapKO;
!     QPixmap      pixmapRunning;

!     LedColor     ledColor;
!     QLabel       *icon;
!     QLabel       *label;
!     QProgressBar *progressBar;
! 
!     CBM::UIMsg *msg;

      QPixmap  *pixmapObject(LedColor _color);
***************
*** 82,88 ****

    public:
!     StatusLedText(std::string _label,
! 		  LedColor _color = Waiting,
! 		  QWidget *_parent = 0);

    public slots:
--- 74,79 ----

    public:
!     StatusAction(CBM::UIMsg *_msg,
! 		 QWidget *_parent = 0);

    public slots:
***************
*** 92,143 ****

!     virtual ~StatusLedText();
!   };
! 
!   class StatusInstall : public StatusWidget,
!                         public PackageHolder
!   {
!   private:
!     Q_OBJECT
!     StatusLedText *ledDownloaded;
!     StatusLedText *ledChecksum;
!     StatusLedText *ledExtracted;
!     StatusLedText *ledPatched;
!     StatusLedText *ledPreconfigured;
!     int           ledIndex;
! 
!     StatusLedText *ledCreate(std::string _label,
! 			     int         _done);
! 
!     CQT::StatusLedText::LedColor colorFor(CBM::UI::State state);
! 
!   signals:
!     void sigDownload(CBM::UI::State state,
! 		     float          progress);
!     void sigChecksum(CBM::UI::State state);
!     void sigExtract(CBM::UI::State state);
!     void sigPatch(CBM::UI::State state);
!     void sigPreconfigure(CBM::UI::State state,
! 			 float          progress);
! 
!   protected slots:
!     void download(CBM::UI::State state,
! 		  float          _progress);
!     void checksum(CBM::UI::State state);
!     void extract(CBM::UI::State state);
!     void patch(CBM::UI::State state);
!     void preconfigure(CBM::UI::State state,
! 		      float          _progress);
! 
!   public:
!     StatusInstall(CBM::Package *_package, QWidget *parent = 0);
!     
!     // virtual void ProgressDone(void);
!     virtual int Information(CBM::UI::Info type,
! 			    std::string   msg,
! 			    CBM::UI::State state,
! 			    float _progress = 0);
! 
!     ~StatusInstall();
    };
  }
--- 83,87 ----

!     virtual ~StatusAction();
    };
  }

Index: Status.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Status.cpp	16 May 2007 20:25:30 -0000	1.2
--- Status.cpp	29 Aug 2007 20:34:06 -0000	1.3
***************
*** 27,118 ****

    progressBar->setRange(0,100);
!   connect(this, SIGNAL(sigProgressInit(QString)),
! 	  this, SLOT(progressInit(QString)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigProgress(float)),
! 	  this, SLOT(progress(float)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigProgressDone()),
! 	  this, SLOT(progressDone()),
  	  Qt::QueuedConnection);

!   connect(this, SIGNAL(sigUninstall(CBM::UI::State)),
! 	  this, SLOT(uninstall(CBM::UI::State)),
  	  Qt::QueuedConnection);

!   connect(this, SIGNAL(sigCompilerAutodetect(CBM::UI::State, float)),
! 	  this, SLOT(compilerAutodetect(CBM::UI::State, float)),
  	  Qt::QueuedConnection);
  }

! void StatusWidget::progressInit(QString what)
! {
!   actionLabel->setText(what);
!   progressBar->setValue(0);
! }
! 
! void StatusWidget::progress(float _p)
! {
!   int r = (int) round(_p);
!   progressBar->setValue(r);
! }
! 
! void StatusWidget::progressDone(void)
! {
!   progressBar->setValue(100);
! }
! 
! void StatusWidget::ProgressInit(std::string what)
  {
-   emit sigProgressInit(what.c_str());
  }

! void StatusWidget::Progress(float _p)
  {
-   emit sigProgress(_p);
  }

! void StatusWidget::ProgressDone(void)
  {
-   emit sigProgressDone();
  }

! void StatusWidget::uninstall(CBM::UI::State state)
  {
!   actionLabel->setText("Uninstalling package...");
  }

! 	  
! void StatusWidget::compilerAutodetect(CBM::UI::State state,
! 				      float _p)
  {
!   if (state==CBM::UI::Start)
!     ProgressInit("Detecting installed compilers...");
!   else {
!     if (state==CBM::UI::Running)
!       Progress(_p);
!     else
!       ProgressDone();
!   }
  }

! int StatusWidget::Information(CBM::UI::Info  type,
! 			      std::string    msg,
! 			      CBM::UI::State state,
! 			      float          _progress)
  {
!   switch(type) {
!   case PackageUninstall:
!     emit sigUninstall(state);
!     break;
!   case CompilerAutodetect:
!     emit sigCompilerAutodetect(state, _progress);
!   default:
!     break;
!   }
! 
!   return(0);
  }

--- 27,68 ----

    progressBar->setRange(0,100);
!   connect(this, SIGNAL(sigMessageShow(CBM::UIMsg*)),
! 	  this, SLOT(uiMessageShow(CBM::UIMsg*)),
  	  Qt::QueuedConnection);

!   connect(this, SIGNAL(sigMessageProgress(CBM::UIMsg*)),
! 	  this, SLOT(uiMessageProgress(CBM::UIMsg*)),
  	  Qt::QueuedConnection);

!   connect(this, SIGNAL(sigMessageDone(CBM::UIMsg*)),
! 	  this, SLOT(uiMessageDone(CBM::UIMsg*)),
  	  Qt::QueuedConnection);
  }

! void StatusWidget::uiMessageShow(CBM::UIMsg *msg)
  {
  }

! void StatusWidget::uiMessageProgress(CBM::UIMsg *msg)
  {
  }

! void StatusWidget::uiMessageDone(CBM::UIMsg *msg)
  {
  }

! void StatusWidget::Display(CBM::UIMsg *_msg)
  {
!   emit sigMessageShow(_msg);
  }

! void StatusWidget::DisplayProgressUpdate(CBM::UIMsg *_msg)
  {
!   emit sigMessageProgress(_msg);
  }

! void StatusWidget::DisplayDone(CBM::UIMsg *_msg)
  {
!   emit sigMessageDone(_msg);
  }

***************
*** 121,149 ****
  }

! StatusLedText::StatusLedText(std::string _label,
! 			     LedColor _color,
! 			     QWidget *_parent)
    : QWidget(_parent)
  {
    QHBoxLayout *lay = new QHBoxLayout;

!   QIcon I(":/icons/led-yellow.png");
!   pixmapWaiting=I.pixmap(12);
! 
!   QIcon I2(":/icons/success.png");
!   pixmapOK=I2.pixmap(12);

!   QIcon I3(":/icons/error.png");
!   pixmapKO=I3.pixmap(12);

!   QIcon I4(":/icons/arrow-right.png");
!   pixmapRunning=I4.pixmap(12);

    icon=new QLabel();
!   icon->setPixmap(*pixmapObject(_color));
    lay->addWidget(icon);
    icon->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);

!   label=new QLabel(_label.c_str());
    lay->addWidget(label);
    label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
--- 71,101 ----
  }

! StatusAction::StatusAction(CBM::UIMsg *_msg,
! 			   QWidget *_parent)
    : QWidget(_parent)
  {
    QHBoxLayout *lay = new QHBoxLayout;

!   msg=_msg;
!   QIcon I1(":/icons/success.png");
!   pixmapOK=I1.pixmap(12);

!   QIcon I2(":/icons/error.png");
!   pixmapKO=I2.pixmap(12);

!   QIcon I3(":/icons/arrow-right.png");
!   pixmapRunning=I3.pixmap(12);

    icon=new QLabel();
!   icon->setPixmap(*pixmapObject(Running));
    lay->addWidget(icon);
    icon->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);

!   if (_msg->getFlags()==CBM::UIMsg::Progress) {
!     progressBar=new QProgressBar();
!     progressBar->setRange(0,100);
!     lay->addWidget(progressBar);
!   }
!   label=new QLabel("test...!!!");
    lay->addWidget(label);
    label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
***************
*** 153,162 ****
  }

! QPixmap *StatusLedText::pixmapObject(LedColor _color)
  {
    switch(_color) {
-   case Waiting:
-     return(&pixmapWaiting);
-     break;
    case Running:
      return(&pixmapRunning);
--- 105,111 ----
  }

! QPixmap *StatusAction::pixmapObject(LedColor _color)
  {
    switch(_color) {
    case Running:
      return(&pixmapRunning);
***************
*** 172,176 ****
  }

! void StatusLedText::changeColor(LedColor _color)
  {
    icon->setPixmap(*pixmapObject(_color));
--- 121,125 ----
  }

! void StatusAction::changeColor(LedColor _color)
  {
    icon->setPixmap(*pixmapObject(_color));
***************
*** 178,334 ****

! StatusLedText::~StatusLedText()
! {
! }
! 
! StatusInstall::StatusInstall(CBM::Package *_package,
! 			     QWidget *parent)
!   : StatusWidget(parent),
!     PackageHolder(_package)
! {
!   std::string tit = "Installing package ";
!   tit+=Package()->Name();
!   ProgressInit(tit);
!   ledIndex=1;
! 
!   ledDownloaded=ledCreate("Downloading",
! 			  (Package()->getStatus()>=CBM::Package::Downloaded));
! 
!   ledChecksum=ledCreate("Checksum",
! 			(Package()->getStatus()>=CBM::Package::Downloaded));
! 
!   ledExtracted=ledCreate("Extracting",
! 			 (Package()->getStatus()>=CBM::Package::Extracted));
!   ledPatched=0;
!   if (Package()->hasPatch()) {
!     ledPatched=ledCreate("Patching",
!        (Package()->getStatus()>=CBM::Package::Patched));
!   }
! 
! 
!   ledPreconfigured=ledCreate("Preconfiguring",
! 			     (Package()->getStatus()>=CBM::Package::Preconfigured));
! 
!   connect(this, SIGNAL(sigDownload(CBM::UI::State, float)),
! 	  this, SLOT(download(CBM::UI::State, float)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigChecksum(CBM::UI::State)),
! 	  this, SLOT(checksum(CBM::UI::State)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigExtract(CBM::UI::State)),
! 	  this, SLOT(extract(CBM::UI::State)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPatch(CBM::UI::State)),
! 	  this, SLOT(patch(CBM::UI::State)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPreconfigure(CBM::UI::State, float)),
! 	  this, SLOT(preconfigure(CBM::UI::State, float)),
! 	  Qt::QueuedConnection);
! }
! 
! 
! StatusLedText *StatusInstall::ledCreate(std::string _label,
! 					int         _done)
! {
!   StatusLedText *R;
! 
!   ledIndex++;
!   R = new StatusLedText(_label,
! 			_done ? StatusLedText::OK : StatusLedText::Waiting);
! 
!   layout->addWidget(R, ledIndex, 1, 1, 1, Qt::AlignLeft);
!   return(R);
! }
! 
! CQT::StatusLedText::LedColor StatusInstall::colorFor(CBM::UI::State state)
! {
!   switch(state) {
!   case CBM::UI::Start:
!   case CBM::UI::Running:
!     return(StatusLedText::Running);
!     break;
!   case CBM::UI::OK:
!     return(StatusLedText::OK);
!     break;
!  case CBM::UI::Failed:
!     return(StatusLedText::KO);
!     break;
!   default:
!     return(StatusLedText::Waiting);
!   }
!   return(StatusLedText::Waiting);
! }
! 
! void StatusInstall::download(CBM::UI::State state, float _progress)
! {
!   ledDownloaded->changeColor(colorFor(state));
!   if (_progress>0)
!     Progress(_progress);
! }
! 
! void StatusInstall::checksum(CBM::UI::State state)
! {
!   ledChecksum->changeColor(colorFor(state));
! }
! 
! void StatusInstall::extract(CBM::UI::State state)
! {
!   ledExtracted->changeColor(colorFor(state));
! }
! 
! void StatusInstall::patch(CBM::UI::State state)
! {
!   ledPatched->changeColor(colorFor(state));
! }
! 
! void StatusInstall::preconfigure(CBM::UI::State state, float _progress)
! {
!   ledPreconfigured->changeColor(colorFor(state));
!   if (_progress>0)
!     Progress(_progress);
! }
! /*
! void StatusInstall::ProgressDone(void)
! {
!   StatusWidget::ProgressDone();
!   emit sigDownloaded();
! }
! */
! 
! int StatusInstall::Information(CBM::UI::Info  type,
! 			       std::string    msg,
! 			       CBM::UI::State state,
! 			       float          _progress)
! {
!   switch(type) {
!   case Checksum:
!     emit sigChecksum(state);
!     break;
!   case PackageDownload:
!     emit sigDownload(state, _progress);
!     break;
!   case PackageExtract:
!     emit sigExtract(state);
!     break;
!   case PackagePatch:
!     emit sigPatch(state);
!     break;
!   case PackagePreconfigure:
!     if (_progress==0)
!       Progress(0);
!     emit sigPreconfigure(state, _progress);
!     break;
!   default:
!     break;
!   }
! 
!   return(0);
! }
! 
! StatusInstall::~StatusInstall()
  {
  }
--- 127,131 ----

! StatusAction::~StatusAction()
  {
  }