fix stuck

Signed-off-by: huangziyi <huangziyi@canaan-creative.com>
kendryte · Dec 10, 2024 · 089cd78 · 089cd78
1 parent 9e4c968
commit 089cd78
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 37 deletions.
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -7541,8 +7541,8 @@ Would you like to register your OpenMV Cam now?</source>
     </message>
     <message>
         <location line="+16"/>
-        <source>Installation Sucessful! Please restart OpenMV IDE.</source>
-        <translation>安装成功！请重新启动OpenMV IDE。</translation>
+        <source>Installation Sucessful! Please restart CanMV IDE.</source>
+        <translation>安装成功！请重新启动CanMV IDE。</translation>
     </message>
     <message>
         <location line="+10"/>

diff --git a/src/plugins/openmv/openmvplugin.cpp b/src/plugins/openmv/openmvplugin.cpp
@@ -4035,25 +4035,25 @@ void OpenMVPlugin::setPortPath(bool silent)
     {
         QStringList drives;
 
-        foreach(const QStorageInfo &info, QStorageInfo::mountedVolumes())
-        {
-            if(info.isValid()
-            && info.isReady()
-            && (!info.isRoot())
-            && (!info.isReadOnly())
-            && (QString::fromUtf8(info.fileSystemType()).contains(QStringLiteral("fat"), Qt::CaseInsensitive) || QString::fromUtf8(info.fileSystemType()).contains(QStringLiteral("msdos"), Qt::CaseInsensitive) || QString::fromUtf8(info.fileSystemType()).contains(QStringLiteral("fuseblk"), Qt::CaseInsensitive))
-            && ((!Utils::HostOsInfo::isMacHost()) || info.rootPath().startsWith(QStringLiteral("/volumes/"), Qt::CaseInsensitive))
-            && ((!Utils::HostOsInfo::isLinuxHost()) || info.rootPath().startsWith(QStringLiteral("/media/"), Qt::CaseInsensitive) || info.rootPath().startsWith(QStringLiteral("/mnt/"), Qt::CaseInsensitive) || info.rootPath().startsWith(QStringLiteral("/run/"), Qt::CaseInsensitive)))
-            {
-                if(((m_major < OPENMV_DISK_ADDED_MAJOR)
-                || ((m_major == OPENMV_DISK_ADDED_MAJOR) && (m_minor < OPENMV_DISK_ADDED_MINOR))
-                || ((m_major == OPENMV_DISK_ADDED_MAJOR) && (m_minor == OPENMV_DISK_ADDED_MINOR) && (m_patch < OPENMV_DISK_ADDED_PATCH)))
-                || QFile::exists(info.rootPath() + QStringLiteral(OPENMV_DISK_ADDED_NAME)))
-                {
-                    drives.append(info.rootPath());
-                }
-            }
-        }
+//        foreach(const QStorageInfo &info, QStorageInfo::mountedVolumes())
+//        {
+//            if(info.isValid()
+//            && info.isReady()
+//            && (!info.isRoot())
+//            && (!info.isReadOnly())
+//            && (QString::fromUtf8(info.fileSystemType()).contains(QStringLiteral("fat"), Qt::CaseInsensitive) || QString::fromUtf8(info.fileSystemType()).contains(QStringLiteral("msdos"), Qt::CaseInsensitive) || QString::fromUtf8(info.fileSystemType()).contains(QStringLiteral("fuseblk"), Qt::CaseInsensitive))
+//            && ((!Utils::HostOsInfo::isMacHost()) || info.rootPath().startsWith(QStringLiteral("/volumes/"), Qt::CaseInsensitive))
+//            && ((!Utils::HostOsInfo::isLinuxHost()) || info.rootPath().startsWith(QStringLiteral("/media/"), Qt::CaseInsensitive) || info.rootPath().startsWith(QStringLiteral("/mnt/"), Qt::CaseInsensitive) || info.rootPath().startsWith(QStringLiteral("/run/"), Qt::CaseInsensitive)))
+//            {
+//                if(((m_major < OPENMV_DISK_ADDED_MAJOR)
+//                || ((m_major == OPENMV_DISK_ADDED_MAJOR) && (m_minor < OPENMV_DISK_ADDED_MINOR))
+//                || ((m_major == OPENMV_DISK_ADDED_MAJOR) && (m_minor == OPENMV_DISK_ADDED_MINOR) && (m_patch < OPENMV_DISK_ADDED_PATCH)))
+//                || QFile::exists(info.rootPath() + QStringLiteral(OPENMV_DISK_ADDED_NAME)))
+//                {
+//                    drives.append(info.rootPath());
+//                }
+//            }
+//        }
 
         QSettings *settings = ExtensionSystem::PluginManager::settings();
         settings->beginGroup(QStringLiteral(SERIAL_PORT_SETTINGS_GROUP));

diff --git a/src/plugins/openmv/openmvplugin.h b/src/plugins/openmv/openmvplugin.h
@@ -420,10 +420,8 @@ public slots: // private
     OpenMVPluginHistogram *m_histogram;
 
     Utils::ElidingLabel *m_boardLabel;
-    Utils::ElidingLabel *m_sensorLabel;
     Utils::ElidingToolButton *m_versionButton;
     Utils::ElidingLabel *m_portLabel;
-    Utils::ElidingToolButton *m_pathButton;
     Utils::ElidingLabel  *m_fpsLabel;
 
     ///////////////////////////////////////////////////////////////////////////

diff --git a/src/plugins/openmv/openmvpluginconnect.cpp b/src/plugins/openmv/openmvpluginconnect.cpp
@@ -114,7 +114,7 @@ void OpenMVPlugin::packageUpdate()
                                 {
                                     QMessageBox::critical(Core::ICore::dialogParent(),
                                         QString(),
-                                        error + Tr::tr("\n\nPlease close any programs that are viewing/editing OpenMV IDE's application data and then restart CanMV IDE!"));
+                                        error + Tr::tr("\n\nPlease close any programs that are viewing/editing CanMV IDE's application data and then restart CanMV IDE!"));
 
                                     QApplication::quit();
                                     ok = false;
@@ -125,7 +125,7 @@ void OpenMVPlugin::packageUpdate()
                                     {
                                         QMessageBox::critical(Core::ICore::dialogParent(),
                                             QString(),
-                                            Tr::tr("Please close any programs that are viewing/editing OpenMV IDE's application data and then restart CanMV IDE!"));
+                                            Tr::tr("Please close any programs that are viewing/editing CanMV IDE's application data and then restart CanMV IDE!"));
 
                                         QApplication::quit();
                                         ok = false;
@@ -141,7 +141,7 @@ void OpenMVPlugin::packageUpdate()
 
                                     QMessageBox::information(Core::ICore::dialogParent(),
                                         QString(),
-                                        Tr::tr("Installation Sucessful! Please restart OpenMV IDE."));
+                                        Tr::tr("Installation Sucessful! Please restart CanMV IDE."));
 
                                     Core::ICore::restart();
                                 }
