Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 2 additions & 45 deletions deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@

// 项目自身文件
#include "HWGenerator.h"
#include "EDIDParser.h"

Check warning on line 7 in deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

Include file: "EDIDParser.h" not found.
#include "commonfunction.h"

Check warning on line 8 in deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

Include file: "commonfunction.h" not found.
#include "DDLog.h"

Check warning on line 9 in deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

Include file: "DDLog.h" not found.
#include "commontools.h"

Check warning on line 10 in deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

Include file: "commontools.h" not found.

// Qt库文件
#include <QLoggingCategory>

Check warning on line 13 in deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp

View workflow job for this annotation

GitHub Actions / cppcheck

Include file: <QLoggingCategory> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QProcess>
#include <QFile>
#include <QDir>
Expand Down Expand Up @@ -412,50 +413,6 @@
}
}

static void parseEDID(QStringList allEDIDS,QString input)
{
for (auto edid:allEDIDS) {
QProcess process;
process.start(QString("hexdump %1").arg(edid));
process.waitForFinished(-1);

QString deviceInfo = process.readAllStandardOutput();
if (deviceInfo.isEmpty())
continue;

QString edidStr;
QStringList lines = deviceInfo.split("\n");
for (auto line:lines) {
QStringList words = line.trimmed().split(" ");
if (words.size() != 9)
continue;

words.removeAt(0);
QString l = words.join("");
l.append("\n");
edidStr.append(l);
}

lines = edidStr.split("\n");
if (lines.size() > 3){
EDIDParser edidParser;
QString errorMsg;
edidParser.setEdid(edidStr,errorMsg,"\n", false);

QMap<QString, QString> mapInfo;
mapInfo.insert("Vendor",edidParser.vendor());
mapInfo.insert("Model",edidParser.model());
//mapInfo.insert("Date",edidParser.releaseDate());
mapInfo.insert("Size",edidParser.screenSize());
mapInfo.insert("Display Input",input);

DeviceMonitor *device = new DeviceMonitor();
device->setInfoFromEdid(mapInfo);
DeviceManager::instance()->addMonitor(device);
}
}
}

void HWGenerator::generatorMonitorDevice()
{
QString toDir = "/sys/class/drm";
Expand All @@ -473,7 +430,7 @@
QStringList allEDIDS_all;
allEDIDS_all.append(fileInfo.filePath() + "/" + "edid");
QString interface = fileInfo.fileName().remove("card0-").remove("card1-").remove("card2-");
parseEDID(allEDIDS_all,interface);
CommonTools::parseEDID(allEDIDS_all,interface);
}
}
}
Expand Down