Skip to content

GitLab

Commit 6e60dcf0 authored by hrchilds's avatar hrchilds
Browse files

Update from June 13, 2003 

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12 18c085ea-50e0-402c-830e-de6fd14e8384
parent fd72b39d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3170 additions and 630 deletions
common/proxybase/RemoteProxyBase.C
View file @ 6e60dcf0
......@@ -272,7 +272,9 @@ RemoteProxyBase::GetVisItString() const
// Creation: Fri May 2 15:03:15 PST 2003
//
// Modifications:
//
// Brad Whitlock, Tue Jun 10 14:47:35 PST 2003
// Let -dir pass through.
//
// ****************************************************************************
void
......@@ -288,12 +290,5 @@ RemoteProxyBase::AddExtraArguments()
// Add any extra arguments to the component before opening it.
//
for(int i = 0; i < argv.size(); ++i)
{
if (argv[i] == "-dir")
{
i++;
continue;
}
component->AddArgument(argv[i]);
}
}
common/state/ViewAttributes.C
View file @ 6e60dcf0
......@@ -10,28 +10,31 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
// ****************************************************************************
ViewAttributes::ViewAttributes() : AttributeSubject("DDDdbdddbDD")
ViewAttributes::ViewAttributes() : AttributeSubject("DDDdbdddDdbDD")
{
camera[0] = 0;
camera[1] = 0;
camera[2] = -1;
viewNormal[0] = 0;
viewNormal[1] = 0;
viewNormal[2] = 1;
focus[0] = 0;
focus[1] = 0;
focus[2] = 0;
viewUp[0] = 0;
viewUp[1] = 0;
viewUp[1] = 1;
viewUp[2] = 0;
viewAngle = 30;
setScale = false;
parallelScale = 1;
nearPlane = 0.001;
farPlane = 100;
imagePan[0] = 0;
imagePan[1] = 0;
imageZoom = 1;
perspective = true;
windowCoords[0] = 0;
windowCoords[1] = 0;
......@@ -52,19 +55,19 @@ ViewAttributes::ViewAttributes() : AttributeSubject("DDDdbdddbDD")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
// ****************************************************************************
ViewAttributes::ViewAttributes(const ViewAttributes &obj) : AttributeSubject("DDDdbdddbDD")
ViewAttributes::ViewAttributes(const ViewAttributes &obj) : AttributeSubject("DDDdbdddDdbDD")
{
int i;
camera[0] = obj.camera[0];
camera[1] = obj.camera[1];
camera[2] = obj.camera[2];
viewNormal[0] = obj.viewNormal[0];
viewNormal[1] = obj.viewNormal[1];
viewNormal[2] = obj.viewNormal[2];
focus[0] = obj.focus[0];
focus[1] = obj.focus[1];
......@@ -79,6 +82,10 @@ ViewAttributes::ViewAttributes(const ViewAttributes &obj) : AttributeSubject("DD
parallelScale = obj.parallelScale;
nearPlane = obj.nearPlane;
farPlane = obj.farPlane;
imagePan[0] = obj.imagePan[0];
imagePan[1] = obj.imagePan[1];
imageZoom = obj.imageZoom;
perspective = obj.perspective;
for(i = 0; i < 4; ++i)
windowCoords[i] = obj.windowCoords[i];
......@@ -99,7 +106,7 @@ ViewAttributes::ViewAttributes(const ViewAttributes &obj) : AttributeSubject("DD
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -119,7 +126,7 @@ ViewAttributes::~ViewAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -130,9 +137,9 @@ ViewAttributes::operator = (const ViewAttributes &obj)
{
int i;
camera[0] = obj.camera[0];
camera[1] = obj.camera[1];
camera[2] = obj.camera[2];
viewNormal[0] = obj.viewNormal[0];
viewNormal[1] = obj.viewNormal[1];
viewNormal[2] = obj.viewNormal[2];
focus[0] = obj.focus[0];
focus[1] = obj.focus[1];
......@@ -147,6 +154,10 @@ ViewAttributes::operator = (const ViewAttributes &obj)
parallelScale = obj.parallelScale;
nearPlane = obj.nearPlane;
farPlane = obj.farPlane;
imagePan[0] = obj.imagePan[0];
imagePan[1] = obj.imagePan[1];
imageZoom = obj.imageZoom;
perspective = obj.perspective;
for(i = 0; i < 4; ++i)
windowCoords[i] = obj.windowCoords[i];
......@@ -167,7 +178,7 @@ ViewAttributes::operator = (const ViewAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -178,10 +189,10 @@ ViewAttributes::operator == (const ViewAttributes &obj) const
{
int i;
// Compare the camera arrays.
bool camera_equal = true;
for(i = 0; i < 3 && camera_equal; ++i)
camera_equal = (camera[i] == obj.camera[i]);
// Compare the viewNormal arrays.
bool viewNormal_equal = true;
for(i = 0; i < 3 && viewNormal_equal; ++i)
viewNormal_equal = (viewNormal[i] == obj.viewNormal[i]);
// Compare the focus arrays.
bool focus_equal = true;
......@@ -193,6 +204,11 @@ ViewAttributes::operator == (const ViewAttributes &obj) const
for(i = 0; i < 3 && viewUp_equal; ++i)
viewUp_equal = (viewUp[i] == obj.viewUp[i]);
// Compare the imagePan arrays.
bool imagePan_equal = true;
for(i = 0; i < 2 && imagePan_equal; ++i)
imagePan_equal = (imagePan[i] == obj.imagePan[i]);
// Compare the windowCoords arrays.
bool windowCoords_equal = true;
for(i = 0; i < 4 && windowCoords_equal; ++i)
......@@ -204,7 +220,7 @@ ViewAttributes::operator == (const ViewAttributes &obj) const
viewportCoords_equal = (viewportCoords[i] == obj.viewportCoords[i]);
// Create the return value
return (camera_equal &&
return (viewNormal_equal &&
focus_equal &&
viewUp_equal &&
(viewAngle == obj.viewAngle) &&
......@@ -212,6 +228,8 @@ ViewAttributes::operator == (const ViewAttributes &obj) const
(parallelScale == obj.parallelScale) &&
(nearPlane == obj.nearPlane) &&
(farPlane == obj.farPlane) &&
imagePan_equal &&
(imageZoom == obj.imageZoom) &&
(perspective == obj.perspective) &&
windowCoords_equal &&
viewportCoords_equal);
......@@ -226,7 +244,7 @@ ViewAttributes::operator == (const ViewAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -247,7 +265,7 @@ ViewAttributes::operator != (const ViewAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -268,7 +286,7 @@ ViewAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -296,7 +314,7 @@ ViewAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -322,7 +340,7 @@ ViewAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -331,7 +349,7 @@ ViewAttributes::CreateCompatible(const std::string &tname) const
void
ViewAttributes::SelectAll()
{
Select(0, (void *)camera, 3);
Select(0, (void *)viewNormal, 3);
Select(1, (void *)focus, 3);
Select(2, (void *)viewUp, 3);
Select(3, (void *)&viewAngle);
......@@ -339,9 +357,11 @@ ViewAttributes::SelectAll()
Select(5, (void *)&parallelScale);
Select(6, (void *)&nearPlane);
Select(7, (void *)&farPlane);
Select(8, (void *)&perspective);
Select(9, (void *)windowCoords, 4);
Select(10, (void *)viewportCoords, 4);
Select(8, (void *)imagePan, 2);
Select(9, (void *)&imageZoom);
Select(10, (void *)&perspective);
Select(11, (void *)windowCoords, 4);
Select(12, (void *)viewportCoords, 4);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -357,7 +377,7 @@ ViewAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -377,7 +397,7 @@ ViewAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
if(!FieldsEqual(0, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("camera", camera, 3));
node->AddNode(new DataNode("viewNormal", viewNormal, 3));
}
if(!FieldsEqual(1, &defaultObject))
......@@ -425,16 +445,28 @@ ViewAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
if(!FieldsEqual(8, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("perspective", perspective));
node->AddNode(new DataNode("imagePan", imagePan, 2));
}
if(!FieldsEqual(9, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("windowCoords", windowCoords, 4));
node->AddNode(new DataNode("imageZoom", imageZoom));
}
if(!FieldsEqual(10, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("perspective", perspective));
}
if(!FieldsEqual(11, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("windowCoords", windowCoords, 4));
}
if(!FieldsEqual(12, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("viewportCoords", viewportCoords, 4));
......@@ -459,7 +491,7 @@ ViewAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -476,8 +508,8 @@ ViewAttributes::SetFromNode(DataNode *parentNode)
return;
DataNode *node;
if((node = searchNode->GetNode("camera")) != 0)
SetCamera(node->AsDoubleArray());
if((node = searchNode->GetNode("viewNormal")) != 0)
SetViewNormal(node->AsDoubleArray());
if((node = searchNode->GetNode("focus")) != 0)
SetFocus(node->AsDoubleArray());
if((node = searchNode->GetNode("viewUp")) != 0)
......@@ -492,6 +524,10 @@ ViewAttributes::SetFromNode(DataNode *parentNode)
SetNearPlane(node->AsDouble());
if((node = searchNode->GetNode("farPlane")) != 0)
SetFarPlane(node->AsDouble());
if((node = searchNode->GetNode("imagePan")) != 0)
SetImagePan(node->AsDoubleArray());
if((node = searchNode->GetNode("imageZoom")) != 0)
SetImageZoom(node->AsDouble());
if((node = searchNode->GetNode("perspective")) != 0)
SetPerspective(node->AsBool());
if((node = searchNode->GetNode("windowCoords")) != 0)
......@@ -505,12 +541,12 @@ ViewAttributes::SetFromNode(DataNode *parentNode)
///////////////////////////////////////////////////////////////////////////////
void
ViewAttributes::SetCamera(const double *camera_)
ViewAttributes::SetViewNormal(const double *viewNormal_)
{
camera[0] = camera_[0];
camera[1] = camera_[1];
camera[2] = camera_[2];
Select(0, (void *)camera, 3);
viewNormal[0] = viewNormal_[0];
viewNormal[1] = viewNormal_[1];
viewNormal[2] = viewNormal_[2];
Select(0, (void *)viewNormal, 3);
}
void
......@@ -566,11 +602,26 @@ ViewAttributes::SetFarPlane(double farPlane_)
Select(7, (void *)&farPlane);
}
void
ViewAttributes::SetImagePan(const double *imagePan_)
{
imagePan[0] = imagePan_[0];
imagePan[1] = imagePan_[1];
Select(8, (void *)imagePan, 2);
}
void
ViewAttributes::SetImageZoom(double imageZoom_)
{
imageZoom = imageZoom_;
Select(9, (void *)&imageZoom);
}
void
ViewAttributes::SetPerspective(bool perspective_)
{
perspective = perspective_;
Select(8, (void *)&perspective);
Select(10, (void *)&perspective);
}
void
......@@ -580,7 +631,7 @@ ViewAttributes::SetWindowCoords(const double *windowCoords_)
windowCoords[1] = windowCoords_[1];
windowCoords[2] = windowCoords_[2];
windowCoords[3] = windowCoords_[3];
Select(9, (void *)windowCoords, 4);
Select(11, (void *)windowCoords, 4);
}
void
......@@ -590,7 +641,7 @@ ViewAttributes::SetViewportCoords(const double *viewportCoords_)
viewportCoords[1] = viewportCoords_[1];
viewportCoords[2] = viewportCoords_[2];
viewportCoords[3] = viewportCoords_[3];
Select(10, (void *)viewportCoords, 4);
Select(12, (void *)viewportCoords, 4);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -598,15 +649,15 @@ ViewAttributes::SetViewportCoords(const double *viewportCoords_)
///////////////////////////////////////////////////////////////////////////////
const double *
ViewAttributes::GetCamera() const
ViewAttributes::GetViewNormal() const
{
return camera;
return viewNormal;
}
double *
ViewAttributes::GetCamera()
ViewAttributes::GetViewNormal()
{
return camera;
return viewNormal;
}
const double *
......@@ -663,6 +714,24 @@ ViewAttributes::GetFarPlane() const
return farPlane;
}
const double *
ViewAttributes::GetImagePan() const
{
return imagePan;
}
double *
ViewAttributes::GetImagePan()
{
return imagePan;
}
double
ViewAttributes::GetImageZoom() const
{
return imageZoom;
}
bool
ViewAttributes::GetPerspective() const
{
......@@ -698,9 +767,9 @@ ViewAttributes::GetViewportCoords()
///////////////////////////////////////////////////////////////////////////////
void
ViewAttributes::SelectCamera()
ViewAttributes::SelectViewNormal()
{
Select(0, (void *)camera, 3);
Select(0, (void *)viewNormal, 3);
}
void
......@@ -715,16 +784,22 @@ ViewAttributes::SelectViewUp()
Select(2, (void *)viewUp, 3);
}
void
ViewAttributes::SelectImagePan()
{
Select(8, (void *)imagePan, 2);
}
void
ViewAttributes::SelectWindowCoords()
{
Select(9, (void *)windowCoords, 4);
Select(11, (void *)windowCoords, 4);
}
void
ViewAttributes::SelectViewportCoords()
{
Select(10, (void *)viewportCoords, 4);
Select(12, (void *)viewportCoords, 4);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -740,7 +815,7 @@ ViewAttributes::SelectViewportCoords()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -751,7 +826,7 @@ ViewAttributes::GetFieldName(int index) const
{
switch (index)
{
case 0: return "camera";
case 0: return "viewNormal";
case 1: return "focus";
case 2: return "viewUp";
case 3: return "viewAngle";
......@@ -759,9 +834,11 @@ ViewAttributes::GetFieldName(int index) const
case 5: return "parallelScale";
case 6: return "nearPlane";
case 7: return "farPlane";
case 8: return "perspective";
case 9: return "windowCoords";
case 10: return "viewportCoords";
case 8: return "imagePan";
case 9: return "imageZoom";
case 10: return "perspective";
case 11: return "windowCoords";
case 12: return "viewportCoords";
default: return "invalid index";
}
}
......@@ -775,7 +852,7 @@ ViewAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -794,9 +871,11 @@ ViewAttributes::GetFieldType(int index) const
case 5: return FieldType_double;
case 6: return FieldType_double;
case 7: return FieldType_double;
case 8: return FieldType_bool;
case 9: return FieldType_doubleArray;
case 10: return FieldType_doubleArray;
case 8: return FieldType_doubleArray;
case 9: return FieldType_double;
case 10: return FieldType_bool;
case 11: return FieldType_doubleArray;
case 12: return FieldType_doubleArray;
default: return FieldType_unknown;
}
}
......@@ -810,7 +889,7 @@ ViewAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -829,9 +908,11 @@ ViewAttributes::GetFieldTypeName(int index) const
case 5: return "double";
case 6: return "double";
case 7: return "double";
case 8: return "bool";
case 9: return "doubleArray";
case 10: return "doubleArray";
case 8: return "doubleArray";
case 9: return "double";
case 10: return "bool";
case 11: return "doubleArray";
case 12: return "doubleArray";
default: return "invalid index";
}
}
......@@ -845,7 +926,7 @@ ViewAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:40:14 PST 2003
// Creation: Tue Jun 10 11:57:05 PDT 2003
//
// Modifications:
//
......@@ -862,12 +943,12 @@ ViewAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
{
case 0:
{ // new scope
// Compare the camera arrays.
bool camera_equal = true;
for(i = 0; i < 3 && camera_equal; ++i)
camera_equal = (camera[i] == obj.camera[i]);
// Compare the viewNormal arrays.
bool viewNormal_equal = true;
for(i = 0; i < 3 && viewNormal_equal; ++i)
viewNormal_equal = (viewNormal[i] == obj.viewNormal[i]);
retval = camera_equal;
retval = viewNormal_equal;
}
break;
case 1:
......@@ -917,10 +998,25 @@ ViewAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
break;
case 8:
{ // new scope
retval = (perspective == obj.perspective);
// Compare the imagePan arrays.
bool imagePan_equal = true;
for(i = 0; i < 2 && imagePan_equal; ++i)
imagePan_equal = (imagePan[i] == obj.imagePan[i]);
retval = imagePan_equal;
}
break;
case 9:
{ // new scope
retval = (imageZoom == obj.imageZoom);
}
break;
case 10:
{ // new scope
retval = (perspective == obj.perspective);
}
break;
case 11:
{ // new scope
// Compare the windowCoords arrays.
bool windowCoords_equal = true;
......@@ -930,7 +1026,7 @@ ViewAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const