Commit 9ef9d774 authored by hrchilds's avatar hrchilds

Update from October 21, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@104 18c085ea-50e0-402c-830e-de6fd14e8384
parent 432be718
......@@ -56,6 +56,11 @@
# Brad Whitlock, Wed Oct 8 16:29:25 PST 2003
# Added support for clickable scripts in MacOS X.
#
# Brad Whitlock, Tue Oct 21 14:07:33 PST 2003
# I made the command script files that we generate on MacOS X have
# execute file permissions so they can run when double-clicked in
# the Finder.
#
#-----------------------------------------------------------------------
set Compress = COMPRESS
......@@ -265,6 +270,8 @@ if("$os" == "darwin") then
echo "$dir/bin/visit" >> $dir/bin/$appscript.command
endif
echo "exit 0" >> $dir/bin/$appscript.command
chgrp $group_ownership $dir/bin/$appscript.command
chmod $dir_permission $dir/bin/$appscript.command
@ i++
end
endif
......
......@@ -781,14 +781,19 @@ avtSIL::MakeSILAttributes(void) const
// Hank Childs, Thu Nov 14 16:46:58 PST 2002
// Print out the SIL matrices as well.
//
// Mark C. Miller, 23Sep03, Added additional perXXXInfo options
// Mark C. Miller, 23Sep03
// Added additional perXXXInfo options
//
// Brad Whitlock, Mon Oct 20 15:20:37 PST 2003
// I made it work on Windows again.
//
// ****************************************************************************
void
avtSIL::Print(ostream &out) const
{
std::vector< std::string > dummyInfo;
Print(out, dummyInfo, dummyInfo, dummyInfo);
std::vector< std::string > dummyInfo;
Print(out, dummyInfo, dummyInfo, dummyInfo);
}
void
......@@ -802,9 +807,9 @@ avtSIL::Print(ostream &out,
int nSets = sets.size();
if (perSetInfo.size() == nSets)
useInfo = true;
useInfo = true;
else
useInfo = false;
useInfo = false;
for (i = 0 ; i < nSets ; i++)
{
if (isWhole[i])
......@@ -815,31 +820,31 @@ avtSIL::Print(ostream &out,
{
out << "Subset ";
}
out << i << " " << (useInfo?perSetInfo[i]:"") << endl;
out << i << " " << (useInfo ? perSetInfo[i].c_str() : "") << endl;
avtSILSet_p s = sets[i];
s->Print(out);
}
int nColls = collections.size();
if (perCollInfo.size() == nColls)
useInfo = true;
useInfo = true;
else
useInfo = false;
useInfo = false;
for (i = 0 ; i < nColls ; i++)
{
out << "Collection " << i << " " << (useInfo?perCollInfo[i]:"") << endl;
out << "Collection " << i << " " << (useInfo ? perCollInfo[i].c_str() : "") << endl;
avtSILCollection_p c = collections[i];
c->Print(out);
}
int nMats = matrices.size();
if (perMatInfo.size() == nMats)
useInfo = true;
useInfo = true;
else
useInfo = false;
useInfo = false;
for (i = 0 ; i < nMats ; i++)
{
out << "Matrix " << i << " " << (useInfo?perMatInfo[i]:"") << endl;
out << "Matrix " << i << " " << (useInfo ? perMatInfo[i].c_str() : "") << endl;
avtSILMatrix_p m = matrices[i];
m->Print(out);
}
......
......@@ -279,7 +279,8 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md, int)
vector<int> cycles;
domains[0]->GetCycles(cycles);
bool guessLooksGood = true;
for (int i = 0 ; i < nDomains ; i++)
int i;
for (i = 0 ; i < nDomains ; i++)
{
if (i != 0)
{
......@@ -312,7 +313,7 @@ avtMTSDFileFormatInterface::SetDatabaseMetaData(avtDatabaseMetaData *md, int)
vector<double> times;
domains[0]->GetTimes(times);
guessLooksGood = true;
for (int i = 0 ; i < times.size() ; i++)
for (i = 0 ; i < times.size() ; i++)
{
if (i != 0)
{
......
#include <avtStructuredDomainNesting.h>
#include <VisItException.h>
#include <vtkCellData.h>
#include <vtkFloatArray.h>
#include <vtkIntArray.h>
#include <vtkStructuredGrid.h>
......
......@@ -4,7 +4,7 @@
#ifndef AVT_CURVE_CONSTRUCTOR_FILTER_H
#define AVT_CURVE_CONSTRUCTOR_FILTER_H
#include <pipeline_exports.h>
#include <avtDatasetToDatasetFilter.h>
......@@ -32,7 +32,7 @@
//
// ****************************************************************************
class avtCurveConstructorFilter : public avtDatasetToDatasetFilter
class PIPELINE_API avtCurveConstructorFilter : public avtDatasetToDatasetFilter
{
public:
avtCurveConstructorFilter();
......
......@@ -4,8 +4,13 @@
#include <avtFeatureEdgesFilter.h>
#include <vtkCell.h>
#include <vtkCellArray.h>
#include <vtkCellData.h>
#include <vtkDataSet.h>
#include <vtkFeatureEdges.h>
#include <vtkIdList.h>
#include <vtkPointData.h>
#include <vtkPolyData.h>
#include <avtDataset.h>
......
#ifndef QUERY_RPC_H
#define QUERY_RPC_H
#include <vector.h>
#include <vector>
#include <engine_rpc_exports.h>
#include <VisItRPC.h>
#include <QueryAttributes.h>
......
......@@ -758,6 +758,10 @@ QvisFileSelectionWindow::UpdateComboBox(QComboBox *cb, const stringVector &s,
// Brad Whitlock, Fri Mar 28 15:57:26 PST 2003
// I made it use QFileSelectionListBoxItem.
//
// Brad Whitlock, Tue Oct 21 13:28:25 PST 2003
// I made directories get their associated permission flag so they appear
// grayed out if they don't have read permission.
//
// ****************************************************************************
void
......@@ -776,19 +780,22 @@ QvisFileSelectionWindow::UpdateDirectoryList()
{
if(pos->name == std::string("."))
{
new QFileSelectionListBoxItem(directoryList, curDirString,
QualifiedFilename(curDirString.latin1()));
QualifiedFilename dirName(curDirString.latin1());
dirName.SetAccess(pos->CanAccess());
new QFileSelectionListBoxItem(directoryList, curDirString, dirName);
}
else if(pos->name == std::string(".."))
{
new QFileSelectionListBoxItem(directoryList, upDirString,
QualifiedFilename(upDirString.latin1()));
QualifiedFilename dirName(upDirString.latin1());
dirName.SetAccess(pos->CanAccess());
new QFileSelectionListBoxItem(directoryList, upDirString, dirName);
}
else
{
QString name(pos->name.c_str());
new QFileSelectionListBoxItem(directoryList, name,
QualifiedFilename(pos->name), folderPixmap);
QualifiedFilename dirName(pos->name);
dirName.SetAccess(pos->CanAccess());
new QFileSelectionListBoxItem(directoryList, pos->name.c_str(),
dirName, folderPixmap);
}
}
}
......
......@@ -2051,9 +2051,9 @@ QvisGUIApplication::WriteConfigFile(const char *filename)
//
stringVector plotDatabases;
const PlotList *pl = viewer->GetPlotList();
for(int i = 0; i < pl->GetNumPlots(); ++i)
for(int j = 0; j < pl->GetNumPlots(); ++j)
{
const Plot &p = pl->GetPlot(i);
const Plot &p = pl->GetPlot(j);
// Make sure we only add it if it's not already there.
if(std::find(plotDatabases.begin(),
plotDatabases.end(),
......
......@@ -13,7 +13,7 @@ import java.lang.Integer;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Jul 31 16:19:19 PST 2003
// Creation: Tue Oct 21 09:27:44 PDT 2003
//
// Modifications:
//
......@@ -29,9 +29,10 @@ public class PickVarInfo extends AttributeSubject
public PickVarInfo()
{
super(10);
super(11);
variableName = new String("(null)");
variableType = new String("(null)");
names = new Vector();
values = new Vector();
mixNames = new Vector();
......@@ -45,11 +46,12 @@ public class PickVarInfo extends AttributeSubject
public PickVarInfo(PickVarInfo obj)
{
super(10);
super(11);
int i;
variableName = new String(obj.variableName);
variableType = new String(obj.variableType);
names = new Vector(obj.names.size());
for(i = 0; i < obj.names.size(); ++i)
names.addElement(new String((String)obj.names.elementAt(i)));
......@@ -92,6 +94,7 @@ public class PickVarInfo extends AttributeSubject
// Create the return value
return ((variableName == obj.variableName) &&
(variableType == obj.variableType) &&
(names == obj.names) &&
(values == obj.values) &&
(mixNames == obj.mixNames) &&
......@@ -110,62 +113,69 @@ public class PickVarInfo extends AttributeSubject
Select(0);
}
public void SetVariableType(String variableType_)
{
variableType = variableType_;
Select(1);
}
public void SetNames(Vector names_)
{
names = names_;
Select(1);
Select(2);
}
public void SetValues(Vector values_)
{
values = values_;
Select(2);
Select(3);
}
public void SetMixNames(Vector mixNames_)
{
mixNames = mixNames_;
Select(3);
Select(4);
}
public void SetMixValues(Vector mixValues_)
{
mixValues = mixValues_;
Select(4);
Select(5);
}
public void SetMixVar(boolean mixVar_)
{
mixVar = mixVar_;
Select(5);
Select(6);
}
public void SetCentering(int centering_)
{
centering = centering_;
Select(6);
Select(7);
}
public void SetMiscMessage(String miscMessage_)
{
miscMessage = miscMessage_;
Select(7);
Select(8);
}
public void SetVarIsMaterial(boolean varIsMaterial_)
{
varIsMaterial = varIsMaterial_;
Select(8);
Select(9);
}
public void SetNumMatsPerZone(Vector numMatsPerZone_)
{
numMatsPerZone = numMatsPerZone_;
Select(9);
Select(10);
}
// Property getting methods
public String GetVariableName() { return variableName; }
public String GetVariableType() { return variableType; }
public Vector GetNames() { return names; }
public Vector GetValues() { return values; }
public Vector GetMixNames() { return mixNames; }
......@@ -182,22 +192,24 @@ public class PickVarInfo extends AttributeSubject
if(WriteSelect(0, buf))
buf.WriteString(variableName);
if(WriteSelect(1, buf))
buf.WriteStringVector(names);
buf.WriteString(variableType);
if(WriteSelect(2, buf))
buf.WriteDoubleVector(values);
buf.WriteStringVector(names);
if(WriteSelect(3, buf))
buf.WriteStringVector(mixNames);
buf.WriteDoubleVector(values);
if(WriteSelect(4, buf))
buf.WriteDoubleVector(mixValues);
buf.WriteStringVector(mixNames);
if(WriteSelect(5, buf))
buf.WriteBool(mixVar);
buf.WriteDoubleVector(mixValues);
if(WriteSelect(6, buf))
buf.WriteInt(centering);
buf.WriteBool(mixVar);
if(WriteSelect(7, buf))
buf.WriteString(miscMessage);
buf.WriteInt(centering);
if(WriteSelect(8, buf))
buf.WriteBool(varIsMaterial);
buf.WriteString(miscMessage);
if(WriteSelect(9, buf))
buf.WriteBool(varIsMaterial);
if(WriteSelect(10, buf))
buf.WriteIntVector(numMatsPerZone);
}
......@@ -212,30 +224,33 @@ public class PickVarInfo extends AttributeSubject
SetVariableName(buf.ReadString());
break;
case 1:
SetNames(buf.ReadStringVector());
SetVariableType(buf.ReadString());
break;
case 2:
SetValues(buf.ReadDoubleVector());
SetNames(buf.ReadStringVector());
break;
case 3:
SetMixNames(buf.ReadStringVector());
SetValues(buf.ReadDoubleVector());
break;
case 4:
SetMixValues(buf.ReadDoubleVector());
SetMixNames(buf.ReadStringVector());
break;
case 5:
SetMixVar(buf.ReadBool());
SetMixValues(buf.ReadDoubleVector());
break;
case 6:
SetCentering(buf.ReadInt());
SetMixVar(buf.ReadBool());
break;
case 7:
SetMiscMessage(buf.ReadString());
SetCentering(buf.ReadInt());
break;
case 8:
SetVarIsMaterial(buf.ReadBool());
SetMiscMessage(buf.ReadString());
break;
case 9:
SetVarIsMaterial(buf.ReadBool());
break;
case 10:
SetNumMatsPerZone(buf.ReadIntVector());
break;
}
......@@ -245,6 +260,7 @@ public class PickVarInfo extends AttributeSubject
// Attributes
private String variableName;
private String variableType;
private Vector names; // vector of String objects
private Vector values; // vector of Double objects
private Vector mixNames; // vector of String objects
......
......@@ -12,7 +12,7 @@ import java.lang.Integer;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Jul 31 16:19:22 PST 2003
// Creation: Tue Oct 21 09:22:26 PDT 2003
//
// Modifications:
//
......@@ -31,16 +31,17 @@ public class QueryList extends AttributeSubject
public QueryList()
{
super(3);
super(4);
names = new Vector();
types = new Vector();
coordRep = new Vector();
numInputs = new Vector();
}
public QueryList(QueryList obj)
{
super(3);
super(4);
int i;
......@@ -60,6 +61,12 @@ public class QueryList extends AttributeSubject
Integer iv = (Integer)obj.coordRep.elementAt(i);
coordRep.addElement(new Integer(iv.intValue()));
}
numInputs = new Vector();
for(i = 0; i < obj.numInputs.size(); ++i)
{
Integer iv = (Integer)obj.numInputs.elementAt(i);
numInputs.addElement(new Integer(iv.intValue()));
}
SelectAll();
}
......@@ -71,7 +78,8 @@ public class QueryList extends AttributeSubject
// Create the return value
return ((names == obj.names) &&
(types == obj.types) &&
(coordRep == obj.coordRep));
(coordRep == obj.coordRep) &&
(numInputs == obj.numInputs));
}
// Property setting methods
......@@ -93,10 +101,17 @@ public class QueryList extends AttributeSubject
Select(2);
}
public void SetNumInputs(Vector numInputs_)
{
numInputs = numInputs_;
Select(3);
}
// Property getting methods
public Vector GetNames() { return names; }
public Vector GetTypes() { return types; }
public Vector GetCoordRep() { return coordRep; }
public Vector GetNumInputs() { return numInputs; }
// Write and read methods.
public void WriteAtts(CommunicationBuffer buf)
......@@ -107,6 +122,8 @@ public class QueryList extends AttributeSubject
buf.WriteIntVector(types);
if(WriteSelect(2, buf))
buf.WriteIntVector(coordRep);
if(WriteSelect(3, buf))
buf.WriteIntVector(numInputs);
}
public void ReadAtts(int n, CommunicationBuffer buf)
......@@ -125,6 +142,9 @@ public class QueryList extends AttributeSubject
case 2:
SetCoordRep(buf.ReadIntVector());
break;
case 3:
SetNumInputs(buf.ReadIntVector());
break;
}
}
}
......@@ -134,5 +154,6 @@ public class QueryList extends AttributeSubject
private Vector names; // vector of String objects
private Vector types; // vector of Integer objects
private Vector coordRep; // vector of Integer objects
private Vector numInputs; // vector of Integer objects
}
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Jul 31 16:19:23 PST 2003
// Creation: Tue Oct 21 09:01:14 PDT 2003
//
// Modifications:
//
......@@ -35,7 +35,7 @@ public class SaveWindowAttributes extends AttributeSubject
public SaveWindowAttributes()
{
super(13);
super(14);
hostName = new String("localhost");
fileName = new String("visit");
......@@ -49,12 +49,13 @@ public class SaveWindowAttributes extends AttributeSubject
quality = 80;
progressive = false;
binary = false;
lastRealFilename = new String("");
lastRealFilename = new String("(null)");
stereo = false;
}
public SaveWindowAttributes(SaveWindowAttributes obj)
{
super(13);
super(14);
hostName = new String(obj.hostName);
fileName = new String(obj.fileName);
......@@ -69,6 +70,7 @@ public class SaveWindowAttributes extends AttributeSubject
progressive = obj.progressive;
binary = obj.binary;
lastRealFilename = new String(obj.lastRealFilename);
stereo = obj.stereo;
SelectAll();
}
......@@ -88,7 +90,8 @@ public class SaveWindowAttributes extends AttributeSubject
(quality == obj.quality) &&
(progressive == obj.progressive) &&
(binary == obj.binary) &&
(lastRealFilename == obj.lastRealFilename));
(lastRealFilename == obj.lastRealFilename) &&
(stereo == obj.stereo));
}
// Property setting methods
......@@ -170,6 +173,12 @@ public class SaveWindowAttributes extends AttributeSubject
Select(12);
}
public void SetStereo(boolean stereo_)
{
stereo = stereo_;
Select(13);
}
// Property getting methods
public String GetHostName() { return hostName; }
public String GetFileName() { return fileName; }
......@@ -184,6 +193,7 @@ public class SaveWindowAttributes extends AttributeSubject
public boolean GetProgressive() { return progressive; }
public boolean GetBinary() { return binary; }
public String GetLastRealFilename() { return lastRealFilename; }
public boolean GetStereo() { return stereo; }
// Write and read methods.
public void WriteAtts(CommunicationBuffer buf)
......@@ -214,6 +224,8 @@ public class SaveWindowAttributes extends AttributeSubject
buf.WriteBool(binary);
if(WriteSelect(12, buf))
buf.WriteString(lastRealFilename);
if(WriteSelect(13, buf))
buf.WriteBool(stereo);
}
public void ReadAtts(int n, CommunicationBuffer buf)
......@@ -262,6 +274,9 @@ public class SaveWindowAttributes extends AttributeSubject
case 12:
SetLastRealFilename(buf.ReadString());
break;
case 13:
SetStereo(buf.ReadBool());
break;
}
}
}
......@@ -281,5 +296,6 @@ public class SaveWindowAttributes extends AttributeSubject
private boolean progressive;
private boolean binary;
private String lastRealFilename;
private boolean stereo;
}
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Wed Aug 27 08:55:04 PDT 2003
// Creation: Tue Oct 21 09:19:08 PDT 2003
//
// Modifications:
//
......@@ -20,7 +20,7 @@ public class View3DAttributes extends AttributeSubject
{
public View3DAttributes()
{
super(10);
super(11);
viewNormal = new double[3];
viewNormal[0] = 0;
......@@ -43,11 +43,12 @@ public class View3DAttributes extends AttributeSubject
imagePan[1] = 0;
imageZoom = 1;
perspective = true;
eyeAngle = 2;
}
public View3DAttributes(View3DAttributes obj)
{
super(10);
super(11);
int i;
......@@ -76,6 +77,7 @@ public class View3DAttributes extends AttributeSubject
imageZoom = obj.imageZoom;
perspective = obj.perspective;
eyeAngle = obj.eyeAngle;
SelectAll();
}
......@@ -114,7 +116,8 @@ public class View3DAttributes extends AttributeSubject
(farPlane == obj.farPlane) &&
imagePan_equal &&
(imageZoom == obj.imageZoom) &&
(perspective == obj.perspective));
(perspective == obj.perspective) &&
(eyeAngle == obj.eyeAngle));
}
// Property setting methods
......@@ -216,6 +219,12 @@ public class View3DAttributes extends AttributeSubject
Select(9);
}
public void SetEyeAngle(double eyeAngle_)
{
eyeAngle = eyeAngle_;
Select(10);
}
// Property getting methods
public double[] GetViewNormal() { return viewNormal; }
public double[] GetFocus() { return focus; }
......@@ -227,6 +236,7 @@ public class View3DAttributes extends AttributeSubject
public double[] GetImagePan() { return imagePan; }
public double GetImageZoom() { return imageZoom; }
public boolean GetPerspective() { return perspective; }
public double GetEyeAngle() { return eyeAngle; }
// Write and read methods.
public void WriteAtts(CommunicationBuffer buf)
......@@ -251,6 +261,8 @@ public class View3DAttributes extends AttributeSubject
buf.WriteDouble(imageZoom);
if(WriteSelect(9, buf))
buf.WriteBool(perspective);
if(WriteSelect(10, buf))
buf.WriteDouble(eyeAngle);
}
public void ReadAtts(int n, CommunicationBuffer buf)
......@@ -290,6 +302,9 @@ public class View3DAttributes extends AttributeSubject
case 9:
SetPerspective(buf.ReadBool());
break;
case 10:
SetEyeAngle(buf.ReadDouble());
break;
}
}
}
......@@ -306,5 +321,6 @@ public class View3DAttributes extends AttributeSubject
private double[] imagePan;
private double imageZoom;
private boolean perspective;
private double eyeAngle;
}
<?xml version="1.0"?>
<Plugin name="Cylinder" type="operator" label="Cylinder" version="1.0" iconFile="Cylinder.xpm">
<Attribute name="CylinderAttributes" purpose="Contain the attributes for a cylinder" persistent="false" exportAPI="" exportInclude="">
<Field name="point1" label="Endpoint 1" type="doubleArray" length="3">
0.000000
0.000000
0.000000
</Field>
<Field name="point2" label="Endpoint 2" type="doubleArray" length="3">
1.000000
0.000000
0.000000
</Field>
<Field name="radius" label="Radius" type="double">
1.000000
</Field>
</Attribute>
</Plugin>
/* XPM */
static const char *Cylinder_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 358 2",
/* colors */
" c #444F71",
" . c #7592CC",
" X c #78BDC8",
" o c #7390CA",
" O c #60AEB7",
" + c #414D6E",
" @ c #7290C9",