Add SchemaVersion to RestoreDocFile to distinquish double from float binary

src/App/PropertyFile.cpp

@@ -401,7 +401,7 @@ void PropertyFileIncluded::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyFileIncluded::RestoreDocFile(Base::Reader &reader)
+void PropertyFileIncluded::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::FileInfo fi(_cValue.c_str());
     Base::ofstream to(fi);

src/App/PropertyFile.h

@@ -91,7 +91,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);

src/App/PropertyGeo.cpp

@@ -301,7 +301,7 @@ void PropertyVectorList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyVectorList::RestoreDocFile(Base::Reader &reader)
+void PropertyVectorList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;

src/App/PropertyGeo.h

@@ -147,7 +147,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);

src/App/PropertyPythonObject.cpp

@@ -374,7 +374,7 @@ void PropertyPythonObject::SaveDocFile (Base::Writer &writer) const
         writer.Stream().put(*it);
 }
 
-void PropertyPythonObject::RestoreDocFile(Base::Reader &reader)
+void PropertyPythonObject::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
     std::string buffer;

src/App/PropertyPythonObject.h

@@ -63,7 +63,7 @@ public:
     /** Use Python's pickle module to restore the object */
     virtual void Restore(Base::XMLReader &reader);
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual unsigned int getMemSize (void) const;
     virtual Property *Copy(void) const;

src/App/PropertyStandard.cpp

@@ -1150,14 +1150,20 @@ void PropertyFloatList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyFloatList::RestoreDocFile(Base::Reader &reader)
+void PropertyFloatList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
     str >> uCt;
     std::vector<double> values(uCt);
     for (std::vector<double>::iterator it = values.begin(); it != values.end(); ++it) {
-        str >> *it;
+        if (DocumentSchema > 4) {
+            str >> *it;
+        } else {
+            float val;
+            str >> val;
+            (*it) = val;
+        }
     }
     setValues(values);
 }
@@ -2114,7 +2120,7 @@ void PropertyColorList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyColorList::RestoreDocFile(Base::Reader &reader)
+void PropertyColorList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;

src/App/PropertyStandard.h

@@ -540,7 +540,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
     
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
@@ -833,7 +833,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
     
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);

src/Base/Persistence.cpp

@@ -65,6 +65,6 @@ void Persistence::SaveDocFile (Writer &/*writer*/) const
 {
 }
 
-void Persistence::RestoreDocFile(Reader &/*reader*/)
+void Persistence::RestoreDocFile(Reader &/*reader*/, const int DocumentSchema)
 {
 }

src/Base/Persistence.h

@@ -145,7 +145,7 @@ public:
      * \endcode
      * @see Base::Reader,Base::XMLReader
      */
-    virtual void RestoreDocFile(Reader &/*reader*/);
+    virtual void RestoreDocFile(Reader &/*reader*/, const int DocumentSchema);
 };
 
 } //namespace Base

src/Base/Reader.cpp

@@ -304,7 +304,7 @@ void Base::XMLReader::readFiles(zipios::ZipInputStream &zipstream) const
         // no file name for the current entry in the zip was registered.
         if (jt != FileList.end()) {
             try {
-                jt->Object->RestoreDocFile(zipstream);
+                jt->Object->RestoreDocFile(zipstream, DocumentSchema);
             }
             catch(...) {
                 // For any exception we just continue with the next file.

src/Base/Reader.h

@@ -165,6 +165,8 @@ public:
 
     /// Schema Version of the document
     int DocumentSchema;
+    /// Version of FreeCAD that wrote this document
+    std::string ProgramVersion;
 
 protected:
     /// read the next element

src/Gui/Document.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) 2004 Jürgen Riegel <juergen.riegel@web.de>              *
+ *   Copyright (c) 2004 Jrgen Riegel <juergen.riegel@web.de>              *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
@@ -649,7 +649,7 @@ void Document::Restore(Base::XMLReader &reader)
 /**
  * Restores the properties of the view providers.
  */
-void Document::RestoreDocFile(Base::Reader &reader)
+void Document::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     // We must create an XML parser to read from the input stream
     Base::XMLReader xmlReader("GuiDocument.xml", reader);

src/Gui/Document.h

@@ -119,7 +119,7 @@ public:
     /// This method is used to save large amounts of data to a binary file.
     virtual void SaveDocFile (Base::Writer &writer) const;
     /// This method is used to restore large amounts of data from a binary file.
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     void exportObjects(const std::vector<App::DocumentObject*>&, Base::Writer&);
     void importObjects(const std::vector<App::DocumentObject*>&, Base::Reader&);
     //@}

src/Gui/MergeDocuments.cpp

@@ -160,7 +160,7 @@ void MergeDocuments::SaveDocFile (Base::Writer & w) const
     document->exportObjects(objects, w);
 }
 
