Commit 49bef2f9 authored by hrchilds's avatar hrchilds
Browse files

Update from May 3, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@462 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5d90ecfb
......@@ -126,6 +126,9 @@
# Mark C. Miller, Wed Apr 27 08:29:28 PDT 2005
# Removed '~' from URL for test web site
#
# Mark C. Miller, Tue May 3 21:49:22 PDT 2005
# Modified skipList
#
# ----------------------------------------------------------------------------
# list of users who want email every night with the log file
......@@ -256,7 +259,9 @@ if test "`date +%A`" = "Sunday"; then
fi
# set list of tests/modes to skip
skipList="dlb:tests/databases/global_node_ids.py \
skipList="scalable,parallel:tests/databases/boxlib.py \
scalable,parallel:tests/hybrid/locus.py \
dlb:tests/databases/global_node_ids.py \
dlb:tests/queries/pick.py \
serial,purify:tests/databases/global_node_ids.py \
serial,purify:tests/queries/pick.py"
......
......@@ -745,6 +745,12 @@ avtPixieFileFormat::GetMesh(int timestate, const char *meshname)
varDims[0] = varDims[2];
varDims[2] = tmp;
}
else if (nVarDims == 2)
{
int tmp = varDims[0];
varDims[0] = varDims[1];
varDims[1] = tmp;
}
vtkRectilinearGrid *rgrid = vtkRectilinearGrid::New();
vtkFloatArray *coords[3];
......@@ -921,7 +927,10 @@ avtPixieFileFormat::CreateCurvilinearMesh(int timestate, const VarInfo &info,
// Tell the grid what its dimensions are and populate the points array.
//
if(nVarDims == 2)
sgrid->SetDimensions((int *)varDims);
{
int yxzNodes[] = {varDims[1], varDims[0], varDims[2]};
sgrid->SetDimensions((int *)yxzNodes);
}
else
{
// In 3D, Pixie dimensions are stored ZYX. Reverse them so we
......
......@@ -1397,6 +1397,10 @@ ViewerWindowManager::ChooseCenterOfRotation(int windowIndex,
// Brad Whitlock, Wed Feb 23 17:19:41 PST 2005
// Added a call to ClearStatus.
//
// Mark C. Miller, Tue May 3 21:49:22 PDT 2005
// Added error check for attempts to save curve formats from windows
// in SR mode
//
// ****************************************************************************
void
......@@ -1605,7 +1609,17 @@ ViewerWindowManager::SaveWindow(int windowIndex)
}
else
{
avtDataset_p ds = GetDataset(windowIndex);
bool windowIsInScalableRenderingMode;
avtDataset_p ds = GetDataset(windowIndex,
windowIsInScalableRenderingMode);
if (windowIsInScalableRenderingMode)
{
Error("You cannot save curve formats (ultra, curve) from a window "
"that is currently in scalable rendering mode.");
return;
}
if (*ds != NULL)
ds->Compact();
CopyTo(dob, ds);
......@@ -1883,15 +1897,22 @@ ViewerWindowManager::CreateTiledImage(int width, int height, bool leftEye)
// Programmer: Hank Childs
// Creation: May 24, 2002
//
// Modifications:
//
// Mark C. Miller, Tue May 3 21:49:22 PDT 2005
// Added windowIsInScalableRenderingMode
//
// ****************************************************************************
avtDataset_p
ViewerWindowManager::GetDataset(int windowIndex)
ViewerWindowManager::GetDataset(int windowIndex,
bool& windowIsInScalableRenderingMode)
{
int index = (windowIndex == -1 ? activeWindow : windowIndex);
avtDataset_p rv = NULL;
if(windows[index] != 0)
windowIsInScalableRenderingMode = windows[index]->GetScalableRendering();
if(!windowIsInScalableRenderingMode && windows[index] != 0)
{
rv = windows[index]->GetAllDatasets();
}
......
......@@ -311,6 +311,9 @@ typedef struct {
// Added GetTimeLockedWindowIndices and made CreateMultiWindowCorrelation
// public.
//
// Mark C. Miller, Tue May 3 21:49:22 PDT 2005
// Added bool arg to GetDatasets
//
// ****************************************************************************
class VIEWER_API ViewerWindowManager : public QObject
......@@ -511,7 +514,7 @@ class VIEWER_API ViewerWindowManager : public QObject
avtImage_p CreateSingleImage(int windowIndex, int width, int height,
bool screenCapture, bool leftEye);
avtImage_p CreateTiledImage(int width, int height, bool leftEye);
avtDataset_p GetDataset(int windowIndex);
avtDataset_p GetDataset(int windowIndex, bool&);
void GetDatabasesForWindows(const intVector &,stringVector &) const;
bool AskForCorrelationPermission(const char *, const char *,
const stringVector &dbs) const;
......
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