Commit e91e1e9c authored by bonnell's avatar bonnell

Add arrow and tube options to 3D Line annotation object.

git-svn-id: 18c085ea-50e0-402c-830e-de6fd14e8384
parent b3136975
......@@ -44,8 +44,10 @@
#include <viswindow_exports.h>
class vtkActor;
class vtkConeSource;
class vtkLineSource;
class vtkPolyDataMapper;
class vtkTubeFilter;
// ****************************************************************************
// Class: avtLine3DColleague
......@@ -59,6 +61,8 @@ class vtkPolyDataMapper;
// Creation: July 13, 2015
// Modifications:
// Kathleen Biagas, Tue Jul 14 16:35:47 PDT 2015
// Add support for arrows and tube.
// ****************************************************************************
......@@ -84,12 +88,24 @@ public:
virtual void NoPlots(void);
vtkActor *lineActor;
vtkPolyDataMapper *lineMapper;
vtkLineSource *lineSource;
vtkConeSource *arrow1Source;
vtkConeSource *arrow2Source;
vtkPolyDataMapper *lineMapper;
vtkPolyDataMapper *arrow1Mapper;
vtkPolyDataMapper *arrow2Mapper;
vtkActor *lineActor;
vtkActor *arrow1Actor;
vtkActor *arrow2Actor;
vtkTubeFilter *tubeFilter;
bool addedToRenderer;
bool useForegroundForLineColor;
bool useArrow1;
bool useArrow2;
bool arrow1Added;
bool arrow2Added;
int lineType;
ColorAttribute lineColor;
bool ShouldBeAddedToRenderer() const;
This diff is collapsed.
......@@ -45,6 +45,7 @@ class QCheckBox;
class QComboBox;
class QLabel;
class QLineEdit;
class QRadioButton;
class QSpinBox;
class QvisColorButton;
class QvisOpacitySlider;
......@@ -63,6 +64,8 @@ class QvisLineStyleWidget;
// Creation: July 13, 2015
// Modifications:
// Kathleen Biagas, Tue Jul 14 16:39:07 PDT 2015
// Add support for arrow and tube style lines.
// ****************************************************************************
......@@ -91,16 +94,45 @@ private slots:
void opacityChanged(int);
void visibilityToggled(bool);
void useForegroundColorToggled(bool);
void beginArrowToggled(bool);
void endArrowToggled(bool);
void arrow1ResolutionChanged(int);
void arrow2ResolutionChanged(int);
void arrow1RadiusChanged();
void arrow2RadiusChanged();
void lineTypeChanged(int);
void tubeQualityChanged(int);
void tubeRadiusChanged();
QLineEdit *point1Edit;
QLineEdit *point2Edit;
QComboBox *lineType;
QvisLineWidthWidget *widthWidget;
QLabel *widthLabel;
QvisLineStyleWidget *styleWidget;
QLabel *styleLabel;
QComboBox *tubeQuality;
QLabel *tubeQualLabel;
QLineEdit *tubeRadius;
QLabel *tubeRadLabel;
QCheckBox *useForegroundColorCheckBox;
QLabel *colorLabel;
QvisColorButton *colorButton;
QvisOpacitySlider *opacitySlider;
QCheckBox *beginArrow;
QLabel *res1Label;
QSpinBox *arrow1Resolution;
QLabel *rad1Label;
QLineEdit *arrow1Radius;
QCheckBox *endArrow;
QLabel *res2Label;
QSpinBox *arrow2Resolution;
QLabel *rad2Label;
QLineEdit *arrow2Radius;
QCheckBox *visibleCheckBox;
This diff is collapsed.
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