Merge branch 'main' into common-improvements2

donarturo11 · Feb 21, 2025 · 9f8e3b3 · 9f8e3b3
2 parents 61669ad + 3fba1f6
commit 9f8e3b3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -316,9 +316,9 @@ jobs:
            export ARTIFACT_DIR=${{env.WORKDIR}}/${PACKAGE_NAME}
            find "${{env.DEPSPATH}}" -name "*.dll"  -exec cp {} ${{env.APPDIR}}/ \;
            if [[ ${{matrix.aqt-os }} == 'none' ]]; then
-               windeployqt --release ${{env.APPDIR}}/ || echo "::warning::Unknown error"
+               windeployqt ${{env.APPDIR}}/ || echo "::warning::Unknown error"
            else
-               ${{matrix.aqt-prefix}}/${{matrix.qt-version}}/${{matrix.aqt-subdir}}/bin/windeployqt.exe --release ${{env.APPDIR}}/
+               ${{matrix.aqt-prefix}}/${{matrix.qt-version}}/${{matrix.aqt-subdir}}/bin/windeployqt.exe ${{env.APPDIR}}/
            fi
            if [[ ${{matrix.aqt-os }} == 'none' ]]; then
             echo "::notice:: Deploying additional libs"

diff --git a/src/GUI/GraphsWidget/TGEegWidget.cpp b/src/GUI/GraphsWidget/TGEegWidget.cpp
@@ -48,8 +48,8 @@ void TGEegWidget::initValues()
 void TGEegWidget::setupLabels()
 {
     QStringList categories;
-    categories << QString::fromUtf8("\u03b8")     /* theta      */
-               << QString::fromUtf8("\u03b4")     /* delta      */
+    categories << QString::fromUtf8("\u03b4")     /* delta      */
+               << QString::fromUtf8("\u03b8")     /* theta      */
                << QString::fromUtf8("Lo \u03b1")  /* low alpha  */
                << QString::fromUtf8("Hi \u03b1")  /* high alpha */
                << QString::fromUtf8("Lo \u03b2")  /* low beta   */

diff --git a/src/OSCSender/OSCMessage.h b/src/OSCSender/OSCMessage.h
@@ -15,20 +15,21 @@ class OSCMessage
 
 private:
     void align() {
-        int space = 4 - _data.size()%4;
-        for (int i=0; i<space; i++) {
-            _data += (unsigned char) 0x0;
-        }
+        size_t space = 4 - _data.size()%4;
+        _data.append(space, (const char) 0x0);
     }
-    void append(std::string s) {
-        _data += s;
+    void append(std::string &s) {
+        _data.append(s);
         align();
     }
     void append(uint32_t val) {
-        _data += (unsigned char) ((val >> 24) & 0xFF);
-        _data += (unsigned char) ((val >> 16) & 0xFF);
-        _data += (unsigned char) ((val >> 8) & 0xFF);
-        _data += (unsigned char) ((val) & 0xFF);
+        const char d[] = {
+            (char)((val >> 24) & 0xFF),
+            (char)((val >> 16) & 0xFF),
+            (char)((val >> 8) & 0xFF),
+            (char)((val) & 0xFF) 
+        };
+        _data.append(d, d+4);
     }
 protected:
     std::string _data;