Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
42903863
Commit
42903863
authored
Nov 23, 2011
by
Sebastian Eichelbaum
Browse files
[MERGE]
parents
f35b646c
c710c61d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
11 deletions
+18
-11
.hgchurn
.hgchurn
+2
-0
src/modules/data/io/WReaderVTK.cpp
src/modules/data/io/WReaderVTK.cpp
+4
-3
src/modules/directVolumeRendering/WMDirectVolumeRendering.cpp
...modules/directVolumeRendering/WMDirectVolumeRendering.cpp
+5
-5
src/qt4gui/qt4/controlPanel/transferFunction/WTransferFunctionBackground.cpp
...rolPanel/transferFunction/WTransferFunctionBackground.cpp
+1
-1
src/qt4gui/qt4/controlPanel/transferFunction/WTransferFunctionWidget.cpp
...controlPanel/transferFunction/WTransferFunctionWidget.cpp
+1
-1
tools/debugging/bin/openwalnut-gdb
tools/debugging/bin/openwalnut-gdb
+5
-1
No files found.
.hgchurn
View file @
42903863
...
...
@@ -14,6 +14,8 @@ eichelbaum@informatik.uni-leipzig.de Sebastian_Eichelbaum
Sebastian Eichelbaum = Sebastian_Eichelbaum
cornimueller Cornelius_Mueller
mam04cvr@studserv.uni-leipzig.de Cornelius_Mueller
hlawit Mario_Hlawitschka
hlawit@informatik.uni-leipzig.de Mario_Hlawitschka
hlawitschka@ucdavis.edu Mario_Hlawitschka
mai02igw@informatik.uni-leipzig.de Robin_Ledig
mai02ifw@informatik.uni-leipzig.de Robin_Ledig
...
...
src/modules/data/io/WReaderVTK.cpp
View file @
42903863
...
...
@@ -158,7 +158,8 @@ void WReaderVTK::readStructuredPoints()
new
WGridRegular3D
(
dimensions
[
0
],
dimensions
[
1
],
dimensions
[
2
],
transform
)
);
}
void
WReaderVTK
::
readScalars
(
size_t
nbPoints
,
const
std
::
string
&
name
)
// we currently do not handle the name flag but should set the name of the data set somewhere
void
WReaderVTK
::
readScalars
(
size_t
nbPoints
,
const
std
::
string
&
/*name*/
)
{
int
pos
=
m_ifs
->
tellg
();
// remember where we are for binary files
...
...
@@ -211,7 +212,7 @@ void WReaderVTK::readScalars( size_t nbPoints, const std::string& name )
// WAssert( std::string( "" ) == line, "Found characters in file where nothing was expected." );
}
void
WReaderVTK
::
readVectors
(
size_t
nbPoints
,
const
std
::
string
&
name
)
void
WReaderVTK
::
readVectors
(
size_t
nbPoints
,
const
std
::
string
&
/*
name
*/
)
{
int
pos
=
m_ifs
->
tellg
();
// remember where we are for binary files
...
...
@@ -269,7 +270,7 @@ void WReaderVTK::readVectors( size_t nbPoints, const std::string& name )
// WAssert( std::string( "" ) == line, "Found characters in file where nothing was expected." );
}
void
WReaderVTK
::
readTensors
(
size_t
nbPoints
,
const
std
::
string
&
name
)
void
WReaderVTK
::
readTensors
(
size_t
nbPoints
,
const
std
::
string
&
/*
name
*/
)
{
int
pos
=
m_ifs
->
tellg
();
// remember where we are for binary files
...
...
src/modules/directVolumeRendering/WMDirectVolumeRendering.cpp
View file @
42903863
...
...
@@ -398,11 +398,11 @@
unsigned
char
*
data
=
new
unsigned
char
[
tfsize
];
std
::
copy
(
orig
,
&
orig
[
tfsize
],
data
);
for
(
in
t
i
=
0
;
i
<
30
&&
i
<
tfsize
/
4
;
++
i
)
{
debugLog
()
<<
i
<<
":"
<<
(
int
)
data
[
4
*
i
]
<<
' '
<<
(
int
)
data
[
4
*
i
+
1
]
<<
' '
<<
(
int
)
data
[
4
*
i
+
2
]
<<
' '
<<
(
int
)
data
[
4
*
i
+
3
];
}
//
for (
size_
t i = 0; i< 30 && i < tfsize/4; ++i )
//
{
//
debugLog() << i << ":" << ( int )data[ 4*i ] << ' ' << ( int )data[ 4*i+1 ] << ' '<< ( int )data[ 4*i+2 ]
//
<< ' '<< ( int ) data[ 4*i+3 ];
//
}
osg
::
ref_ptr
<
osg
::
Image
>
tfImg
(
new
osg
::
Image
()
);
//debugLog() << "set image";
...
...
src/qt4gui/qt4/controlPanel/transferFunction/WTransferFunctionBackground.cpp
View file @
42903863
...
...
@@ -31,7 +31,7 @@
#include "WTransferFunctionBackground.h"
#include "WTransferFunctionWidget.h"
WTransferFunctionBackground
::
WTransferFunctionBackground
(
WTransferFunctionWidget
*
parent
)
:
BaseClass
()
WTransferFunctionBackground
::
WTransferFunctionBackground
(
WTransferFunctionWidget
*
/*
parent
*/
)
:
BaseClass
()
{
//this->setFlag( ItemIsMovable );
setOpacity
(
1.0
);
...
...
src/qt4gui/qt4/controlPanel/transferFunction/WTransferFunctionWidget.cpp
View file @
42903863
...
...
@@ -242,7 +242,7 @@ WTransferFunctionWidget::~WTransferFunctionWidget()
void
WTransferFunctionWidget
::
setMyBackground
()
{
const
int
transferFunctionSize
=
32
;
const
int
transferFunctionSize
=
100
;
static
unsigned
char
texturearray
[
4
*
transferFunctionSize
];
if
(
background
)
...
...
tools/debugging/bin/openwalnut-gdb
View file @
42903863
#!/bin/sh
# get the current directory
PWD
=
`
pwd
`
# get path of this script
BINDIR
=
`
dirname
"
$0
"
`
...
...
@@ -12,6 +15,7 @@ echo run $@ > $PARAM_FILENAME
cd
"
$BINDIR
"
# run walnut
gdb ./openwalnut-qt4
-command
=
$PARAM_FILENAME
gdb ./openwalnut-qt4
-cd
=
$PWD
-command
=
$PARAM_FILENAME
rm
$PARAM_FILENAME
cd
$PWD
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