@@ -3229,9 +3229,9 @@ void OpenMVPlugin::connectClicked(bool forceBootloader, QString forceFirmwarePat
 
         QString boardTypeLabel = Tr::tr("Unknown");
 
-        if(((major2 > OLD_API_MAJOR)
+        /*if(((major2 > OLD_API_MAJOR)
         || ((major2 == OLD_API_MAJOR) && (minor2 > OLD_API_MINOR))
-        || ((major2 == OLD_API_MAJOR) && (minor2 == OLD_API_MINOR) && (patch2 >= OLD_API_PATCH))))
+        || ((major2 == OLD_API_MAJOR) && (minor2 == OLD_API_MINOR) && (patch2 >= OLD_API_PATCH)))) */
         {
             QString arch2 = QString();
             QString *arch2Ptr = &arch2;
@@ -3502,14 +3502,10 @@ void OpenMVPlugin::connectClicked(bool forceBootloader, QString forceFirmwarePat
 
         m_boardLabel->setEnabled(true);
         m_boardLabel->setText(Tr::tr("Board: %L1").arg(boardTypeLabel));
-        m_sensorLabel->setEnabled(true);
-        m_sensorLabel->setText(Tr::tr("Sensor: %L1").arg(m_sensorType));
         m_versionButton->setEnabled(true);
         m_versionButton->setText(Tr::tr("Firmware Version: %L1.%L2.%L3").arg(major2).arg(minor2).arg(patch2));
         m_portLabel->setEnabled(true);
         m_portLabel->setText(Tr::tr("Serial Port: %L1").arg(m_portName));
-        m_pathButton->setEnabled(true);
-        m_pathButton->setText(Tr::tr("Drive:"));
         m_fpsLabel->setEnabled(true);
         m_fpsLabel->setText(Tr::tr("FPS: 0"));
 
@@ -3763,14 +3759,10 @@ void OpenMVPlugin::disconnectClicked(bool reset)
 
             m_boardLabel->setDisabled(true);
             m_boardLabel->setText(Tr::tr("Board:"));
-            m_sensorLabel->setDisabled(true);
-            m_sensorLabel->setText(Tr::tr("Sensor:"));
             m_versionButton->setDisabled(true);
             m_versionButton->setText(Tr::tr("Firmware Version:"));
             m_portLabel->setDisabled(true);
             m_portLabel->setText(Tr::tr("Serial Port:"));
-            m_pathButton->setDisabled(true);
-            m_pathButton->setText(Tr::tr("Drive:"));
             m_fpsLabel->setDisabled(true);
             m_fpsLabel->setText(Tr::tr("FPS:"));
 
@@ -4007,6 +3999,7 @@ void OpenMVPlugin::stopClicked()
         ///////////////////////////////////////////////////////////////////////
 
         m_fpsLabel->setText(Tr::tr("FPS: 0"));
+        m_frameBuffer->rotation = 0;
 
         ///////////////////////////////////////////////////////////////////////
 

diff --git a/src/plugins/openmv/openmvpluginfb.h b/src/plugins/openmv/openmvpluginfb.h
@@ -20,6 +20,7 @@ class OpenMVPluginFB : public QGraphicsView
     bool beginImageWriter();
     void endImageWriter();
     void enableInteraction(bool enable) { m_enableInteraction = enable; }
+    qreal rotation;
 
 public slots:
 
@@ -69,7 +70,6 @@ public slots:
     QElapsedTimer m_elaspedTimer;
     QQueue<qint64> m_previousElaspedTimers;
 
-    qreal rotation;
 };
 
 } // namespace Internal