Skip to content

GitLab

Commit 26b2b3a6 authored by bonnell's avatar bonnell
Browse files
Options

Added ability to turn off time in the DBInfo part of legends. Made... 

Added ability to turn off time in the DBInfo part of legends. Made QueryOverTime turn off the time for its window.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16120 18c085ea-50e0-402c-830e-de6fd14e8384
parent 13183666
Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 69 deletions
avt/VisWindow/Colleagues/VisWinLegends.C
View file @ 26b2b3a6
......@@ -93,6 +93,9 @@ const double VisWinLegends::dbInfoWidth = 0.21;
// Brad Whitlock, Mon Mar 2 14:11:07 PST 2009
// I added dbInfoTimeScale and dbInfoTimeOffset.
//
// Kathleen Biagas, Wed Sep 7 16:23:57 PDT 2011
// Added timeVisible.
//
// ****************************************************************************
VisWinLegends::VisWinLegends(VisWindowColleagueProxy &p) : VisWinColleague(p),
......@@ -113,6 +116,7 @@ VisWinLegends::VisWinLegends(VisWindowColleagueProxy &p) : VisWinColleague(p),
pathExpansionMode = 0;
legendVisible = true;
homogeneous = true;
timeVisible = true;
}
......@@ -482,14 +486,18 @@ VisWinLegends::UpdateDBInfo(vector<avtActor_p> &lst)
// Cyrus Harrison, Mon Jun 18 09:34:37 PDT 2007
// Added database path expansion mode option
//
// Kathleen Biagas, Wed Sep 7 16:23:08 PDT 2011
// Added timeInfo argument.
//
// ****************************************************************************
void
VisWinLegends::SetVisibility(bool db, int path_exp_mode, bool legend)
VisWinLegends::SetVisibility(bool db, int path_exp_mode, bool legend, bool timeInfo)
{
dbInfoVisible = db;
pathExpansionMode = path_exp_mode;
legendVisible = legend;
timeVisible = timeInfo;
}
// ****************************************************************************
......@@ -539,6 +547,9 @@ VisWinLegends::SetTimeScaleAndOffset(double scale, double offset)
// Brad Whitlock, Mon Mar 2 14:12:41 PST 2009
// I added support for time scale and offset.
//
// Kathleen Biagas, Wed Sep 7 16:23:36 PDT 2011
// Added timeVisible.
//
// ****************************************************************************
bool
......@@ -548,12 +559,12 @@ VisWinLegends::CreateDatabaseInfo(char *info,
{
bool hasTime = false;
sprintf(info, "DB: %s\n", dbname.c_str());
if (atts.CycleIsAccurate())
if (timeVisible && atts.CycleIsAccurate())
{
sprintf(info+strlen(info), "Cycle: %-8d ", atts.GetCycle());
}
if (atts.TimeIsAccurate())
if (timeVisible && atts.TimeIsAccurate())
{
double t = atts.GetTime() * dbInfoTimeScale + dbInfoTimeOffset;
sprintf(info+strlen(info), "Time:%-10g", t);
......
avt/VisWindow/Colleagues/VisWinLegends.h
View file @ 26b2b3a6
......@@ -90,6 +90,9 @@ class vtkTextActor;
// Brad Whitlock, Mon Mar 2 14:10:22 PST 2009
// I added time scale and offset.
//
// Kathleen Biagas, Wed Sep 7 16:22:39 PDT 2011
// Added timeInfo to SetVisibility call.
//
// ****************************************************************************
class VISWINDOW_API VisWinLegends : public VisWinColleague
......@@ -101,9 +104,10 @@ class VISWINDOW_API VisWinLegends : public VisWinColleague
virtual void SetForegroundColor(double, double, double);
virtual void UpdatePlotList(std::vector<avtActor_p> &);
void SetVisibility(bool db,
void SetVisibility(bool db,
int path_exp_mode,
bool legend);
bool legend,
bool timeInfo);
void SetDatabaseInfoTextAttributes(
const VisWinTextAttributes &);
void SetTimeScaleAndOffset(double,double);
......@@ -111,6 +115,7 @@ class VISWINDOW_API VisWinLegends : public VisWinColleague
vtkTextActor *dbInfoActor;
bool dbInfoIsAdded;
bool dbInfoVisible;
bool timeVisible;
VisWinTextAttributes dbInfoTextAttributes;
double dbInfoTimeScale;
double dbInfoTimeOffset;
......
avt/VisWindow/VisWindow/VisWindow.C
View file @ 26b2b3a6
......@@ -4553,6 +4553,9 @@ VisWindow::UpdateAxes3D()
// Brad Whitlock, Mon Mar 2 14:07:57 PST 2009
// I added time scale and offset.
//
// Kathleen Biagas, Wed Sep 7 16:21:51 PDT 2011
// I added timeInfoFlag to the SetVisibility call for legends.
//
// ****************************************************************************
void
......@@ -4566,7 +4569,8 @@ VisWindow::UpdateTextAnnotations()
// Set the legend and database info properties.
legends->SetVisibility(annotationAtts.GetDatabaseInfoFlag(),
annotationAtts.GetDatabaseInfoExpansionMode(),
annotationAtts.GetLegendInfoFlag());
annotationAtts.GetLegendInfoFlag(),
annotationAtts.GetTimeInfoFlag());
legends->SetTimeScaleAndOffset(annotationAtts.GetDatabaseInfoTimeScale(),
annotationAtts.GetDatabaseInfoTimeOffset());
const FontAttributes &fa2 = annotationAtts.GetDatabaseInfoFont();
......
common/state/AnnotationAttributes.C
View file @ 26b2b3a6
......@@ -172,6 +172,7 @@ void AnnotationAttributes::Init()
{
userInfoFlag = true;
databaseInfoFlag = true;
timeInfoFlag = true;
databaseInfoExpansionMode = File;
databaseInfoTimeScale = 1;
databaseInfoTimeOffset = 0;
......@@ -206,6 +207,7 @@ void AnnotationAttributes::Copy(const AnnotationAttributes &obj)
userInfoFlag = obj.userInfoFlag;
userInfoFont = obj.userInfoFont;
databaseInfoFlag = obj.databaseInfoFlag;
timeInfoFlag = obj.timeInfoFlag;
databaseInfoFont = obj.databaseInfoFont;
databaseInfoExpansionMode = obj.databaseInfoExpansionMode;
databaseInfoTimeScale = obj.databaseInfoTimeScale;
......@@ -387,6 +389,7 @@ AnnotationAttributes::operator == (const AnnotationAttributes &obj) const
(userInfoFlag == obj.userInfoFlag) &&
(userInfoFont == obj.userInfoFont) &&
(databaseInfoFlag == obj.databaseInfoFlag) &&
(timeInfoFlag == obj.timeInfoFlag) &&
(databaseInfoFont == obj.databaseInfoFont) &&
(databaseInfoExpansionMode == obj.databaseInfoExpansionMode) &&
(databaseInfoTimeScale == obj.databaseInfoTimeScale) &&
......@@ -550,6 +553,7 @@ AnnotationAttributes::SelectAll()
Select(ID_userInfoFlag, (void *)&userInfoFlag);
Select(ID_userInfoFont, (void *)&userInfoFont);
Select(ID_databaseInfoFlag, (void *)&databaseInfoFlag);
Select(ID_timeInfoFlag, (void *)&timeInfoFlag);
Select(ID_databaseInfoFont, (void *)&databaseInfoFont);
Select(ID_databaseInfoExpansionMode, (void *)&databaseInfoExpansionMode);
Select(ID_databaseInfoTimeScale, (void *)&databaseInfoTimeScale);
......@@ -645,6 +649,12 @@ AnnotationAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool f
node->AddNode(new DataNode("databaseInfoFlag", databaseInfoFlag));
}
if(completeSave || !FieldsEqual(ID_timeInfoFlag, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("timeInfoFlag", timeInfoFlag));
}
if(completeSave || !FieldsEqual(ID_databaseInfoFont, &defaultObject))
{
DataNode *databaseInfoFontNode = new DataNode("databaseInfoFont");
......@@ -801,6 +811,8 @@ AnnotationAttributes::SetFromNode(DataNode *parentNode)
userInfoFont.SetFromNode(node);
if((node = searchNode->GetNode("databaseInfoFlag")) != 0)
SetDatabaseInfoFlag(node->AsBool());
if((node = searchNode->GetNode("timeInfoFlag")) != 0)
SetTimeInfoFlag(node->AsBool());
if((node = searchNode->GetNode("databaseInfoFont")) != 0)
databaseInfoFont.SetFromNode(node);
if((node = searchNode->GetNode("databaseInfoExpansionMode")) != 0)
......@@ -914,6 +926,13 @@ AnnotationAttributes::SetDatabaseInfoFlag(bool databaseInfoFlag_)
Select(ID_databaseInfoFlag, (void *)&databaseInfoFlag);
}
void
AnnotationAttributes::SetTimeInfoFlag(bool timeInfoFlag_)
{
timeInfoFlag = timeInfoFlag_;
Select(ID_timeInfoFlag, (void *)&timeInfoFlag);
}
void
AnnotationAttributes::SetDatabaseInfoFont(const FontAttributes &databaseInfoFont_)
{
......@@ -1071,6 +1090,12 @@ AnnotationAttributes::GetDatabaseInfoFlag() const
return databaseInfoFlag;
}
bool
AnnotationAttributes::GetTimeInfoFlag() const
{
return timeInfoFlag;
}
const FontAttributes &
AnnotationAttributes::GetDatabaseInfoFont() const
{
......@@ -1296,6 +1321,7 @@ AnnotationAttributes::GetFieldName(int index) const
case ID_userInfoFlag: return "userInfoFlag";
case ID_userInfoFont: return "userInfoFont";
case ID_databaseInfoFlag: return "databaseInfoFlag";
case ID_timeInfoFlag: return "timeInfoFlag";
case ID_databaseInfoFont: return "databaseInfoFont";
case ID_databaseInfoExpansionMode: return "databaseInfoExpansionMode";
case ID_databaseInfoTimeScale: return "databaseInfoTimeScale";
......@@ -1340,6 +1366,7 @@ AnnotationAttributes::GetFieldType(int index) const
case ID_userInfoFlag: return FieldType_bool;
case ID_userInfoFont: return FieldType_att;
case ID_databaseInfoFlag: return FieldType_bool;
case ID_timeInfoFlag: return FieldType_bool;
case ID_databaseInfoFont: return FieldType_att;
case ID_databaseInfoExpansionMode: return FieldType_enum;
case ID_databaseInfoTimeScale: return FieldType_double;
......@@ -1384,6 +1411,7 @@ AnnotationAttributes::GetFieldTypeName(int index) const
case ID_userInfoFlag: return "bool";
case ID_userInfoFont: return "att";
case ID_databaseInfoFlag: return "bool";
case ID_timeInfoFlag: return "bool";
case ID_databaseInfoFont: return "att";
case ID_databaseInfoExpansionMode: return "enum";
case ID_databaseInfoTimeScale: return "double";
......@@ -1450,6 +1478,11 @@ AnnotationAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (databaseInfoFlag == obj.databaseInfoFlag);
}
break;
case ID_timeInfoFlag:
{ // new scope
retval = (timeInfoFlag == obj.timeInfoFlag);
}
break;
case ID_databaseInfoFont:
{ // new scope
retval = (databaseInfoFont == obj.databaseInfoFont);
......
common/state/AnnotationAttributes.h
View file @ 26b2b3a6
......@@ -132,6 +132,7 @@ public:
void SetUserInfoFlag(bool userInfoFlag_);
void SetUserInfoFont(const FontAttributes &userInfoFont_);
void SetDatabaseInfoFlag(bool databaseInfoFlag_);
void SetTimeInfoFlag(bool timeInfoFlag_);
void SetDatabaseInfoFont(const FontAttributes &databaseInfoFont_);
void SetDatabaseInfoExpansionMode(PathExpansionMode databaseInfoExpansionMode_);
void SetDatabaseInfoTimeScale(double databaseInfoTimeScale_);
......@@ -157,6 +158,7 @@ public:
const FontAttributes &GetUserInfoFont() const;
FontAttributes &GetUserInfoFont();
bool GetDatabaseInfoFlag() const;
bool GetTimeInfoFlag() const;
const FontAttributes &GetDatabaseInfoFont() const;
FontAttributes &GetDatabaseInfoFont();
PathExpansionMode GetDatabaseInfoExpansionMode() const;
......@@ -218,6 +220,7 @@ public:
ID_userInfoFlag,
ID_userInfoFont,
ID_databaseInfoFlag,
ID_timeInfoFlag,
ID_databaseInfoFont,
ID_databaseInfoExpansionMode,
ID_databaseInfoTimeScale,
......@@ -242,6 +245,7 @@ private:
bool userInfoFlag;
FontAttributes userInfoFont;
bool databaseInfoFlag;
bool timeInfoFlag;
FontAttributes databaseInfoFont;
int databaseInfoExpansionMode;
double databaseInfoTimeScale;
......@@ -262,6 +266,6 @@ private:
static const char *TypeMapFormatString;
static const private_tmfs_t TmfsStruct;
};
#define ANNOTATIONATTRIBUTES_TMFS "aababaiddbaaiaaisiia"
#define ANNOTATIONATTRIBUTES_TMFS "aababbaiddbaaiaaisiia"
#endif
common/state/AnnotationAttributes.xml
View file @ 26b2b3a6
......@@ -32,6 +32,9 @@
<Field name="databaseInfoFlag" label="databaseInfoFlag" type="bool">
true
</Field>
<Field name="timeInfoFlag" label="timeInfoFlag" type="bool">
true
</Field>
<Field name="databaseInfoFont" label="Database info font" type="att" subtype="FontAttributes">
</Field>
<Field name="databaseInfoExpansionMode" label="Path Expansion:" type="enum" subtype="PathExpansionMode" enabler="databaseInfoFlag:true">
......
gui/QvisAnnotationWindow.C
View file @ 26b2b3a6
......@@ -370,6 +370,9 @@ QvisAnnotationWindow::CreateWindowContents()
// Brad Whitlock, Wed Jun 25 09:30:38 PDT 2008
// Qt 4.
//
// Kathleen Biagas, Wed Sep 7 16:16:36 PDT 2011
// Add timeInfo.
//
// ****************************************************************************
void
......@@ -442,20 +445,24 @@ QvisAnnotationWindow::CreateGeneralTab()
dbSep2->setFrameStyle(QFrame::HLine + QFrame::Sunken);
dLayout->addWidget(dbSep2, 3, 0, 1, 2);
QWidget *timeControls = new QWidget(databaseInfo);
dLayout->addWidget(timeControls, 4, 0, 1, 2);
QHBoxLayout *htLayout = new QHBoxLayout(timeControls);
timeInfo = new QGroupBox(databaseInfo);
timeInfo->setTitle(tr("Time"));
timeInfo->setCheckable(true);
connect(timeInfo, SIGNAL(toggled(bool)), this, SLOT(timeInfoChecked(bool)));
dLayout->addWidget(timeInfo, 4, 0, 1, 2);
QHBoxLayout *htLayout = new QHBoxLayout(timeInfo);
htLayout->setSpacing(5);
databaseTimeScale = new QNarrowLineEdit(timeControls);
databaseTimeScale = new QNarrowLineEdit(timeInfo);
connect(databaseTimeScale, SIGNAL(returnPressed()),
this, SLOT(databaseTimeScaleChanged()));
htLayout->addWidget(new QLabel(tr("Time scale factor"), timeControls));
htLayout->addWidget(new QLabel(tr("Time scale factor"), timeInfo));
htLayout->addWidget(databaseTimeScale);
databaseTimeOffset = new QNarrowLineEdit(timeControls);
databaseTimeOffset = new QNarrowLineEdit(timeInfo);
connect(databaseTimeOffset, SIGNAL(returnPressed()),
this, SLOT(databaseTimeOffsetChanged()));
htLayout->addWidget(new QLabel(tr("Time offset"), timeControls));
htLayout->addWidget(new QLabel(tr("Time offset"), timeInfo));
htLayout->addWidget(databaseTimeOffset);
//
......@@ -1607,6 +1614,9 @@ QvisAnnotationWindow::UpdateAxes3D()
// Brad Whitlock, Mon Mar 2 14:43:04 PST 2009
// I added time scale and offset.
//
// Kathleen Biagas, Wed Sep 7 16:16:56 PDT 2011
// Added timeInfo.
//
// ****************************************************************************
void
......@@ -1650,9 +1660,11 @@ QvisAnnotationWindow::UpdateAnnotationControls(bool doAll)
databaseInfo->blockSignals(true);
databaseInfo->setChecked(annotationAtts->GetDatabaseInfoFlag());
databaseInfo->blockSignals(false);
databasePathExpansionMode->setEnabled(annotationAtts->GetDatabaseInfoFlag());
databasePathExpansionModeLabel->setEnabled(annotationAtts->GetDatabaseInfoFlag());
break;
case AnnotationAttributes::ID_timeInfoFlag:
timeInfo->blockSignals(true);
timeInfo->setChecked(annotationAtts->GetTimeInfoFlag() && annotationAtts->GetDatabaseInfoFlag());
timeInfo->blockSignals(false);
break;
case AnnotationAttributes::ID_databaseInfoFont:
databaseInfoFont->setFontAttributes(annotationAtts->GetDatabaseInfoFont());
......@@ -2325,6 +2337,29 @@ QvisAnnotationWindow::databaseInfoChecked(bool val)
Apply();
}
// ****************************************************************************
// Method: QvisAnnotationWindow::timeInfoChecked
//
// Purpose:
// This is a Qt slot function that sets the time info flag.
//
// Arguments:
// val : The new time info value.
//
// Programmer: Kathleen Biagas
// Creation: September 7, 2011
//
// Modifications:
//
// ****************************************************************************
void
QvisAnnotationWindow::timeInfoChecked(bool val)
{
annotationAtts->SetTimeInfoFlag(val);
Apply();
}
// ****************************************************************************
// Method: QvisAnnotationWindow::databasePathExpansionModeChanged
//
......
gui/QvisAnnotationWindow.h
View file @ 26b2b3a6
......@@ -140,6 +140,9 @@ class QvisLineWidthWidget;
// Hank Childs, Fri May 13 16:00:24 PDT 2011
// Add ability to set location of bounding box.
//
// Kathleen Biagas, Wed Sep 7 16:17:23 PDT 2011
// Added timeInfo.
//
// ****************************************************************************
class GUI_API QvisAnnotationWindow : public QvisPostableWindowSimpleObserver
......@@ -191,6 +194,7 @@ private slots:
void databaseInfoChecked(bool val);
void databasePathExpansionModeChanged(int index);
void databaseInfoFontChanged(const FontAttributes &);
void timeInfoChecked(bool val);
void legendChecked(bool val);
void turnOffAllAnnotations();
void databaseTimeScaleChanged();
......@@ -267,6 +271,7 @@ private:
QvisFontAttributesWidget *databaseInfoFont;
QLabel *databasePathExpansionModeLabel;
QComboBox *databasePathExpansionMode;
QGroupBox *timeInfo;
QCheckBox *legendInfo;
QPushButton *turnOffAllButton;
QNarrowLineEdit *databaseTimeScale;
......
java/AnnotationAttributes.java
View file @ 26b2b3a6
......@@ -56,7 +56,7 @@ package llnl.visit;
public class AnnotationAttributes extends AttributeSubject
{
private static int AnnotationAttributes_numAdditionalAtts = 20;
private static int AnnotationAttributes_numAdditionalAtts = 21;
// Enum values
public final static int GRADIENTSTYLE_TOPTOBOTTOM = 0;
......@@ -86,6 +86,7 @@ public class AnnotationAttributes extends AttributeSubject
userInfoFlag = true;
userInfoFont = new FontAttributes();
databaseInfoFlag = true;
timeInfoFlag = true;
databaseInfoFont = new FontAttributes();
databaseInfoExpansionMode = PATHEXPANSIONMODE_FILE;
databaseInfoTimeScale = 1;
......@@ -112,6 +113,7 @@ public class AnnotationAttributes extends AttributeSubject
userInfoFlag = true;
userInfoFont = new FontAttributes();
databaseInfoFlag = true;
timeInfoFlag = true;
databaseInfoFont = new FontAttributes();
databaseInfoExpansionMode = PATHEXPANSIONMODE_FILE;
databaseInfoTimeScale = 1;
......@@ -138,6 +140,7 @@ public class AnnotationAttributes extends AttributeSubject
userInfoFlag = obj.userInfoFlag;
userInfoFont = new FontAttributes(obj.userInfoFont);
databaseInfoFlag = obj.databaseInfoFlag;
timeInfoFlag = obj.timeInfoFlag;
databaseInfoFont = new FontAttributes(obj.databaseInfoFont);
databaseInfoExpansionMode = obj.databaseInfoExpansionMode;
databaseInfoTimeScale = obj.databaseInfoTimeScale;
......@@ -175,6 +178,7 @@ public class AnnotationAttributes extends AttributeSubject
(userInfoFlag == obj.userInfoFlag) &&
(userInfoFont.equals(obj.userInfoFont)) &&
(databaseInfoFlag == obj.databaseInfoFlag) &&
(timeInfoFlag == obj.timeInfoFlag) &&
(databaseInfoFont.equals(obj.databaseInfoFont)) &&
(databaseInfoExpansionMode == obj.databaseInfoExpansionMode) &&
(databaseInfoTimeScale == obj.databaseInfoTimeScale) &&
......@@ -223,94 +227,100 @@ public class AnnotationAttributes extends AttributeSubject
Select(4);
}
public void SetTimeInfoFlag(boolean timeInfoFlag_)
{
timeInfoFlag = timeInfoFlag_;
Select(5);
}
public void SetDatabaseInfoFont(FontAttributes databaseInfoFont_)
{
databaseInfoFont = databaseInfoFont_;
Select(5);
Select(6);
}
public void SetDatabaseInfoExpansionMode(int databaseInfoExpansionMode_)
{
databaseInfoExpansionMode = databaseInfoExpansionMode_;
Select(6);
Select(7);
}
public void SetDatabaseInfoTimeScale(double databaseInfoTimeScale_)
{
databaseInfoTimeScale = databaseInfoTimeScale_;
Select(7);
Select(8);
}
public void SetDatabaseInfoTimeOffset(double databaseInfoTimeOffset_)
{
databaseInfoTimeOffset = databaseInfoTimeOffset_;
Select(8);
Select(9);
}
public void SetLegendInfoFlag(boolean legendInfoFlag_)
{
legendInfoFlag = legendInfoFlag_;
Select(9);
Select(10);
}
public void SetBackgroundColor(ColorAttribute backgroundColor_)
{
backgroundColor = backgroundColor_;
Select(10);
Select(11);
}
public void SetForegroundColor(ColorAttribute foregroundColor_)
{
foregroundColor = foregroundColor_;
Select(11);
Select(12);
}
public void SetGradientBackgroundStyle(int gradientBackgroundStyle_)
{
gradientBackgroundStyle = gradientBackgroundStyle_;
Select(12);
Select(13);
}
public void SetGradientColor1(ColorAttribute gradientColor1_)
{
gradientColor1 = gradientColor1_;
Select(13);
Select(14);
}
public void SetGradientColor2(ColorAttribute gradientColor2_)
{
gradientColor2 = gradientColor2_;
Select(14);
Select(15);
}
public void SetBackgroundMode(int backgroundMode_)
{
backgroundMode = backgroundMode_;
Select(15);
Select(16);
}
public void SetBackgroundImage(String backgroundImage_)
{
backgroundImage = backgroundImage_;
Select(16);
Select(17);
}
public void SetImageRepeatX(int imageRepeatX_)
{
imageRepeatX = imageRepeatX_;
Select(17);
Select(18);
}
public void SetImageRepeatY(int imageRepeatY_)
{
imageRepeatY = imageRepeatY_;
Select(18);
Select(19);
}
public void SetAxesArray(AxesArray axesArray_)
{
axesArray = axesArray_;
Select(19);
Select(20);
}
// Property getting methods
......@@ -319,6 +329,7 @@ public class AnnotationAttributes extends AttributeSubject
public boolean GetUserInfoFlag() { return userInfoFlag; }
public FontAttributes GetUserInfoFont() { return userInfoFont; }
public boolean GetDatabaseInfoFlag() { return databaseInfoFlag; }
public boolean GetTimeInfoFlag() { return timeInfoFlag; }
public FontAttributes GetDatabaseInfoFont() { return databaseInfoFont; }
public int GetDatabaseInfoExpansionMode() { return databaseInfoExpansionMode; }
public double GetDatabaseInfoTimeScale() { return databaseInfoTimeScale; }
......@@ -349,34 +360,36 @@ public class AnnotationAttributes extends AttributeSubject
if(WriteSelect(4, buf))
buf.WriteBool(databaseInfoFlag);
if(WriteSelect(5, buf))
databaseInfoFont.Write(buf);
buf.WriteBool(timeInfoFlag);
if(WriteSelect(6, buf))
buf.WriteInt(databaseInfoExpansionMode);
databaseInfoFont.Write(buf);
if(WriteSelect(7, buf))
buf.WriteDouble(databaseInfoTimeScale);
buf.WriteInt(databaseInfoExpansionMode);
if(WriteSelect(8, buf))
buf.WriteDouble(databaseInfoTimeOffset);
buf.WriteDouble(databaseInfoTimeScale);
if(WriteSelect(9, buf))
buf.WriteBool(legendInfoFlag);
buf.WriteDouble(databaseInfoTimeOffset);
if(WriteSelect(10, buf))
backgroundColor.Write(buf);
buf.WriteBool(legendInfoFlag);
if(WriteSelect(11, buf))
foregroundColor.Write(buf);
backgroundColor.Write(buf);
if(WriteSelect(12, buf))
buf.WriteInt(gradientBackgroundStyle);
foregroundColor.Write(buf);
if(WriteSelect(13, buf))
gradientColor1.Write(buf);
buf.WriteInt(gradientBackgroundStyle);
if(WriteSelect(14, buf))
gradientColor2.Write(buf);
gradientColor1.Write(buf);
if(WriteSelect(15, buf))
buf.WriteInt(backgroundMode);
gradientColor2.Write(buf);
if(WriteSelect(16, buf))
buf.WriteString(backgroundImage);
buf.WriteInt(backgroundMode);
if(WriteSelect(17, buf))
buf.WriteInt(imageRepeatX);
buf.WriteString(backgroundImage);
if(WriteSelect(18, buf))
buf.WriteInt(imageRepeatY);
buf.WriteInt(imageRepeatX);
if(WriteSelect(19, buf))
buf.WriteInt(imageRepeatY);
if(WriteSelect(20, buf))
axesArray.Write(buf);
}
......@@ -403,55 +416,58 @@ public class AnnotationAttributes extends AttributeSubject
SetDatabaseInfoFlag(buf.ReadBool());
break;
case 5:
databaseInfoFont.Read(buf);
Select(5);
SetTimeInfoFlag(buf.ReadBool());
break;
case 6:
SetDatabaseInfoExpansionMode(