Segments info, feedback on segments saves

Author: Xplatforms

cffflashdatablock.cpp

@@ -111,6 +111,7 @@ void CFFFlashDataBlock::readCFFData(QFile * cff, long baseAddress)
     qDbg() << "BlockLength " << this->BlockLength();
     qDbg() << "FlashData " << this->FlashData();
     qDbg() << "FileName " << this->FileName();
+    qDbg() << "LongName " << this->LongName();
 
 }
 
@@ -120,7 +121,7 @@ void CFFFlashDataBlock::updateModel(CFFFlashSegmentModel * model)
     model->addFlashSegments(this->m_FlashSegments);
 }
 
-void CFFFlashDataBlock::exportSegments(QString fpath)
+QString CFFFlashDataBlock::exportSegments(QString fpath, QString prefix)
 {
     if(fpath.startsWith(QStringLiteral("file:")))
     {
@@ -135,12 +136,14 @@ void CFFFlashDataBlock::exportSegments(QString fpath)
 
     foreach(auto segment, this->FlashSegments())
     {
-        qDbg() << "Segment: " << fpath+this->FlashDataInfo_Idk()+QLatin1String("_")+segment->SegmentName()+".segment";
-        QFile seg_file(fpath+this->FlashDataInfo_Idk()+QLatin1String("_")+segment->SegmentName()+".segment");
+        qDbg() << "Segment: " << fpath+prefix+"_"+this->FlashDataInfo_Idk()+QLatin1String("_")+segment->SegmentName()+".segment";
+        QFile seg_file(fpath+prefix+"_"+this->FlashDataInfo_Idk()+QLatin1String("_")+segment->SegmentName()+".segment");
         if(seg_file.open(QIODevice::WriteOnly))
         {
             seg_file.write(segment->readFlashSegment());
             seg_file.close();
         }
     }
+
+    return fpath;
 }

cffflashdatablock.h

@@ -44,7 +44,7 @@ class CFFFlashDataBlock : public QObject
     Q_PROPERTY(long BaseAddress READ BaseAddress WRITE setBaseAddress NOTIFY BaseAdressChanged);
 
     Q_INVOKABLE void updateModel(CFFFlashSegmentModel * model);
-    Q_INVOKABLE void exportSegments(QString fpath);
+    Q_INVOKABLE QString exportSegments(QString fpath, QString prefix = QLatin1String());
 
     QString Qualifier(){return this->m_Qualifier;}
     int32_t LongName(){return this->m_LongName;}

cffflashdescriptionheader.cpp

@@ -50,4 +50,5 @@ void CFFFlashDescriptionHeader::readCFFData(QFile * cff, long baseAddress)
     qDbg() << this->BaseAddress();
     qDbg() << this->Qualifier();
     qDbg() << this->FlashAreaName();
+    qDbg() << UniqueObjectID;
 }

cffflashheader.cpp

@@ -51,7 +51,7 @@ void CFFFlashHeader::readFlash()
 
 
     this->setFileAuthor(CFFUtils::ReadBitflagString(bitFlags, this->m_cff_file, this->m_BaseAddress));
-    this->m_FileCreationTime = CFFUtils::ReadBitflagString(bitFlags, this->m_cff_file, this->m_BaseAddress);
+    this->setFileCreationTime(CFFUtils::ReadBitflagString(bitFlags, this->m_cff_file, this->m_BaseAddress));
     this->m_AuthoringToolVersion = CFFUtils::ReadBitflagString(bitFlags, this->m_cff_file, this->m_BaseAddress);
     this->m_FTRAFOVersionString = CFFUtils::ReadBitflagString(bitFlags, this->m_cff_file, this->m_BaseAddress);
 
@@ -135,3 +135,8 @@ void CFFFlashHeader::updateModel(CFFFlashDataBlocksModel * model)
     qDbg() << "update blocks model!";
     model->addFlashDataBlocks(this->m_flash_data_blocks);
 }
