| Revision | 7b18c5da89e4077a5a95ddaf787dbd939ed207ac (tree) |
|---|---|
| Zeit | 2022-05-14 23:56:51 |
| Autor | MRSa <mrsa@myad...> |
| Commiter | MRSa |
検出データの表示色を少し変更。
app/src/main/java/net/osdn/gokigen/objectdetection/a01f/liaison/CameraLiaison.kt (diff) app/src/main/java/net/osdn/gokigen/objectdetection/a01f/tflite/ObjectDetectionModelReader.kt (diff)| @@ -156,7 +156,7 @@ class CameraLiaison(private val activity: AppCompatActivity, private val informa | ||
| 156 | 156 | { |
| 157 | 157 | if (!::objectDetectionModel2nd.isInitialized) |
| 158 | 158 | { |
| 159 | - objectDetectionModel2nd = ObjectDetectionModelReader(activity, id = 1, maxObject, 1.1f, 5, 2.0f, 0.5f) | |
| 159 | + objectDetectionModel2nd = ObjectDetectionModelReader(activity, id = 1, maxObject, 1.1f, 4, 2.0f, 0.5f) | |
| 160 | 160 | drawers.addAnotherDrawer(objectDetectionModel2nd) |
| 161 | 161 | } |
| 162 | 162 | if (!objectDetectionModel2nd.readObjectModel(modelUri)) |
| @@ -224,13 +224,13 @@ class ObjectDetectionModelReader(private val activity: AppCompatActivity, privat | ||
| 224 | 224 | 1 -> Color.rgb(0, 250, 0) // green |
| 225 | 225 | 2 -> Color.rgb(255, 0, 255) // magenta |
| 226 | 226 | 3 -> Color.rgb(0, 255, 255) // aqua |
| 227 | - 4 -> Color.rgb(255,165,0) // organge | |
| 228 | - 5 -> Color.rgb(127, 255, 212) // aquamarine | |
| 229 | - 6 -> Color.rgb(255, 215, 0) // gold | |
| 227 | + 4 -> Color.rgb(127, 255, 212) // aquamarine | |
| 228 | + 5 -> Color.rgb(255,165,0) // organge | |
| 229 | + 6 -> Color.rgb(0, 0, 255) // blue | |
| 230 | 230 | 7 -> Color.rgb(144, 238, 144) // lightgreen |
| 231 | 231 | 8 -> Color.rgb(138, 43, 226) // blueviolet |
| 232 | 232 | 9 -> Color.rgb(250, 128, 114) // salmon |
| 233 | - 10 -> Color.rgb(0, 0, 255) // blue | |
| 233 | + 10 -> Color.rgb(255, 215, 0) // gold | |
| 234 | 234 | else -> Color.WHITE |
| 235 | 235 | }) |
| 236 | 236 | } |
Fork