-void MergeDocuments::RestoreDocFile(Base::Reader & reader)
+void MergeDocuments::RestoreDocFile(Base::Reader & reader, const int DocumentSchema)
 {
     std::vector<App::DocumentObject*> obj = objects;
     // We must create an XML parser to read from the input stream

src/Gui/MergeDocuments.h

@@ -49,7 +49,7 @@ public:
     void Save (Base::Writer & w) const;
     void Restore(Base::XMLReader &r);
     void SaveDocFile (Base::Writer & w) const;
-    void RestoreDocFile(Base::Reader & r);
+    void RestoreDocFile(Base::Reader & r, const int DocumentSchema);
 
 private:
     zipios::ZipInputStream* stream;

src/Gui/Thumbnail.cpp

@@ -117,7 +117,7 @@ void Thumbnail::SaveDocFile (Base::Writer &writer) const
     writer.Stream().write(ba.constData(), ba.length());
 }
 
-void Thumbnail::RestoreDocFile(Base::Reader &reader)
+void Thumbnail::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
 }
 

src/Gui/Thumbnail.h

@@ -52,7 +52,7 @@ public:
     /// This method is used to save large amounts of data to a binary file.
     void SaveDocFile (Base::Writer &writer) const;
     /// This method is used to restore large amounts of data from a binary file.
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     //@}
 
 private:

src/Mod/Fem/App/FemMesh.cpp

@@ -783,7 +783,7 @@ void FemMesh::SaveDocFile (Base::Writer &writer) const
     fi.deleteFile();
 }
 
-void FemMesh::RestoreDocFile(Base::Reader &reader)
+void FemMesh::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     // create a temporary file and copy the content from the zip stream
     Base::FileInfo fi(Base::FileInfo::getTempFileName().c_str());

src/Mod/Fem/App/FemMesh.h

@@ -66,7 +66,7 @@ public:
     virtual void Save (Base::Writer &/*writer*/) const;
     virtual void Restore(Base::XMLReader &/*reader*/);
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     /** @name Subelement management */
     //@{

src/Mod/Fem/App/FemMeshProperty.cpp

@@ -151,9 +151,9 @@ void PropertyFemMesh::SaveDocFile (Base::Writer &writer) const
     _FemMesh->SaveDocFile(writer);
 }
 
-void PropertyFemMesh::RestoreDocFile(Base::Reader &reader)
+void PropertyFemMesh::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
-    _FemMesh->RestoreDocFile(reader);
+    _FemMesh->RestoreDocFile(reader, DocumentSchema);
     hasSetValue();
 }

src/Mod/Fem/App/FemMeshProperty.h

@@ -77,7 +77,7 @@ public:
     void Save (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     App::Property *Copy(void) const;
     void Paste(const App::Property &from);

src/Mod/Mesh/App/Core/Trim.cpp

@@ -157,7 +157,7 @@ bool MeshTrimming::PolygonContainsCompleteFacet(bool bInner, unsigned long ulInd
 bool MeshTrimming::IsPolygonPointInFacet(unsigned long ulIndex, Base::Vector3f& clPoint)
 {
     Base::Vector2D A, B, C, P;
-    double u,v,w, fDetPAC, fDetPBC, fDetPAB, fDetABC;
+    float u,v,w, fDetPAC, fDetPBC, fDetPAB, fDetABC;
     Base::Polygon2D clFacPoly;
     const MeshGeomFacet &rclFacet = myMesh.GetFacet(ulIndex);
   

src/Mod/Mesh/App/Mesh.cpp

@@ -297,7 +297,7 @@ void MeshObject::Restore(Base::XMLReader &reader)
     // this is handled by the property class
 }
 
-void MeshObject::RestoreDocFile(Base::Reader &reader)
+void MeshObject::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     load(reader);
 }

src/Mod/Mesh/App/Mesh.h

@@ -147,7 +147,7 @@ public:
     void Save (Base::Writer &writer) const;
     void SaveDocFile (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     void save(const char* file,MeshCore::MeshIO::Format f=MeshCore::MeshIO::Undefined,
         const MeshCore::Material* mat = 0) const;
     void save(std::ostream&) const;

src/Mod/Mesh/App/MeshProperties.cpp

@@ -221,7 +221,7 @@ void PropertyCurvatureList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader)
+void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
@@ -478,7 +478,7 @@ void PropertyMeshKernel::SaveDocFile (Base::Writer &writer) const
     _meshObject->save(writer.Stream());
 }
 
