Commit e4d9bb4b authored by hrchilds's avatar hrchilds

Update from March 23, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@840 18c085ea-50e0-402c-830e-de6fd14e8384
parent 86486823
......@@ -146,6 +146,10 @@ using std::map;
//
// Mark C. Miller, Tue Dec 5 18:14:58 PST 2006
// Set discMode based on existence of FI library
//
// Cyrus Harrison, Fri Mar 23 07:48:16 PDT 2007
// Set default MIR algorithm to Zoo
//
// ****************************************************************************
avtDataSpecification::avtDataSpecification(const char *var, int ts,
......@@ -166,7 +170,7 @@ avtDataSpecification::avtDataSpecification(const char *var, int ts,
needMixedVariableReconstruction = false;
needSmoothMaterialInterfaces = false;
needCleanZonesOnly = false;
mirAlgorithm = 0; // 0=Tet 1==Zoo 2=Isovolume
mirAlgorithm = 1; // 0=Tet 1==Zoo 2=Isovolume
isovolumeMIRVF = 0.5;
simplifyHeavilyMixedZones = false;
maxMatsPerZone = 3;
......
......@@ -2947,7 +2947,7 @@ echo "${ECHO_T}found" >&6
VTK_DIR=$VTK
VTK_INCROOT="$""(TOPDIR)/include/vtk"
VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/Common -I$VTK_INCROOT/Filtering -I$VTK_INCROOT/Graphics -I$VTK_INCROOT/Hybrid -I$VTK_INCROOT/IO -I$VTK_INCROOT/Imaging -I$VTK_INCROOT/Rendering -I$VTK_INCROOT/Utilities"
VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode $MESA_LIBS $GL_LIBS "
VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode "
if test "$SHORT_UNAME" = "darwin"; then
VTK_LIGHTWEIGHT_LIBS=$VTK_LIBS
else
......@@ -16189,7 +16189,8 @@ CQSCORE_FILES="cqscore/Makefile"
THIRD_PARTY_BUILTIN_FILES="third_party_builtin/Makefile
third_party_builtin/bzip2/Makefile
third_party_builtin/glew/Makefile
third_party_builtin/bilib/Makefile"
third_party_builtin/bilib/Makefile
third_party_builtin/mesa_stub/Makefile"
if test "$enable_scripting" = "yes"; then
VISITPY_FILES="visitpy/Makefile
......
......@@ -655,6 +655,12 @@ dnl
dnl Brad Whitlock, Tue Mar 13 18:20:38 PST 2007
dnl Changed how Python is used in CLI.
dnl
dnl Eric Brugger, Tue Mar 20 11:27:01 PDT 2007
dnl Removed MESA_LIBS and GL_LIBS from the definition of VTK_LIBS.
dnl
dnl Eric Brugger, Wed Mar 21 14:51:01 PDT 2007
dnl Added support for building mesa_stub.
dnl
dnl --------------------------------------------------------------------------
dnl
......@@ -908,7 +914,7 @@ if test -n "$VTK"; then
VTK_DIR=$VTK
VTK_INCROOT="$""(TOPDIR)/include/vtk"
VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/Common -I$VTK_INCROOT/Filtering -I$VTK_INCROOT/Graphics -I$VTK_INCROOT/Hybrid -I$VTK_INCROOT/IO -I$VTK_INCROOT/Imaging -I$VTK_INCROOT/Rendering -I$VTK_INCROOT/Utilities"
VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode $MESA_LIBS $GL_LIBS "
VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode "
if test "$SHORT_UNAME" = "darwin"; then
VTK_LIGHTWEIGHT_LIBS=$VTK_LIBS
else
......@@ -3299,7 +3305,8 @@ CQSCORE_FILES="cqscore/Makefile"
THIRD_PARTY_BUILTIN_FILES="third_party_builtin/Makefile
third_party_builtin/bzip2/Makefile
third_party_builtin/glew/Makefile
third_party_builtin/bilib/Makefile"
third_party_builtin/bilib/Makefile
third_party_builtin/mesa_stub/Makefile"
if test "$enable_scripting" = "yes"; then
VISITPY_FILES="visitpy/Makefile
......
......@@ -267,6 +267,10 @@
# Mark C. Miller, Sun Dec 3 12:20:11 PST 2006
# Added VISIT_VTK_LDFLAGS to COMMONLIBS and FILIB_LIBS to SERLIBS & PARLIBS
#
# Eric Brugger, Tue Mar 20 11:36:46 PDT 2007
# Added MESA_LIBS and GL_LIBS to the list of libraries since they are
# no longer included in VTK_LIBS.
#
##############################################################################
##
......@@ -292,14 +296,14 @@ SERLIBS=$(COMMONLIBS) -lviswindow_ser -lplotter_ser -lmir_ser -lavtwriter_ser \
-lavtddf_ser -lavtmath_ser -ldatabase_ser -lquery_ser \
-lexpressions_ser -lavtfilters_ser -lpipeline_ser \
-lengineparstate_ser -lparallel_visit_vtk_ser \
$(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS) $(BZIP2_LIBS) \
$(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(BZIP2_LIBS) \
$(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@
PARLIBS=$(COMMONLIBS) -lviswindow_par -lplotter_par -lmir_par -lavtwriter_par \
-lavtddf_par -lavtmath_par -ldatabase_par -lquery_par \
-lexpressions_par -lavtfilters_par -lpipeline_par \
-lengineparstate_par -lparallel_visit_vtk_par \
$(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS) \
$(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) \
$(BZIP2_LIBS) $(FILIB_LIBS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
SERLIBDEP=../../lib/libplugin.@SHLIB_LIBEXT@ ../../lib/libplotter_ser.@SHLIB_LIBEXT@ \
......
......@@ -103,5 +103,7 @@ create confusing window groups in their taskbars.</li>
</ul>
<p>Click the following link to view the release notes for the previous version
of VisIt: <a href="relnotes1.5.4.html">VisIt 1.5.4 Release Notes</a>.</p>
<p>Click the following link to view the release notes for the next version
of VisIt: <a href="relnotes1.6.html">VisIt 1.6 Release Notes</a>.</p>
</body>
</html>
This diff is collapsed.
......@@ -49,7 +49,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Mon Jan 9 09:13:48 PDT 2006
// Creation: Mon Mar 19 16:19:45 PST 2007
//
// ****************************************************************************
......@@ -68,7 +68,7 @@ struct VectorAttributesObject
//
static PyObject *NewVectorAttributes(int);
static std::string
std::string
PyVectorAttributes_ToString(const VectorAttributes *atts, const char *prefix)
{
std::string str;
......@@ -83,7 +83,8 @@ PyVectorAttributes_ToString(const VectorAttributes *atts, const char *prefix)
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%snVectors = %d\n", prefix, atts->GetNVectors());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%slineStyle = %d\n", prefix, atts->GetLineStyle());
const char *lineStyle_values[] = {"SOLID", "DASH", "DOT", "DOTDASH"};
SNPRINTF(tmpStr, 1000, "%slineStyle = %s # SOLID, DASH, DOT, DOTDASH\n", prefix, lineStyle_values[atts->GetLineStyle()]);
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%slineWidth = %d\n", prefix, atts->GetLineWidth());
str += tmpStr;
......@@ -164,6 +165,18 @@ PyVectorAttributes_ToString(const VectorAttributes *atts, const char *prefix)
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%smax = %g\n", prefix, atts->GetMax());
str += tmpStr;
if(atts->GetLineStem())
SNPRINTF(tmpStr, 1000, "%slineStem = 1\n", prefix);
else
SNPRINTF(tmpStr, 1000, "%slineStem = 0\n", prefix);
str += tmpStr;
if(atts->GetHighQuality())
SNPRINTF(tmpStr, 1000, "%shighQuality = 1\n", prefix);
else
SNPRINTF(tmpStr, 1000, "%shighQuality = 0\n", prefix);
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%sstemWidth = %g\n", prefix, atts->GetStemWidth());
str += tmpStr;
return str;
}
......@@ -258,7 +271,16 @@ VectorAttributes_SetLineStyle(PyObject *self, PyObject *args)
return NULL;
// Set the lineStyle in the object.
obj->data->SetLineStyle(ival);
if(ival >= 0 && ival <= 3)
obj->data->SetLineStyle(ival);
else
{
fprintf(stderr, "An invalid value was given. "
"Valid values are in the range of [0,3]. "
"You can also use the following names: "
"\"SOLID\", \"DASH\", \"DOT\", \"DOTDASH\"\n");
return NULL;
}
Py_INCREF(Py_None);
return Py_None;
......@@ -727,6 +749,78 @@ VectorAttributes_GetMax(PyObject *self, PyObject *args)
return retval;
}
static PyObject *
VectorAttributes_SetLineStem(PyObject *self, PyObject *args)
{
VectorAttributesObject *obj = (VectorAttributesObject *)self;
int ival;
if(!PyArg_ParseTuple(args, "i", &ival))
return NULL;
// Set the lineStem in the object.
obj->data->SetLineStem(ival != 0);
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *
VectorAttributes_GetLineStem(PyObject *self, PyObject *args)
{
VectorAttributesObject *obj = (VectorAttributesObject *)self;
PyObject *retval = PyInt_FromLong(obj->data->GetLineStem()?1L:0L);
return retval;
}
static PyObject *
VectorAttributes_SetHighQuality(PyObject *self, PyObject *args)
{
VectorAttributesObject *obj = (VectorAttributesObject *)self;
int ival;
if(!PyArg_ParseTuple(args, "i", &ival))
return NULL;
// Set the highQuality in the object.
obj->data->SetHighQuality(ival != 0);
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *
VectorAttributes_GetHighQuality(PyObject *self, PyObject *args)
{
VectorAttributesObject *obj = (VectorAttributesObject *)self;
PyObject *retval = PyInt_FromLong(obj->data->GetHighQuality()?1L:0L);
return retval;
}
static PyObject *
VectorAttributes_SetStemWidth(PyObject *self, PyObject *args)
{
VectorAttributesObject *obj = (VectorAttributesObject *)self;
double dval;
if(!PyArg_ParseTuple(args, "d", &dval))
return NULL;
// Set the stemWidth in the object.
obj->data->SetStemWidth(dval);
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *
VectorAttributes_GetStemWidth(PyObject *self, PyObject *args)
{
VectorAttributesObject *obj = (VectorAttributesObject *)self;
PyObject *retval = PyFloat_FromDouble(obj->data->GetStemWidth());
return retval;
}
static struct PyMethodDef VectorAttributes_methods[] = {
......@@ -771,6 +865,12 @@ static struct PyMethodDef VectorAttributes_methods[] = {
{"GetMin", VectorAttributes_GetMin, METH_VARARGS},
{"SetMax", VectorAttributes_SetMax, METH_VARARGS},
{"GetMax", VectorAttributes_GetMax, METH_VARARGS},
{"SetLineStem", VectorAttributes_SetLineStem, METH_VARARGS},
{"GetLineStem", VectorAttributes_GetLineStem, METH_VARARGS},
{"SetHighQuality", VectorAttributes_SetHighQuality, METH_VARARGS},
{"GetHighQuality", VectorAttributes_GetHighQuality, METH_VARARGS},
{"SetStemWidth", VectorAttributes_SetStemWidth, METH_VARARGS},
{"GetStemWidth", VectorAttributes_GetStemWidth, METH_VARARGS},
{NULL, NULL}
};
......@@ -805,6 +905,15 @@ VectorAttributes_getattr(PyObject *self, char *name)
return VectorAttributes_GetNVectors(self, NULL);
if(strcmp(name, "lineStyle") == 0)
return VectorAttributes_GetLineStyle(self, NULL);
if(strcmp(name, "SOLID") == 0)
return PyInt_FromLong(long(0));
else if(strcmp(name, "DASH") == 0)
return PyInt_FromLong(long(1));
else if(strcmp(name, "DOT") == 0)
return PyInt_FromLong(long(2));
else if(strcmp(name, "DOTDASH") == 0)
return PyInt_FromLong(long(3));
if(strcmp(name, "lineWidth") == 0)
return VectorAttributes_GetLineWidth(self, NULL);
if(strcmp(name, "scale") == 0)
......@@ -849,6 +958,12 @@ VectorAttributes_getattr(PyObject *self, char *name)
return VectorAttributes_GetMin(self, NULL);
if(strcmp(name, "max") == 0)
return VectorAttributes_GetMax(self, NULL);
if(strcmp(name, "lineStem") == 0)
return VectorAttributes_GetLineStem(self, NULL);
if(strcmp(name, "highQuality") == 0)
return VectorAttributes_GetHighQuality(self, NULL);
if(strcmp(name, "stemWidth") == 0)
return VectorAttributes_GetStemWidth(self, NULL);
return Py_FindMethod(VectorAttributes_methods, self, name);
}
......@@ -903,6 +1018,12 @@ VectorAttributes_setattr(PyObject *self, char *name, PyObject *args)
retval = (VectorAttributes_SetMin(self, tuple) != NULL);
else if(strcmp(name, "max") == 0)
retval = (VectorAttributes_SetMax(self, tuple) != NULL);
else if(strcmp(name, "lineStem") == 0)
retval = (VectorAttributes_SetLineStem(self, tuple) != NULL);
else if(strcmp(name, "highQuality") == 0)
retval = (VectorAttributes_SetHighQuality(self, tuple) != NULL);
else if(strcmp(name, "stemWidth") == 0)
retval = (VectorAttributes_SetStemWidth(self, tuple) != NULL);
Py_DECREF(tuple);
return retval ? 0 : -1;
......
......@@ -50,8 +50,9 @@ bool PyVectorAttributes_Check(PyObject *obj);
VectorAttributes *PyVectorAttributes_FromPyObject(PyObject *obj);
PyObject *PyVectorAttributes_NewPyObject();
PyObject *PyVectorAttributes_WrapPyObject(const VectorAttributes *attr);
std::string PyVectorAttributes_GetLogString();
void PyVectorAttributes_SetDefaults(const VectorAttributes *atts);
std::string PyVectorAttributes_GetLogString();
std::string PyVectorAttributes_ToString(const VectorAttributes *, const char *);
#endif
This diff is collapsed.
......@@ -81,6 +81,10 @@ class VectorAttributes;
// Kathleen Bonnell, Wed Dec 22 16:42:35 PST 2004
// Added widgets for min/max and limitsSelection.
//
// Jeremy Meredith, Mon Mar 19 16:24:08 EDT 2007
// Added controls for lineStem, stemWidth, and highQuality.
// Reorganized the window a bit.
//
// ****************************************************************************
class QvisVectorPlotWindow : public QvisPostableWindowObserver
......@@ -124,13 +128,24 @@ private slots:
void processMinLimitText();
void limitsSelectChanged(int);
void lineStemMethodChanged(int);
void highQualityToggled(bool);
void processStemWidthText();
private:
int plotType;
VectorAttributes *vectorAtts;
QButtonGroup *lineStemButtonGroup;
QGroupBox *styleGroupBox;
QCheckBox *highQualityToggle;
QvisLineStyleWidget *lineStyle;
QvisLineWidthWidget *lineWidth;
QLabel *lineStyleLabel;
QLabel *lineWidthLabel;
QLineEdit *stemWidthEdit;
QLabel *stemWidthLabel;
QGroupBox *colorGroupBox;
QvisColorButton *vectorColor;
QButtonGroup *colorButtonGroup;
......
......@@ -73,6 +73,15 @@
<Field name="max" label="Max" type="double" enabler="maxFlag:true">
1.000000
</Field>
<Field name="lineStem" label="Draw stem as line" type="bool">
true
</Field>
<Field name="highQuality" label="High quality geometry" type="bool">
false
</Field>
<Field name="stemWidth" label="Stem width" type="double">
0.080000
</Field>
<Function name="ChangesRequireRecalculation" user="true" member="true">
</Function>
</Attribute>
......
This diff is collapsed.
......@@ -50,7 +50,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Dec 27 10:47:02 PDT 2004
// Creation: Mon Mar 19 16:19:42 PST 2007
//
// Modifications:
//
......@@ -110,6 +110,9 @@ public:
void SetLimitsMode(LimitsMode limitsMode_);
void SetMin(double min_);
void SetMax(double max_);
void SetLineStem(bool lineStem_);
void SetHighQuality(bool highQuality_);
void SetStemWidth(double stemWidth_);
// Property getting methods
bool GetUseStride() const;
......@@ -134,6 +137,9 @@ public:
LimitsMode GetLimitsMode() const;
double GetMin() const;
double GetMax() const;
bool GetLineStem() const;
bool GetHighQuality() const;
double GetStemWidth() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -180,6 +186,12 @@ private:
int limitsMode;
double min;
double max;
bool lineStem;
bool highQuality;
double stemWidth;
// Static class format string for type map.
static const char *TypeMapFormatString;
};
#endif
// ****************************************************************************
// ***************************************************************************
//
// Copyright (c) 2000 - 2007, The Regents of the University of California
// Produced at the Lawrence Livermore National Laboratory
......@@ -33,7 +33,7 @@
// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
// DAMAGE.
//
// ****************************************************************************
// ***************************************************************************
package llnl.visit.plots;
......@@ -51,7 +51,7 @@ import llnl.visit.ColorAttribute;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Mon Dec 27 10:47:18 PDT 2004
// Creation: Mon Mar 19 16:19:48 PST 2007
//
// Modifications:
//
......@@ -70,7 +70,7 @@ public class VectorAttributes extends AttributeSubject implements Plugin
public VectorAttributes()
{
super(20);
super(23);
useStride = false;
stride = 1;
......@@ -92,11 +92,14 @@ public class VectorAttributes extends AttributeSubject implements Plugin
limitsMode = LIMITSMODE_ORIGINALDATA;
min = 0;
max = 1;
lineStem = true;
highQuality = false;
stemWidth = 0.08;
}
public VectorAttributes(VectorAttributes obj)
{
super(20);
super(23);
useStride = obj.useStride;
stride = obj.stride;
......@@ -118,6 +121,9 @@ public class VectorAttributes extends AttributeSubject implements Plugin
limitsMode = obj.limitsMode;
min = obj.min;
max = obj.max;
lineStem = obj.lineStem;
highQuality = obj.highQuality;
stemWidth = obj.stemWidth;
SelectAll();
}
......@@ -144,7 +150,10 @@ public class VectorAttributes extends AttributeSubject implements Plugin
(maxFlag == obj.maxFlag) &&
(limitsMode == obj.limitsMode) &&
(min == obj.min) &&
(max == obj.max));
(max == obj.max) &&
(lineStem == obj.lineStem) &&
(highQuality == obj.highQuality) &&
(stemWidth == obj.stemWidth));
}
public String GetName() { return "Vector"; }
......@@ -271,6 +280,24 @@ public class VectorAttributes extends AttributeSubject implements Plugin
Select(19);
}
public void SetLineStem(boolean lineStem_)
{
lineStem = lineStem_;
Select(20);
}
public void SetHighQuality(boolean highQuality_)
{
highQuality = highQuality_;
Select(21);
}
public void SetStemWidth(double stemWidth_)
{
stemWidth = stemWidth_;
Select(22);
}
// Property getting methods
public boolean GetUseStride() { return useStride; }
public int GetStride() { return stride; }
......@@ -292,6 +319,9 @@ public class VectorAttributes extends AttributeSubject implements Plugin
public int GetLimitsMode() { return limitsMode; }
public double GetMin() { return min; }
public double GetMax() { return max; }
public boolean GetLineStem() { return lineStem; }
public boolean GetHighQuality() { return highQuality; }
public double GetStemWidth() { return stemWidth; }
// Write and read methods.
public void WriteAtts(CommunicationBuffer buf)
......@@ -336,6 +366,12 @@ public class VectorAttributes extends AttributeSubject implements Plugin
buf.WriteDouble(min);
if(WriteSelect(19, buf))
buf.WriteDouble(max);
if(WriteSelect(20, buf))
buf.WriteBool(lineStem);
if(WriteSelect(21, buf))
buf.WriteBool(highQuality);
if(WriteSelect(22, buf))
buf.WriteDouble(stemWidth);
}
public void ReadAtts(int n, CommunicationBuffer buf)
......@@ -406,6 +442,15 @@ public class VectorAttributes extends AttributeSubject implements Plugin
case 19:
SetMax(buf.ReadDouble());
break;
case 20:
SetLineStem(buf.ReadBool());
break;
case 21:
SetHighQuality(buf.ReadBool());
break;
case 22:
SetStemWidth(buf.ReadDouble());
break;
}
}
}
......@@ -432,5 +477,8 @@ public class VectorAttributes extends AttributeSubject implements Plugin
private int limitsMode;
private double min;
private double max;
private boolean lineStem;
private boolean highQuality;
private double stemWidth;
}
......@@ -408,6 +408,12 @@ avtVectorPlot::CustomizeMapper(avtDataObjectInformation &doi)
// Kathleen Bonnell, Wed Dec 22 17:01:09 PST 2004
// Added call to SetLimitsMode.
//
// Jeremy Meredith, Mon Mar 19 17:15:54 EDT 2007
// Added more options to the vector glyph: settings now exist for
// higher number of facets, drawing the stem as a cylinder/rectangle
// instead of a line, capping the ends of the head and stem, and
// setting the width of the stem if it's not drawn as a line.
//
// ****************************************************************************
void
......@@ -437,6 +443,18 @@ avtVectorPlot::SetAtts(const AttributeGroup *a)
glyph->SetMakeHead(atts.GetHeadOn());
glyph->SetHeadSize(atts.GetHeadSize());
glyph->SetLineStem(atts.GetLineStem());
glyph->SetStemWidth(atts.GetStemWidth());
if (atts.GetHighQuality())
{
glyph->HighQualityOn();
glyph->CapEndsOn();
}
else
{
glyph->HighQualityOff();
glyph->CapEndsOff();
}
float offset;
switch (atts.GetVectorOrigin())
......
......@@ -59,13 +59,16 @@
# Brad Whitlock, Fri Apr 7 15:08:10 PST 2006
# Added GLEW library.
#
# Eric Brugger, Tue Mar 20 09:46:13 PDT 2007
# Added mesa stub library.
#
##############################################################################
@SET_MAKE@
@VARIABLES@
@DIRTARGETS@
SUBDIRS=@BUILD_BZIP2@ @BUILD_GLEW@ @BUILD_BILIB@
SUBDIRS=mesa_stub @BUILD_BZIP2@ @BUILD_GLEW@ @BUILD_BILIB@
message:
@echo
......
# Copyright (c) 2000 - 2007
# The Regents of the University of California
# Produced at the Lawrence Livermore National Laboratory
# Written by Sean Ahern, Kathleen Bonnell, Eric Brugger,
# Hank Childs, Jeremy Meredith, Mark Miller, Brad Whitlock
# UCRL-CODE-220908
# All rights reserved.
#
# This file is part of VisIt. For details, see http://www.llnl.gov/visit/.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# - Redistributions of source code must retain the above copyright notice,
# this list of conditions and the disclaimer below.
# - Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the disclaimer (as noted below) in the
# documentation and/or materials provided with the distribution.
# - Neither the name of the UC/LLNL nor the names of its contributors may be
# used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OF THE UNIVERSITY OF
# CALIFORNIA, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Additional BSD Notice
#
# 1. This notice is required to be provided under our contract with the U.S.
# Department of Energy (DOE). This work was produced at the University of
# California, Lawrence Livermore National Laboratory under Contract No.
# W-7405-ENG-48 with the DOE.
#
# 2. Neither the United States Government nor the University of California
# nor any of their employees, makes any warranty, express or implied, or
# assumes any liability or responsibility for the accuracy, completeness,
# or usefulness of any information, apparatus, product, or process
# disclosed, or represents that its use would not infringe privately-owned
# rights.
#
# 3. Also, reference herein to any specific commercial products, process, or
# services by trade name, trademark, manufacturer or otherwise does not
# necessarily constitute or imply its endorsement, recommendation, or
# favoring by the United States Government or the University of California.
# The views and opinions of authors expressed herein do not necessarily
# state or reflect those of the United States Government or the University
# of California, and shall not be used for advertising or product
# endorsement purposes.
#
# Modifications:
#
##############################################################################
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
##
## Files...
##
SRC=gl.c glu.c glx.c glxext.c osmesa.c
CPPFLAGS=-I. @MESA_INCLUDE@
OBJ=$(SRC:.c=.o)
LIB=libMesaStub
LIBS=
##
## Standard targets...
##
all: message $(LIBSHARED)
clean:
$(RM) $(OBJ) $(LIBSHARED)
##
## Other targets...
##
message:
@echo
@echo "****************************************************************************"
@echo "*** Building MesaStub Library ($(LIB))"
@echo "****************************************************************************"
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
This diff is collapsed.
/*****************************************************************************
*
* Copyright (c) 2000 - 2007, The Regents of the University of California
* Produced at the Lawrence Livermore National Laboratory
* All rights reserved.
*
* This file is part of VisIt. For details, see http://www.llnl.gov/visit/. The
* full copyright notice is contained in the file COPYRIGHT located at the root
* of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice,
* this list of conditions and the disclaimer below.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the disclaimer (as noted below) in the
* documentation and/or materials provided with the distribution.
* - Neither the name of the UC/LLNL nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"