Skip to content

Commit 13f8091

Browse files
committed
Improved description of some device methods [ci skip]
1 parent 7b03bf0 commit 13f8091

1 file changed

Lines changed: 31 additions & 21 deletions

File tree

rc_genicam_api/device.h

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ class Device : public std::enable_shared_from_this<Device>
9898
/**
9999
Returns the currently available streams of this device.
100100
101-
NOTE: open() must be called before calling this method.
101+
NOTE: The device must have been opened with the open() call before
102+
calling this method.
102103
103104
@return List of streams.
104105
*/
@@ -108,8 +109,9 @@ class Device : public std::enable_shared_from_this<Device>
108109
/**
109110
Returns the vendor of the device.
110111
111-
NOTE: At least the parent object must have been opened before calling
112-
this method.
112+
NOTE: This method only returns a non empty string if the parent interface
113+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
114+
call, or if this device itself has been opened with the open() call.
113115
114116
@return Vendor.
115117
*/
@@ -119,8 +121,9 @@ class Device : public std::enable_shared_from_this<Device>
119121
/**
120122
Returns the model of the device.
121123
122-
NOTE: At least the parent object must have been opened before calling
123-
this method.
124+
NOTE: This method only returns a non empty string if the parent interface
125+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
126+
call, or if this device itself has been opened with the open() call.
124127
125128
@return Model.
126129
*/
@@ -130,8 +133,9 @@ class Device : public std::enable_shared_from_this<Device>
130133
/**
131134
Returns the transport layer type of the device.
132135
133-
NOTE: At least the parent object must have been opened before calling
134-
this method.
136+
NOTE: This method only returns a non empty string if the parent interface
137+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
138+
call, or if this device itself has been opened with the open() call.
135139
136140
@return Transport layer type.
137141
*/
@@ -141,8 +145,9 @@ class Device : public std::enable_shared_from_this<Device>
141145
/**
142146
Returns the display name of the device.
143147
144-
NOTE: At least the parent object must have been opened before calling
145-
this method.
148+
NOTE: This method only returns a non empty string if the parent interface
149+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
150+
call, or if this device itself has been opened with the open() call.
146151
147152
@return Display name.
148153
*/
@@ -152,8 +157,9 @@ class Device : public std::enable_shared_from_this<Device>
152157
/**
153158
Returns the access status of the device.
154159
155-
NOTE: At least the parent object must have been opened before calling
156-
this method.
160+
NOTE: This method only returns a non empty string if the parent interface
161+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
162+
call, or if this device itself has been opened with the open() call.
157163
158164
@return Access status.
159165
*/
@@ -163,8 +169,9 @@ class Device : public std::enable_shared_from_this<Device>
163169
/**
164170
Returns the user defined name of the device.
165171
166-
NOTE: At least the parent object must have been opened before calling
167-
this method.
172+
NOTE: This method only returns a non empty string if the parent interface
173+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
174+
call, or if this device itself has been opened with the open() call.
168175
169176
@return User defined name.
170177
*/
@@ -174,8 +181,9 @@ class Device : public std::enable_shared_from_this<Device>
174181
/**
175182
Returns the serial number of the device.
176183
177-
NOTE: At least the parent object must have been opened before calling
178-
this method.
184+
NOTE: This method only returns a non empty string if the parent interface
185+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
186+
call, or if this device itself has been opened with the open() call.
179187
180188
@return Serial number.
181189
*/
@@ -185,8 +193,9 @@ class Device : public std::enable_shared_from_this<Device>
185193
/**
186194
Returns the version of the device.
187195
188-
NOTE: At least the parent object must have been opened before calling
189-
this method.
196+
NOTE: This method only returns a non empty string if the parent interface
197+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
198+
call, or if this device itself has been opened with the open() call.
190199
191200
@return Version.
192201
*/
@@ -196,8 +205,9 @@ class Device : public std::enable_shared_from_this<Device>
196205
/**
197206
Returns the timestamp frequency of the device.
198207
199-
NOTE: At least the parent object must have been opened before calling
200-
this method.
208+
NOTE: This method only returns a non empty string if the parent interface
209+
has NOT been closed after Interface::getDevice() or Interface::getDevices()
210+
call, or if this device itself has been opened with the open() call.
201211
202212
@return Tick-frequency of the time stamp clock.
203213
*/
@@ -229,7 +239,7 @@ class Device : public std::enable_shared_from_this<Device>
229239
std::shared_ptr<GenApi::CNodeMapRef> getRemoteNodeMap(const char *xml=0);
230240

231241
/**
232-
Get internal interace handle.
242+
Get internal interface handle.
233243
234244
@return Internal handle.
235245
*/
@@ -278,4 +288,4 @@ std::shared_ptr<Device> getDevice(const char *devid);
278288

279289
}
280290

281-
#endif
291+
#endif

0 commit comments

Comments
 (0)