Commit fdec6442 authored by hrchilds's avatar hrchilds

Update from June 4, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@6 18c085ea-50e0-402c-830e-de6fd14e8384
parent 50976055
......@@ -10,7 +10,7 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -18,7 +18,7 @@
AnimationAttributes::AnimationAttributes() : AttributeSubject("bi")
{
pipelineCachingMode = true;
pipelineCachingMode = false;
timeout = 1;
}
......@@ -31,7 +31,7 @@ AnimationAttributes::AnimationAttributes() : AttributeSubject("bi")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -54,7 +54,7 @@ AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) : Attri
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -74,7 +74,7 @@ AnimationAttributes::~AnimationAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -98,7 +98,7 @@ AnimationAttributes::operator = (const AnimationAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -121,7 +121,7 @@ AnimationAttributes::operator == (const AnimationAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -142,7 +142,7 @@ AnimationAttributes::operator != (const AnimationAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -163,7 +163,7 @@ AnimationAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -191,7 +191,7 @@ AnimationAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -217,7 +217,7 @@ AnimationAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -243,7 +243,7 @@ AnimationAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -291,7 +291,7 @@ AnimationAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -361,7 +361,7 @@ AnimationAttributes::GetTimeout() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -387,7 +387,7 @@ AnimationAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -413,7 +413,7 @@ AnimationAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......@@ -439,7 +439,7 @@ AnimationAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......
......@@ -12,7 +12,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue May 20 13:39:39 PST 2003
// Creation: Tue Jun 3 17:47:27 PST 2003
//
// Modifications:
//
......
<?xml version="1.0"?>
<Attribute name="AnimationAttributes" purpose="This class contains the animation attributes." exportAPI="STATE_API" exportInclude="state_exports.h">
<Field name="pipelineCachingMode" type="bool">true</Field>
<Field name="pipelineCachingMode" type="bool">false</Field>
<Field name="timeout" type="int">1</Field>
</Attribute>
......@@ -10,7 +10,7 @@ package llnl.visit;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Mon Aug 12 15:46:35 PST 2002
// Creation: Wed Jun 4 08:32:18 PDT 2003
//
// Modifications:
//
......@@ -22,7 +22,7 @@ public class AnimationAttributes extends AttributeSubject
{
super(2);
pipelineCachingMode = true;
pipelineCachingMode = false;
timeout = 1;
}
......
element * CHECKEDOUT
element * ../svn_Feb_25_2007/LATEST -time 3-June-2003.23:59
element * /main/LATEST -mkbranch svn_Feb_25_2007 -time 3-June-2003.23:59
element * ../svn_Feb_25_2007/LATEST -time 4-June-2003.23:59
element * /main/LATEST -mkbranch svn_Feb_25_2007 -time 4-June-2003.23:59
......@@ -66,6 +66,9 @@ vtkStandardNewMacro(vtkHankAxisActor2D);
// Eric Brugger, Fri Nov 1 15:59:20 PST 2002
// Added support for specifying the tick locations precisely.
//
// Eric Brugger, Tue Jun 3 11:45:37 PDT 2003
// Change the default tick offset to 4.
//
// **********************************************************************
vtkHankAxisActor2D::vtkHankAxisActor2D()
{
......@@ -91,7 +94,7 @@ vtkHankAxisActor2D::vtkHankAxisActor2D()
this->LabelFontHeight = 0.02;
this->TitleFontHeight = 0.02;
this->TickLength = 5;
this->TickOffset = 2;
this->TickOffset = 4;
this->TickLocation = 1; // outside
this->Range[0] = 0.0;
this->Range[1] = 1.0;
......@@ -365,6 +368,10 @@ void vtkHankAxisActor2D::PrintSelf(ostream& os, vtkIndent indent)
// Eric Brugger, Fri Nov 1 15:59:20 PST 2002
// Added support for specifying the tick locations precisely.
//
// Eric Brugger, Tue Jun 3 11:45:37 PDT 2003
// Multiply the text height by a fudge factor to account for the fact that
// the height of a digit is considerably less than the height returned.
//
// ****************************************************************************
void vtkHankAxisActor2D::BuildAxis(vtkViewport *viewport)
......@@ -580,6 +587,10 @@ void vtkHankAxisActor2D::BuildAxis(vtkViewport *viewport)
}
pts->GetPoint(2*i+1, xTick);
this->LabelMappers[labelCount]->GetSize(viewport, stringSize);
// Fudge factor, the height of the digits varies roughly from
// 0.61 to 0.68 of the font height. Use 0.68 to be conservative.
// This centers the labels properly on the tick marks.
stringSize[1] = 0.68 * stringSize[1];
this->SetOffsetPosition(xTick, theta, stringSize[0], stringSize[1],
this->TickOffset,
this->LabelActors[labelCount++], 0);
......
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