Changeset - b1d64d0822d2
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Hasan Yavuz ÖZDERYA - 9 years ago 2017-04-01 12:41:24
hy@ozderya.net
add windows style line endings option for recording
4 files changed with 115 insertions and 60 deletions:
src/datarecorder.cpp
8
2
src/datarecorder.h
11
src/recordpanel.cpp
8
src/recordpanel.ui
88
58
0 comments (0 inline, 0 general)
src/datarecorder.cpp
➞
Show inline comments
 
@@ -24,12 +24,13 @@
 
DataRecorder::DataRecorder(QObject *parent) :
 
    QObject(parent),
 
    fileStream(&file)
 
{
 
    lastNumChannels = 0;
 
    disableBuffering = false;
 
    windowsLE = false;
 
}
 

			




	
	
	
		
 
bool DataRecorder::startRecording(QString fileName, QString separator, QStringList channelNames)

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_ASSERT(!file.isOpen());

			




	
	
	
		
 
    _sep =  separator;

			




	
	
		
 
@@ -44,13 +45,13 @@ bool DataRecorder::startRecording(QStrin

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // write header line

			




	
	
	
		
 
    if (!channelNames.isEmpty())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        fileStream << channelNames.join(_sep);

			




	
	
	
		
 
        fileStream << "\n";

			




	
	
	
		
 
        fileStream << le();

			




	
	
	
		
 
        lastNumChannels = channelNames.length();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DataRecorder::addData(double* data, unsigned length, unsigned numOfChannels)

			




	
	
		
 
@@ -71,19 +72,24 @@ void DataRecorder::addData(double* data,

			




	
	
	
		
 
    {

			




	
	
	
		
 
        for (unsigned ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            fileStream << data[ci * numOfSamples + i];

			




	
	
	
		
 
            if (ci != numOfChannels-1) fileStream << _sep;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        fileStream << '\n';

			




	
	
	
		
 
        fileStream << le();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (disableBuffering) fileStream.flush();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DataRecorder::stopRecording()

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_ASSERT(file.isOpen());

			




	
	
	
		
 

			




	
	
	
		
 
    file.close();

			




	
	
	
		
 
    lastNumChannels = 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
const char* DataRecorder::le() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return windowsLE ? "\r\n" : "\n";

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/datarecorder.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,12 +31,20 @@ public:

			




	
	
	
		
 
    explicit DataRecorder(QObject *parent = 0);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Disables file buffering

			




	
	
	
		
 
    bool disableBuffering;

			




	
	
	
		
 

			




	
	
	
		
 
    /**

			




	
	
	
		
 
     * Use CR+LF as line ending. `false` by default.

			




	
	
	
		
 
     *

			




	
	
	
		
 
     * @note Toggling this variable during a recording will result in

			




	
	
	
		
 
     * a corrupted file. Care must be taken at higher (UI) levels.

			




	
	
	
		
 
     */

			




	
	
	
		
 
    bool windowsLE;

			




	
	
	
		
 

			




	
	
	
		
 
    /**

			




	
	
	
		
 
     * @brief Starts recording data to a file in CSV format.

			




	
	
	
		
 
     *

			




	
	
	
		
 
     * File is opened and header line (names of channels) is written.

			




	
	
	
		
 
     *

			




	
	
	
		
 
     * @param fileName name of the recording file

			




	
	
	
		
 
     * @param separator column separator

			




	
	
		
 
@@ -69,9 +77,12 @@ public:

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    unsigned lastNumChannels;   ///< used for error message only

			




	
	
	
		
 
    QFile file;

			




	
	
	
		
 
    QTextStream fileStream;

			




	
	
	
		
 
    QString _sep;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Returns the selected line ending.

			




	
	
	
		
 
    const char* le() const;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // DATARECORDER_H

			




        

    


    
    

    

        

                

                    src/recordpanel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -57,12 +57,20 @@ RecordPanel::RecordPanel(DataRecorder* r

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->cbDisableBuffering, &QCheckBox::toggled,

			




	
	
	
		
 
            [this](bool enabled)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                _recorder->disableBuffering = enabled;

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->cbWindowsLE, &QCheckBox::toggled,

			




	
	
	
		
 
            [this](bool enabled)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                _recorder->windowsLE = enabled;

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&recordAction, &QAction::toggled, ui->cbWindowsLE, &QWidget::setDisabled);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
RecordPanel::~RecordPanel()

			




	
	
	
		
 
{

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/recordpanel.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3,13 +3,13 @@

			




	
	
	
		
 
 <class>RecordPanel</class>

			




	
	
	
		
 
 <widget class="QWidget" name="RecordPanel">

			




	
	
	
		
 
  <property name="geometry">

			




	
	
	
		
 
   <rect>

			




	
	
	
		
 
    <x>0</x>

			




	
	
	
		
 
    <y>0</y>

			




	
	
	
		
 
    <width>532</width>

			




	
	
	
		
 
    <width>627</width>

			




	
	
	
		
 
    <height>261</height>

			




	
	
	
		
 
   </rect>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>Form</string>

			




	
	
	
		
 
  </property>

			




	
	
		
 
@@ -41,59 +41,99 @@

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
      </layout>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QCheckBox" name="cbAutoIncrement">

			




	
	
	
		
 
       <property name="toolTip">

			




	
	
	
		
 
        <string>Increments file name automatically everytime a new recording starts</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Auto increment file name</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="checked">

			




	
	
	
		
 
        <bool>true</bool>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QCheckBox" name="cbRecordPaused">

			




	
	
	
		
 
       <property name="toolTip">

			




	
	
	
		
 
        <string>Continue recording to file even when plotting is paused</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Record while paused</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="checked">

			




	
	
	
		
 
        <bool>true</bool>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QCheckBox" name="cbStopOnClose">

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Stop recording when port closed</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="checked">

			




	
	
	
		
 
        <bool>true</bool>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QCheckBox" name="cbHeader">

			




	
	
	
		
 
       <property name="toolTip">

			




	
	
	
		
 
        <string>Channel names are written to the first line of record file</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Write header line</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="checked">

			




	
	
	
		
 
        <bool>true</bool>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
      <layout class="QGridLayout" name="gridLayout">

			




	
	
	
		
 
       <item row="1" column="1">

			




	
	
	
		
 
        <widget class="QCheckBox" name="cbHeader">

			




	
	
	
		
 
         <property name="toolTip">

			




	
	
	
		
 
          <string>Channel names are written to the first line of record file</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Write header line</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="checked">

			




	
	
	
		
 
          <bool>true</bool>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item row="2" column="0">

			




	
	
	
		
 
        <widget class="QCheckBox" name="cbRecordPaused">

			




	
	
	
		
 
         <property name="toolTip">

			




	
	
	
		
 
          <string>Continue recording to file even when plotting is paused</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Record while paused</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="checked">

			




	
	
	
		
 
          <bool>true</bool>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item row="3" column="0">

			




	
	
	
		
 
        <widget class="QCheckBox" name="cbDisableBuffering">

			




	
	
	
		
 
         <property name="toolTip">

			




	
	
	
		
 
          <string>Do not buffer when writing to file. Check this if you are using other software to open the file during recording.</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Disable buffering</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item row="2" column="1">

			




	
	
	
		
 
        <widget class="QCheckBox" name="cbStopOnClose">

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Stop recording when port closed</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="checked">

			




	
	
	
		
 
          <bool>true</bool>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item row="1" column="0">

			




	
	
	
		
 
        <widget class="QCheckBox" name="cbAutoIncrement">

			




	
	
	
		
 
         <property name="toolTip">

			




	
	
	
		
 
          <string>Increments file name automatically everytime a new recording starts</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Auto increment file name</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="checked">

			




	
	
	
		
 
          <bool>true</bool>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item row="3" column="1">

			




	
	
	
		
 
        <widget class="QCheckBox" name="cbWindowsLE">

			




	
	
	
		
 
         <property name="toolTip">

			




	
	
	
		
 
          <string>Use CR+LF as line endings. Some windows software may not show lines correctly otherwise. Can't be changed during recording.</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Windows Style Line Endings</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="checked">

			




	
	
	
		
 
          <bool>false</bool>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item row="1" column="2">

			




	
	
	
		
 
        <spacer name="horizontalSpacer_2">

			




	
	
	
		
 
         <property name="orientation">

			




	
	
	
		
 
          <enum>Qt::Horizontal</enum>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="sizeHint" stdset="0">

			




	
	
	
		
 
          <size>

			




	
	
	
		
 
           <width>1</width>

			




	
	
	
		
 
           <height>20</height>

			




	
	
	
		
 
          </size>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </spacer>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
      </layout>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <layout class="QHBoxLayout" name="horizontalLayout_3">

			




	
	
	
		
 
       <item>

			




	
	
	
		
 
        <widget class="QLabel" name="label">

			




	
	
	
		
 
         <property name="text">

			




	
	
		
 
@@ -130,22 +170,12 @@

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </spacer>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
      </layout>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QCheckBox" name="cbDisableBuffering">

			




	
	
	
		
 
       <property name="toolTip">

			




	
	
	
		
 
        <string>Do not buffer when writing to file. Check this if you are using other software to open the file during recording.</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Disable buffering</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <spacer name="verticalSpacer">

			




	
	
	
		
 
       <property name="orientation">

			




	
	
	
		
 
        <enum>Qt::Vertical</enum>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="sizeHint" stdset="0">

			




	
	
	
		
 
        <size>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support