Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

CvSource: Update interface functions.

Browse Source 
- Add SetDescription
- Supply minimum, maximum, step, defaultValue, and value to CreateProperty
- Add SetEnumPropertyChoices
This commit is contained in:
Peter Johnson
2016-10-23 08:43:06 -07:00
parent 1f6b386325
commit 9142cbb820
9 changed files with 182 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
java/lib/CameraServerJNI.cpp
View File

@@ -563,20 +563,58 @@ JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setSourceConnec
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: createSourceProperty
* Signature: (ILjava/lang/String;I)I
* Method: setSourceDescription
* Signature: (ILjava/lang/String;)V
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_createSourceProperty
(JNIEnv *env, jclass, jint source, jstring name, jint type)
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setSourceDescription
(JNIEnv *env, jclass, jint source, jstring description)
{
CS_Status status = 0;
auto val =
cs::CreateSourceProperty(source, JStringRef{env, name},
static_cast<CS_PropertyType>(type), &status);
cs::SetSourceDescription(source, JStringRef{env, description}, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: createSourceProperty
* Signature: (ILjava/lang/String;IIIIII)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_createSourceProperty
(JNIEnv *env, jclass, jint source, jstring name, jint type, jint minimum, jint maximum, jint step, jint defaultValue, jint value)
{
CS_Status status = 0;
auto val = cs::CreateSourceProperty(
source, JStringRef{env, name}, static_cast<CS_PropertyType>(type),
minimum, maximum, step, defaultValue, value, &status);
CheckStatus(env, status);
return val;
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: setSourceEnumPropertyChoices
* Signature: (II[Ljava/lang/String;)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setSourceEnumPropertyChoices
(JNIEnv *env, jclass, jint source, jint property, jobjectArray choices)
{
size_t len = env->GetArrayLength(choices);
llvm::SmallVector<std::string, 8> vec;
vec.reserve(len);
for (size_t i = 0; i < len; ++i) {
JLocal<jstring> elem{
env, static_cast<jstring>(env->GetObjectArrayElement(choices, i))};
if (!elem) {
// TODO
return;
}
vec.push_back(JStringRef{env, elem}.str());
}
CS_Status status = 0;
cs::SetSourceEnumPropertyChoices(source, property, vec, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: removeSourceProperty