Commit e351cde7 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Fixed warnings.

Change-Id: Idc3282ed0332171d5a5c5ecb82f4f6b5800f9607
parent 7f1a8d09
......@@ -114,40 +114,40 @@ pqAnimationTimeWidget::~pqAnimationTimeWidget()
}
//-----------------------------------------------------------------------------
void pqAnimationTimeWidget::setAnimationScene(vtkSMProxy* animationScene)
void pqAnimationTimeWidget::setAnimationScene(vtkSMProxy* ascene)
{
pqInternals& internals = *this->Internals;
if (internals.AnimationSceneVoidPtr == animationScene)
if (internals.AnimationSceneVoidPtr == ascene)
{
return;
}
internals.Links.clear();
internals.AnimationScene = animationScene;
internals.AnimationSceneVoidPtr = animationScene;
this->setEnabled(animationScene != NULL);
if (!animationScene)
internals.AnimationScene = ascene;
internals.AnimationSceneVoidPtr = ascene;
this->setEnabled(ascene != NULL);
if (!ascene)
{
return;
}
internals.Links.addPropertyLink(
this, "timeValue", SIGNAL(timeValueChanged()),
animationScene, animationScene->GetProperty("AnimationTime"));
ascene, ascene->GetProperty("AnimationTime"));
internals.Links.addPropertyLink(this, "playMode", SIGNAL(playModeChanged()),
animationScene, animationScene->GetProperty("PlayMode"));
ascene, ascene->GetProperty("PlayMode"));
// In a ParaView application, it's safe to assume that the timekeeper an
// animation scene is using doesn't change in the life span of the scene.
vtkSMProxy* timeKeeper = vtkSMPropertyHelper(animationScene, "TimeKeeper").GetAsProxy();
Q_ASSERT(timeKeeper != NULL);
vtkSMProxy* atimekeeper = vtkSMPropertyHelper(ascene, "TimeKeeper").GetAsProxy();
Q_ASSERT(atimekeeper != NULL);
internals.Links.addPropertyLink<pqAnimationTimeWidgetLinks>(
this, "timeStepCount", SIGNAL(dummySignal()),
timeKeeper, timeKeeper->GetProperty("TimestepValues"));
atimekeeper, atimekeeper->GetProperty("TimestepValues"));
internals.Links.addPropertyLink(
this, "timeLabel", SIGNAL(dummySignal()),
timeKeeper, timeKeeper->GetProperty("TimeLabel"));
atimekeeper, atimekeeper->GetProperty("TimeLabel"));
}
//-----------------------------------------------------------------------------
......
......@@ -92,8 +92,8 @@ protected:
std::vector<vtkSMProxy*> proxies;
foreach (const QVariant& var, value.toList())
{
vtkSMProxy* proxy = reinterpret_cast<vtkSMProxy*>(var.value<void*>());
proxies.push_back(proxy);
vtkSMProxy* aproxy = reinterpret_cast<vtkSMProxy*>(var.value<void*>());
proxies.push_back(aproxy);
}
proxies.push_back(NULL);
Q_ASSERT(proxies.size() > 0);
......@@ -126,8 +126,8 @@ class pqTimeInspectorWidget::TimeTrack : public pqAnimationTrack
bool HasDataTime;
double DataTime;
public:
TimeTrack(vtkSMProxy* sourceProxy, QObject* parentObject=NULL)
: Superclass(parentObject),
TimeTrack(vtkSMProxy* sourceProxy, QObject* parentObj=NULL)
: Superclass(parentObj),
Source(sourceProxy),
HasDataTime(false),
DataTime(0.0)
......@@ -162,6 +162,9 @@ protected:
const QStyleOptionGraphicsItem * option,
QWidget * widget)
{
Q_UNUSED(option);
Q_UNUSED(widget);
// draw border for this track
p->save();
p->setBrush(QBrush(QColor(255, 255, 255)));
......@@ -289,12 +292,12 @@ pqTimeInspectorWidget::~pqTimeInspectorWidget()
}
//-----------------------------------------------------------------------------
void pqTimeInspectorWidget::setServer(pqServer* server)
void pqTimeInspectorWidget::setServer(pqServer* aserver)
{
if (server != this->Internals->VoidServer)
if (aserver != this->Internals->VoidServer)
{
this->Internals->VoidServer = server;
this->Internals->Server = server;
this->Internals->VoidServer = aserver;
this->Internals->Server = aserver;
this->updateScene();
}
......
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