Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
dcdb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
dcdb
dcdb
Commits
38bfdf30
Commit
38bfdf30
authored
Mar 12, 2019
by
Alessio Netti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor warning fixes
- Fixing a few warnings here and there in the tools subdirectory
parent
787db53b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
tools/dcdbconfig/useraction.h
tools/dcdbconfig/useraction.h
+1
-0
tools/dcdbcsvimport/dcdbcsvimport.cpp
tools/dcdbcsvimport/dcdbcsvimport.cpp
+1
-1
tools/dcdbquery/query.cpp
tools/dcdbquery/query.cpp
+6
-2
No files found.
tools/dcdbconfig/useraction.h
View file @
38bfdf30
...
...
@@ -33,6 +33,7 @@
class
UserAction
{
public:
virtual
~
UserAction
()
{}
virtual
void
printHelp
(
int
argc
,
char
*
argv
[])
=
0
;
virtual
int
executeCommand
(
int
argc
,
char
*
argv
[],
int
argvidx
,
const
char
*
hostname
)
=
0
;
};
...
...
tools/dcdbcsvimport/dcdbcsvimport.cpp
View file @
38bfdf30
...
...
@@ -213,7 +213,7 @@ int main(int argc, char** argv)
for (it = sensors.begin(); it != sensors.end(); it++) {
std::cout << it->name << " " << it->topic << " " << it->publicName << std::endl;
sensorConfig.publishSensor(it->publicName.c_str(), it->topic.c_str());
}
}
*/
/* Disconnect */
delete
connection
;
...
...
tools/dcdbquery/query.cpp
View file @
38bfdf30
...
...
@@ -95,6 +95,8 @@ void DCDBQuery::genOutput(std::list<DCDB::SensorDataStoreReading> &results, quer
case
DCDB_OP_INTEGRAL
:
std
::
cout
<<
",Integral"
;
break
;
default:
break
;
}
if
(
it
->
second
.
unit
!=
DCDB
::
Unit_None
)
{
std
::
cout
<<
" ("
<<
DCDB
::
UnitConv
::
toString
(
it
->
second
.
unit
)
<<
")"
;
...
...
@@ -161,6 +163,8 @@ void DCDBQuery::genOutput(std::list<DCDB::SensorDataStoreReading> &results, quer
std
::
cout
<<
","
;
}
break
;}
default:
break
;
}
}
else
{
std
::
cout
<<
","
;
...
...
@@ -192,8 +196,8 @@ void DCDBQuery::doQuery(const char* hostname, std::list<std::string> sensors, DC
std
::
string
sensorName
;
std
::
string
functName
;
std
::
string
modifierStr
;
double
scalingFactor
=
1.0
;
DCDB
::
Unit
unit
=
DCDB
::
Unit_None
;
//
double scalingFactor = 1.0;
//
DCDB::Unit unit = DCDB::Unit_None;
/* Retrieve sensor object first */
std
::
string
str
=
*
it
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment