diff --git a/runner17/Enchanter.exe b/runner17/Enchanter.exe index 5ad0517..59a6e62 100644 Binary files a/runner17/Enchanter.exe and b/runner17/Enchanter.exe differ diff --git a/runner17/Enchanterd.exe b/runner17/Enchanterd.exe index c91b81e..54cfd4a 100644 Binary files a/runner17/Enchanterd.exe and b/runner17/Enchanterd.exe differ diff --git a/runner17/Hubwheel.exe b/runner17/Hubwheel.exe new file mode 100644 index 0000000..a7c185b Binary files /dev/null and b/runner17/Hubwheel.exe differ diff --git a/runner17/Hubwheeld.exe b/runner17/Hubwheeld.exe new file mode 100644 index 0000000..e3e96b6 Binary files /dev/null and b/runner17/Hubwheeld.exe differ diff --git a/runner17/QUserInfo.dll b/runner17/QUserInfo.dll index fa02146..06c35d0 100644 Binary files a/runner17/QUserInfo.dll and b/runner17/QUserInfo.dll differ diff --git a/runner17/QUserInfod.dll b/runner17/QUserInfod.dll index f2529cd..927654e 100644 Binary files a/runner17/QUserInfod.dll and b/runner17/QUserInfod.dll differ diff --git a/runner17/lpCoreCtrl.dll b/runner17/lpCoreCtrl.dll index 7ac97e3..17abf53 100644 Binary files a/runner17/lpCoreCtrl.dll and b/runner17/lpCoreCtrl.dll differ diff --git a/runner17/lpCoreCtrld.dll b/runner17/lpCoreCtrld.dll index debe303..0ac15c6 100644 Binary files a/runner17/lpCoreCtrld.dll and b/runner17/lpCoreCtrld.dll differ diff --git a/runner17/tpShell.exe b/runner17/tpShell.exe new file mode 100644 index 0000000..5ad0517 Binary files /dev/null and b/runner17/tpShell.exe differ diff --git a/src/tpMain/Resource/hubwheel.ico b/src/tpMain/Resource/hubwheel.ico new file mode 100644 index 0000000..90c3a44 Binary files /dev/null and b/src/tpMain/Resource/hubwheel.ico differ diff --git a/src/tpMain/Resource/molun.ico b/src/tpMain/Resource/molun.ico new file mode 100644 index 0000000..8c86d16 Binary files /dev/null and b/src/tpMain/Resource/molun.ico differ diff --git a/tpvs17/QUserInfo/QUserInfo.vcxproj b/tpvs17/QUserInfo/QUserInfo.vcxproj index 5f969ef..6b47643 100644 --- a/tpvs17/QUserInfo/QUserInfo.vcxproj +++ b/tpvs17/QUserInfo/QUserInfo.vcxproj @@ -262,7 +262,7 @@ Windows - $(SolutionDir)..\runner13\$(TargetName)$(TargetExt) + $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) $(QTDIR)\lib;%(AdditionalLibraryDirectories) false qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Sql.lib;Qt5Widgets.lib;%(AdditionalDependencies) diff --git a/tpvs17/tpMain/QCamSettingDlg.cpp b/tpvs17/tpMain/QCamSettingDlg.cpp index ad473c0..b7a0ae4 100644 --- a/tpvs17/tpMain/QCamSettingDlg.cpp +++ b/tpvs17/tpMain/QCamSettingDlg.cpp @@ -124,6 +124,7 @@ Q_SLOT void QCamSettingDlg::onButtonClicked() if (m_pCoreCtl) { emTpColorFormat colorf = index == 0 ? TP_COLOR_Y800 : TP_COLOR_RGB32; + m_pCoreCtl->ISetHeight(m_curCamKey, h); m_pCoreCtl->ISetWidth(m_curCamKey, w); //m_pCoreCtl->ISetPixelFormat(); diff --git a/tpvs17/tpMain/QCamSettingDlg.ui b/tpvs17/tpMain/QCamSettingDlg.ui index d70efc7..5569d50 100644 --- a/tpvs17/tpMain/QCamSettingDlg.ui +++ b/tpvs17/tpMain/QCamSettingDlg.ui @@ -189,7 +189,7 @@ - ... + set @@ -248,7 +248,7 @@ - ... + set @@ -315,7 +315,7 @@ - ... + set