-void PropertyMeshKernel::RestoreDocFile(Base::Reader &reader)
+void PropertyMeshKernel::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
     _meshObject->load(reader);

src/Mod/Mesh/App/MeshProperties.h

@@ -107,7 +107,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     /** @name Python interface */
     //@{
@@ -205,7 +205,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     App::Property *Copy(void) const;
     void Paste(const App::Property &from);

src/Mod/Part/App/PropertyTopoShape.cpp

@@ -304,7 +304,7 @@ void PropertyPartShape::SaveDocFile (Base::Writer &writer) const
     fi.deleteFile();
 }
 
-void PropertyPartShape::RestoreDocFile(Base::Reader &reader)
+void PropertyPartShape::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     BRep_Builder builder;
 
@@ -397,7 +397,7 @@ void PropertyShapeHistory::SaveDocFile (Base::Writer &writer) const
 {
 }
 
-void PropertyShapeHistory::RestoreDocFile(Base::Reader &reader)
+void PropertyShapeHistory::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
 }
 
@@ -505,7 +505,7 @@ void PropertyFilletEdges::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyFilletEdges::RestoreDocFile(Base::Reader &reader)
+void PropertyFilletEdges::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;

src/Mod/Part/App/PropertyTopoShape.h

@@ -87,7 +87,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     App::Property *Copy(void) const;
     void Paste(const App::Property &from);
@@ -138,7 +138,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
@@ -191,7 +191,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);

src/Mod/Part/App/TopoShape.cpp

@@ -939,7 +939,7 @@ void TopoShape::SaveDocFile (Base::Writer &writer) const
 {
 }
 
-void TopoShape::RestoreDocFile(Base::Reader &reader)
+void TopoShape::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
 }
 

src/Mod/Part/App/TopoShape.h

@@ -111,7 +111,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     unsigned int getMemSize (void) const;
     //@}
 

src/Mod/Points/App/Points.cpp

@@ -134,7 +134,7 @@ void PointKernel::Restore(Base::XMLReader &reader)
     }
 }
 
-void PointKernel::RestoreDocFile(Base::Reader &reader)
+void PointKernel::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt = 0;

src/Mod/Points/App/Points.h

@@ -90,7 +90,7 @@ public:
     void Save (Base::Writer &writer) const;
     void SaveDocFile (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     void save(const char* file) const;
     void save(std::ostream&) const;
     void load(const char* file);

src/Mod/Points/App/PointsFeature.cpp

@@ -64,10 +64,10 @@ void Feature::Restore(Base::XMLReader &reader)
     GeoFeature::Restore(reader);
 }
 
-void Feature::RestoreDocFile(Base::Reader &reader)
+void Feature::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     // This gets only invoked if a points file has been added from Restore()
-    Points.RestoreDocFile(reader);
+    Points.RestoreDocFile(reader, DocumentSchema);
 }
 
 void Feature::onChanged(const App::Property* prop)

src/Mod/Points/App/PointsFeature.h

@@ -60,7 +60,7 @@ public:
     /** @name methods overide Feature */
     //@{
     void Restore(Base::XMLReader &reader);
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     /// recalculate the Feature
     virtual App::DocumentObjectExecReturn *execute(void);
     /// returns the type name of the ViewProvider

src/Mod/Points/App/Properties.cpp

@@ -291,7 +291,7 @@ void PropertyCurvatureList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader)
+void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;

src/Mod/Points/App/Properties.h

@@ -141,7 +141,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     //@}
 
     /** @name Undo/Redo */

src/Mod/Points/App/PropertyPointKernel.cpp

@@ -134,10 +134,10 @@ void PropertyPointKernel::SaveDocFile (Base::Writer &writer) const
     // does nothing
 }
 
-void PropertyPointKernel::RestoreDocFile(Base::Reader &reader)
+void PropertyPointKernel::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
-    _cPoints->RestoreDocFile(reader);
+    _cPoints->RestoreDocFile(reader, DocumentSchema);
     hasSetValue();
 }
 

src/Mod/Points/App/PropertyPointKernel.h

@@ -78,7 +78,7 @@ public:
     void Save (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     //@}
 
     /** @name Modification */