ledok 2.0

LedOK/main.cpp

@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
     QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 #endif
     QApplication::setOrganizationName("Sysolution");
-    QApplication::setOrganizationDomain("www.ledok.cn");
+    QApplication::setOrganizationDomain("ledok.cn");
     QApplication::setApplicationName("LedOK Express");
     QApplication::setStyle("Fusion");
     QApplication a(argc, argv);

LedOK/mainwindow.cpp

@@ -66,17 +66,7 @@ MainWindow::MainWindow(QWidget *parent) : BaseWin(parent) {
     });
 
     QSettings settings;
-    auto MainGeo = settings.value("MainGeo");
-    if(! MainGeo.isValid()) {
-        QSettings old("Shanghai Xixun Electronic Technology Co., Ltd.", "LedOK Express");
-        MainGeo = old.value("MainGeo");
-        if(MainGeo.isValid()) {
-            auto keys = old.allKeys();
-            for(auto &key : keys) settings.setValue(key, old.value(key));
-            old.remove("");
-        }
-    }
-    QString langName = settings.value("Language").toString();
+    auto langName = settings.value("Language").toString();
     QAction *actLan = 0;
 #ifdef leyide
     auto actTW = new QAction("中文繁体");
@@ -180,7 +170,7 @@ MainWindow::MainWindow(QWidget *parent) : BaseWin(parent) {
     emit menuLang->triggered(actLan);
     QCoreApplication::installTranslator(&translator);
 
-    auto geo = MainGeo.toRect();
+    auto geo = settings.value("MainGeo").toRect();
     if(geo.width()>=800 && geo.height()>=500 && geo.x()>=-600 && geo.x()<=1280 && geo.y()>=-200 && geo.y()<=800) setGeometry(geo);
     else resize(1280, 800);
     if(settings.value("MainIsMax", false).toBool()) setWindowState(Qt::WindowMaximized);

LedOK/program/ebase.cpp

@@ -53,7 +53,7 @@ void EBase::setBaseAttr(const JObj &json) {
     mEntryDur = json["entryDur"].toInt();
     mExitDur = json["exitDur"].toInt();
     _rotate = json["rotate"].toInt();
-    _blinkFreq = json["blinkFreq"].toDouble(1.0);
+    _blink = json["blink"].toDouble(1.0);
     _hasBlink = json["hasBlink"].toBool();
     auto geometry = json["geometry"];
     setPos(geometry["x"].toInt(), geometry["y"].toInt());
@@ -87,7 +87,7 @@ void EBase::addBaseAttr(JObj &obj) const {
     obj.insert("entryDur", mEntryDur);
     obj.insert("exitDur", mExitDur);
     obj["rotate"] = _rotate;
-    obj["blinkFreq"] = _blinkFreq;
+    obj["blink"] = _blink;
     obj["hasBlink"] = _hasBlink;
     if(bdImgIdx>-1) {
         obj["border"] = borderImgs[bdImgIdx].name;
@@ -914,9 +914,9 @@ void EBase::addBaseAttrWgt(QBoxLayout *vBox) {
         auto fdBlinkFreq = new QDoubleSpinBox;
         fdBlinkFreq->setDecimals(1);
         fdBlinkFreq->setSingleStep(0.1);
-        fdBlinkFreq->setValue(_blinkFreq);
+        fdBlinkFreq->setValue(_blink);
         connect(fdBlinkFreq, (void(QDoubleSpinBox::*)(double))&QDoubleSpinBox::valueChanged, this, [=](double value) {
-            _blinkFreq = value;
+            _blink = value;
         });
         grid->addWidget(fdBlinkFreq, 2, ccc++);
         grid->addLabel("Hz", 2, ccc++);

LedOK/program/ebase.h

@@ -52,7 +52,7 @@ public:
     int mStartTime = 0, mDuration = 10;
     QString mEntryEffect, mExitEffect;
     int mEntryDur = 1, mExitDur = 1;
-    double _blinkFreq = 1.0;
+    double _blink = 1.0;
     bool _hasBlink = 0;
 signals:
     void sizeChanged();

LedOK/program/evideo.cpp

@@ -242,12 +242,12 @@ QString EVideo::transcoding(QWidget *parent, QString rawFile, QString rawName, Q
     // }
     QSettings settings;
     int rawMax = qMax(w, h);
-    if(settings.value("VideoCompress", true).toBool() && rawMax > 1360 && (w > gProgItem->mWidth || h > gProgItem->mHeight)) {
+    if(settings.value("VideoCompress").toBool() && rawMax > 1360 && (w > gProgItem->mWidth || h > gProgItem->mHeight)) {
         auto rate = 1280.0 / rawMax;
         w *= rate;
         h *= rate;
         qDebug()<<"Compressed Size"<<w<<h;
-    } else if(! settings.value("VideoTranscoding", true).toBool() || codec_id == AV_CODEC_ID_H264) {
+    } else if(! settings.value("VideoTranscoding").toBool() || codec_id == AV_CODEC_ID_H264) {
         auto outFile = dir+"/"+rawName;
         QFile::copy(rawFile, outFile);
         return outFile;

LedOK/program/gentmpthread.cpp

@@ -137,7 +137,19 @@ JObj GenTmpThread::cvtPage(const JObj &pageJson) {
     for(const auto &ele : elements) {
         auto type = ele["elementType"].toString();
         auto geometry = ele["geometry"];
-        sources = type=="Window" ? genSources(QString(), ele["elements"].toArray(), geometry) : genSources(type, JArray{ele}, geometry);
+        bool isWin = type=="Window";
+        sources = isWin ? genSources(QString(), ele["elements"].toArray()) : genSources(type, JArray{ele});
+        auto startTime = isWin ? 0 : ele["startTime"].toInt();
+        for(auto &ss : sources) {
+            auto source = ss.toObj();
+            source["left"] = geometry["x"];
+            source["top"] = geometry["y"];
+            source["width"] = geometry["w"];
+            source["height"] = geometry["h"];
+            source["rotate"] = ele["rotate"];
+            source["playTime"] = startTime;
+            startTime += source["timeSpan"].toInt();
+        }
         if(! sources.empty()) {
             JObj layer{{"repeat", sourceRepeat}, {"sources", sources}};
             auto border = ele["border"].toString();
@@ -203,7 +215,7 @@ JObj GenTmpThread::cvtPage(const JObj &pageJson) {
     };
 }
 
-JArray GenTmpThread::genSources(QString type, const JArray &eles, const JValue &geometry) {
+JArray GenTmpThread::genSources(QString type, const JArray &eles) {
     JArray sources;
     auto needType = type.isEmpty();
     for(const auto &ele : eles) {
@@ -222,23 +234,12 @@ JArray GenTmpThread::genSources(QString type, const JArray &eles, const JValue &
             if(source["timeSpan"].isNull()) source["timeSpan"] = ele["duration"];
             source["entryEffect"] = ele["entryEffect"];
             source["exitEffect"] = ele["exitEffect"];
-            if(source["entryEffect"].toStr().isEmpty()) source["entryEffect"] = "None"; //兼容旧播放器
-            if(source["exitEffect"].toStr().isEmpty()) source["exitEffect"] = "None"; //兼容旧播放器
             source["entryEffectTimeSpan"] = ele["entryDur"];
             source["exitEffectTimeSpan"] = ele["exitDur"];
+            if(ele["hasBlink"].toBool()) source["blink"] = ele["blink"];
             sources.append(source);
         }
     }
-    auto startTime = needType ? 0 : eles[0]["startTime"].toInt();
-    for(auto &ss : sources) {
-        auto source = ss.toObj();
-        source["left"] = geometry["x"];
-        source["top"] = geometry["y"];
-        source["width"] = geometry["w"];
-        source["height"] = geometry["h"];
-        source["playTime"] = startTime;
-        startTime += source["timeSpan"].toInt();
-    }
     return sources;
 }
 

LedOK/program/gentmpthread.h

@@ -15,7 +15,7 @@ protected:
     virtual void run() override;
 
     JObj cvtPage(const JObj &);
-    JArray genSources(QString type, const JArray &eles, const JValue &);
+    JArray genSources(QString type, const JArray &eles);
     JObj genText(const JValue &json, JArray &);
     JObj genImage(const JValue &json);
     JObj convertGif(const JValue &json);