Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently name property max/min functions and add step/default.

Browse Source
This commit is contained in:
Peter Johnson
2016-09-16 21:00:19 -07:00
parent 9bb37d5df0
commit c606671d27
10 changed files with 100 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/cameraserver_c.h
View File

@@ -70,8 +70,10 @@ void CS_SetBooleanProperty(CS_Property property, CS_Bool value,
double CS_GetDoubleProperty(CS_Property property, CS_Status* status);
void CS_SetDoubleProperty(CS_Property property, double value,
CS_Status* status);
double CS_GetDoublePropertyMin(CS_Property property, CS_Status* status);
double CS_GetDoublePropertyMax(CS_Property property, CS_Status* status);
double CS_GetPropertyMin(CS_Property property, CS_Status* status);
double CS_GetPropertyMax(CS_Property property, CS_Status* status);
double CS_GetPropertyStep(CS_Property property, CS_Status* status);
double CS_GetPropertyDefault(CS_Property property, CS_Status* status);
char* CS_GetStringProperty(CS_Property property, CS_Status* status);
void CS_SetStringProperty(CS_Property property, const char* value,
CS_Status* status);

6
include/cameraserver_cpp.h
View File

@@ -55,8 +55,10 @@ bool GetBooleanProperty(CS_Property property, CS_Status* status);
void SetBooleanProperty(CS_Property property, bool value, CS_Status* status);
double GetDoubleProperty(CS_Property property, CS_Status* status);
void SetDoubleProperty(CS_Property property, double value, CS_Status* status);
double GetDoublePropertyMin(CS_Property property, CS_Status* status);
double GetDoublePropertyMax(CS_Property property, CS_Status* status);
double GetPropertyMin(CS_Property property, CS_Status* status);
double GetPropertyMax(CS_Property property, CS_Status* status);
double GetPropertyStep(CS_Property property, CS_Status* status);
double GetPropertyDefault(CS_Property property, CS_Status* status);
std::string GetStringProperty(CS_Property property, CS_Status* status);
llvm::StringRef GetStringProperty(CS_Property property,
llvm::SmallVectorImpl<char>& buf,

2
include/cameraserver_oo.h
View File

@@ -60,6 +60,8 @@ class VideoProperty {
void SetDouble(double value);
double GetMin() const;
double GetMax() const;
double GetStep() const;
double GetDefault() const;
// String-specific functions
std::string GetString() const;

14
include/cameraserver_oo.inl
View File

@@ -37,12 +37,22 @@ inline void VideoProperty::SetDouble(double value) {
inline double VideoProperty::GetMin() const {
m_status = 0;
return GetDoublePropertyMin(m_handle, &m_status);
return GetPropertyMin(m_handle, &m_status);
}
inline double VideoProperty::GetMax() const {
m_status = 0;
return GetDoublePropertyMax(m_handle, &m_status);
return GetPropertyMax(m_handle, &m_status);
}
inline double VideoProperty::GetStep() const {
m_status = 0;
return GetPropertyStep(m_handle, &m_status);
}
inline double VideoProperty::GetDefault() const {
m_status = 0;
return GetPropertyDefault(m_handle, &m_status);
}
inline std::string VideoProperty::GetString() const {