Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
fbc0a781
Commit
fbc0a781
authored
Nov 11, 2019
by
Claes Sjofors
Committed by
Claes Sjöfors
Mar 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pwrwb build fix for Qt and some doc fixes
parent
c7a336ef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
wb/exp/pwrwb/src/pwrwbmodule.cpp
wb/exp/pwrwb/src/pwrwbmodule.cpp
+6
-6
wb/exp/pwrwb/src/setup_pwrwb.py
wb/exp/pwrwb/src/setup_pwrwb.py
+3
-1
No files found.
wb/exp/pwrwb/src/pwrwbmodule.cpp
View file @
fbc0a781
...
@@ -85,7 +85,7 @@ while (v):\n\
...
@@ -85,7 +85,7 @@ while (v):\n\
"
);
"
);
PyDoc_STRVAR
(
vid_root_doc
,
"\
PyDoc_STRVAR
(
vid_root_doc
,
"\
child
()
\n
--
\n\n
\
root
()
\n
--
\n\n
\
Get first root object of the volume.
\n\n
\
Get first root object of the volume.
\n\n
\
Returns
\n
\
Returns
\n
\
-------
\n
\
-------
\n
\
...
@@ -100,7 +100,7 @@ while o:\n\
...
@@ -100,7 +100,7 @@ while o:\n\
"
);
"
);
PyDoc_STRVAR
(
vid_roots_doc
,
"\
PyDoc_STRVAR
(
vid_roots_doc
,
"\
children
()
\n
--
\n\n
\
roots
()
\n
--
\n\n
\
Get all root objects of the volume.
\n\n
\
Get all root objects of the volume.
\n\n
\
Returns
\n
\
Returns
\n
\
-------
\n
\
-------
\n
\
...
@@ -651,7 +651,7 @@ pwrwb.openWb('VolDemo')\n\
...
@@ -651,7 +651,7 @@ pwrwb.openWb('VolDemo')\n\
PyDoc_STRVAR
(
pwrwb_openSession_doc
,
"\
PyDoc_STRVAR
(
pwrwb_openSession_doc
,
"\
openSession(volume, access)
\n
--
\n\n
\
openSession(volume, access)
\n
--
\n\n
\
Open
database
.
\n
\
Open
session
.
\n
\
If no database argument is supplied, the directory volume is opened.
\n\n
\
If no database argument is supplied, the directory volume is opened.
\n\n
\
Arguments
\n
\
Arguments
\n
\
---------
\n
\
---------
\n
\
...
@@ -1052,7 +1052,7 @@ static PyTypeObject ArefType = {
...
@@ -1052,7 +1052,7 @@ static PyTypeObject ArefType = {
0
,
/* tp_setattro */
0
,
/* tp_setattro */
0
,
/* tp_as_buffer */
0
,
/* tp_as_buffer */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
"Proview
runtime object
"
,
/* tp_doc */
"Proview
development attribute
"
,
/* tp_doc */
0
,
/* tp_traverse */
0
,
/* tp_traverse */
0
,
/* tp_clear */
0
,
/* tp_clear */
Aref_richcompare
,
/* tp_richcompare */
Aref_richcompare
,
/* tp_richcompare */
...
@@ -1126,7 +1126,7 @@ static PyTypeObject CidType = {
...
@@ -1126,7 +1126,7 @@ static PyTypeObject CidType = {
0
,
/* tp_setattro */
0
,
/* tp_setattro */
0
,
/* tp_as_buffer */
0
,
/* tp_as_buffer */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
"
Proview runtime class"
,
/* tp_doc */
"
Class of a development object"
,
/* tp_doc */
0
,
/* tp_traverse */
0
,
/* tp_traverse */
0
,
/* tp_clear */
0
,
/* tp_clear */
Cid_richcompare
,
/* tp_richcompare */
Cid_richcompare
,
/* tp_richcompare */
...
@@ -1187,7 +1187,7 @@ static PyTypeObject TidType = {
...
@@ -1187,7 +1187,7 @@ static PyTypeObject TidType = {
0
,
/* tp_setattro */
0
,
/* tp_setattro */
0
,
/* tp_as_buffer */
0
,
/* tp_as_buffer */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
Py_TPFLAGS_DEFAULT
,
/* tp_flags */
"
Proview runtime class"
,
/* tp_doc */
"
Attribute type"
,
/* tp_doc */
0
,
/* tp_traverse */
0
,
/* tp_traverse */
0
,
/* tp_clear */
0
,
/* tp_clear */
Tid_richcompare
,
/* tp_richcompare */
Tid_richcompare
,
/* tp_richcompare */
...
...
wb/exp/pwrwb/src/setup_pwrwb.py
View file @
fbc0a781
...
@@ -19,6 +19,7 @@ if pwre_conf_qt == "":
...
@@ -19,6 +19,7 @@ if pwre_conf_qt == "":
'pwr_wb'
,
'pwr_xtt'
,
'pwr_ge'
,
'pwr_cow'
,
'pwr_wb'
,
'pwr_xtt'
,
'pwr_ge'
,
'pwr_cow'
,
'pwr_flow'
,
'pwr_glow'
,
'pwr_flow'
,
'pwr_glow'
,
'pwr_rt'
,
'pwr_statussrv'
,
'pwr_co'
,
'pwr_msg_dummy'
]
'pwr_rt'
,
'pwr_statussrv'
,
'pwr_co'
,
'pwr_msg_dummy'
]
xlibs
=
[
'gtk-x11-2.0'
]
else
:
else
:
libs
=
[
'pwr_wb_qt'
,
'pwr_xtt_qt'
,
'pwr_ge_qt'
,
'pwr_cow_qt'
,
libs
=
[
'pwr_wb_qt'
,
'pwr_xtt_qt'
,
'pwr_ge_qt'
,
'pwr_cow_qt'
,
'pwr_flow_qt'
,
'pwr_glow_qt'
,
'pwr_flow_qt'
,
'pwr_glow_qt'
,
...
@@ -27,6 +28,7 @@ else:
...
@@ -27,6 +28,7 @@ else:
'pwr_wb'
,
'pwr_xtt'
,
'pwr_ge'
,
'pwr_cow'
,
'pwr_wb'
,
'pwr_xtt'
,
'pwr_ge'
,
'pwr_cow'
,
'pwr_flow'
,
'pwr_glow'
,
'pwr_flow'
,
'pwr_glow'
,
'pwr_rt'
,
'pwr_statussrv'
,
'pwr_co'
,
'pwr_msg_dummy'
]
'pwr_rt'
,
'pwr_statussrv'
,
'pwr_co'
,
'pwr_msg_dummy'
]
xlibs
=
[
'QtCore'
,
'QtGui'
]
pwrwbmodule
=
Extension
(
name
=
'pwrwb'
,
pwrwbmodule
=
Extension
(
name
=
'pwrwb'
,
sources
=
[
'pwrwbmodule.cpp'
],
sources
=
[
'pwrwbmodule.cpp'
],
...
@@ -45,7 +47,7 @@ pwrwbmodule = Extension( name='pwrwb',
...
@@ -45,7 +47,7 @@ pwrwbmodule = Extension( name='pwrwb',
libraries
=
libs
+
libraries
=
libs
+
[
'db_cxx'
,
'rpcsvc'
,
'asound'
,
'pthread'
,
[
'db_cxx'
,
'rpcsvc'
,
'asound'
,
'pthread'
,
'm'
,
'db'
,
'z'
,
'crypt'
,
'rt'
,
'fl'
,
'X11'
,
'mysqlclient'
,
'm'
,
'db'
,
'z'
,
'crypt'
,
'rt'
,
'fl'
,
'X11'
,
'mysqlclient'
,
'sqlite3'
,
'rsvg-2'
,
'gtk-x11-2.0'
]
,
'sqlite3'
,
'rsvg-2'
,
'QtCore'
,
'QtGui'
]
+
xlibs
,
# extra_link_args=['-L/usr/lib/x86_64-linux-gnu', commands.getoutput('pkg-config --libs gtk+-2.0')],
# extra_link_args=['-L/usr/lib/x86_64-linux-gnu', commands.getoutput('pkg-config --libs gtk+-2.0')],
language
=
'c++'
language
=
'c++'
)
)
...
...
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