Changeset 122 in flair-src for trunk/lib/FlairCore

Timestamp:

Jan 6, 2017, 1:56:26 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs uav vrpn i686

Location:

trunk/lib/FlairCore/src

Files:

• Buffer.cpp (deleted)
• Buffer.h (deleted)
• FrameworkManager.cpp (modified) (1 diff)
• FrameworkManager.h (modified) (1 diff)
• FrameworkManager_impl.cpp (modified) (2 diffs)
• IODevice_impl.cpp (modified) (3 diffs)
• io_data_impl.cpp (modified) (1 diff)
• unexported/FrameworkManager_impl.h (modified) (1 diff)
• unexported/IODevice_impl.h (modified) (1 diff)

trunk/lib/FlairCore/src/FrameworkManager.cpp

@@ -178 +178 @@
 }
 
+bool FrameworkManager::IsDeviceLogged(const IODevice *device) const {
+        return pimpl_->IsDeviceLogged(device);
+}
+
 void FrameworkManager::StartLog(void) { pimpl_->StartLog(); }
 

trunk/lib/FlairCore/src/FrameworkManager.h

@@ -121 +121 @@
   */
   void AddDeviceToLog(IODevice *device);
+        
+        /*!
+  * \brief Is device logged
+  *
+  * Check if AddDeviceToLog was called for an IODevice
+  *
+  * \param device IODevice to check
+  * \return true if AddDeviceToLog was called for this IODevice
+  */
+  bool IsDeviceLogged(const IODevice *device) const;
 
   /*!

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -630 +630 @@
 
   if (is_logging == false) {
-    if (device->pimpl_->SetToBeLogged()) {
+    if (!device->pimpl_->IsSetToBeLogged()) {
+                        device->pimpl_->SetToBeLogged();
       log_desc_t tmp;
       tmp.device = device;
@@ -640 +641 @@
     Err("impossible while logging\n");
   }
+}
+
+bool FrameworkManager_impl::IsDeviceLogged(const IODevice *device) const {
+        return device->pimpl_->IsSetToBeLogged();
 }
 

trunk/lib/FlairCore/src/IODevice_impl.cpp

@@ -106 +106 @@
 }
 
-bool IODevice_impl::SetToBeLogged(void) {
+bool IODevice_impl::IsSetToBeLogged(void) const{
+        return tobelogged;
+}
+
+void IODevice_impl::SetToBeLogged(void) {
   if (!tobelogged) {
     tobelogged = true;
-    return true;
   } else {
     self->Warn("already added to log\n");
-    return false;
   }
 }
 
 void IODevice_impl::WriteLogsDescriptors(fstream &desc_file, int *index) {
-  // own descriptor
+  //Printf("WriteLogsDescriptors %s\n",self->ObjectName().c_str());
+        // own descriptor
   for (size_t i = 0; i < datasToLog.size(); i++)
     datasToLog.at(i)->pimpl_->WriteLogDescriptor(desc_file, index);
@@ -127 +130 @@
   for (size_t i = 0; i < devicesToLog.size(); i++)
     devicesToLog.at(i)->pimpl_->WriteLogsDescriptors(desc_file, index);
+        //Printf("WriteLogsDescriptors %s ok\n",self->ObjectName().c_str());
 }
 
@@ -194 +198 @@
 
 void IODevice_impl::AppendLog(char **ptr) {
-  // Printf("AppendLog %s %x\n",self->ObjectName().c_str(),*ptr);
+   //Printf("AppendLog %s %x\n",self->ObjectName().c_str(),*ptr);
 
   // copy state to buf
   for (size_t i = 0; i < datasToLog.size(); i++) {
-    // printf("copy\n");
+    // printf("copy %s\n",datasToLog.at(i)->ObjectName().c_str());
     datasToLog.at(i)->CopyDatas(*ptr);
     (*ptr) += datasToLog.at(i)->GetDataType().GetSize();

trunk/lib/FlairCore/src/io_data_impl.cpp

@@ -42 +42 @@
 
 void io_data_impl::WriteLogDescriptor(std::fstream &desc_file, int *index) {
+        if(descriptors.size()==0) self->Warn("AppendLogDescription was not called for this object.\n");
   for (size_t i = 0; i < descriptors.size(); i++) {
     desc_file << (*index)++ << ": " << self->ObjectName() << " - "

trunk/lib/FlairCore/src/unexported/FrameworkManager_impl.h

@@ -48 +48 @@
   void SetupLogger(std::string log_path);
   void AddDeviceToLog(flair::core::IODevice *device);
+        bool IsDeviceLogged(const flair::core::IODevice *device) const;
   void StartLog();
   void StopLog();

trunk/lib/FlairCore/src/unexported/IODevice_impl.h

@@ -42 +42 @@
   void WriteLog(flair::core::Time time);
   void AddDeviceToLog(const flair::core::IODevice *device);
-  bool SetToBeLogged(void); // return true if possible
+  void SetToBeLogged(void); 
+        bool IsSetToBeLogged(void) const;
   void OutputToShMem(bool enabled);
   void WriteToShMem(void);