WebSVN – svn1 – Diff – /Mara/trunk/qmteamdisplay.cpp

 #include "qmteamdisplay.h"
 #include "ui_qmteamdisplay.h"
 #include "spinboxdelegate.h"
 #include "timedelegate.h"
 #include "textdelegate.h"
+#include "mainwindow.h"
+#include "QmEditAddendum.h"
 /*----------------------------------------------------------------------------
 ** FUNCTION           : qmTeamDisplay
 **
 ** DESCRIPTION        : Construct a new widget
 ** RETURNS            :
 **
 ----------------------------------------------------------------------------*/
-qmTeamDisplay::qmTeamDisplay(QWidget *parent) :
+qmTeamDisplay::qmTeamDisplay(QWidget *parent, int initialTeam, bool useDone) :
     QWidget(parent),
     ui(new Ui::QmTeamDisplay)
+{
     ui->setupUi(this);
     team = 0;
     dirty = true;
-    populating = true;
+    populating = false;
-    /*
-    ** Populate the Combo Box
-    ** Should do more often
+    enableDone = useDone;
-    */
-    for ( int ii = 0; ii < config.num_class ; ii++)
-    {
-        ui->category->addItem(config.team_class[ii].full_name, ii);
-    }
-    ui->category->setCurrentIndex(-1);
     /*
     **  Set delegates to assist in editing the members table
     **      Name
     **      Sex
     **      Age
     */
     ui->members->setItemDelegateForColumn(0, new textDelegate(MAX_PERSON_NAME));
     ui->members->setItemDelegateForColumn(2, new SpinBoxDelegate(0,120));
+    ui->members->verticalHeader()->setVisible(true);
+    QStringList labels;
+    for ( int ii = 0 ; ii < config.num_legs; ii++)
+    {
+        labels << config.leg_name[ii];
+    }
+    ui->members->setVerticalHeaderLabels(labels);
     /*
     ** Insert widgets for the Team Times
     */
+    for (int ii = 0; ii <= MAX_LEGS; ii++) {
+        lt[ii] = NULL;
+    }
     for ( int ii = 1 ; ii <= config.num_legs; ii++)
+    {
         lt[ii] = new QmLegTimes(ii, config.leg_name[ii-1]);
         ui->legTime_layout->addWidget(lt[ii]);
         connect (lt[ii], SIGNAL(dataChanged()), this, SLOT(recalculateTimes()) );
+    }
     lt[0] = new QmLegTimes(0, "Overall Event");
     ui->legTime_layout->addWidget(lt[0]);
     /*
+    ** Init initial displayed team
+    */
+    team = initialTeam ? initialTeam : config.min_team;
+    /*
     **  Connect up various signals
     */
     connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(save()) );
     connect(ui->pushButtonRestore, SIGNAL(clicked()), this, SLOT(cancel()) );
     connect(ui->teamNumber, SIGNAL(valueChanged(int)), this, SLOT(populate(int)) );
-    connect(ui->name, SIGNAL(editingFinished()), this, SLOT(changed()));
+    connect(ui->name, SIGNAL(textEdited(QString)), this, SLOT(changed()) );
     connect(ui->category , SIGNAL(currentIndexChanged(int)), this, SLOT(changed()));
     connect(ui->category , SIGNAL(currentIndexChanged(int)), this, SLOT(updateCategory()));
     connect(ui->members , SIGNAL(cellChanged(int,int)), this, SLOT(changed()));
     connect(ui->disqualified , SIGNAL(clicked(bool)), this, SLOT(changed()));
-    connect(ui->nonEquestrian , SIGNAL(clicked(bool)), this, SLOT(changed()));
+    connect(ui->nonEquestrian , SIGNAL(clicked(bool)), this, SLOT(recalculateTimes()));
     connect(ui->disabled , SIGNAL(clicked(bool)), this, SLOT(changed()));
     connect(ui->VetCheck , SIGNAL(clicked(bool)), this, SLOT(changed()));
+    connect(ui->editNote, SIGNAL(clicked()), this, SLOT(editNote()));
     updateChanged(false);
