Commit ac0752b1 authored by Charles Law's avatar Charles Law
Browse files

Make the default coloring to use textures.

parent 2ab68e7c
......@@ -83,7 +83,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVData);
vtkCxxRevisionMacro(vtkPVData, "1.291");
vtkCxxRevisionMacro(vtkPVData, "1.292");
int vtkPVDataCommand(ClientData cd, Tcl_Interp *interp,
int argc, char *argv[]);
......@@ -630,7 +630,7 @@ void vtkPVData::CreateProperties()
this->InterpolateColorsCheck->SetParent(this->ColorFrame->GetFrame());
this->InterpolateColorsCheck->Create(this->GetApplication(), "-text {Interpolate Colors}");
this->InterpolateColorsCheck->SetState(1);
this->InterpolateColorsCheck->SetState(0);
this->InterpolateColorsCheck->SetBalloonHelpString(
"Interpolate colors after mapping.");
this->GetApplication()->Script(
......
......@@ -41,7 +41,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVLODPartDisplay);
vtkCxxRevisionMacro(vtkPVLODPartDisplay, "1.25");
vtkCxxRevisionMacro(vtkPVLODPartDisplay, "1.26");
//----------------------------------------------------------------------------
......@@ -186,6 +186,10 @@ void vtkPVLODPartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp)
// ===== LOD branch:
this->LODMapperID = pm->NewStreamObject("vtkPolyDataMapper");
pm->GetStream()
<< vtkClientServerStream::Invoke
<< this->LODMapperID << "InterpolateScalarsBeforeMappingOn"
<< vtkClientServerStream::End;
pm->GetStream()
<< vtkClientServerStream::Invoke
<< this->LODMapperID << "UseLookupTableScalarRangeOn"
......
/*=========================================================================
/*=========================================================================Interpolate
Program: ParaView
Module: vtkPVPartDisplay.cxx
......@@ -48,7 +48,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVPartDisplay);
vtkCxxRevisionMacro(vtkPVPartDisplay, "1.37");
vtkCxxRevisionMacro(vtkPVPartDisplay, "1.38");
//----------------------------------------------------------------------------
......@@ -57,7 +57,7 @@ vtkPVPartDisplay::vtkPVPartDisplay()
this->PVApplication = NULL;
this->DirectColorFlag = 1;
this->InterpolateColorsFlag = 1;
this->InterpolateColorsFlag = 0;
this->Visibility = 1;
this->Part = NULL;
......@@ -285,6 +285,8 @@ void vtkPVPartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp)
this->MapperID = pm->NewStreamObject("vtkPolyDataMapper");
stream << vtkClientServerStream::Invoke << this->MapperID << "UseLookupTableScalarRangeOn"
<< vtkClientServerStream::End;
stream << vtkClientServerStream::Invoke << this->MapperID << "InterpolateScalarsBeforeMappingOn"
<< vtkClientServerStream::End;
stream << vtkClientServerStream::Invoke << this->UpdateSuppressorID << "GetPolyDataOutput"
<< vtkClientServerStream::End;
stream << vtkClientServerStream::Invoke << this->MapperID << "SetInput"
......
......@@ -27,6 +27,7 @@ $pvWarp AcceptCallback
set warpOutput [$pvWarp GetPVOutput]
$warpOutput SetVisibility 0
$warpOutput SetInterpolateColorsFlag 1
set pvWindow [lindex [vtkPVWindow ListInstances] 0]
$pvWindow SetCurrentPVSourceCallback $pvWarp
......
......@@ -63,10 +63,13 @@ $pv(vtkTemp294) AcceptCallback
set pv(vtkTemp327) [$pv(vtkTemp1) CreatePVSource DataSetSurfaceFilter]
$pv(vtkTemp327) AcceptCallback
[$pv(vtkTemp327) GetPVOutput] SetInterpolateColorsFlag 1
$pv(vtkTemp1) SetCurrentPVSourceCallback $pv(vtkTemp207)
$pv(vtkTemp1) ShowCurrentSourcePropertiesCallback
set pv(vtkTemp366) [$pv(vtkTemp1) CreatePVSource Clip]
set pv(vtkTemp368) [$pv(vtkTemp366) GetPVWidget {Clip Function}]
set pv(vtkTemp367) [$pv(vtkTemp368) GetPVWidget {Plane}]
......@@ -80,6 +83,7 @@ $pv(vtkTemp395) AcceptCallback
# Triangle filter to disabiguate quads.
set pv(vtkTemp2244) [$pv(vtkTemp1) CreatePVSource TriangleFilter]
$pv(vtkTemp2244) AcceptCallback
[$pv(vtkTemp2244) GetPVOutput] SetInterpolateColorsFlag 1
$pv(vtkTemp1) SetCurrentPVSourceCallback $pv(vtkTemp164)
$pv(vtkTemp1) ShowCurrentSourcePropertiesCallback
......@@ -90,6 +94,8 @@ set pv(vtkTemp417) [$pv(vtkTemp418) GetPVWidget {Plane}]
$pv(vtkTemp417) SetCenter 0.150 -0.650 0.500
$pv(vtkTemp417) SetNormal 0 0 -1
$pv(vtkTemp416) AcceptCallback
[$pv(vtkTemp416) GetPVOutput] SetInterpolateColorsFlag 1
$pv(vtkTemp1) SetCurrentPVSourceCallback $pv(vtkTemp98)
$pv(vtkTemp1) ShowCurrentSourcePropertiesCallback
......@@ -103,6 +109,7 @@ set pv(vtkTemp463) [$pv(vtkTemp446) GetPVWidget {Cut Values}]
$pv(vtkTemp463) RemoveAllValues
$pv(vtkTemp463) AddValue 0.1
$pv(vtkTemp446) AcceptCallback
[$pv(vtkTemp446) GetPVOutput] SetInterpolateColorsFlag 1
# Retrace
# update
......
......@@ -12,7 +12,7 @@ if {[info exists argc]} {
if {[lindex $argv $i] == "-UC" && $i < $argcm1} {
set rmui [$pv(vtkTemp43) GetRenderModuleUI]
catch {$rmui SetCompositeThreshold 0}
}
}1
}
}
......@@ -55,6 +55,7 @@ $pv(vtkTemp999) SetPoint2 0 0 1
set pv(vtkTemp229) [$pv(vtkTemp220) GetPVWidget {Input}]
$pv(vtkTemp229) SetCurrentValue $pv(vtkTemp98)
$pv(vtkTemp220) AcceptCallback
[$pv(vtkTemp220) GetPVOutput] SetInterpolateColorsFlag 1
# Retrace
update
......
......@@ -148,6 +148,7 @@ $kw(vtkTemp1623) SetResolution 20
$kw(vtkTemp1612) AcceptCallback
set kw(vtkTemp1613) [$kw(vtkTemp1612) GetPVOutput]
$kw(vtkTemp1613) ColorByPointField "Elevation" 1
$kw(vtkTemp1613) SetInterpolateColorsFlag 1
# Retrace
update
......
......@@ -26,7 +26,7 @@ $pv(vtkTemp98) AcceptCallback
set pv(vtkTemp110) [$pv(vtkTemp98) GetPVWidget {Extent}]
$pv(vtkTemp110) SetValue 0 250 0 250 100 100
$pv(vtkTemp98) AcceptCallback
[$pv(vtkTemp98) GetPVOutput] SetInterpolateColorsFlag 1
[$pv(vtkTemp98) GetPVOutput] DrawSurface
# Retrace
......
......@@ -23,6 +23,7 @@ $kw(vtkTemp1) Open "$DataDir/Data/vox8_bin.vtk"
set kw(vtkTemp285) [$kw(vtkTemp1) CreatePVSource DataSetTriangleFilter]
$kw(vtkTemp285) AcceptCallback
[$kw(vtkTemp285) GetPVOutput] DrawSurface
[$kw(vtkTemp285) GetPVOutput] SetInterpolateColorsFlag 1
set kw(vtkTemp321) [$kw(vtkTemp1) GetPVColorMap {scalars} 1]
$kw(vtkTemp321) SetScalarBarVisibility 1
......
......@@ -33,6 +33,7 @@ $pv(vtkTemp999) SetPoint1 0 0 0
$pv(vtkTemp999) SetPoint2 0 0 1
$pvElevation AcceptCallback
[$pvElevation GetPVOutput] DrawSurface
[$pvElevation GetPVOutput] SetInterpolateColorsFlag 1
set pvExtract [$pvWindow CreatePVSource ExtractEdges]
$pvExtract AcceptCallback
......
......@@ -46,6 +46,7 @@ $kw(vtkTemp291) AcceptCallback
set kw(vtkTemp841) [$kw(vtkTemp1) CreatePVSource DataSetTriangleFilter]
$kw(vtkTemp841) AcceptCallback
[$kw(vtkTemp841) GetPVOutput] DrawSurface
[$kw(vtkTemp841) GetPVOutput] SetInterpolateColorsFlag 1
update
......
......@@ -42,6 +42,7 @@ $pv(vtkTemp229) SetMinValue 0.023000
$pv(vtkTemp229) SetMaxValue 0.255880
$pv(vtkTemp215) AcceptCallback
[$pv(vtkTemp215) GetPVOutput] DrawSurface
[$pv(vtkTemp215) GetPVOutput] SetInterpolateColorsFlag 1
# Retrace
update
......
......@@ -42,6 +42,8 @@ $pv(vtkTemp164) SetCurrentValue $pv(vtkTemp129)
$pv(vtkTemp158) AcceptCallback
$pv(vtkTemp158) SetVisibility 0
[$pv(vtkTemp304) GetPVOutput] SetInterpolateColorsFlag 1
# Retrace
update
$Application StopRecordingScript
......
......@@ -44,12 +44,16 @@ $kw(vtkTemp18) SetCameraState 7.797 -2.031 2.139 1.162 1.000 -1.000 0.112 -0.5
$kw(vtkTemp18) SetCameraState 1.624 -5.207 -5.932 1.162 1.000 -1.000 0.098 0.624 -0.776
set kw(vtkTemp1228) [$kw(vtkTemp2) CreatePVSource ShrinkFilter]
$kw(vtkTemp1228) AcceptCallback
$kw(vtkTemp18) SetCameraState 9.056 1.841 -1.218 1.162 1.000 -1.000 -0.054 0.255 -0.966
$kw(vtkTemp18) SetCameraState -1.828 -4.819 -5.501 1.162 1.000 -1.000 -0.474 0.678 -0.562
$kw(vtkTemp18) SetCameraState 2.600 -0.066 -8.737 1.162 1.000 -1.000 -0.410 0.890 -0.199
$kw(vtkTemp2) SetCurrentPVSourceCallback $kw(vtkTemp582)
set kw(vtkTemp1346) [$kw(vtkTemp2) CreatePVSource ShrinkFilter]
$kw(vtkTemp1346) AcceptCallback
[$kw(vtkTemp1346) GetPVOutput] SetInterpolateColorsFlag 1
$kw(vtkTemp18) SetCameraState 9.004 1.696 -2.043 1.162 1.000 -1.000 -0.143 0.850 -0.508
$kw(vtkTemp18) SetCameraState 0.597 -1.103 -8.637 1.162 1.000 -1.000 -0.467 0.861 -0.202
$kw(vtkTemp2) ResetCameraCallback
......
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