New DTX Classes

New classes for FilesDB: DTXField, DTXChapter, DTXSection and DTXSubSection
CSMathematics · Oct 10, 2024 · fbfb980 · fbfb980
1 parent c32e89e
commit fbfb980
Show file tree

Hide file tree

Showing 19 changed files with 397 additions and 237 deletions.
diff --git a/DataTex.pro.user b/DataTex.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.1, 2024-10-02T17:10:10. -->
+<!-- Written by QtCreator 14.0.1, 2024-10-09T20:02:32. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/datatex.cpp b/datatex.cpp
@@ -594,33 +594,7 @@ DataTex::DataTex(QWidget *parent)
         }
     });
 
-    // qDebug()<<dtxSettings.findTexLiveBinFolder();
-
-    // QJsonDocument newDatabaseInfo;
-    // QJsonObject basicObject;
-    // basicObject["FileName"] = "a_gymnasiou";
-    // basicObject["IsConnected"] = 1;
-    // basicObject["Name"] = "Α Γυμνασίου";
-    // basicObject["Password"];
-    // basicObject["Path"] = "/home/spyros/Μαθηματικά/Βάσεις Δεδομένων DataTeX/Α Γυμνασίου/a_gymnasiou.db";
-    // basicObject["Prefix"];
-    // basicObject["Type"] = 0;
-    // basicObject["TypeName"] = "Files database";
-    // basicObject["Username"];
-
-    // QStringList array = {"2","3"};
-    // QJsonArray metaArray;
-    // for(QString i:array){
-    //     metaArray.append(QJsonValue(i));
-    // }
-    // basicObject["Metadata"] = metaArray;
-    // newDatabaseInfo.setObject(basicObject);
-
-    // QFile file("/home/spyros/test.json");
-    // file.open(QIODevice::WriteOnly);
-    // file.write(newDatabaseInfo.toJson());
-    // file.close();
-
+    ui->OpenDatabasesGridLayout->addWidget(ui->SideBarViewOptions,0,0);
 }
 
 void DataTex::setDefaultAction(QAction* action)
