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
e91551c8e49211457e249c5c533affbe04c77475 to 9d4261800f139e6f98c07cdc487ab87561d5560a
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
9d4261800f139e6f98c07cdc487ab87561d5560a
Select Git revision
Branches
cali
dev
master
3 results
Swap
Target
sugu/vimba
Select target project
sugu/vimba
1 result
e91551c8e49211457e249c5c533affbe04c77475
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 (2)
find style.qss if app is called from different dir
· d59dc802
am0ebe
authored
1 year ago
d59dc802
.
· 9d426180
am0ebe
authored
1 year ago
9d426180
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
obj/moc_predefs.h
+2
-2
2 additions, 2 deletions
obj/moc_predefs.h
recorder.sublime-project
+4
-0
4 additions, 0 deletions
recorder.sublime-project
src/main.cpp
+2
-2
2 additions, 2 deletions
src/main.cpp
src/mainwindow.cpp
+1
-0
1 addition, 0 deletions
src/mainwindow.cpp
with
9 additions
and
4 deletions
obj/moc_predefs.h
View file @
9d426180
...
...
@@ -207,7 +207,7 @@
#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
#define __FLT_MANT_DIG__ 24
#define __LDBL_DECIMAL_DIG__ 21
#define __VERSION__ "11.
3
.0"
#define __VERSION__ "11.
4
.0"
#define __UINT64_C(c) c ## UL
#define __cpp_unicode_characters 201411L
#define _STDC_PREDEF_H 1
...
...
@@ -408,7 +408,7 @@
#define __DEC128_MAX_EXP__ 6145
#define __FLT32X_HAS_QUIET_NAN__ 1
#define __ATOMIC_CONSUME 1
#define __GNUC_MINOR__
3
#define __GNUC_MINOR__
4
#define __GLIBCXX_TYPE_INT_N_0 __int128
#define __INT_FAST16_WIDTH__ 64
#define __UINTMAX_MAX__ 0xffffffffffffffffUL
...
...
This diff is collapsed.
Click to expand it.
recorder.sublime-project
View file @
9d426180
...
...
@@ -12,6 +12,10 @@
"path": "../dox",
"name": "dox"
},
{
"path": "~/dox/idiv/camtron",
"name": "dox 2"
},
],
"build_systems":
[
...
...
This diff is collapsed.
Click to expand it.
src/main.cpp
View file @
9d426180
...
...
@@ -10,7 +10,7 @@ void loadStyleSheets(const QString& name, MainWindow& mw)
QFile
file
(
name
);
if
(
!
file
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
))
{
mw
.
log
(
"didn't find '"
+
name
+
"'
in "
+
QDir
::
currentPath
()
);
mw
.
log
(
"didn't find '"
+
name
+
"'
"
);
}
else
{
...
...
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
{
QApplication
a
(
argc
,
argv
);
MainWindow
w
;
loadStyleSheets
(
"
style.qss"
,
w
);
loadStyleSheets
(
QCoreApplication
::
applicationDirPath
()
+
"/
style.qss"
,
w
);
w
.
show
();
return
a
.
exec
();
...
...
This diff is collapsed.
Click to expand it.
src/mainwindow.cpp
View file @
9d426180
...
...
@@ -78,6 +78,7 @@ void MainWindow::openCloseCam()
if
(
b
->
text
()
==
"open"
)
{
auto
ret
=
curCam
->
Open
(
VmbAccessModeFull
);
// log( QString("foo"));
if
(
ret
==
VmbErrorSuccess
)
b
->
setText
(
"close"
);
log
(
QString
(
"Open camera"
),
ret
);
...
...
This diff is collapsed.
Click to expand it.