Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vimba
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
kr69sugu
vimba
Compare revisions
ae17fc6dacf86b63b3f2ef65f819145c0fc3b94c to d161e4bae3857a41575afde56eba8c3ef5cac194
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
sugu/vimba
Select target project
No results found
d161e4bae3857a41575afde56eba8c3ef5cac194
Select Git revision
Branches
cali
dev
master
3 results
Swap
Target
sugu/vimba
Select target project
sugu/vimba
1 result
ae17fc6dacf86b63b3f2ef65f819145c0fc3b94c
Select Git revision
Branches
cali
dev
master
3 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (1)
.
· d161e4ba
am0ebe
authored
11 months ago
d161e4ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cam.cpp
+3
-3
3 additions, 3 deletions
src/cam.cpp
src/cmd/console.cpp
+1
-1
1 addition, 1 deletion
src/cmd/console.cpp
with
4 additions
and
4 deletions
src/cam.cpp
View file @
d161e4ba
...
...
@@ -193,7 +193,6 @@ QString Cam::camInfo()
{
QString
camInfo
=
_name
+
DELIM
+
_ip
+
DELIM
;
camInfo
+=
"recDur:"
+
formatTime
(
_rec
->
dur
().
count
()
*
1000
)
+
DELIM
;
//XXX mv down
if
(
state
()
==
Cam
::
disconnected
)
return
camInfo
+
"disconnected"
;
...
...
@@ -217,8 +216,9 @@ QString Cam::camInfo()
camInfo
+=
stateToString
(
_state
);
if
(
_state
==
recording
)
_rec
->
showProgress
();
//else dur
_rec
->
showProgress
();
//xxx string to add to camInfo
else
camInfo
+=
"recdur:"
+
formatTime
(
_rec
->
dur
().
count
()
*
1000
)
+
DELIM
;
}
catch
(
const
std
::
exception
&
e
)
...
...
This diff is collapsed.
Click to expand it.
src/cmd/console.cpp
View file @
d161e4ba
...
...
@@ -113,7 +113,7 @@ void Console::printHelp()
<<
"i: show info"
<<
"l: list available cameras"
<<
"k: deteKt cameras"
<<
"y: load cam settings
("
+
utils
::
settingsFile
()
+
")
"
<<
"y: load cam settings"
<<
"u: save cam settings"
<<
"v: print versions"
<<
"q: quit"
...
...
This diff is collapsed.
Click to expand it.