@@ -663,23 +637,21 @@ void DataTex::CreateMenus_Actions()
             AreAllDBConnected();
         },"",QIcon::fromTheme("DisconnectDB"),tr("Disconnect selected database"));
     ConnectAllDatabase = CreateNewAction(FileMenu,ConnectAllDatabase,[=](){
-            for(DTXDatabase DTXDB : GlobalDatabaseList.values()){
-                if(!DTXDB.IsConnected){
-                    QTreeWidgetItem * item = ui->OpenDatabasesTreeWidget->findItems(DTXDB.BaseName,Qt::MatchExactly | Qt::MatchRecursive,2).at(0);
+        for (auto DTXDB = GlobalDatabaseList.cbegin(), end = GlobalDatabaseList.cend(); DTXDB != end; DTXDB++){
+                if(!DTXDB->IsConnected){
+                    QTreeWidgetItem * item = ui->OpenDatabasesTreeWidget->findItems(DTXDB->BaseName,Qt::MatchExactly | Qt::MatchRecursive,2).at(0);
                     SetDatabaseConnected(item);
                 }
-//                ConnectAllDatabase->setEnabled(false);
-//                DisconnectAllDatabase->setEnabled(true);
             }
         },"",QIcon::fromTheme("ConnectAllDB"),tr("Connect all databases"));
     DisconnectAllDatabase = CreateNewAction(FileMenu,DisconnectAllDatabase,[=](){
-            for(DTXDatabase DTXDB : GlobalDatabaseList.values()){
-                if(DTXDB.IsConnected){
-                    QTreeWidgetItem * item = ui->OpenDatabasesTreeWidget->findItems(DTXDB.BaseName,Qt::MatchExactly | Qt::MatchRecursive,2).at(0);
+        for (auto DTXDB = GlobalDatabaseList.cbegin(), end = GlobalDatabaseList.cend(); DTXDB != end; DTXDB++){
+            if(DTXDB->IsConnected){
+                    QTreeWidgetItem * item = ui->OpenDatabasesTreeWidget->findItems(DTXDB->BaseName,Qt::MatchExactly | Qt::MatchRecursive,2).at(0);
                     SetDatabaseDisconnected(item);
                 }
                 DisconnectAllDatabase->setEnabled(false);
-                ConnectAllDatabase->setEnabled(true);//If all are unencrypted
+                ConnectAllDatabase->setEnabled(true);//If all are not encrypted
             }
         },"",QIcon::fromTheme("DisconnectAllDB"),tr("Disconnect all databases"));
     FileMenu->addSeparator();
@@ -3997,7 +3969,7 @@ void DataTex::SetDatabaseConnected(QTreeWidgetItem * item)
         file.open(QFile::ReadWrite | QFile::Text);
         QJsonDocument doc(QJsonDocument::fromJson(file.readAll()));
         QJsonObject dbObject(doc.object());
-        dbObject["IsConnected"] = 1;
+        dbObject["IsConnected"] = true;
         file.resize(0);
         QJsonDocument newDoc(dbObject);
         file.write(newDoc.toJson());
@@ -4019,7 +3991,7 @@ void DataTex::SetDatabaseDisconnected(QTreeWidgetItem *item)
     file.open(QFile::ReadWrite | QFile::Text);
     QJsonDocument doc(QJsonDocument::fromJson(file.readAll()));
     QJsonObject dbObject(doc.object());
-    dbObject["IsConnected"] = 0;
+    dbObject["IsConnected"] = false;
     file.resize(0);
     QJsonDocument newDoc(dbObject);
     file.write(newDoc.toJson());

diff --git a/datatex.ui b/datatex.ui
@@ -1773,8 +1773,8 @@
                       <rect>
                        <x>0</x>
                        <y>0</y>
-                       <width>176</width>
-                       <height>25</height>
+                       <width>185</width>
+                       <height>28</height>
                       </rect>
                      </property>
                      <layout class="QVBoxLayout" name="verticalLayout_20">
@@ -2215,7 +2215,7 @@
              <item>
               <widget class="QStackedWidget" name="PreviewStackedWidget">
                <property name="currentIndex">
-                <number>1</number>
+                <number>0</number>
                </property>
                <widget class="QWidget" name="MetadataPage">
                 <layout class="QGridLayout" name="gridLayout_16">
@@ -2249,8 +2249,8 @@
                        <rect>
                         <x>0</x>
                         <y>0</y>
-                        <width>96</width>
-                        <height>26</height>
+                        <width>567</width>
+                        <height>611</height>
                        </rect>
                       </property>
                       <layout class="QGridLayout" name="gridLayout_3">
@@ -3362,8 +3362,8 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="SideBarButtonGroup"/>
   <buttongroup name="MenuButtons"/>
+  <buttongroup name="SideBarButtonGroup"/>
   <buttongroup name="ActionButtonGroup"/>
  </buttongroups>
 </ui>
diff --git a/datatex/clonedatabasefile.cpp b/datatex/clonedatabasefile.cpp
@@ -241,7 +241,7 @@ void CloneDatabaseFile::AddFiles(int row)
     DTXFile *FileData = new DTXFile;
     FileData->Id = Id;
 //    FileData->FileType<<SqlFunctions::Get_Record_From_Query(QString("SELECT * FROM FileTypes WHERE Name = \'%1\'").arg(FileType),SourceDatabase.Database);
-//    FileData->Field<<SqlFunctions::Get_Record_From_Query(QString("SELECT * FROM Fields WHERE Name = \'%1\'").arg(Field),SourceDatabase.Database);
+    // FileData->Field<<SqlFunctions::Get_Record_From_Query(QString("SELECT * FROM Fields WHERE Name = \'%1\'").arg(Field),SourceDatabase.Database);
     FileData->Chapters<<FileData->setRecordList(SqlFunctions::GetChapterInfo.arg(Id),SourceDatabase.Database);
     FileData->Sections<<FileData->setRecordList(SqlFunctions::GetSectionInfo.arg(Id),SourceDatabase.Database);
     FileData->SubSections<<FileData->setRecordList(SqlFunctions::GetSubsectionInfo.arg(Id),SourceDatabase.Database);
@@ -404,7 +404,7 @@ void CloneDatabaseFile::on_Okbutton_accepted()
         if(info->misc.value<int>()==NewFileMode::CloneModeContentAndMetadata){
             //Sql queries to clone metadata to destination database
             QSqlQuery WriteData(DataTex::CurrentFilesDataBase.Database);
-            WriteData.exec(QString("INSERT OR IGNORE INTO Fields (Id,Name) VALUES(\"%1\",\"%2\")").arg(info->Field[0],info->Field[1]));
+            WriteData.exec(QString("INSERT OR IGNORE INTO Fields (Id,Name) VALUES(\"%1\",\"%2\")").arg(info->Field.Id,info->Field.Name));
             for (QStringList chapter:info->Chapters) {
                 WriteData.exec(QString("INSERT OR IGNORE INTO Chapters (Id,Name,Field) VALUES(\"%1\",\"%2\",\"%3\")")
                                    .arg(chapter[0],chapter[1],chapter[2]));
@@ -556,7 +556,7 @@ void CloneDatabaseFile::on_SelectedFiles_itemClicked(QTreeWidgetItem *item, int
         ui->BibliographyBrowser->setText(info->Bibliography);
         ui->removeButton->setEnabled(true);
         ui->MetadataTable->item(0,0)->setText(info->Id);
-        ui->MetadataTable->item(1,0)->setText(info->Field[1]);
+        ui->MetadataTable->item(1,0)->setText(info->Field.Name);
         ui->MetadataTable->item(2,0)->setText(chapters.join("|"));
         ui->MetadataTable->item(3,0)->setText(sections.join("|"));
         ui->MetadataTable->item(4,0)->setText(subsections.join("|"));
@@ -582,7 +582,7 @@ void CloneDatabaseFile::disableItems(QComboBox * combo,int excludeItems,bool che
 bool CloneDatabaseFile::CheckMetadataResemblances(DTXFile * fileInfo, QSqlDatabase destinationDatabase)
 {
     DTXFile resemblenceInfo;
-    QStringList check = SqlFunctions::Get_Record_From_Query(QString("SELECT Id='%1',Name='%2' FROM Fields WHERE (Id = '%1' OR Name = '%2')").arg(fileInfo->Field[0],fileInfo->Field[1]),destinationDatabase);
+    QStringList check = SqlFunctions::Get_Record_From_Query(QString("SELECT Id='%1',Name='%2' FROM Fields WHERE (Id = '%1' OR Name = '%2')").arg(fileInfo->Field.Id,fileInfo->Field.Name),destinationDatabase);
 
     QStringList chapters;
     QStringList sections;

diff --git a/datatex/clonedatabasefile.h b/datatex/clonedatabasefile.h
@@ -18,7 +18,7 @@
 #include "style.h"
 #include "databasecreator.h"
 
-class DTXFile;
+struct DTXFile;
 enum NewFileMode {
     BasicMode,ImportMode,EditMode,CloneModeOnlyContent,CloneModeContentAndMetadata
 };

diff --git a/datatex/databasecreator.cpp b/datatex/databasecreator.cpp
@@ -405,7 +405,10 @@ void DatabaseCreator::on_DatabaseCreator_accepted()
     basicObject["Metadata"] = metaArray;
     newDatabaseInfo.setObject(basicObject);
 
-    QFile file(DataTex::datatexpath+"Databases/"+NewDatabase.BaseName+".json");
+    QString path = DataTex::datatexpath+"Databases/";
+    QDir dir(path);
+    if (!dir.exists())dir.mkpath(path);
+    QFile file(path+NewDatabase.BaseName+".json");
     file.open(QIODevice::WriteOnly);
     file.write(newDatabaseInfo.toJson());
     file.close();
@@ -503,7 +506,6 @@ void DatabaseCreator::on_DatabaseCreator_accepted()
     newdatabaseFile.close();
 
     emit newbase(NewDatabase);
-//    QDialog::accept();
 }
 
 QString DatabaseCreator::getDatabaseTypeName(int type)
@@ -528,6 +530,7 @@ QString DatabaseCreator::getDatabaseTypeName(int type)
     case DTXDatabaseType::ClassesDB:
         return tr("Classes database");
     }
+    // default
 }
 
 DTXFileType::DTXFileType(){}