Merge topic 'xml_writer_progress2'

a1dee02e fix progress reporting on writing XMLMultiBlockDataSets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci <berk.geveci@kitware.com>
Merge-request: !1285

IO/XML/vtkXMLCompositeDataWriter.cxx

@@ -254,6 +254,9 @@ int vtkXMLCompositeDataWriter::WriteNonCompositeData(
     }
 
   // FIXME
+  // Ken's note, I do not think you can fix this, the
+  // setprogress range has to be done in the loop that calls
+  // this function.
   // this->SetProgressRange(progressRange, myWriterIndex,
   //                       GetNumberOfInputConnections(0)+writeCollection);
 

IO/XML/vtkXMLMultiBlockDataWriter.cxx

@@ -60,6 +60,15 @@ int vtkXMLMultiBlockDataWriter::WriteComposite(vtkCompositeDataSet* compositeDat
   iter->VisitOnlyLeavesOff();
   iter->TraverseSubTreeOff();
   iter->SkipEmptyNodesOff();
+  int toBeWritten = 0;
+  for (iter->InitTraversal(); !iter->IsDoneWithTraversal();
+    iter->GoToNextItem())
+    {
+    toBeWritten++;
+    }
+
+  float progressRange[2] = { 0.f, 0.f };
+  this->GetProgressRange(progressRange);
 
   int index = 0;
   int RetVal = 0;
@@ -115,6 +124,8 @@ int vtkXMLMultiBlockDataWriter::WriteComposite(vtkCompositeDataSet* compositeDat
         datasetXML->SetAttribute("name", name);
         }
       vtkStdString fileName = this->CreatePieceFileName(writerIdx);
+
+      this->SetProgressRange(progressRange, writerIdx, toBeWritten);
       if (this->WriteNonCompositeData( curDO, datasetXML, writerIdx,
                                        fileName.c_str()))
         {