-    populating = false;
-    populate(config.min_team);
+}
 /*----------------------------------------------------------------------------
 ** FUNCTION           : ~qmTeamDisplay
 **
+{
     delete ui;
+}
 /*----------------------------------------------------------------------------
+** FUNCTION           : showEvent
+**
+** DESCRIPTION        : Slot that is wired into the main windows widget
+**                      It will be called when the main window widget changes
+**                      If this display is the current display, then load new data
+**
+** INPUTS             : index of the tab that now has focus
+**
+----------------------------------------------------------------------------*/
+void qmTeamDisplay::showEvent ( QShowEvent * event )
+{
+    //qDebug("showEvent::showEvent");
+    if ( ! event->spontaneous() )
+    {
+        if ( ! dirty)
+        {
+            populate(team);
+        }
+    }
+}
+/*----------------------------------------------------------------------------
+** FUNCTION           : blockSignals
+**
+** DESCRIPTION        : Block signal from widgets that set Changed
+**                      while populating the display
+**
+**
+** INPUTS             : state - New blocking state
+**
+** RETURNS            : Nothing
+**
+----------------------------------------------------------------------------*/
+void qmTeamDisplay::blockSignals(bool state)
+{
+//    ui->pushButtonSave->blockSignals(state);
+//    ui->pushButtonRestore->blockSignals(state);
+//    ui->teamNumber->blockSignals(state);
+    ui->name->blockSignals(state);
+    ui->category->blockSignals(state);
+    ui->members->blockSignals(state);
+    ui->disqualified->blockSignals(state);
+    ui->nonEquestrian->blockSignals(state);
+    ui->disabled->blockSignals(state);
+    ui->VetCheck->blockSignals(state);
+    for ( int ii = 0 ; ii <= MAX_LEGS; ii++)
+    {
+        if (lt[ii]) {
+            lt[ii]->blockSignals(state);
+        }
+    }
+}
+/*----------------------------------------------------------------------------
 ** FUNCTION           : populate
 **
 ** DESCRIPTION        : Populate the widget with data
 **
 **
 **
 ----------------------------------------------------------------------------*/
 void qmTeamDisplay::populate(int team_number)
+{
+    if (MainWindow::shutDown) {
+        return;
+    }
     /*
     **  Update the spinner that describes the current team number
     */
     populating = true;
+    blockSignals(true);
     ui->teamNumber->setMaximum(config.max_team);
     ui->teamNumber->setMinimum(config.min_team);
     ui->teamNumber->setValue(team_number);
     team = team_number;
     /*
     ** Basic Data
     */
     ui->name->setText( team_buf.name );
     ui->category_abr->setText( config.team_class[team_buf.teamclass - 1].abr );
+    /*
+    ** ComboBox for Category selection
+    **  Save category index as data inthe combobox
+    **  Do not show the NE category - it should be selected
+    */
+    ui->category->clear();
+    int selectedIndex = -1;
+    for ( int ii = 0; ii < config.num_class ; ii++)
+    {
+        if (config.team_class[ii].abr[0] && (config.nonequestrian_class != ii + 1))
+        {
+            ui->category->addItem(config.team_class[ii].full_name, ii);
-    ui->category->setCurrentIndex(team_buf.teamclass - 1);
+            if (ii == team_buf.teamclass - 1)
+            {
-    //TODO: Link update of combo box to the abreviation display
+                selectedIndex = ui->category->count() - 1;
+                //qDebug("ComboIndex:%d",ii);
+            }
+        }
+    }
+    ui->category->setCurrentIndex(selectedIndex);
     ui->disqualified->setCheckState(team_buf.flags.disqualified ? Qt::Checked : Qt::Unchecked);
     ui->nonEquestrian->setCheckState(team_buf.flags.non_equestrian ? Qt::Checked : Qt::Unchecked);
     ui->disabled->setCheckState( !team_buf.flags.valid ? Qt::Checked : Qt::Unchecked);
     ui->VetCheck->setCheckState( team_buf.flags.vet_check ? Qt::Checked : Qt::Unchecked);
+        }
+    }
     ui->members->resizeColumnsToContents();
     /*
-    **  Mainatainthe display of total age
+    **  Mainatain the display of total age
     */
     if ( age_sum <= 0 )
+    {
         ui->totalAge->setText("--");
+    }
     for ( int ii = 0 ; ii <= config.num_legs; ii++)
+    {
         lt[ii]->setData(&team_buf.leg[ii]);
+    }
+    /*
+    **  Team Note
+    */
-    populating = false;
+    populateNote();
     updateChanged(false);
+    populating = false;
+    blockSignals(false);
+}
 void qmTeamDisplay::updateCategory(void)
+{
+    int currentIndex = ui->category->currentIndex();
+    if (currentIndex >= 0)
+    {
+        int itemData = ui->category->itemData(currentIndex).toInt();
-     ui->category_abr->setText( config.team_class[ui->category->currentIndex()].abr );
+        ui->category_abr->setText( config.team_class[itemData].abr );
+    }
+}
 /*----------------------------------------------------------------------------
 ** FUNCTION           : recalculateTimes
 **
+{
     for ( int ii = 0 ; ii <= config.num_legs; ii++)
+    {
         lt[ii]->getData(&team_buf.leg[ii]);
+    }
+    suckData();
     set_times( &team_buf );
     test_times( &team_buf, 0 );
     for ( int ii = 0 ; ii <= config.num_legs; ii++)
+    {
         lt[ii]->setData(&team_buf.leg[ii]);
     // Flag data as changed
     changed();
+}
 /*----------------------------------------------------------------------------
-** FUNCTION           : save
+** FUNCTION           : suckData
 **
-** DESCRIPTION        : Save the data back to disk
+** DESCRIPTION        : Save the data back to memory
 **
 ** INPUTS             :
 **
 ** RETURNS            :
 **
 ----------------------------------------------------------------------------*/
