njohnson/XPlor
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Update file viewers.

Browse Source
This commit is contained in:
= 2025-04-04 20:36:32 -04:00
parent faeb24bb90
commit 917784b4cb
4 changed files with 102 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/fastfileviewer.cpp
View File

@ -18,7 +18,7 @@ FastFileViewer::~FastFileViewer()
void FastFileViewer::SetFastFile(std::shared_ptr<FastFile> aFastFile) { void FastFileViewer::SetFastFile(std::shared_ptr<FastFile> aFastFile) {
mFastFile.swap(aFastFile); mFastFile.swap(aFastFile);
ui->label_Title->setText(mFastFile->GetStem()); ui->label_Title->setText(mFastFile->GetStem() + ".ff");
ui->comboBox_Company->setCurrentIndex(mFastFile->GetCompany()); ui->comboBox_Company->setCurrentIndex(mFastFile->GetCompany());
ui->comboBox_FileType->setCurrentIndex(mFastFile->GetType()); ui->comboBox_FileType->setCurrentIndex(mFastFile->GetType());
ui->checkBox_Signed->setChecked(mFastFile->GetSignage() == SIGNAGE_SIGNED); ui->checkBox_Signed->setChecked(mFastFile->GetSignage() == SIGNAGE_SIGNED);

2
app/materialviewer.h
View File

@ -2,7 +2,9 @@
#define MATERIALVIEWER_H #define MATERIALVIEWER_H
#include "asset_structs.h" #include "asset_structs.h"
#include <QWidget> #include <QWidget>
#include <QScrollArea>
namespace Ui { namespace Ui {
class MaterialViewer; class MaterialViewer;

79
app/zonefileviewer.cpp
View File

@ -3,33 +3,32 @@
ZoneFileViewer::ZoneFileViewer(QWidget *parent) ZoneFileViewer::ZoneFileViewer(QWidget *parent)
: QWidget(parent) : QWidget(parent)
, ui(new Ui::ZoneFileViewer) , ui(new Ui::ZoneFileViewer) {
{
ui->setupUi(this); ui->setupUi(this);
aZoneFile = nullptr; aZoneFile = nullptr;
ui->tableWidget_RecordCounts->setColumnCount(2); ui->tableWidget_RecordCounts->setColumnCount(4);
ui->tableWidget_RecordCounts->setHorizontalHeaderLabels({ "Asset", "Count" }); ui->tableWidget_RecordCounts->setHorizontalHeaderLabels({ "Identifier", "Asset", "Count", "Icon" });
ui->tableWidget_RecordCounts->horizontalHeader()->setStretchLastSection(true); ui->tableWidget_RecordCounts->horizontalHeader()->setStretchLastSection(true);
ui->tableWidget_RecordOrder->setColumnCount(2); ui->tableWidget_RecordOrder->setColumnCount(4);
ui->tableWidget_RecordOrder->setHorizontalHeaderLabels({ "Asset", "Count" }); ui->tableWidget_RecordOrder->setHorizontalHeaderLabels({ "Identifier", "Asset", "Count", "Icon" });
ui->tableWidget_RecordOrder->horizontalHeader()->setStretchLastSection(true); ui->tableWidget_RecordOrder->horizontalHeader()->setStretchLastSection(true);
} }
ZoneFileViewer::~ZoneFileViewer() ZoneFileViewer::~ZoneFileViewer() {
{
delete ui; delete ui;
} }
void ZoneFileViewer::SetZoneFile(std::shared_ptr<ZoneFile> aZoneFile) { void ZoneFileViewer::SetZoneFile(std::shared_ptr<ZoneFile> aZoneFile) {
ui->tableWidget_RecordCounts->clear(); ui->tableWidget_RecordCounts->clearContents();
ui->tableWidget_RecordOrder->clearContents();
ui->listWidget_Tags->clear(); ui->listWidget_Tags->clear();
const QStringList tags = aZoneFile->GetTags(); const QStringList tags = aZoneFile->GetTags();
ui->listWidget_Tags->addItems(tags); ui->listWidget_Tags->addItems(tags);
ui->label_Title->setText(aZoneFile->GetStem()); ui->label_Title->setText(aZoneFile->GetStem() + ".zone");
if (tags.isEmpty()) { if (tags.isEmpty()) {
ui->groupBox_Tags->hide(); ui->groupBox_Tags->hide();
@ -38,11 +37,14 @@ void ZoneFileViewer::SetZoneFile(std::shared_ptr<ZoneFile> aZoneFile) {
} }
QString lastAsset = ""; QString lastAsset = "";
QString lastRecord = "";
QIcon assetIcon;
int consecutiveCount = 1; int consecutiveCount = 1;
int consecutiveIndex = 0; int consecutiveIndex = 0;
const QStringList records = aZoneFile->GetRecords(); const QStringList records = aZoneFile->GetRecords();
QMap<QString, int> recordCounts = QMap<QString, int>(); QMap<QString, int> recordCounts = QMap<QString, int>();
for (const QString &record : records) { for (const QString &record : records) {
lastRecord = record;
if (record == "ffffffff") { break; } if (record == "ffffffff") { break; }
if (!recordCounts.contains(record)) { if (!recordCounts.contains(record)) {
recordCounts[record] = 0; recordCounts[record] = 0;
@ -50,63 +52,76 @@ void ZoneFileViewer::SetZoneFile(std::shared_ptr<ZoneFile> aZoneFile) {
recordCounts[record]++; recordCounts[record]++;
QString assetType = aZoneFile->AssetTypeToString(record); QString assetType = aZoneFile->AssetTypeToString(record);
if (assetIcon.isNull()) {
qDebug() << "Icon is null for record: " << record;
}
if (lastAsset.isEmpty()) { if (lastAsset.isEmpty()) {
lastAsset = assetType; lastAsset = assetType;
lastRecord = record;
} else if (lastAsset == assetType) { } else if (lastAsset == assetType) {
consecutiveCount++; consecutiveCount++;
} else { } else {
ui->tableWidget_RecordOrder->setRowCount(consecutiveIndex + 1); ui->tableWidget_RecordOrder->setRowCount(consecutiveIndex + 1);
QTableWidgetItem *recordItem = new QTableWidgetItem(lastRecord.toUpper());
QTableWidgetItem *recordStrItem = new QTableWidgetItem(lastAsset); QTableWidgetItem *recordStrItem = new QTableWidgetItem(lastAsset);
QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(consecutiveCount)); QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(consecutiveCount));
QTableWidgetItem *recordIconItem = new QTableWidgetItem();
assetIcon = aZoneFile->AssetStrToIcon(lastAsset);
recordIconItem->setIcon(assetIcon);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 0, recordStrItem); ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 0, recordItem);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 1, recordCountItem); ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 1, recordStrItem);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 2, recordCountItem);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 3, recordIconItem);
consecutiveCount = 1; consecutiveCount = 1;
consecutiveIndex++; consecutiveIndex++;
lastAsset = assetType; lastAsset = assetType;
lastRecord = record;
} }
} }
ui->tableWidget_RecordOrder->setRowCount(consecutiveIndex + 1); ui->tableWidget_RecordOrder->setRowCount(consecutiveIndex + 1);
QTableWidgetItem *recordItem = new QTableWidgetItem(lastRecord.toUpper());
QTableWidgetItem *recordStrItem = new QTableWidgetItem(lastAsset); QTableWidgetItem *recordStrItem = new QTableWidgetItem(lastAsset);
QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(consecutiveCount)); QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(consecutiveCount));
QTableWidgetItem *recordIconItem = new QTableWidgetItem();
assetIcon = aZoneFile->AssetStrToIcon(lastAsset);
recordIconItem->setIcon(assetIcon);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 0, recordStrItem); ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 0, recordItem);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 1, recordCountItem); ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 1, recordStrItem);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 2, recordCountItem);
ui->tableWidget_RecordOrder->setItem(consecutiveIndex, 3, recordIconItem);
int recordIndex = 0; int recordIndex = 0;
for (const QString &record : recordCounts.keys()) { for (const QString &record : recordCounts.keys()) {
int recordCount = recordCounts[record]; int recordCount = recordCounts[record];
QString assetType = aZoneFile->AssetTypeToString(record); QString assetType = aZoneFile->AssetTypeToString(record);
assetIcon = aZoneFile->AssetStrToIcon(assetType);
if (assetIcon.isNull()) {
qDebug() << "Icon is null for record: " << record;
}
ui->tableWidget_RecordCounts->setRowCount(recordIndex + 1); ui->tableWidget_RecordCounts->setRowCount(recordIndex + 1);
QTableWidgetItem *recordCountStrItem = new QTableWidgetItem(assetType); QTableWidgetItem *recordCountStrItem = new QTableWidgetItem(assetType);
QTableWidgetItem *recordItem = new QTableWidgetItem(record.toUpper());
QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(recordCount)); QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(recordCount));
QTableWidgetItem *recordIconItem = new QTableWidgetItem();
recordIconItem->setIcon(assetIcon);
ui->tableWidget_RecordCounts->setItem(recordIndex, 0, recordCountStrItem); ui->tableWidget_RecordCounts->setItem(recordIndex, 0, recordItem);
ui->tableWidget_RecordCounts->setItem(recordIndex, 1, recordCountItem); ui->tableWidget_RecordCounts->setItem(recordIndex, 1, recordCountStrItem);
ui->tableWidget_RecordCounts->setItem(recordIndex, 2, recordCountItem);
ui->tableWidget_RecordCounts->setItem(recordIndex, 3, recordIconItem);
recordIndex++; recordIndex++;
} }
auto assetMap = aZoneFile->GetAssetMap(); ui->tableWidget_RecordOrder->resizeColumnsToContents();
for (LocalString localString : assetMap.localStrings) { ui->tableWidget_RecordCounts->resizeColumnsToContents();
}
for (RawFile rawFile : assetMap.rawFiles) {
}
for (TechSet techSet : assetMap.techSets) {
}
for (Image image : assetMap.images) {
}
for (Animation animation : assetMap.animations) {
}
for (StringTable stringTable : assetMap.stringTables) {
}
for (MenuFile menuFile : assetMap.menuFiles) {
}
} }

45
app/zonefileviewer.ui
View File

@ -6,16 +6,10 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>942</width> <width>556</width>
<height>445</height> <height>428</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>942</width>
<height>445</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
@ -34,18 +28,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QGroupBox" name="groupBox_Tags"> <widget class="QGroupBox" name="groupBox_Tags">
<property name="minimumSize">
<size>
<width>225</width>
<height>0</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<family>Roboto</family> <family>Roboto</family>
@ -82,12 +68,6 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_RecordCounts"> <widget class="QGroupBox" name="groupBox_RecordCounts">
<property name="minimumSize">
<size>
<width>179</width>
<height>0</height>
</size>
</property>
<property name="title"> <property name="title">
<string>Record Counts</string> <string>Record Counts</string>
</property> </property>
@ -100,12 +80,6 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_RecordOrder"> <widget class="QGroupBox" name="groupBox_RecordOrder">
<property name="minimumSize">
<size>
<width>179</width>
<height>0</height>
</size>
</property>
<property name="title"> <property name="title">
<string>Record Order</string> <string>Record Order</string>
</property> </property>
@ -118,21 +92,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>