+
+QString CFFFlashHeader::FileCreationTime()
+{
+    return QDateTime::fromString(this->m_FileCreationTime, Qt::ISODateWithMs).toString("dd.MM.yyyy hh:mm:ss");
+}

cffflashheader.h

@@ -21,6 +21,7 @@ class CFFFlashHeader : public QObject
 
     Q_PROPERTY(QString FlashName READ FlashName WRITE setFlashName NOTIFY FlashNameChanged);
     Q_PROPERTY(QString FileAuthor READ FileAuthor WRITE setFileAuthor NOTIFY FileAuthorChanged);
+    Q_PROPERTY(QString FileCreationTime READ FileCreationTime WRITE setFileCreationTime NOTIFY FileCreationTimeChanged);
 
     Q_PROPERTY(int32_t CTFHeaderTable READ CTFHeaderTable NOTIFY CTFHeaderTableChanged);
     Q_PROPERTY(int32_t CffHeaderSize READ CffHeaderSize NOTIFY CffHeaderSizeChanged);
@@ -37,9 +38,11 @@ class CFFFlashHeader : public QObject
     long BaseAddress(){return this->m_BaseAddress;}
     QString FlashName(){return this->m_FlashName;}
     QString FileAuthor(){return this->m_FileAuthor;}
+    QString FileCreationTime();
 
     void setFlashName(QString data){this->m_FlashName = data;}
     void setFileAuthor(QString data){this->m_FileAuthor = data;}
+    void setFileCreationTime(QString data){this->m_FileCreationTime = data;}
 
 
 private:
@@ -54,6 +57,7 @@ class CFFFlashHeader : public QObject
     void BaseAddressChanged();
     void FileAuthorChanged();
     void FlashNameChanged();
+    void FileCreationTimeChanged();
 
 private:
     QFile * m_cff_file;

cffflashsegment.cpp

@@ -74,7 +74,7 @@ QByteArray CFFFlashSegment::readFlashSegment()
     return data;
 }
 
-void CFFFlashSegment::saveToFile(QString fpath)
+QString CFFFlashSegment::saveToFile(QString fpath)
 {
     if(fpath.startsWith(QStringLiteral("file:")))
     {
@@ -90,4 +90,6 @@ void CFFFlashSegment::saveToFile(QString fpath)
         seg_file.write(this->readFlashSegment());
         seg_file.close();
     }
+
+    return fpath;
 }

cffflashsegment.h

@@ -22,7 +22,7 @@ class CFFFlashSegment : public QObject
     Q_PROPERTY(long BaseAddress READ BaseAddress WRITE setBaseAddress NOTIFY BaseAddressChanged);
 
     Q_INVOKABLE QByteArray readFlashSegment();    
-    Q_INVOKABLE void saveToFile(QString fpath);
+    Q_INVOKABLE QString saveToFile(QString fpath);
 
     QString SegmentName(){return this->m_SegmentName;}
     uint32_t FromAdress(){return this->m_FromAdress;}

qml/FlashDataBlockDelegate.qml

@@ -3,13 +3,15 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import Qt.labs.platform
 
