Browse Source

Update category name

Change 可回收物 to 可回收垃圾
main
HuskyRye 5 years ago
parent
commit
db4272c56a
6 changed files with 6 additions and 5 deletions
  1. BIN
      WasteSorting.jpg
  2. +1
    -1
      WasteSorting.pro.user
  3. +1
    -0
      image.qrc
  4. BIN
      image/可回收垃圾.PNG
  5. +1
    -1
      tensorflow/label_image.py
  6. +3
    -3
      widget.cpp

BIN
WasteSorting.jpg View File

Before After
Width: 1280  |  Height: 720  |  Size: 55 kB Width: 1280  |  Height: 720  |  Size: 60 kB

+ 1
- 1
WasteSorting.pro.user View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2021-03-03T18:07:55. -->
<!-- Written by QtCreator 4.11.1, 2021-03-07T17:40:02. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>


+ 1
- 0
image.qrc View File

@@ -13,5 +13,6 @@
<file>image/主.png</file>
<file>image/工训大赛_.png</file>
<file>image/工训大赛.png</file>
<file>image/可回收垃圾.PNG</file>
</qresource>
</RCC>

BIN
image/可回收垃圾.PNG View File

Before After
Width: 1280  |  Height: 720  |  Size: 104 kB

+ 1
- 1
tensorflow/label_image.py View File

@@ -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:


+ 3
- 3
widget.cpp View File

@@ -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');


Loading…
Cancel
Save