-void qmTeamDisplay::save(void)
+void qmTeamDisplay::suckData(void)
+{
     /*
     ** Extract data from the widgets
     ** The time stuff is done on the fly as it changes
     */
     strncpy(team_buf.name , qPrintable(ui->name->text()), sizeof(team_buf.name));
-    team_buf.teamclass = ui->category->currentIndex() + 1;
+    int currentIndex = ui->category->currentIndex();
+    if (currentIndex >= 0)
+    {
+        int itemData = ui->category->itemData(currentIndex).toInt();
+        team_buf.teamclass = itemData + 1;
+    }
     team_buf.flags.disqualified =  ( ui->disqualified->checkState () == Qt::Checked);
     team_buf.flags.non_equestrian =  ( ui->nonEquestrian->checkState () == Qt::Checked);
     team_buf.flags.valid =  ( ui->disabled->checkState () != Qt::Checked);
     team_buf.flags.vet_check =  ( ui->VetCheck->checkState () == Qt::Checked);
         item = ui->members->item ( ii, 2 );
         team_buf.members[ii].age = item->data(Qt::EditRole).toInt();
+    }
+}
+/*----------------------------------------------------------------------------
+** FUNCTION           : save
+**
+** DESCRIPTION        : Save the data back to disk
+**                      Also called if nothing to save - ie Done Mode
+**
+** INPUTS             :
+**
+** RETURNS            :
+**
+----------------------------------------------------------------------------*/
+void qmTeamDisplay::save(void)
+{
+    if ( dirty )
-    /*
+    {
+        /*
-    ** Save the record back to disk
+        ** Save the record back to disk
-    */
+        */
+        suckData();
-    put_team_record( team, &team_buf );
+        put_team_record( team, &team_buf );
-    populate(team);
+        populate(team);
+    }
+    else
+    {
+        if ( enableDone )
+            emit dialogDone(1);
+    }
+}
 /*----------------------------------------------------------------------------
 ** FUNCTION           : cancel
 **
     populate(team);
+}
 void qmTeamDisplay::changed(void)
+{
+//QObject * who = sender () ;
+//qDebug ("Changed: %p", who);
     if (populating)
         return;
     updateChanged(true);
-//qDebug ("Changed");
+}
 void qmTeamDisplay::updateChanged(bool newDirty)
+{
-    //qDebug("updateChanged: %d -> %d", newDirty, dirty);
+    //qDebug("updateChanged: %d, %d -> %d", populating, dirty, newDirty );
     if (newDirty != dirty)
+    {
         dirty = newDirty;
         if (dirty)
+        {
             ui->Changed->setVisible(true);
             ui->teamNumber->setEnabled(false);
             ui->pushButtonSave->setEnabled(true);
             ui->pushButtonSave->setStyleSheet("background-color: rgb(255, 0, 0);");
+            ui->pushButtonSave->setText("Save");
+            //  Only valid when within a dialog
+            //  Now have the dialog swallow <return>
+            //ui->pushButtonSave->setDefault(true);
+        }
         else
+        {
             ui->Changed->setVisible(false);
             ui->teamNumber->setEnabled(true);
-            ui->pushButtonSave->setEnabled(false);
+            //ui->pushButtonSave->setEnabled(false);
             ui->pushButtonSave->setStyleSheet("");
+            if ( enableDone )
+                ui->pushButtonSave->setText("Done");
+        }
+    }
+}
 /*----------------------------------------------------------------------------
         break;
     default:
         break;
+    }
+}
+/*----------------------------------------------------------------------------
+** FUNCTION           : populateNote
+**
+** DESCRIPTION        : Populate the Note area of the team display
+**                      Must be called during populate as
+**
+**
+** INPUTS             :
+**
+** RETURNS            :
+**
+----------------------------------------------------------------------------*/
+void qmTeamDisplay::populateNote(void)
+{
+    noteFileName = "TeamNote_" + QString::number(team) + ".txt";
+    //qDebug("NoteFile:%s",qPrintable(noteFileName));
+    //  Clear combobox before we add text
+    ui->noteText->clear();
+    QFile noteFile(QString(filepath) + noteFileName);
+    if ( noteFile.open( QIODevice::ReadOnly ) )
+    {
+        QTextStream stream( &noteFile );
+        QString line;
+        do {
+             line = stream.readLine();
+             if (line.isNull())
+                 break;
+             ui->noteText->addItem(line);
+         } while (true);
+        noteFile.close();
+    }
+    ui->noteText->setStyleSheet( ui->noteText->count() ? "background-color: #FFFFCB;" : "");
+    /*
+    ** Delete empy files to keep things clean
+    */
+    if (noteFile.size() == 0 )
+    {
+        noteFile.remove();
+    }
+}
+/*----------------------------------------------------------------------------
+** FUNCTION           : editNote
+**
+** DESCRIPTION        : Edit the Team Note in a  modal dialog box
+**
+** INPUTS             :
+**
+** RETURNS            :
+**
+----------------------------------------------------------------------------*/
+void qmTeamDisplay::editNote(void)
+{
+    QmEditAddendum dialog(QmConfig::getAddendemFile(noteFileName, true), true);
+     dialog.exec();
+     populateNote();
+}

Subversion Repositories svn1

(root)/Mara/trunk/qmteamdisplay.cpp – Rev 226 → 380