Commit d8a230a4 authored by camc's avatar camc

restore renderer defaults to previous state

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22096 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4536a18b
......@@ -1016,8 +1016,6 @@ void QvisVolumePlotWindow::CreateSamplingGroups(QWidget *parent, QLayout *pLayou
rendererSamples = new QDoubleSpinBox( rendererSamplesWidget);
samplingMethodWidget = new QWidget( raycastingGroup);
samplingMethodLabel = new QLabel(tr("Sampling method"), samplingMethodWidget);
//QHBoxLayout *smLayout = new QHBoxLayout( samplingMethodWidget);
//QGridLayout *smLayout = new QGridLayout( samplingMethodWidget);
samplingButtonGroup = new QButtonGroup( samplingMethodWidget);
rasterizationButton = new QRadioButton(tr("Rasterization"), samplingMethodWidget);
kernelButton = new QRadioButton(tr("Kernel Based"), samplingMethodWidget);
......@@ -1042,15 +1040,6 @@ void QvisVolumePlotWindow::CreateSamplingGroups(QWidget *parent, QLayout *pLayou
sprLayout->addWidget(samplesPerRayLabel);
sprLayout->addWidget(samplesPerRay,Qt::AlignLeft);
sprLayout->addStretch(QSizePolicy::Maximum);
// smLayout->addWidget(samplingMethodLabel,0,0);
// smLayout->addWidget(rasterizationButton,0,1);
// smLayout->addWidget(kernelButton,0,2);
// smLayout->addWidget(trilinearButton,0,4);
//smLayout->addStretch(QSizePolicy::Maximum);
// raycastingLayout0->addWidget(samplesPerRayWidget);
// raycastingLayout0->addWidget(rendererSamplesWidget);
// raycastingLayoutV->addWidget(samplingMethodWidget);
//raycastingLayout->addWidget(samplingMethodWidget,0,0,1,6);
raycastingLayout->addWidget(samplingMethodLabel,0,0);
raycastingLayout->addWidget(rasterizationButton,0,1);
raycastingLayout->addWidget(kernelButton,0,2,1,2);
......@@ -1284,7 +1273,6 @@ QvisVolumePlotWindow::CreateRendererOptionsGroup(int maxWidth)
// Create the rendering method radio buttons.
this->rendererOptionsLayout = new QVBoxLayout(parent);
//<ctc> more of this!
rendererOptionsLayout->setMargin(5);
rendererOptionsLayout->setSpacing(5);
......@@ -2429,6 +2417,18 @@ QvisVolumePlotWindow::GetCurrentValues(int which_widget)
}
}
// Get the value of the resample target
if(which_widget == VolumeAttributes::ID_resampleTarget || doAll)
{
volumeAtts->SetResampleTarget(resampleTarget->value());
}
// Get the value of the compact support target
if(which_widget == VolumeAttributes::ID_compactVariable || doAll)
{
volumeAtts->SetCompactVariable(compactVariable->text().toStdString());
}
// Get the value of the minimum for the color variable.
if(which_widget == VolumeAttributes::ID_colorVarMin || doAll)
{
......@@ -2489,6 +2489,18 @@ QvisVolumePlotWindow::GetCurrentValues(int which_widget)
}
}
// Get the number of samples per ray.
if(which_widget == VolumeAttributes::ID_samplesPerRay || doAll)
{
volumeAtts->SetSamplesPerRay(samplesPerRay->value());
}
// Get the number of slices for 3D texturing.
if(which_widget == VolumeAttributes::ID_num3DSlices || doAll)
{
volumeAtts->SetNum3DSlices(num3DSlices->value());
}
// Do the skew factor value
if(which_widget == VolumeAttributes::ID_skewFactor || doAll)
{
......@@ -2505,6 +2517,12 @@ QvisVolumePlotWindow::GetCurrentValues(int which_widget)
}
}
// Get the value of the renderer samples
if(which_widget == VolumeAttributes::ID_rendererSamples || doAll)
{
volumeAtts->SetRendererSamples(rendererSamples->value());
}
if(which_widget == VolumeAttributes::ID_lowGradientLightingClampValue
|| doAll)
{
......
......@@ -263,7 +263,7 @@ private:
QLineEdit *colorMax;
QButtonGroup *scalingButtons;
QLineEdit *skewLineEdit;
//QvisVariableButton *compactVariable;
QvisVariableButton *compactVariable;
QvisVariableButton *opacityVariable;
QCheckBox *opacityMinToggle;
QLineEdit *opacityMin;
......@@ -319,11 +319,8 @@ private:
QRadioButton *centeredDiffButton;
QRadioButton *sobelButton;
QWidget *resampleTargetWidget;
//QHBoxLayout *resampleTargetLayout;
QLabel *resampleTargetLabel;
// QLabel *compactVarLabel;
QSpinBox *resampleTarget;
// QLabel *num3DSlicesLabel;
QSpinBox *num3DSlices;
QWidget *samplesPerRayWidget;
QLabel *samplesPerRayLabel;
......@@ -345,8 +342,6 @@ private:
QLabel *specPow;
//Sampling group
//QGroupBox *samplingGroup;
//QGridLayout *samplingLayout;
QGroupBox *resampleGroup;
QWidget *splattingOptions;
QVBoxLayout *splattingGroupLayout;
......
......@@ -188,7 +188,7 @@
Splatting
</Field>
<Field name="gradientType" label="Gradient Type" type="enum" subtype="GradientType">
CenteredDifferences
SobelOperator
</Field>
<Field name="num3DSlices" label="num3DSlices" type="int">
200
......@@ -206,7 +206,7 @@
Rasterization
</Field>
<Field name="rendererSamples" label="Render samples" type="float" enabler="rendererType:SLIVR">
2.000000
3.000000
</Field>
<Field name="transferFunction2DWidgets" label="Transfer function widget list" type="attVector" subtype="TransferFunctionWidget">
</Field>
......@@ -214,7 +214,7 @@
1
</Field>
<Field name="lowGradientLightingReduction" label="lowGradientLightingReduction" type="enum" subtype="LowGradientLightingReduction">
Off
Lower
</Field>
<Field name="lowGradientLightingClampFlag" label="lowGradientLightingClampFlag" type="bool">
false
......
......@@ -345,15 +345,15 @@ void VolumeAttributes::Init()
smoothData = false;
samplesPerRay = 500;
rendererType = Splatting;
gradientType = CenteredDifferences;
gradientType = SobelOperator;
num3DSlices = 200;
scaling = Linear;
skewFactor = 1;
limitsMode = OriginalData;
sampling = Rasterization;
rendererSamples = 2;
rendererSamples = 3;
transferFunctionDim = 1;
lowGradientLightingReduction = Off;
lowGradientLightingReduction = Lower;
lowGradientLightingClampFlag = false;
lowGradientLightingClampValue = 1;
materialProperties[0] = 0.4;
......
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