Commit 86486823 authored by hrchilds's avatar hrchilds
Browse files

Update from March 22, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@839 18c085ea-50e0-402c-830e-de6fd14e8384
parent d872b2ec
......@@ -1272,4 +1272,15 @@ extern PFNGLTEXIMAGE3DEXTPROC glTexImage3D;
to the file after the standard includes.
Note about fonts used in VisIt
===============================
It has been reported that the font that VisIt uses by default is larger than
some users prefer. If you want to use a smaller font size, you can now pass
the -font argument to VisIt with an XLFD font name or a Qt font name as
returned by QFont::toString (see http://doc.trolltech.com/3.0/qfont.html#toString).
You can also set the font in the VisIt GUI's Appearance window. If you would
rather change the name of the default font that is compiled into VisIt then you
can replace the font name in the AppearanceAttributes state object located in
./common/state/AppearanceAttributes.C.
If you have any problems send e-mail to visit-help@llnl.gov.
......@@ -96,7 +96,7 @@
<string>Classification text color</string>
</property>
</widget>
<widget class="QvisFileLineEdit" row="0" column="2">
<widget class="QvisDialogLineEdit" row="0" column="2">
<property name="name">
<cstring>DATABASE</cstring>
</property>
......@@ -297,8 +297,8 @@
<property type="String">variable</property>
</customwidget>
<customwidget>
<class>QvisFileLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisFileLineEdit.h</header>
<class>QvisDialogLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisDialogLineEdit.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
......@@ -328,7 +328,7 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>qvisfilelineedit.h</includehint>
<includehint>QvisDialogLineEdit.h</includehint>
<includehint>qviscolorbutton.h</includehint>
<includehint>qvisvariablebutton.h</includehint>
<includehint>qviscolorbutton.h</includehint>
......
......@@ -67,7 +67,7 @@
</size>
</property>
</spacer>
<widget class="QvisFileLineEdit" row="0" column="1">
<widget class="QvisDialogLineEdit" row="0" column="1">
<property name="name">
<cstring>CURVE_DATABASE</cstring>
</property>
......@@ -120,8 +120,8 @@
</widget>
<customwidgets>
<customwidget>
<class>QvisFileLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisFileLineEdit.h</header>
<class>QvisDialogLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisDialogLineEdit.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
......@@ -145,6 +145,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>qvisfilelineedit.h</includehint>
<includehint>QvisDialogLineEdit.h</includehint>
</includehints>
</UI>
......@@ -76,7 +76,7 @@
<string>2D Variable</string>
</property>
</widget>
<widget class="QvisFileLineEdit">
<widget class="QvisDialogLineEdit">
<property name="name">
<cstring>DATABASE1</cstring>
</property>
......@@ -385,7 +385,7 @@
<string>Source</string>
</property>
</widget>
<widget class="QvisFileLineEdit">
<widget class="QvisDialogLineEdit">
<property name="name">
<cstring>DATABASE2</cstring>
</property>
......@@ -837,8 +837,8 @@
<property type="String">variable</property>
</customwidget>
<customwidget>
<class>QvisFileLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisFileLineEdit.h</header>
<class>QvisDialogLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisDialogLineEdit.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
......@@ -868,10 +868,10 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>qvisfilelineedit.h</includehint>
<includehint>QvisDialogLineEdit.h</includehint>
<includehint>qvisvariablebutton.h</includehint>
<includehint>qvisvariablebutton.h</includehint>
<includehint>qvisfilelineedit.h</includehint>
<includehint>QvisDialogLineEdit.h</includehint>
<includehint>qviscolorbutton.h</includehint>
<includehint>qviscolorbutton.h</includehint>
<includehint>qviscolorbutton.h</includehint>
......
......@@ -67,7 +67,7 @@
</size>
</property>
</spacer>
<widget class="QvisFileLineEdit" row="0" column="1">
<widget class="QvisDialogLineEdit" row="0" column="1">
<property name="name">
<cstring>CURVE_DATABASE</cstring>
</property>
......@@ -120,8 +120,8 @@
</widget>
<customwidgets>
<customwidget>
<class>QvisFileLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisFileLineEdit.h</header>
<class>QvisDialogLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisDialogLineEdit.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
......@@ -145,6 +145,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>qvisfilelineedit.h</includehint>
<includehint>QvisDialogLineEdit.h</includehint>
</includehints>
</UI>
......@@ -61,7 +61,7 @@
<string>Variable</string>
</property>
</widget>
<widget class="QvisFileLineEdit" row="0" column="1">
<widget class="QvisDialogLineEdit" row="0" column="1">
<property name="name">
<cstring>DATABASE</cstring>
</property>
......@@ -575,8 +575,8 @@
<property type="String">variable</property>
</customwidget>
<customwidget>
<class>QvisFileLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisFileLineEdit.h</header>
<class>QvisDialogLineEdit</class>
<header location="global">/data_vobs/VisIt/gui/QvisDialogLineEdit.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
......@@ -606,7 +606,7 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>qvisfilelineedit.h</includehint>
<includehint>QvisDialogLineEdit.h</includehint>
<includehint>qvisvariablebutton.h</includehint>
<includehint>qviscolorbutton.h</includehint>
<includehint>qviscolorbutton.h</includehint>
......
......@@ -147,6 +147,9 @@ int ReadKey(const char *key, char **keyval);
* Brad Whitlock, Thu Dec 21 14:52:11 PST 2006
* Added support for transition and composite programs.
*
* Kathleen Bonnell, Thu Mar 22 09:29:45 PDT 2007
* Enclose argv[i] in quotes before calling PUSHARG, if there are spaces.
*
*****************************************************************************/
int
......@@ -259,6 +262,13 @@ main(int argc, char *argv[])
}
else
{
char *newArg = argv[i];
if (strstr(argv[i], " ") != NULL)
{
newArg = (char*)malloc(strlen(argv[i]+1+2)); /* just leak it */
sprintf(newArg, "\"%%s\"", argv[i]);
}
PUSHARG(argv[i]);
}
}
......
......@@ -36,6 +36,10 @@
# Mark C. Miller, Thu Mar 15 22:53:04 PST 2007
# Added support for testing on the user's end (during install)
#
# Mark C. Miller, Tue Mar 20 08:50:53 PDT 2007
# Removed incorrect instructions verbage regarding having to install
# plugin on both client and server.
#
# ----------------------------------------------------------------------------
#
......@@ -66,11 +70,13 @@ cat > $1 <<- EOF
$commentString
Simple commands for installing/UNinstalling a plugin
Simple commands for installing and UNinstalling a plugin
(Works in most cases)
--------------------------------------------------------------
(Note: no '.tar.gz' after the plugin's name)
To install...
% visit_plugin -install $pluginName
To UNinstall...
% visit_plugin -uninstall $pluginName
Manual commands for installing and UNinstalling
......@@ -85,19 +91,17 @@ cat > $1 <<- EOF
To UNinstall...
% make clean
If you have problems, email visit-help@llnl.gov
If you have problems, email mailto:visit-help@llnl.gov
Additional information to be aware of
-------------------------------------
Note that if you run VisIt in client/server mode, you will need to
make sure to install the plugin on both the client machine (usually
your desktop machine) and the server.
If you are running a version of VisIt that is older than the most
current release, be aware there is always a chance the plugin will
not install or, once installed, not run correctly. You may be
required to update either VisIt and/or the third party I/O library(s)
this plugin may require.
current release, be aware there is always a chance the plugin
will not install or, once installed, not run correctly. You may
be required to update either VisIt and/or the third party I/O
library(s) this plugin may require. In general, the VisIt team
trys to avoid this situation but depending on where we are in a
release cycle, it can crop up and is something to be aware of.
EOF
......@@ -127,37 +131,50 @@ cat >> $1 <<- EOF
plugins in the public directory. You can disable this behavior by
adding '-publicpluginsonly' on the command line to launch VisIt.
Over time, as you install private plugins and/or VisIt, you can wind
up having private plugins that are not compatibile with the version
of VisIt you are running. VisIt will warn you of this occurance during
startup and ignore your private plugin in favor of the public one.
To correct this situation, simply uninstall your private plugin
following the instructions here.
If VisIt was installed on your system without this database plugin,
then you will most likely have to use the Manual approach for installing
and UNinstalling the plugin. Also, you will most likely have to modify
the Makefile that gets created by xml2makefile to specify the location(s)
of any applicable third party include and library files. Typically,
you would do this by editing Makefile and defining something like...
Over time, as you install private plugins and/or VisIt, you can
wind up having private plugins that are not compatibile with the
version of VisIt you are running. VisIt will warn you of this
occurance during startup and ignore your private plugin in favor
of the public one. To correct this situation, simply uninstall
your private plugin following the instructions here.
If you are working with a binary distribution of VisIt (that is,
you did not build and install it from sources) or if VisIt was
installed on your system without this database plugin,
then you will most likely have to use the Manual approach for
installing and UNinstalling the plugin. Also, you will most likely
have to modify the Makefile that gets created by xml2makefile to
specify the location(s) of any applicable third party include and
library files. Typically, you would do this by editing Makefile
and defining something like...
${upperPluginName}_INCLUDE="-I/usr/local/foo/include -I/usr/local/bar/include"
${upperPluginName}_LIB="-L/usr/local/foo/lib -lfoo -L/usr/local/bar/lib -lbar"
You would place these lines AFTER the include directive that includes
'make-variables' near the top of the Makefile. Alternatively, you may
need to statically link to third party libraries by specifing the complete
path to the .a files in ${upperPluginName}_LIB like so...
In other words, modify the above make variables to point to
your local installation of any applicable third party include
and library files.
You would place these lines AFTER the include directive that
includes 'make-variables' near the top of the Makefile.
Alternatively, you may need to statically link to third party
libraries by specifing the complete path to the .a files in
${upperPluginName}_LIB like so...
${upperPluginName}_LIB="/usr/local/foo/lib/libfoo.a /usr/local/bar/lib/libbar.a"
If you would like VisIt to test the plugin and automatically uninstall
it if the test fails, give the command
If you would like VisIt to test the plugin and automatically
uninstall it if the test fails, give the command
% visit_plugin -install . -testrun <Filename>:<PlotType>:<Varname>
VisIt will build the plugin, install it and then attempt to open the
specified file and display the specified plot with the specified
variable. If this test fails, VisIt will automatically uninstall
the plugin and inform you of the failure.
VisIt will build the plugin, install it and then attempt to open
the specified file and display the specified plot with the
specified variable. If this test fails, VisIt will automatically
uninstall the plugin and inform you of the failure.
If the tarball we've sent you was test-run'd before we emailed it
to you, installing it will automatically behave as described above.
That is, it will automatically attempt to run the plugin and, if
it cannot, UNinstall it from your private plugins.
EOF
}
......@@ -176,7 +193,9 @@ packagePluginDir () {
fi
if test -n "$testRun"; then
inputFileName=`echo $testRun | cut -d':' -f1`
cp $inputFileName $theDir/.
pushd
cp $inputFileName $TMPDIR/${theDir}_tmp.$$/$theDir/.
pushd
echo $testRun > $theDir/.TEST_RUN_COMMAND
fi
tar cf - $theDir | gzip > $theDir.tar.gz
......@@ -194,6 +213,7 @@ testBuildPluginTarball () {
thePluginName=`basename $theTarball .tar.gz`
mkdir $TMPDIR/${theTarball}_tmp.$$
cp $theTarball $TMPDIR/${theTarball}_tmp.$$/.
oldDir=`pwd`
pushd $TMPDIR/${theTarball}_tmp.$$ 1>/dev/null 2>&1
gunzip < $theTarball | tar xf -
cd $thePluginName
......@@ -205,7 +225,7 @@ testBuildPluginTarball () {
fi
xml2info $vers -clobber $thePluginName.xml 1>/dev/null 2>&1
xml2makefile $vers -clobber $thePluginName.xml 1>/dev/null 2>&1
make -j 2 1>/dev/null 2>&1
make -j 2 1>$oldDir/visit_plugin_${thePluginName}_make.log 2>&1
hadError=$?
if test -z "$deleteIt" || test $deleteIt -ne 0; then
make clean 1>/dev/null 2>&1
......@@ -404,6 +424,15 @@ if test $optError -eq 0 && test -z "$action"; then
echo "************************************************"
fi
if test $optError -eq 0 && test -z "$pluginName"; then
optError=1
echo "************************"
echo "************************"
echo "No Plugin Dir specified."
echo "************************"
echo "************************"
fi
if test "$optError" = "1"; then
echo "Usage: $0 <options> [dirs]"
echo "Available options:"
......@@ -468,7 +497,7 @@ if test $action = pack; then
buildError=`echo $buildResult | cut -d' ' -f1`
buildDir=`echo $buildResult | cut -d' ' -f2`
if test $buildError -ne 0; then
echo "Test Build failed"
echo "Test Build failed. Check visit_plugin_${pluginName}_make.log"
pushd $buildDir 1>/dev/null 2>&1
make clean 1>/dev/null 2>&1
popd 1>/dev/null 2>&1
......
......@@ -782,5 +782,14 @@
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
<Object name="ParallelAxisAttributes">
<Object name="linesColor">
<Object name="ColorAttribute">
<Field name="color" type="unsignedCharArray" length="4">192 192 192 255 </Field>
</Object>
</Object>
<Field name="drawContext" type="bool">false</Field>
<Field name="drawLinesOnlyIfExtentsOn" type="bool">false</Field>
</Object>
</Object>
</Object>
......@@ -817,5 +817,14 @@
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
<Object name="ParallelAxisAttributes">
<Object name="linesColor">
<Object name="ColorAttribute">
<Field name="color" type="unsignedCharArray" length="4">192 192 192 255 </Field>
</Object>
</Object>
<Field name="drawContext" type="bool">false</Field>
<Field name="drawLinesOnlyIfExtentsOn" type="bool">false</Field>
</Object>
</Object>
</Object>
......@@ -816,5 +816,14 @@
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
<Object name="ParallelAxisAttributes">
<Object name="linesColor">
<Object name="ColorAttribute">
<Field name="color" type="unsignedCharArray" length="4">192 192 192 255 </Field>
</Object>
</Object>
<Field name="drawContext" type="bool">false</Field>
<Field name="drawLinesOnlyIfExtentsOn" type="bool">false</Field>
</Object>
</Object>
</Object>
......@@ -854,5 +854,14 @@ isit" "-switch" "ib" </Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
<Object name="ParallelAxisAttributes">
<Object name="linesColor">
<Object name="ColorAttribute">
<Field name="color" type="unsignedCharArray" length="4">192 192 192 255 </Field>
</Object>
</Object>
<Field name="drawContext" type="bool">false</Field>
<Field name="drawLinesOnlyIfExtentsOn" type="bool">false</Field>
</Object>
</Object>
</Object>
......@@ -130,6 +130,9 @@ class ViewerPlot;
// Brad Whitlock, Wed Feb 7 15:53:14 PST 2007
// Added methods for alternate display in the viewer plugin info.
//
// Brad Whitlock, Tue Mar 20 11:44:35 PDT 2007
// Added ProvidesLegend method on the viewer plugin info.
//
// ****************************************************************************
class PLUGIN_API GeneralPlotPluginInfo
......@@ -176,6 +179,8 @@ class PLUGIN_API ViewerPlotPluginInfo : public virtual CommonPlotPluginInfo
virtual avtPlot *AllocAvtPlot() = 0;
virtual bool ProvidesLegend() const { return true; }
virtual void InitializePlotAtts(AttributeSubject *atts, ViewerPlot *) = 0;
virtual void ReInitializePlotAtts(AttributeSubject *atts,
ViewerPlot *) { ; }
......
This diff is collapsed.
......@@ -51,7 +51,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Mar 31 14:20:56 PST 2006
// Creation: Tue Mar 20 14:41:02 PST 2007
//
// Modifications:
//
......@@ -69,7 +69,9 @@ public:
Arrow2D,
Arrow3D,
Box,
Image
Image,
LegendAttributes,
MaxAnnotationType
};
enum FontFamily
{
......@@ -93,6 +95,7 @@ public:
// Property selection methods
virtual void SelectAll();
void SelectObjectName();
void SelectPosition();
void SelectPosition2();
void SelectTextColor();
......@@ -101,6 +104,7 @@ public:
void SelectText();
// Property setting methods
void SetObjectName(const std::string &objectName_);
void SetObjectType(AnnotationType objectType_);
void SetVisible(bool visible_);
void SetActive(bool active_);
......@@ -119,6 +123,8 @@ public:
void SetIntAttribute1(int intAttribute1_);
// Property getting methods
const std::string &GetObjectName() const;
std::string &GetObjectName();
AnnotationType GetObjectType() const;
bool GetVisible() const;
bool GetActive() const;
......@@ -165,6 +171,7 @@ public:
virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const;
private:
std::string objectName;
int objectType;
bool visible;
bool active;
......@@ -181,6 +188,9 @@ private:
bool fontShadow;
double doubleAttribute1;
int intAttribute1;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
......@@ -9,12 +9,16 @@
Arrow3D
Box
Image
LegendAttributes
MaxAnnotationType
</Enum>
<Enum name="FontFamily">
Arial
Courier
Times
</Enum>
<Field name="objectName" label="Object name" type="string">
</Field>
<Field name="objectType" label="ObjectType" type="enum" subtype="AnnotationType">
Text2D
</Field>
......
......@@ -37,6 +37,7 @@
#include <AnnotationObjectList.h>
#include <DataNode.h>
#include <snprintf.h>
#include <AnnotationObject.h>
// Type map format string
......@@ -51,7 +52,7 @@ const char *AnnotationObjectList::TypeMapFormatString = "a*";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications:
//
......@@ -71,7 +72,7 @@ AnnotationObjectList::AnnotationObjectList() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications:
//
......@@ -110,7 +111,7 @@ AnnotationObjectList::AnnotationObjectList(const AnnotationObjectList &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications:
//
......@@ -134,7 +135,7 @@ AnnotationObjectList::~AnnotationObjectList()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications:
//
......@@ -175,7 +176,7 @@ AnnotationObjectList::operator = (const AnnotationObjectList &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications:
//
......@@ -208,7 +209,7 @@ AnnotationObjectList::operator == (const AnnotationObjectList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications:
//
......@@ -229,7 +230,7 @@ AnnotationObjectList::operator != (const AnnotationObjectList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications:
//
......@@ -250,7 +251,7 @@ AnnotationObjectList::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 13 10:49:51 PDT 2007
// Creation: Tue Mar 20 13:38:41 PST 2007
//
// Modifications: