Commit ca884d0b authored by hrchilds's avatar hrchilds

Update from March 27, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@207 18c085ea-50e0-402c-830e-de6fd14e8384
parent 85623787
......@@ -752,6 +752,9 @@ class MakeMovie:
# Brad Whitlock, Tue Aug 12 09:37:37 PDT 2003
# Passed the desired version to mpeg_encode.
#
# Hank Childs, Sat Mar 27 11:51:10 PST 2004
# Don't do such aggressive compression.
#
###########################################################################
def EncodeMPEGMovie(self):
......@@ -775,9 +778,9 @@ class MakeMovie:
f.write("RANGE 10\n")
f.write("PSEARCH_ALG TWOLEVEL\n")
f.write("BSEARCH_ALG SIMPLE\n")
f.write("IQSCALE 5\n")
f.write("PQSCALE 8\n")
f.write("BQSCALE 18\n")
f.write("IQSCALE 2\n")
f.write("PQSCALE 2\n")
f.write("BQSCALE 2\n")
f.write("REFERENCE_FRAME DECODED\n")
f.write("FORCE_ENCODE_LAST_FRAME\n")
f.write("YUV_SIZE %dx%d\n" % (self.xres, self.yres))
......
......@@ -5313,6 +5313,9 @@ avtGenericDatabase::AssociateBounds(vtkDataSet *ds)
// Hank Childs, Tue Dec 16 09:49:13 PST 2003
// Improve clarity of warning message.
//
// Hank Childs, Sat Mar 27 11:51:10 PST 2004
// Do not let scaling go into an infinite loop.
//
// ****************************************************************************
void
......@@ -5337,7 +5340,8 @@ avtGenericDatabase::ScaleMesh(vtkDataSet *ds)
{
scaleFactor = 1.;
double temp = bounds[1] - bounds[0];
while (temp > 1e6)
int iterations = 0;
while (temp > 1e6 && (iterations++ < 100))
{
temp /= 10.;
scaleFactor *= 10.;
......@@ -5348,7 +5352,8 @@ avtGenericDatabase::ScaleMesh(vtkDataSet *ds)
{
scaleFactor = 1.;
double temp = bounds[1] - bounds[0];
while (temp < 1e-3)
int iterations = 0;
while (temp < 1e-3 && (iterations++ < 100))
{
temp *= 10.;
scaleFactor /= 10.;
......@@ -5359,7 +5364,8 @@ avtGenericDatabase::ScaleMesh(vtkDataSet *ds)
{
scaleFactor = 1.;
double temp = bounds[3] - bounds[2];
while (temp > 1e6)
int iterations = 0;
while (temp > 1e6 && (iterations++ < 100))
{
temp /= 10.;
scaleFactor *= 10.;
......@@ -5370,7 +5376,8 @@ avtGenericDatabase::ScaleMesh(vtkDataSet *ds)
{
scaleFactor = 1.;
double temp = bounds[3] - bounds[2];
while (temp < 1e-3)
int iterations = 0;
while (temp < 1e-3 && (iterations++ < 100))
{
temp *= 10.;
scaleFactor /= 10.;
......@@ -5381,7 +5388,8 @@ avtGenericDatabase::ScaleMesh(vtkDataSet *ds)
{
scaleFactor = 1.;
double temp = bounds[5] - bounds[4];
while (temp > 1e6)
int iterations = 0;
while (temp > 1e6 && (iterations++ < 100))
{
temp /= 10.;
scaleFactor *= 10.;
......@@ -5392,7 +5400,8 @@ avtGenericDatabase::ScaleMesh(vtkDataSet *ds)
{
scaleFactor = 1.;
double temp = bounds[5] - bounds[4];
while (temp < 1e-3)
int iterations = 0;
while (temp < 1e-3 && (iterations++ < 100))
{
temp *= 10.;
scaleFactor /= 10.;
......
......@@ -1270,18 +1270,26 @@ void vtkVisItClipper3D::GeneralExecute(void)
ClipDataset(GetInput(), (vtkUnstructuredGrid*)GetOutput());
}
// ****************************************************************************
// Modifications:
//
// Hank Childs, Sat Mar 27 10:56:08 PST 2004
// Work-around some funniness with VTK memory management. (the funniness
// is a bug with the vtkClipDataSet filter.)
//
// ****************************************************************************
void vtkVisItClipper3D::ClipDataset(vtkDataSet *in_ds,
vtkUnstructuredGrid *out_ds)
{
vtkClipDataSet *clipData = vtkClipDataSet::New();
clipData->SetInput(in_ds);
clipData->SetOutput(out_ds);
//if (clipFunction
clipData->SetClipFunction(clipFunction);
clipData->GenerateClipScalarsOff();
clipData->SetInsideOut(insideOut);
clipData->Update();
out_ds->ShallowCopy(clipData->GetOutput());
clipData->Delete();
clipData = NULL;
}
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