Commit 624c394a authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Bringing back comparative chart views.

parent 11fb4913
......@@ -47,10 +47,10 @@ QT4_WRAP_CPP(MOC_BUILT_SOURCES
pqColorButtonEventPlayer.h
pqColorButtonEventTranslator.h
pqCommandServerStartup.h
# pqComparativeContextView.h
pqComparativeContextView.h
pqComparativeRenderView.h
# pqComparativeXYBarChartView.h
# pqComparativeXYChartView.h
pqComparativeXYBarChartView.h
pqComparativeXYChartView.h
pqCoreTestUtility.h
pqDataRepresentation.h
pqDisplayPolicy.h
......@@ -191,8 +191,14 @@ ADD_LIBRARY(pqCore
pqColorButtonEventTranslator.h
pqCommandServerStartup.cxx
pqCommandServerStartup.h
pqComparativeContextView.cxx
pqComparativeContextView.h
pqComparativeRenderView.cxx
pqComparativeRenderView.h
pqComparativeXYBarChartView.cxx
pqComparativeXYBarChartView.h
pqComparativeXYChartView.cxx
pqComparativeXYChartView.h
pqContextView.cxx
pqContextView.h
pqCoreExport.h
......@@ -376,12 +382,6 @@ ADD_LIBRARY(pqCore
)
#ADD_LIBRARY(pqCore_old
# pqComparativeContextView.cxx
# pqComparativeContextView.h
# pqComparativeXYBarChartView.cxx
# pqComparativeXYBarChartView.h
# pqComparativeXYChartView.cxx
# pqComparativeXYChartView.h
#
# pqHelperProxyRegisterUndoElement.cxx
# pqHelperProxyRegisterUndoElement.h
......
......@@ -185,8 +185,8 @@ void pqComparativeContextView::onComparativeVisLayoutChanged()
// Now layout the views.
int dimensions[2];
compView->GetDimensions(dimensions);
if (compView->GetOverlayAllComparisons())
vtkSMPropertyHelper(compView, "Dimensions").Get(dimensions, 2);
if (vtkSMPropertyHelper(compView, "OverlayAllComparisons").GetAsInt() !=0)
{
dimensions[0] = dimensions[1] = 1;
}
......
......@@ -117,7 +117,7 @@ pqContextView::pqContextView(
this->Internal = new pqContextView::pqInternal();
viewProxy->UpdateVTKObjects(); // this results in calling CreateVTKObjects().
this->Command = command::New(*this);
viewProxy->GetClientSideView()->AddObserver(
vtkObject::SafeDownCast(viewProxy->GetClientSideObject())->AddObserver(
vtkCommand::SelectionChangedEvent, this->Command);
}
......
......@@ -73,10 +73,8 @@ QStringList pqStandardViewModules::viewTypes() const
pqXYChartView::XYChartViewType() <<
pqXYBarChartView::XYBarChartViewType() <<
pqComparativeRenderView::comparativeRenderViewType() <<
#ifdef FIXME_COLLABORATION
pqComparativeXYChartView::chartViewType() <<
pqComparativeXYBarChartView::chartViewType() <<
#endif
pqParallelCoordinatesChartView::chartViewType();
}
......@@ -102,7 +100,6 @@ QString pqStandardViewModules::viewTypeName(const QString& type) const
{
return pqComparativeRenderView::comparativeRenderViewTypeName();
}
#ifdef FIXME_COLLABORATION
else if (type == pqComparativeXYBarChartView::chartViewType())
{
return pqComparativeXYBarChartView::chartViewTypeName();
......@@ -111,7 +108,6 @@ QString pqStandardViewModules::viewTypeName(const QString& type) const
{
return pqComparativeXYChartView::chartViewTypeName();
}
#endif
else if (type == pqSpreadSheetView::spreadsheetViewType())
{
return pqSpreadSheetView::spreadsheetViewTypeName();
......@@ -158,7 +154,6 @@ vtkSMProxy* pqStandardViewModules::createViewProxy(const QString& viewtype,
{
root_xmlname = "ComparativeRenderView";
}
#ifdef FIXME_COLLABORATION
else if(viewtype == pqComparativeXYBarChartView::chartViewType())
{
root_xmlname = "ComparativeXYBarChartView";
......@@ -167,7 +162,6 @@ vtkSMProxy* pqStandardViewModules::createViewProxy(const QString& viewtype,
{
root_xmlname = "ComparativeXYChartView";
}
#endif
else if (viewtype == pqTwoDRenderView::twoDRenderViewType())
{
root_xmlname = "2DRenderView";
......@@ -231,7 +225,6 @@ pqView* pqStandardViewModules::createView(const QString& viewtype,
{
return new pqRenderView(group, viewname, viewmodule, server, p);
}
#ifdef FIXME_COLLABORATION
else if (viewtype == pqComparativeXYBarChartView::chartViewType()
&& viewmodule->IsA("vtkSMComparativeViewProxy"))
{
......@@ -246,7 +239,6 @@ pqView* pqStandardViewModules::createView(const QString& viewtype,
group, viewname, vtkSMComparativeViewProxy::SafeDownCast(viewmodule),
server, p);
}
#endif
else if (viewmodule->IsA("vtkSMComparativeViewProxy"))
{
// Handle the other comparative render views.
......
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