diff --git a/WasteSorting.jpg b/WasteSorting.jpg index 29efb86..7af8d55 100644 Binary files a/WasteSorting.jpg and b/WasteSorting.jpg differ diff --git a/WasteSorting.pro.user b/WasteSorting.pro.user index 6efded8..95d73ad 100644 --- a/WasteSorting.pro.user +++ b/WasteSorting.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/image.qrc b/image.qrc index 944c6a9..bc86b03 100644 --- a/image.qrc +++ b/image.qrc @@ -13,5 +13,6 @@ image/主.png image/工训大赛_.png image/工训大赛.png + image/可回收垃圾.PNG diff --git a/image/可回收垃圾.PNG b/image/可回收垃圾.PNG new file mode 100644 index 0000000..9b0c1d5 Binary files /dev/null and b/image/可回收垃圾.PNG differ diff --git a/tensorflow/label_image.py b/tensorflow/label_image.py index 532073f..796a21e 100644 --- a/tensorflow/label_image.py +++ b/tensorflow/label_image.py @@ -77,7 +77,7 @@ def main(): elif label in range(1, 4): print('有害垃圾') elif label in range(4, 7): - print('可回收物') + print('可回收垃圾') elif label in range(7, 10): print('厨余垃圾') else: diff --git a/widget.cpp b/widget.cpp index cc92de3..dce4d2b 100644 --- a/widget.cpp +++ b/widget.cpp @@ -7,8 +7,8 @@ * (at your option) any later version. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of  - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -337,7 +337,7 @@ void Widget::classifyFinished(QString cate_name) ui->label_4->setVisible(true); ui->label_5->setVisible(false); ui->frame->setStyleSheet("#frame {border-image: url(:/new/prefix1/image/主.png);}"); - } else if (cate_name == "可回收物") + } else if (cate_name == "可回收垃圾") serialWrite('\x01'); else if (cate_name == "厨余垃圾") serialWrite('\x02');