Commit 73332358 authored by miller86's avatar miller86
Browse files

fixing problem in gui where after setting try harder to get accurate...

fixing problem in gui where after setting try harder to get accurate cycles/times and re-opening, the accurate info does not appear in the file list

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@1843 18c085ea-50e0-402c-830e-de6fd14e8384
parent b103ff18
......@@ -391,6 +391,10 @@ QvisFilePanel::~QvisFilePanel()
// Mark C. Miller, Wed Aug 2 19:58:44 PDT 2006
// Changed interface to FileServerList::GetMetaData
//
// Mark C. Miller, Fri Aug 10 23:11:55 PDT 2007
// Propogated knowledge that item was updated with metadata that was forced
// to get accurate cycles/times.
//
// ****************************************************************************
void
......@@ -448,6 +452,8 @@ QvisFilePanel::SetTimeStateFormat(const TimeFormat &m)
it.current()->setText(0, CreateItemLabel(md, j,
useVirtualDBInfo));
}
item->timeStateHasBeenForced =
fileServer->GetForceReadAllCyclesTimes();
}
}
}
......@@ -1189,11 +1195,18 @@ QvisFilePanel::UpdateTimeFieldText(int timeState)
//
// Mark C. Miller, Wed Aug 2 19:58:44 PDT 2006
// Changed interface to FileServerList::GetMetaData
//
// Mark C. Miller, Fri Aug 10 23:11:55 PDT 2007
// Checked to see if item has had its time/state forced and if not, but
// the file server is currently forcing, set showing correct file info to
// false. Also, Propogate knowledge that item was updated with metadata
// that was forced to get accurate cycles/times.
// ****************************************************************************
void
QvisFilePanel::ExpandDatabases()
{
debug5 << "In QvisFilePanel::ExpandDatabases " << endl;
// Count the number of items in the fileListView. I didn't see a way to
// count them all without traversing them all.
int i, count = 0;
......@@ -1240,6 +1253,10 @@ QvisFilePanel::ExpandDatabases()
!FileServerList::GET_NEW_MD);
if(md != 0 && md->GetNumStates() > 1)
{
if (fileServer->GetForceReadAllCyclesTimes() &&
!item->timeStateHasBeenForced)
SetFileShowsCorrectData(item->file, false);
if(md->GetNumStates() != item->childCount())
{
//
......@@ -1265,6 +1282,8 @@ QvisFilePanel::ExpandDatabases()
// Remember that the item now has the correct information
// displayed through its children.
SetFileShowsCorrectData(item->file, true);
item->timeStateHasBeenForced =
fileServer->GetForceReadAllCyclesTimes();
}
}
}
......@@ -1361,6 +1380,10 @@ QvisFilePanel::ExpandDatabaseItem(QvisListViewFileItem *item)
//
// Mark C. Miller, Wed Aug 2 19:58:44 PDT 2006
// Changed interface to FileServerList::GetMetaData
// Mark C. Miller, Fri Aug 10 23:11:55 PDT 2007
//
// Propogated knowledge that item was updated with metadata that was forced
// to get accurate cycles/times.
// ****************************************************************************
void
......@@ -1385,6 +1408,8 @@ QvisFilePanel::ExpandDatabaseItemUsingMetaData(QvisListViewFileItem *item)
item->file, QvisListViewFileItem::FILE_NODE, i);
fi->setOpen(false);
}
item->timeStateHasBeenForced =
fileServer->GetForceReadAllCyclesTimes();
// Set the database pixmap.
item->setPixmap(0, *databasePixmap);
......
......@@ -70,15 +70,21 @@ int QvisListViewFileItem::globalNodeNumber = 0;
// Brad Whitlock, Wed Mar 21 00:32:42 PDT 2001
// Added an argument.
//
// Mark C. Miller, Fri Aug 10 23:11:55 PDT 2007
// Added timeStateHasBeenForced to keep track of whether item has
// been updated with cycle/time information from metadata that was
// forced to have accurate cycles/times.
// *******************************************************************
QvisListViewFileItem::QvisListViewFileItem(QListView *parent,
const QString &str, const QualifiedFilename &qf, int node, int state_) :
const QString &str, const QualifiedFilename &qf, int node, int state_,
bool tsForced) :
QListViewItem(parent, str), file(qf)
{
nodeType = node;
timeState = state_;
nodeNumber = globalNodeNumber++;
timeStateHasBeenForced = tsForced;
}
// *******************************************************************
......@@ -102,15 +108,21 @@ QvisListViewFileItem::QvisListViewFileItem(QListView *parent,
//
// Modifications:
//
// Mark C. Miller, Fri Aug 10 23:11:55 PDT 2007
// Added timeStateHasBeenForced to keep track of whether item has
// been updated with cycle/time information from metadata that was
// forced to have accurate cycles/times.
// *******************************************************************
QvisListViewFileItem::QvisListViewFileItem(QListViewItem *parent,
const QString &str, const QualifiedFilename &qf, int node, int state_) :
const QString &str, const QualifiedFilename &qf, int node, int state_,
bool tsForced) :
QListViewItem(parent, str), file(qf)
{
nodeType = node;
timeState = state_;
nodeNumber = globalNodeNumber++;
timeStateHasBeenForced = tsForced;
}
// *******************************************************************
......
......@@ -58,6 +58,11 @@
// Added an argument to the constructor and added some convenience
// functions.
//
// Mark C. Miller, Fri Aug 10 23:11:55 PDT 2007
// Added timeStateHasBeenForced to keep track of whether item has been
// updated with cycle/time information from metadata that was forced to
// have accurate cycles/times.
//
// ****************************************************************************
class GUI_API QvisListViewFileItem : public QListViewItem
......@@ -69,9 +74,11 @@ public:
static const int FILE_NODE;
QvisListViewFileItem(QListView *parent, const QString &str,
const QualifiedFilename &qf, int nodeType = 3, int state = -1);
const QualifiedFilename &qf, int nodeType = 3, int state = -1,
bool tsForced = false);
QvisListViewFileItem(QListViewItem *parent, const QString &str,
const QualifiedFilename &qf, int nodeType = 3, int state = -1);
const QualifiedFilename &qf, int nodeType = 3, int state = -1,
bool tsForced = false);
virtual ~QvisListViewFileItem();
virtual void paintCell(QPainter *p, const QColorGroup &cg,
......@@ -90,6 +97,7 @@ public:
QualifiedFilename file;
int nodeType;
int timeState;
bool timeStateHasBeenForced;
private:
static int globalNodeNumber;
int nodeNumber;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment