Commit 8c679157 authored by hrchilds's avatar hrchilds

Update from June 17, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@14 18c085ea-50e0-402c-830e-de6fd14e8384
parent 197d567b
/* XPM */
static const char * pointtool_xpm[] = {
"31 30 30 1",
" c None",
". c #3E76CA",
"+ c #509CF9",
"@ c #69C9FC",
"# c #B0FCFE",
"$ c #000000",
"% c #000509",
"& c #000A12",
"* c #000F1C",
"= c #001425",
"- c #00192E",
"; c #001E38",
"> c #002341",
", c #00294A",
"' c #002E54",
") c #00335D",
"! c #003866",
"~ c #003D70",
"{ c #004279",
"] c #004782",
"^ c #004C8C",
"/ c #005295",
"( c #00579E",
"_ c #005CA8",
": c #0061B1",
"< c #0066BA",
"[ c #006BC4",
"} c #0070CD",
"| c #0075D6",
"1 c #007BDF",
" ",
" ",
" . ",
" .+. ",
" .+++. ",
" .++@++. ",
" .++@#@++. ",
" .++@###@++. ",
" .++@#@++. ",
" .++@++. ",
" .+++. ",
" .+. ",
" . ",
" $% ",
" %&*= ",
" *=-;> ",
" =-;>,') ",
" ;>,')!~{ ",
" >,')!~{]^/ ",
" ')!~{]^/( ",
" )!~{]^ ",
" ~{]^/( ",
" {]^ (_: ",
" ^/ :<[ ",
" /( [}| ",
" |11 ",
" 111 ",
" 111 ",
" 11 ",
" "};
......@@ -267,6 +267,28 @@ PluginManager::GetEnabledID(int index) const
return loadedids[index];
}
// ****************************************************************************
// Method: PluginManager::GetEnabledIndex
//
// Purpose:
// Return the enabled-index of a loaded plugin.
//
// Arguments:
// id The id of a plugin.
//
// Returns: The index of a loaded plugin id.
//
// Programmer: Jeremy Meredith
// Creation: June 17, 2003
//
// ****************************************************************************
int
PluginManager::GetEnabledIndex(const std::string &id)
{
return loadedindexmap[id];
}
// ****************************************************************************
// Method: PluginManager::DisablePlugin
//
......
......@@ -31,6 +31,9 @@
// which can attempt to load a plugin on demand before checking to see
// if it is loaded.
//
// Jeremy Meredith, Tue Jun 17 19:08:21 PDT 2003
// Added GetEnabledIndex.
//
// ****************************************************************************
class PLUGIN_API PluginManager
......@@ -73,6 +76,7 @@ class PLUGIN_API PluginManager
int GetNEnabledPlugins() const;
std::string GetEnabledID(const int) const;
int GetEnabledIndex(const std::string &);
protected:
PluginManager(const std::string&);
......
......@@ -195,6 +195,9 @@
# Kathleen Bonnell, Wed Jan 22 14:47:40 PST 2003
# Added GlobalLineoutAttributes.
#
# Akira Haddox, Thu Jun 12 15:45:26 PDT 2003
# Added PointAttributes.
#
##############################################################################
##
......@@ -252,6 +255,7 @@ SRC= AnimationAttributes.C \
PlotQueryInfo.C \
PluginManagerAttributes.C \
Point.C \
PointAttributes.C \
PrinterAttributes.C \
QueryAttributes.C \
QueryList.C \
......@@ -314,6 +318,7 @@ HDR= AnimationAttributes.h \
PlotQueryInfo.h \
PluginManagerAttributes.h \
Point.h \
PointAttributes.h \
PrinterAttributes.h \
QueryAttributes.h \
QueryList.h \
......
This diff is collapsed.
#ifndef POINTATTRIBUTES_H
#define POINTATTRIBUTES_H
#include <state_exports.h>
#include <AttributeSubject.h>
// ****************************************************************************
// Class: PointAttributes
//
// Purpose:
// Attributes for a point
//
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Mon Jun 9 09:54:24 PDT 2003
//
// Modifications:
//
// ****************************************************************************
class STATE_API PointAttributes : public AttributeSubject
{
public:
PointAttributes();
PointAttributes(const PointAttributes &obj);
virtual ~PointAttributes();
virtual void operator = (const PointAttributes &obj);
virtual bool operator == (const PointAttributes &obj);
virtual bool operator != (const PointAttributes &obj);
virtual const std::string TypeName() const;
virtual bool CopyAttributes(const AttributeGroup *);
virtual AttributeSubject *CreateCompatible(const std::string &) const;
// Property selection methods
virtual void SelectAll();
void SelectPoint();
// Property setting methods
void SetPoint(const double *point_);
// Property getting methods
const double *GetPoint() const;
double *GetPoint();
// Persistence methods
virtual void CreateNode(DataNode *node);
virtual void SetFromNode(DataNode *node);
// Keyframing methods
virtual std::string GetFieldName(int index) const;
virtual AttributeGroup::FieldType GetFieldType(int index) const;
virtual std::string GetFieldTypeName(int index) const;
virtual bool FieldsEqual(int index, AttributeGroup *rhs);
private:
double point[3];
};
#endif
<?xml version="1.0"?>
<Attribute name="PointAttributes" purpose="Attributes for a point" exportAPI="STATE_API" exportInclude="state_exports.h">
<Field name="point" type="doubleArray" length="3"> 0. 0. 0. </Field>
</Attribute>
......@@ -6,6 +6,7 @@
#include <VisitBoxTool.h>
#include <VisitLineTool.h>
#include <VisitPlaneTool.h>
#include <VisitPointTool.h>
#include <VisitSphereTool.h>
#include <vtkActor2D.h>
......@@ -111,6 +112,7 @@ VisWinTools::VisWinTools(VisWindowColleagueProxy &v) : VisWinColleague(v),
boxTool = new VisitBoxTool(toolProxy);
lineTool = new VisitLineTool(toolProxy);
planeTool = new VisitPlaneTool(toolProxy);
pointTool = new VisitPointTool(toolProxy);
sphereTool = new VisitSphereTool(toolProxy);
// Add the tools to the tools array.
......@@ -118,6 +120,7 @@ VisWinTools::VisWinTools(VisWindowColleagueProxy &v) : VisWinColleague(v),
tools[numTools++] = lineTool;
tools[numTools++] = planeTool;
tools[numTools++] = sphereTool;
tools[numTools++] = pointTool;
}
// ****************************************************************************
......
......@@ -12,6 +12,7 @@ class VisitInteractiveTool;
class VisitBoxTool;
class VisitLineTool;
class VisitPlaneTool;
class VisitPointTool;
class VisitSphereTool;
class vtkHighlightActor2D;
......@@ -47,6 +48,9 @@ class vtkHighlightActor2D;
// Kathleen Bonnell, Fri Jun 6 15:23:05 PDT 2003
// Added FullFrameOn/Off methods.
//
// Akira Haddox, Thu Jun 12 15:56:03 PDT 2003
// Added point tool.
//
// ****************************************************************************
class VISWINDOW_API VisWinTools : public VisWinColleague
......@@ -98,6 +102,7 @@ class VISWINDOW_API VisWinTools : public VisWinColleague
VisitBoxTool *boxTool;
VisitLineTool *lineTool;
VisitPlaneTool *planeTool;
VisitPointTool *pointTool;
VisitSphereTool *sphereTool;
};
......
......@@ -83,6 +83,9 @@
# Brad Whitlock, Mon Oct 28 15:35:04 PST 2002
# Added the box tool.
#
# Akira Haddox, Thu Jun 12 15:47:32 PDT 2003
# Added the point tool.
#
##############################################################################
@SET_MAKE@
......@@ -129,10 +132,12 @@ Tools_src= \
Tools/VisitBoxTool.C \
Tools/VisitLineTool.C \
Tools/VisitPlaneTool.C \
Tools/VisitPointTool.C \
Tools/VisitSphereTool.C \
Tools/avtBoxToolInterface.C \
Tools/avtLineToolInterface.C \
Tools/avtPlaneToolInterface.C \
Tools/avtPointToolInterface.C \
Tools/avtSphereToolInterface.C \
Tools/avtToolInterface.C
VisWindow_src= \
......
This diff is collapsed.
#ifndef VISIT_POINT_TOOL_H
#define VISIT_POINT_TOOL_H
#include <viswindow_exports.h>
#include <VisitInteractiveTool.h>
#include <avtPointToolInterface.h>
// Forward declarations
class VisWindow;
class vtkActor;
class vtkPointSource;
class vtkPolyDataMapper;
class vtkPolyData;
class vtkTextActor;
// ****************************************************************************
// Class: VisitPointTool
//
// Purpose:
// This class contains an interactive point tool.
//
// Notes:
//
// Programmer: Akira Haddox
// Creation: Mon Jun 9 09:20:16 PDT 2003
//
// ****************************************************************************
class VISWINDOW_API VisitPointTool : public VisitInteractiveTool
{
public:
VisitPointTool(VisWindowToolProxy &);
virtual ~VisitPointTool();
virtual void Enable();
virtual void Disable();
virtual bool IsAvailable() const;
virtual void Start2DMode();
virtual void Start3DMode();
virtual void Stop3DMode();
virtual void SetForegroundColor(float, float, float);
virtual const char * GetName() const { return "Point"; };
virtual avtToolInterface &GetInterface() { return Interface; };
virtual void UpdateView();
virtual void UpdateTool();
protected:
// Callback functions for the tool's hot points.
static void TranslateCallback(VisitInteractiveTool *, CB_ENUM,
int, int, int, int);
virtual void CallCallback();
void Translate(CB_ENUM, int, int, int, int, int);
void CreatePointActor();
void UpdatePoint();
void CreateGuide();
void DeleteGuide();
void AddGuide();
void RemoveGuide();
void UpdateGuide();
void GetGuidePoints(avtVector *pts);
void CreateTextActors();
void DeleteTextActors();
void AddText();
void RemoveText();
void UpdateText();
void InitialActorSetup();
void FinalActorSetup();
float focalDepth;
float translationDistance;
avtVector depthTranslationDistance;
vtkPointSource *pointSource;
vtkActor *pointActor;
vtkPolyDataMapper *pointMapper;
vtkPolyData *pointData;
vtkActor *guideActor;
vtkPolyDataMapper *guideMapper;
vtkPolyData *guideData;
vtkTextActor *pointTextActor;
avtPointToolInterface Interface;
bool addedBbox;
bool window3D;
bool addedGuide;
bool depthTranslate;
};
#endif
#include <avtPointToolInterface.h>
#include <PointAttributes.h>
avtPointToolInterface::avtPointToolInterface(const VisWindow *v) :
avtToolInterface(v)
{
atts = new PointAttributes;
}
avtPointToolInterface::~avtPointToolInterface()
{
// nothing
}
void
avtPointToolInterface::SetPoint(double x, double y, double z)
{
PointAttributes *p = (PointAttributes *)atts;
double d[3] = {x, y, z};
p->SetPoint(d);
}
const double *
avtPointToolInterface::GetPoint() const
{
PointAttributes *p = (PointAttributes *)atts;
return p->GetPoint();
}
#ifndef VISIT_POINT_TOOL_INTERFACE_H
#define VISIT_POINT_TOOL_INTERFACE_H
#include <viswindow_exports.h>
#include <avtToolInterface.h>
// ****************************************************************************
// Class: avtPointToolInterface
//
// Purpose:
// This class contains the information passed to users of the point tool.
//
// Notes:
//
// Programmer: Akira Haddox
// Creation: Mon Jun 9 09:37:49 PDT 2003
//
// Modifications:
//
// ****************************************************************************
class VISWINDOW_API avtPointToolInterface : public avtToolInterface
{
public:
avtPointToolInterface(const VisWindow *v);
virtual ~avtPointToolInterface();
void SetPoint(double, double, double);
const double *GetPoint() const;
};
#endif
This diff is collapsed.
......@@ -418,6 +418,9 @@ dnl
dnl Eric Brugger, Mon Jun 16 13:22:38 PDT 2003
dnl Only build the BOV database reader if zlib is present.
dnl
dnl Hank Childs, Tue Jun 17 10:19:25 PDT 2003
dnl Remove BOV symbols. Add ZLIB symbols.
dnl
dnl --------------------------------------------------------------------------
dnl
......@@ -1180,6 +1183,11 @@ case $withval in
fi
;;
esac
ZLIB=""
if test "$HAVE_ZLIB" = "yes"; then
ZLIB="$""(ZLIB)"
fi
AC_SUBST(ZLIB)
AC_SUBST(ZLIB_INCLUDE)
AC_SUBST(ZLIB_LIB)
......@@ -1574,15 +1582,6 @@ else
fi
AC_SUBST(SILO_LIB)
dnl
dnl Only build the BOV database reader if zlib is present.
dnl
BOV=""
if test "$HAVE_ZLIB" = "yes"; then
BOV="$""(BOV)"
fi
AC_SUBST(BOV)
dnl
dnl Check for exodus libraries
dnl
......
......@@ -76,6 +76,9 @@
# Eric Brugger, Mon Jun 16 12:57:17 PDT 2003
# Make the building of the BOV reader optional.
#
# Hank Childs, Tue Jun 17 10:07:15 PDT 2003
# Do not require that HDF4 be available. Modified BOV to depend on ZLIB.
#
##############################################################################
@SET_MAKE@
......@@ -83,19 +86,20 @@
all: message
for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $@) || exit 1; done
BOV=BOV
ZLIB=BOV
EXODUS=Exodus TimeVaryingExodus
HDF4=Cosmos
HDF5=Tetrad
MILI=Mili
PDB=KullLite
SAF=SAF
SAMPLES=Rect Hex
REQUIRED=Cosmos Curve2D EnSight Lines PLOT3D Point3D STL Silo Spheral VTK WavefrontOBJ
REQUIRED=Curve2D EnSight Lines PLOT3D Point3D STL Silo Spheral VTK WavefrontOBJ
OPTIONAL=
SUBDIRS=$(REQUIRED) @DB_OPTIONAL_DIRS@ @BOV@ @EXODUS@ @SAF@ @HDF5@ @PDB@ @MILI@
ALLSUBDIRS=$(REQUIRED) $(BOV) $(EXODUS) $(SAF) $(HDF5) $(MILI) $(PDB) $(SAMPLES)
SUBDIRS=$(REQUIRED) @DB_OPTIONAL_DIRS@ @ZLIB@ @EXODUS@ @SAF@ @HDF4@ @HDF5@ @PDB@ @MILI@
ALLSUBDIRS=$(REQUIRED) $(ZLIB) $(EXODUS) $(SAF) $(HDF4) $(HDF5) $(MILI) $(PDB) $(SAMPLES)
message:
@echo
......
/* XPM */
static const char * pointtool_xpm[] = {
"31 30 30 1",
" c None",
". c #3E76CA",
"+ c #509CF9",
"@ c #69C9FC",
"# c #B0FCFE",
"$ c #000000",
"% c #000509",
"& c #000A12",
"* c #000F1C",
"= c #001425",
"- c #00192E",
"; c #001E38",
"> c #002341",
", c #00294A",
"' c #002E54",
") c #00335D",
"! c #003866",
"~ c #003D70",
"{ c #004279",
"] c #004782",
"^ c #004C8C",
"/ c #005295",
"( c #00579E",
"_ c #005CA8",
": c #0061B1",
"< c #0066BA",
"[ c #006BC4",
"} c #0070CD",
"| c #0075D6",
"1 c #007BDF",
" ",
" ",
" . ",
" .+. ",
" .+++. ",
" .++@++. ",
" .++@#@++. ",
" .++@###@++. ",
" .++@#@++. ",
" .++@++. ",
" .+++. ",
" .+. ",
" . ",
" $% ",
" %&*= ",
" *=-;> ",
" =-;>,') ",
" ;>,')!~{ ",
" >,')!~{]^/ ",
" ')!~{]^/( ",
" )!~{]^ ",
" ~{]^/( ",
" {]^ (_: ",
" ^/ :<[ ",
" /( [}| ",
" |11 ",
" 111 ",
" 111 ",
" 11 ",
" "};
......@@ -130,6 +130,9 @@
# Eric Brugger, Thu Jan 16 08:18:06 PST 2003
# Renamed the Erase operator to Clip.
#
# Akira Haddox, Thu Jun 12 15:50:34 PDT 2003
# Added the ThreeSlice operator.
#
##############################################################################
@SET_MAKE@
......@@ -141,7 +144,7 @@ OPTIONAL=Context ConnCompReduce Decimate Displace ExternalSurface \
InverseGhostZone MetricThreshold Revolve SiloDump Tube
REQUIRED=Box Clip Cone IndexSelect Isosurface Lineout OnionPeel Reflect \
Slice SphereSlice Threshold Transform
Slice SphereSlice ThreeSlice Threshold Transform
SUBDIRS=$(REQUIRED) @OPERATOR_OPTIONAL_DIRS@
ALLSUBDIRS=$(REQUIRED) $(OPTIONAL)
......
This diff is collapsed.
#ifndef PY_THREESLICEATTRIBUTES_H
#define PY_THREESLICEATTRIBUTES_H
#include <Python.h>
#include <ThreeSliceAttributes.h>
//
// Functions exposed to the VisIt module.
//
void PyThreeSliceAttributes_StartUp(ThreeSliceAttributes *subj, FILE *logFile);
void PyThreeSliceAttributes_CloseDown();
PyMethodDef *PyThreeSliceAttributes_GetMethodTable(int *nMethods);
bool PyThreeSliceAttributes_Check(PyObject *obj);
ThreeSliceAttributes *PyThreeSliceAttributes_FromPyObject(PyObject *obj);
PyObject *PyThreeSliceAttributes_NewPyObject();
PyObject *PyThreeSliceAttributes_WrapPyObject(const ThreeSliceAttributes *attr);
void PyThreeSliceAttributes_SetLogging(bool val);
void PyThreeSliceAttributes_SetDefaults(const ThreeSliceAttributes *atts);
#endif
#include "QvisThreeSliceWindow.h"
#include <ThreeSliceAttributes.h>
#include <ViewerProxy.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qspinbox.h>
#include <qvbox.h>
#include <qbuttongroup.h>
#include <qradiobutton.h>
#include <QvisColorTableButton.h>
#include <QvisOpacitySlider.h>
#include <QvisColorButton.h>
#include <QvisLineStyleWidget.h>
#include <QvisLineWidthWidget.h>
#include <stdio.h>
#include <string>
using std::string;
// ****************************************************************************
// Method: QvisThreeSliceWindow::QvisThreeSliceWindow
//
// Purpose:
// Constructor
//
// Programmer: xml2window
// Creation: Mon Jun 9 13:18:31 PST 2003
//
// Modifications:
//
// ****************************************************************************
QvisThreeSliceWindow::QvisThreeSliceWindow(const int type,
ThreeSliceAttributes *subj,
const char *caption,
const char *shortName,
QvisNotepadArea *notepad)
: QvisOperatorWindow(type,subj, caption, shortName, notepad)
{
atts = subj;
}
// ****************************************************************************
// Method: QvisThreeSliceWindow::~QvisThreeSliceWindow
//
// Purpose:
// Destructor
//
// Programmer: xml2window
// Creation: Mon Jun 9 13:18:31 PST 2003
//
// Modifications:
//
// ****************************************************************************
QvisThreeSliceWindow::~QvisThreeSliceWindow()
{
}
// ****************************************************************************
// Method: QvisThreeSliceWindow::CreateWindowContents
//
// Purpose:
// Creates the widgets for the window.
//
// Programmer: xml2window
// Creation: Mon Jun 9 13:18:31 PST 2003
//
// Modifications:
//
// ****************************************************************************
void
QvisThreeSliceWindow::CreateWindowContents()
{
QGridLayout *mainLayout = new QGridLayout(topLayout, 3,2, 10, "mainLayout");
mainLayout->addWidget(new QLabel("x", central, "xLabel"),0,0);
x = new QLineEdit(central, "x");
connect(x, SIGNAL(returnPressed()),
this, SLOT(xProcessText()));
mainLayout->addWidget(x, 0,1);
mainLayout->addWidget(new QLabel("y", central, "yLabel"),1,0);
y = new QLineEdit(central, "y");
connect(y, SIGNAL(returnPressed()),
this, SLOT(yProcessText()));
mainLayout->addWidget(y, 1,1);
mainLayout->addWidget(new QLabel("z", central, "zLabel"),2,0);
z = new QLineEdit(central, "z");
connect(z, SIGNAL(returnPressed()),
this, SLOT(zProcessText()));
mainLayout->addWidget(z, 2,1);
}
// ****************************************************************************
// Method: QvisThreeSliceWindow::UpdateWindow
//
// Purpose:
// Updates the widgets in the window when the subject changes.
//
// Programmer: xml2window
// Creation: Mon Jun 9 13:18:31 PST 2003
//
// Modifications: