diff --git a/.gitignore b/.gitignore index b3a9bae..b3c97b1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build.bat *.exe bin/logfile.txt bin/secondary_graph.grf +bin/mainlog.txt diff --git a/PrimaryFormParts/PrimaryForm.SoundEffects.cs b/PrimaryFormParts/PrimaryForm.SoundEffects.cs index f62df3a..c97d41b 100644 --- a/PrimaryFormParts/PrimaryForm.SoundEffects.cs +++ b/PrimaryFormParts/PrimaryForm.SoundEffects.cs @@ -100,7 +100,7 @@ namespace DualScreenDemo if (!pictureBoxSceneSoundEffects.Visible) { - ShowImageOnPictureBoxSceneSoundEffects(Path.Combine(Application.StartupPath, @"themes\superstar\555022.jpg")); + ShowImageOnPictureBoxSceneSoundEffects(Path.Combine(Application.StartupPath, @"themes\superstar\場景音效\場景音效.png")); SetPictureBoxSceneSoundEffectsAndButtonsVisibility(true); } else @@ -138,10 +138,10 @@ namespace DualScreenDemo mediaPlayer.URL = Path.Combine(Application.StartupPath,"sounds" ,"zs.m4a"); mediaPlayer.controls.play(); } - + // 按鈕位置需要更改,底圖需要更改 private void ShowImageOnPictureBoxSceneSoundEffects(string imagePath) { - + /* Bitmap originalImage = new Bitmap(imagePath); @@ -157,6 +157,24 @@ namespace DualScreenDemo ResizeAndPositionPictureBox(pictureBoxSceneSoundEffects, cropArea.X, cropArea.Y, cropArea.Width, cropArea.Height); pictureBoxSceneSoundEffects.Visible = true; + */ + if (File.Exists(imagePath)) + { + // 直接載入完整圖 + Bitmap image = new Bitmap(imagePath); + + // 顯示在 PictureBox 上 + pictureBoxSceneSoundEffects.Image = image; + + // 設定 PictureBox 的大小與位置(依你的需要調整) + ResizeAndPositionPictureBox(pictureBoxSceneSoundEffects, 773, 380, image.Width , image.Height); + + pictureBoxSceneSoundEffects.Visible = true; + } + else + { + Console.WriteLine("圖片檔案不存在:" + imagePath); + } } private void TogglePictureBoxSceneSoundEffectsButtonsVisibility() diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs index 66f71df..b65fdd7 100644 --- a/PrimaryFormParts/PrimaryForm.cs +++ b/PrimaryFormParts/PrimaryForm.cs @@ -1706,6 +1706,9 @@ public class MultiPagePanel : Panel } } private List currentSongList = new List(); + public List get_currentSongList(){ + return currentSongList; + } private List currentArtistList = new List(); private int _totalPages = 0; private Point mouseDownLocation; // 新增字段 @@ -1839,7 +1842,7 @@ public class MultiPagePanel : Panel public void LoadSingers(List artists) { currentArtistList = artists; - currentSongList.Clear(); + //currentSongList.Clear(); currentPageIndex = 0; totalPages = (int)Math.Ceiling(artists.Count / (double)itemsPerPage); RefreshDisplayBase_Singer(); @@ -2667,27 +2670,27 @@ public class MultiPagePanel : Panel resizedMouseDownImageForNewSongAlert = ResizeImage(mouseDownImageNewSongAlert, targetWidth, targetHeight); - normalStateImageArtistQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\3.歌星查詢_未按.jpg")); + normalStateImageArtistQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\歌星查詢_未按.jpg")); resizedNormalStateImageForArtistQuery = ResizeImage(normalStateImageArtistQuery, targetWidth, targetHeight); - mouseOverImageArtistQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\3.歌星查詢_已按.jpg")); + mouseOverImageArtistQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\歌星查詢_已按.jpg")); resizedMouseOverImageForArtistQuery = ResizeImage(mouseOverImageArtistQuery, targetWidth, targetHeight); - mouseDownImageArtistQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\3.歌星查詢_已按.jpg")); + mouseDownImageArtistQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\歌星查詢_已按.jpg")); resizedMouseDownImageForArtistQuery = ResizeImage(mouseDownImageArtistQuery, targetWidth, targetHeight); - normalStateImageSongQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\4.歌名查詢_未按.jpg")); + normalStateImageSongQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\歌名查詢_未按.jpg")); resizedNormalStateImageForSongQuery = ResizeImage(normalStateImageSongQuery, targetWidth, targetHeight); - mouseOverImageSongQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\4.歌名查詢_已按.jpg")); + mouseOverImageSongQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\歌名查詢_已按.jpg")); resizedMouseOverImageForSongQuery = ResizeImage(mouseOverImageSongQuery, targetWidth, targetHeight); - mouseDownImageSongQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\4.歌名查詢_已按.jpg")); + mouseDownImageSongQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\歌名查詢_已按.jpg")); resizedMouseDownImageForSongQuery = ResizeImage(mouseDownImageSongQuery, targetWidth, targetHeight); @@ -3042,7 +3045,7 @@ public class MultiPagePanel : Panel /// private void ShouYeButton_Click(object sender, EventArgs e) { - if(currentSongList == playedSongsHistory) + if(multiPagePanel.get_currentSongList() == playedSongsHistory) return; autoRefreshTimer.Stop(); // 停止自动刷新 /* diff --git a/bin/themes/superstar.zip b/bin/themes/superstar.zip deleted file mode 100644 index c06a97a..0000000 Binary files a/bin/themes/superstar.zip and /dev/null differ diff --git a/bin/themes/superstar/3.歌星查詢_已按.jpg b/bin/themes/superstar/3.歌星查詢_已按.jpg deleted file mode 100644 index 88a21f6..0000000 Binary files a/bin/themes/superstar/3.歌星查詢_已按.jpg and /dev/null differ diff --git a/bin/themes/superstar/3.歌星查詢_未按.jpg b/bin/themes/superstar/3.歌星查詢_未按.jpg deleted file mode 100644 index 527e6ae..0000000 Binary files a/bin/themes/superstar/3.歌星查詢_未按.jpg and /dev/null differ diff --git a/bin/themes/superstar/4.歌名查詢_已按.jpg b/bin/themes/superstar/4.歌名查詢_已按.jpg deleted file mode 100644 index 5c8dca6..0000000 Binary files a/bin/themes/superstar/4.歌名查詢_已按.jpg and /dev/null differ diff --git a/bin/themes/superstar/4.歌名查詢_未按.jpg b/bin/themes/superstar/4.歌名查詢_未按.jpg deleted file mode 100644 index 4cfdc3f..0000000 Binary files a/bin/themes/superstar/4.歌名查詢_未按.jpg and /dev/null differ diff --git a/bin/themes/superstar/555008.jpg b/bin/themes/superstar/555008.jpg deleted file mode 100644 index cf44855..0000000 Binary files a/bin/themes/superstar/555008.jpg and /dev/null differ diff --git a/bin/themes/superstar/555009.jpg b/bin/themes/superstar/555009.jpg index 35bb6af..b7da239 100644 Binary files a/bin/themes/superstar/555009.jpg and b/bin/themes/superstar/555009.jpg differ diff --git a/bin/themes/superstar/555010.jpg b/bin/themes/superstar/555010.jpg deleted file mode 100644 index 55789a6..0000000 Binary files a/bin/themes/superstar/555010.jpg and /dev/null differ diff --git a/bin/themes/superstar/555011.jpg b/bin/themes/superstar/555011.jpg deleted file mode 100644 index 2cf0319..0000000 Binary files a/bin/themes/superstar/555011.jpg and /dev/null differ diff --git a/bin/themes/superstar/555012.jpg b/bin/themes/superstar/555012.jpg deleted file mode 100644 index 4dc58be..0000000 Binary files a/bin/themes/superstar/555012.jpg and /dev/null differ diff --git a/bin/themes/superstar/555013.jpg b/bin/themes/superstar/555013.jpg deleted file mode 100644 index 631fec7..0000000 Binary files a/bin/themes/superstar/555013.jpg and /dev/null differ diff --git a/bin/themes/superstar/555014.jpg b/bin/themes/superstar/555014.jpg deleted file mode 100644 index 7bc1c4e..0000000 Binary files a/bin/themes/superstar/555014.jpg and /dev/null differ diff --git a/bin/themes/superstar/555015.jpg b/bin/themes/superstar/555015.jpg deleted file mode 100644 index b6d9d0f..0000000 Binary files a/bin/themes/superstar/555015.jpg and /dev/null differ diff --git a/bin/themes/superstar/555016.jpg b/bin/themes/superstar/555016.jpg deleted file mode 100644 index 7718f19..0000000 Binary files a/bin/themes/superstar/555016.jpg and /dev/null differ diff --git a/bin/themes/superstar/555017.jpg b/bin/themes/superstar/555017.jpg deleted file mode 100644 index 7f994db..0000000 Binary files a/bin/themes/superstar/555017.jpg and /dev/null differ diff --git a/bin/themes/superstar/555018.jpg b/bin/themes/superstar/555018.jpg deleted file mode 100644 index b5bdcf0..0000000 Binary files a/bin/themes/superstar/555018.jpg and /dev/null differ diff --git a/bin/themes/superstar/555019.jpg b/bin/themes/superstar/555019.jpg index 0e76eb7..3d06223 100644 Binary files a/bin/themes/superstar/555019.jpg and b/bin/themes/superstar/555019.jpg differ diff --git a/bin/themes/superstar/555020.jpg b/bin/themes/superstar/555020.jpg deleted file mode 100644 index a0dd336..0000000 Binary files a/bin/themes/superstar/555020.jpg and /dev/null differ diff --git a/bin/themes/superstar/555022.jpg b/bin/themes/superstar/555022.jpg index 6024a23..d67fa1c 100644 Binary files a/bin/themes/superstar/555022.jpg and b/bin/themes/superstar/555022.jpg differ diff --git a/bin/themes/superstar/555023.jpg b/bin/themes/superstar/555023.jpg deleted file mode 100644 index dc8a7e4..0000000 Binary files a/bin/themes/superstar/555023.jpg and /dev/null differ diff --git a/bin/themes/superstar/555024.jpg b/bin/themes/superstar/555024.jpg deleted file mode 100644 index d353841..0000000 Binary files a/bin/themes/superstar/555024.jpg and /dev/null differ diff --git a/bin/themes/superstar/555027.jpg b/bin/themes/superstar/555027.jpg deleted file mode 100644 index d06eb48..0000000 Binary files a/bin/themes/superstar/555027.jpg and /dev/null differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_優惠活動-11.png b/bin/themes/superstar/ICON上方/上方ICON_優惠活動-11.png index e4bb92c..06e2ca0 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_優惠活動-11.png and b/bin/themes/superstar/ICON上方/上方ICON_優惠活動-11.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_優惠活動-23.png b/bin/themes/superstar/ICON上方/上方ICON_優惠活動-23.png index 0961d35..61c4e43 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_優惠活動-23.png and b/bin/themes/superstar/ICON上方/上方ICON_優惠活動-23.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-06.png b/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-06.png index e12d477..f887e65 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-06.png and b/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-06.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-18.png b/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-18.png index e4d8b6a..c5b7e2d 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-18.png and b/bin/themes/superstar/ICON上方/上方ICON_合唱查詢-18.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-09.png b/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-09.png index 97e5668..c2556b0 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-09.png and b/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-09.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-21.png b/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-21.png index 05b2098..289689f 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-21.png and b/bin/themes/superstar/ICON上方/上方ICON_已點歌曲-21.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_我的最愛-10.png b/bin/themes/superstar/ICON上方/上方ICON_我的最愛-10.png index e906ea2..eb3f93f 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_我的最愛-10.png and b/bin/themes/superstar/ICON上方/上方ICON_我的最愛-10.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_我的最愛-22.png b/bin/themes/superstar/ICON上方/上方ICON_我的最愛-22.png index 52eb458..eab0bab 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_我的最愛-22.png and b/bin/themes/superstar/ICON上方/上方ICON_我的最愛-22.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_手機點歌.png b/bin/themes/superstar/ICON上方/上方ICON_手機點歌.png index 1412305..9671542 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_手機點歌.png and b/bin/themes/superstar/ICON上方/上方ICON_手機點歌.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_新歌快報O.png b/bin/themes/superstar/ICON上方/上方ICON_新歌快報O.png index 014ec71..d41bf03 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_新歌快報O.png and b/bin/themes/superstar/ICON上方/上方ICON_新歌快報O.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_新歌快報X.png b/bin/themes/superstar/ICON上方/上方ICON_新歌快報X.png index 56c0cc8..6b2aec7 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_新歌快報X.png and b/bin/themes/superstar/ICON上方/上方ICON_新歌快報X.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-08.png b/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-08.png index 3d66586..2b3cc76 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-08.png and b/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-08.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-20.png b/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-20.png index 0e00635..b355f36 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-20.png and b/bin/themes/superstar/ICON上方/上方ICON_服 務 鈴-20.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-04.png b/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-04.png index 47dbc2a..4e43fe1 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-04.png and b/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-04.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-16.png b/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-16.png index 2b445e1..f506dfa 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-16.png and b/bin/themes/superstar/ICON上方/上方ICON_歌名查詢-16.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-03.png b/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-03.png index 21f650f..44f42cf 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-03.png and b/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-03.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-15.png b/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-15.png index 114f4ef..a5b298c 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-15.png and b/bin/themes/superstar/ICON上方/上方ICON_歌星查詢-15.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_熱門排行-02.png b/bin/themes/superstar/ICON上方/上方ICON_熱門排行-02.png index 427001a..5b83615 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_熱門排行-02.png and b/bin/themes/superstar/ICON上方/上方ICON_熱門排行-02.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_熱門排行-14.png b/bin/themes/superstar/ICON上方/上方ICON_熱門排行-14.png index b59d827..8040a86 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_熱門排行-14.png and b/bin/themes/superstar/ICON上方/上方ICON_熱門排行-14.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_美味菜單-12.png b/bin/themes/superstar/ICON上方/上方ICON_美味菜單-12.png index 9aa8f9c..cabb549 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_美味菜單-12.png and b/bin/themes/superstar/ICON上方/上方ICON_美味菜單-12.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_美味菜單-24.png b/bin/themes/superstar/ICON上方/上方ICON_美味菜單-24.png index 2120360..8aabb3d 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_美味菜單-24.png and b/bin/themes/superstar/ICON上方/上方ICON_美味菜單-24.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_語別查詢-05.png b/bin/themes/superstar/ICON上方/上方ICON_語別查詢-05.png index 50365c0..60a0117 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_語別查詢-05.png and b/bin/themes/superstar/ICON上方/上方ICON_語別查詢-05.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_語別查詢-17.png b/bin/themes/superstar/ICON上方/上方ICON_語別查詢-17.png index c39bae3..8d7d447 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_語別查詢-17.png and b/bin/themes/superstar/ICON上方/上方ICON_語別查詢-17.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_類別查詢-07.png b/bin/themes/superstar/ICON上方/上方ICON_類別查詢-07.png index 0942835..9e878dd 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_類別查詢-07.png and b/bin/themes/superstar/ICON上方/上方ICON_類別查詢-07.png differ diff --git a/bin/themes/superstar/ICON上方/上方ICON_類別查詢-19.png b/bin/themes/superstar/ICON上方/上方ICON_類別查詢-19.png index 07dc449..73e1275 100644 Binary files a/bin/themes/superstar/ICON上方/上方ICON_類別查詢-19.png and b/bin/themes/superstar/ICON上方/上方ICON_類別查詢-19.png differ diff --git a/bin/themes/superstar/VOD_送客畫面.jpg b/bin/themes/superstar/VOD_送客畫面.jpg index 1e9789e..9495038 100644 Binary files a/bin/themes/superstar/VOD_送客畫面.jpg and b/bin/themes/superstar/VOD_送客畫面.jpg differ diff --git a/bin/themes/superstar/下方按鈕_工作區域 1.jpg b/bin/themes/superstar/下方按鈕_工作區域 1.jpg index 6364058..b7da239 100644 Binary files a/bin/themes/superstar/下方按鈕_工作區域 1.jpg and b/bin/themes/superstar/下方按鈕_工作區域 1.jpg differ diff --git a/bin/themes/superstar/主選單_已按.jpg b/bin/themes/superstar/主選單_已按.jpg index 0caff87..e12b3c3 100644 Binary files a/bin/themes/superstar/主選單_已按.jpg and b/bin/themes/superstar/主選單_已按.jpg differ diff --git a/bin/themes/superstar/主選單_未按.jpg b/bin/themes/superstar/主選單_未按.jpg index f8b508e..8a456df 100644 Binary files a/bin/themes/superstar/主選單_未按.jpg and b/bin/themes/superstar/主選單_未按.jpg differ diff --git a/bin/themes/superstar/其他介面/image.jpg b/bin/themes/superstar/其他介面/image.jpg deleted file mode 100644 index c274d5f..0000000 Binary files a/bin/themes/superstar/其他介面/image.jpg and /dev/null differ diff --git a/bin/themes/superstar/其他介面/test2.py b/bin/themes/superstar/其他介面/test2.py deleted file mode 100644 index 905954e..0000000 --- a/bin/themes/superstar/其他介面/test2.py +++ /dev/null @@ -1,80 +0,0 @@ -import cv2 -import numpy as np - -# 初始化坐标点 -roi_pts = [] -drawing = False # True if the mouse is pressed down - -# 鼠标回调函数 -def select_roi(event, x, y, flags, param): - global roi_pts, drawing - - # 当按下左键是记录起始位置坐标 - if event == cv2.EVENT_LBUTTONDOWN: - drawing = True - roi_pts = [(x, y)] - - # 当鼠标左键按下并移动是绘制图形 - elif event == cv2.EVENT_MOUSEMOVE: - if drawing == True: - temp_image = param.copy() - cv2.rectangle(temp_image, roi_pts[0], (x, y), (0, 255, 0), 2) - cv2.imshow('image', temp_image) - - # 当松开鼠标左键停止绘画 - elif event == cv2.EVENT_LBUTTONUP: - drawing = False - roi_pts.append((x, y)) - cv2.rectangle(param, roi_pts[0], (x, y), (0, 255, 0), 2) - cv2.imshow('image', param) - -# 读取图像 -image = cv2.imread('555024.jpg') -image_copy = image.copy() -cv2.namedWindow('image') -cv2.setMouseCallback('image', select_roi, image) - -# Keep looping until the 'q' key is pressed -while True: - cv2.imshow('image', image) - key = cv2.waitKey(1) & 0xFF - - # 按下'r'重置选择区域 - if key == ord('r'): - image = image_copy.copy() - roi_pts = [] - - # 按下'q'退出循环 - elif key == ord('q'): - break - -# 关闭所有打开的窗口 -cv2.destroyAllWindows() - -# 如果选择了区域,那么进行黄色检测 -if len(roi_pts) == 2: - roi = image_copy[roi_pts[0][1]:roi_pts[1][1], roi_pts[0][0]:roi_pts[1][0]] - hsv_roi = cv2.cvtColor(roi, cv2.COLOR_BGR2HSV) - lower_yellow = np.array([20, 100, 100]) - upper_yellow = np.array([30, 255, 255]) - mask = cv2.inRange(hsv_roi, lower_yellow, upper_yellow) - - # 在掩码上找出轮廓 - contours, _ = cv2.findContours(mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE) - - # 如果有轮廓则找出最大的轮廓 - if contours: - max_contour = max(contours, key=cv2.contourArea) - x, y, w, h = cv2.boundingRect(max_contour) - cv2.rectangle(roi, (x, y), (x+w, y+h), (0, 255, 0), 2) - print(f"Yellow area at X: {x}, Y: {y}, W: {w}, H: {h}") - - # 将边界框位置映射回原始图像 - x += roi_pts[0][0] - y += roi_pts[0][1] - cv2.rectangle(image_copy, (x, y), (x+w, y+h), (0, 255, 0), 2) - print(f"Yellow area at X: {x}, Y: {y}, W: {w}, H: {h}") - - cv2.imshow('Detected Yellow Area in ROI', image_copy) - cv2.waitKey(0) - cv2.destroyAllWindows() diff --git a/bin/themes/superstar/其他介面/test3.py b/bin/themes/superstar/其他介面/test3.py deleted file mode 100644 index 6d28a8b..0000000 --- a/bin/themes/superstar/其他介面/test3.py +++ /dev/null @@ -1,52 +0,0 @@ -import cv2 -import numpy as np -import os - -# 使用絕對路徑 -image_path = 'image.jpg' -# if not os.path.exists(image_path): -# print("File does not exist:", image_path) -# else: -# print("File exists, attempting to load...") -image = cv2.imread(image_path) - -if image is None: - print("But failed to load.") -else: - print("Image loaded successfully, processing...") - -# Convert to HSV color space -hsv = cv2.cvtColor(image, cv2.COLOR_BGR2HSV) - -# Define the range for yellow color in HSV -# Adjust these ranges based on your specific yellow color and lighting conditions -lower_yellow = np.array([20, 100, 100]) -upper_yellow = np.array([30, 255, 255]) -lower_pink = np.array([140, 100, 100]) -upper_pink = np.array([170, 255, 255]) -lower_purple = np.array([129, 50, 50]) # Lower bound of purple -upper_purple = np.array([158, 255, 255]) # Upper bound of purple -lower_blue = np.array([110, 50, 50]) # Lower bound of blue -upper_blue = np.array([130, 255, 255]) # Upper bound of blue -lower_blue_violet = np.array([120, 50, 50]) # Lower bound of blue-violet -upper_blue_violet = np.array([160, 255, 255]) # Upper bound of blue-violet - -# Create a mask for yellow color -mask = cv2.inRange(hsv, lower_pink, upper_pink) - -# Find contours on the mask -contours, _ = cv2.findContours(mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE) - -# Draw all contours -for contour in contours: - x, y, w, h = cv2.boundingRect(contour) - cv2.rectangle(image, (x, y), (x+w, y+h), (0, 255, 0), 2) - coordinates_text = f"X: {x}, Y: {y}, W: {w}, H: {h}" - print(coordinates_text) - # Display coordinates on the image - cv2.putText(image, coordinates_text, (x, y-10), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 0), 1) - -# Show the image with all bounding boxes drawn -cv2.imshow('Image with yellow contours', image) -cv2.waitKey(0) -cv2.destroyAllWindows() \ No newline at end of file diff --git a/bin/themes/superstar/其他介面/其他_優惠活動.jpg b/bin/themes/superstar/其他介面/其他_優惠活動.jpg deleted file mode 100644 index b83f701..0000000 Binary files a/bin/themes/superstar/其他介面/其他_優惠活動.jpg and /dev/null differ diff --git a/bin/themes/superstar/其他介面/其他_同步畫面.jpg b/bin/themes/superstar/其他介面/其他_同步畫面.jpg deleted file mode 100644 index 9891756..0000000 Binary files a/bin/themes/superstar/其他介面/其他_同步畫面.jpg and /dev/null differ diff --git a/bin/themes/superstar/其他介面/其他_場景音效.jpg b/bin/themes/superstar/其他介面/其他_場景音效.jpg deleted file mode 100644 index 71bd0b3..0000000 Binary files a/bin/themes/superstar/其他介面/其他_場景音效.jpg and /dev/null differ diff --git a/bin/themes/superstar/其他介面/其他_我的最愛.jpg b/bin/themes/superstar/其他介面/其他_我的最愛.jpg deleted file mode 100644 index c274d5f..0000000 Binary files a/bin/themes/superstar/其他介面/其他_我的最愛.jpg and /dev/null differ diff --git a/bin/themes/superstar/其他介面/其他_手機點歌.jpg b/bin/themes/superstar/其他介面/其他_手機點歌.jpg deleted file mode 100644 index a4a300c..0000000 Binary files a/bin/themes/superstar/其他介面/其他_手機點歌.jpg and /dev/null differ diff --git a/bin/themes/superstar/其他介面/其他_美味菜單.jpg b/bin/themes/superstar/其他介面/其他_美味菜單.jpg deleted file mode 100644 index 00eba46..0000000 Binary files a/bin/themes/superstar/其他介面/其他_美味菜單.jpg and /dev/null differ diff --git a/bin/themes/superstar/團體查詢_已按.jpg b/bin/themes/superstar/團體查詢_已按.jpg index a6ec998..5cdabdb 100644 Binary files a/bin/themes/superstar/團體查詢_已按.jpg and b/bin/themes/superstar/團體查詢_已按.jpg differ diff --git a/bin/themes/superstar/團體查詢_未按.jpg b/bin/themes/superstar/團體查詢_未按.jpg index 95b4334..97f05ec 100644 Binary files a/bin/themes/superstar/團體查詢_未按.jpg and b/bin/themes/superstar/團體查詢_未按.jpg differ diff --git a/bin/themes/superstar/場景音效/場景音效.png b/bin/themes/superstar/場景音效/場景音效.png new file mode 100644 index 0000000..2f994a8 Binary files /dev/null and b/bin/themes/superstar/場景音效/場景音效.png differ diff --git a/bin/themes/superstar/新歌快報_已按.jpg b/bin/themes/superstar/新歌快報_已按.jpg index 5a83dfc..d30d3dc 100644 Binary files a/bin/themes/superstar/新歌快報_已按.jpg and b/bin/themes/superstar/新歌快報_已按.jpg differ diff --git a/bin/themes/superstar/新歌快報_未按.jpg b/bin/themes/superstar/新歌快報_未按.jpg index 224b4b3..afc6419 100644 Binary files a/bin/themes/superstar/新歌快報_未按.jpg and b/bin/themes/superstar/新歌快報_未按.jpg differ diff --git a/bin/themes/superstar/歌名查詢_已按.jpg b/bin/themes/superstar/歌名查詢_已按.jpg index 7f2575c..761f4a4 100644 Binary files a/bin/themes/superstar/歌名查詢_已按.jpg and b/bin/themes/superstar/歌名查詢_已按.jpg differ diff --git a/bin/themes/superstar/歌名查詢_未按.jpg b/bin/themes/superstar/歌名查詢_未按.jpg index e3747a1..56839a8 100644 Binary files a/bin/themes/superstar/歌名查詢_未按.jpg and b/bin/themes/superstar/歌名查詢_未按.jpg differ diff --git a/bin/themes/superstar/歌星查詢_已按.jpg b/bin/themes/superstar/歌星查詢_已按.jpg index aa04cb6..82e7bab 100644 Binary files a/bin/themes/superstar/歌星查詢_已按.jpg and b/bin/themes/superstar/歌星查詢_已按.jpg differ diff --git a/bin/themes/superstar/歌星查詢_未按.jpg b/bin/themes/superstar/歌星查詢_未按.jpg index bd39017..58eb995 100644 Binary files a/bin/themes/superstar/歌星查詢_未按.jpg and b/bin/themes/superstar/歌星查詢_未按.jpg differ diff --git a/bin/themes/superstar/熱門排行_已按.jpg b/bin/themes/superstar/熱門排行_已按.jpg index c2f9f21..0fa88a7 100644 Binary files a/bin/themes/superstar/熱門排行_已按.jpg and b/bin/themes/superstar/熱門排行_已按.jpg differ diff --git a/bin/themes/superstar/熱門排行_未按.jpg b/bin/themes/superstar/熱門排行_未按.jpg index 3df54b7..055e0e1 100644 Binary files a/bin/themes/superstar/熱門排行_未按.jpg and b/bin/themes/superstar/熱門排行_未按.jpg differ diff --git a/bin/themes/superstar/燈光控制_1.jpg b/bin/themes/superstar/燈光控制_1.jpg deleted file mode 100644 index 6a0c210..0000000 Binary files a/bin/themes/superstar/燈光控制_1.jpg and /dev/null differ diff --git a/bin/themes/superstar/燈光控制_23.jpg b/bin/themes/superstar/燈光控制_23.jpg deleted file mode 100644 index a744179..0000000 Binary files a/bin/themes/superstar/燈光控制_23.jpg and /dev/null differ diff --git a/bin/themes/superstar/燈光控制_45.jpg b/bin/themes/superstar/燈光控制_45.jpg deleted file mode 100644 index 2a0c15a..0000000 Binary files a/bin/themes/superstar/燈光控制_45.jpg and /dev/null differ diff --git a/bin/themes/superstar/語別查詢_已按.jpg b/bin/themes/superstar/語別查詢_已按.jpg index 1bab852..2249528 100644 Binary files a/bin/themes/superstar/語別查詢_已按.jpg and b/bin/themes/superstar/語別查詢_已按.jpg differ diff --git a/bin/themes/superstar/語別查詢_未按.jpg b/bin/themes/superstar/語別查詢_未按.jpg index 13678d3..d5bfeaa 100644 Binary files a/bin/themes/superstar/語別查詢_未按.jpg and b/bin/themes/superstar/語別查詢_未按.jpg differ diff --git a/bin/themes/superstar/選單內介面_燈光控制.jpg b/bin/themes/superstar/選單內介面_燈光控制.jpg index 5d49bd1..8906d0e 100644 Binary files a/bin/themes/superstar/選單內介面_燈光控制.jpg and b/bin/themes/superstar/選單內介面_燈光控制.jpg differ diff --git a/bin/themes/superstar/類別查詢_已按.jpg b/bin/themes/superstar/類別查詢_已按.jpg index cafa386..e697ab3 100644 Binary files a/bin/themes/superstar/類別查詢_已按.jpg and b/bin/themes/superstar/類別查詢_已按.jpg differ diff --git a/bin/themes/superstar/類別查詢_未按.jpg b/bin/themes/superstar/類別查詢_未按.jpg index d027d54..04fa1be 100644 Binary files a/bin/themes/superstar/類別查詢_未按.jpg and b/bin/themes/superstar/類別查詢_未按.jpg differ