+import xplatforms.cffflashcontainer.flashheader 1.0
 import xplatforms.cffflashcontainer.flashblock 1.0
 import xplatforms.cffflashcontainer.flashsegment 1.0
 import xplatforms.cffflashcontainer.flashsegmentmodel 1.0
 
 
 ColumnLayout
 {
+    property CFFFlashHeader header;
     property CFFFlashDataBlock block;
     property CFFFlashSegmentModel segments_model: CFFFlashSegmentModel{}
     Component.onCompleted: {
@@ -24,7 +26,7 @@ ColumnLayout
     {
         Label{
             font.bold: true
-            text: "Qualifier: "
+            text: "qualifier: "
         }
         Label{text: block.Qualifier}
         //Label{text: "test"}
@@ -46,7 +48,8 @@ ColumnLayout
         }
         Button
         {
-            //Layout.fillWidth: true
+            id: btn_export_all
+
             text: " Export all segments... "
             onClicked:
             {
@@ -80,7 +83,7 @@ ColumnLayout
         //height: 200
         model: segments_model
         //block.getSegmentsModel()//segments_model.addFlashSegments(block.FlashSegments)
-        delegate: FlashSegmentModel{idk: block.FlashDataInfo_Idk; segment: FlashSegment}
+        delegate: FlashSegmentModel{flash_name: header.FlashName; idk: block.FlashDataInfo_Idk; segment: FlashSegment}
     }
 
     FolderDialog
@@ -94,17 +97,22 @@ ColumnLayout
 
         onAccepted: {
             console.log("You chose: " + export_dialog.folder)
-            block.exportSegments(export_dialog.folder);
-            //FlashSegment.saveToFile(FlashSegment.SegmentName+"_"+idk+".segment");
-            //loadCFF(fileDialog.currentFile);
-            //Qt.quit()
+            ttip_id.show("Segments saved to: " +block.exportSegments(export_dialog.folder, header.FlashName), 2500);
         }
         onRejected: {
             console.log("Canceled")
             //Qt.quit()
         }
         //Component.onCompleted: visible = true
     }
+
+    ToolTip
+    {
+        id: ttip_id
+        //parent: parent//btn_export_all
+        anchors.centerIn: parent
+        margins: 20
+    }
 }
 
 

qml/FlashInfoScreen.qml

@@ -44,7 +44,7 @@ Page {
         {
             Label
             {
-                text: qsTr("Flash Name:")
+                text: qsTr("flash name:")
                 font: window.headerFont12
             }
             Label
@@ -73,14 +73,26 @@ Page {
         {
             Label
             {
-                text: qsTr("Flash Author:")
+                text: qsTr("author:")
                 font: window.headerFont12
 
             }
             Label
             {
                 text: flash_header.FileAuthor
             }
+
+            Label
+            {
+                Layout.leftMargin: 10
+                text: qsTr("creation date:")
+                font: window.headerFont12
+
+            }
+            Label
+            {
+                text: flash_header.FileCreationTime
+            }
         }
 
         Rectangle
@@ -107,7 +119,7 @@ Page {
                     Layout.fillWidth: true
                     //anchors.fill: parent
                     model: blocks_model
-                    delegate: FlashDataBlockDelegate{block: FlashDataBlock; width: parent.width}
+                    delegate: FlashDataBlockDelegate{header: flash_header; block: FlashDataBlock; width: parent.width}
                 }
         }
 

qml/FlashSegmentModel.qml

@@ -10,7 +10,8 @@ import xplatforms.cffflashcontainer.flashsegmentmodel 1.0
 
 ColumnLayout
 {
-    property string idk
+    property string flash_name;
+    property string idk;
     property CFFFlashSegment segment;
 
     width: parent.width
@@ -25,15 +26,15 @@ ColumnLayout
         }
         Label
         {
-            text: "FromAdress "
+            text: "Address: "
         }
         Label
         {
             text: segment.FromAdress
         }
         Label
         {
-            text: "SegmentLength "
+            text: "Length (byte): "
         }
         Label
         {
@@ -69,7 +70,7 @@ ColumnLayout
 
         onAccepted: {
             console.log("You chose: " + file_save_dialog.folder)
-            segment.saveToFile(file_save_dialog.folder+"/"+segment.SegmentName+"_"+idk+".segment");
+            ttip_id.show("Segment saved to: " +segment.saveToFile(file_save_dialog.folder+"/"+flash_name+"_"+idk+"_"+segment.SegmentName+".segment"), 2500);
             //loadCFF(fileDialog.currentFile);
             //Qt.quit()
         }
@@ -80,6 +81,14 @@ ColumnLayout
         //Component.onCompleted: visible = true
     }
 
+    ToolTip
+    {
+        id: ttip_id
+        //parent: parent//btn_export_all
+        anchors.centerIn: parent
+        margins: 20
+    }
+
 }