Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenWalnut Core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
44
Issues
44
List
Boards
Labels
Service Desk
Milestones
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
e5913ba5
Commit
e5913ba5
authored
Aug 22, 2011
by
Sebastian Eichelbaum
Browse files
Options
Browse Files
Download
Plain Diff
[MERGE]
parents
af722891
8d829cfc
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
17 additions
and
17 deletions
+17
-17
src/core/common/WColor.h
src/core/common/WColor.h
+1
-1
src/core/common/WLogger.h
src/core/common/WLogger.h
+1
-1
src/core/common/math/WPlane.h
src/core/common/math/WPlane.h
+1
-1
src/core/common/math/WValue.h
src/core/common/math/WValue.h
+1
-1
src/core/common/test/WMixinVector_test.h
src/core/common/test/WMixinVector_test.h
+1
-1
src/core/dataHandler/datastructures/WFiberCluster.cpp
src/core/dataHandler/datastructures/WFiberCluster.cpp
+2
-2
src/core/dataHandler/datastructures/WFiberCluster.h
src/core/dataHandler/datastructures/WFiberCluster.h
+2
-2
src/modules/writeTracts/WMWriteTracts.cpp
src/modules/writeTracts/WMWriteTracts.cpp
+1
-1
tools/packaging/README
tools/packaging/README
+4
-4
tools/packaging/owbuildchroot
tools/packaging/owbuildchroot
+1
-1
tools/packaging/owpack
tools/packaging/owpack
+2
-2
No files found.
src/core/common/WColor.h
View file @
e5913ba5
...
...
@@ -64,7 +64,7 @@ WColor OWCOMMON_EXPORT inverseColor( const WColor& other );
*/
namespace
defaultColor
{
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
static
const
WColor
GREEN
(
0.0
,
1.0
,
0.0
,
1.0
);
//!< Default for green
static
const
WColor
RED
(
1.0
,
0.0
,
0.0
,
1.0
);
//!< Default for red
static
const
WColor
BLUE
(
0.0
,
0.0
,
1.0
,
1.0
);
//!< Default for blue
...
...
src/core/common/WLogger.h
View file @
e5913ba5
...
...
@@ -191,7 +191,7 @@ namespace wlog
template
<
typename
T
>
WStreamedLogger
operator
<<
(
const
T
&
loggable
);
// Doxygen should ignore the TypeDef below which are just an alias for std::endl etc.
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
typedef
std
::
basic_ostream
<
char
,
std
::
char_traits
<
char
>
>
OutStreamType
;
typedef
OutStreamType
&
(
*
StreamManipulatorFunctor
)(
OutStreamType
&
);
// \endcond
...
...
src/core/common/math/WPlane.h
View file @
e5913ba5
...
...
@@ -146,7 +146,7 @@ public:
m_second
=
normalize
(
m_second
);
}
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
// /**
// * Computes sample points on that plane.
// *
...
...
src/core/common/math/WValue.h
View file @
e5913ba5
...
...
@@ -41,7 +41,7 @@ template< typename T > class WValue
template
<
typename
S
>
friend
class
WValue
;
//!< All WValues are friends of each other.
// We exclude this from doxygen since they are documented already as functions and I don't want to duplicate that documentation
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
template
<
typename
U
>
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
WValue
<
U
>
&
rhs
);
template
<
typename
U
>
friend
std
::
istream
&
operator
>>
(
std
::
istream
&
in
,
WValue
<
U
>&
rhs
);
// \endcond
...
...
src/core/common/test/WMixinVector_test.h
View file @
e5913ba5
...
...
@@ -33,7 +33,7 @@
#include "../WMixinVector.h"
#include "WMixinVectorTraits.h"
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
// This is just a dummy class to test if the default constructor is called when
// not specified by WMixinVector instanziation.
class
A
{
public
:
A
(){
m_x
=
3.1415
;}
bool
operator
==
(
double
x
){
return
m_x
==
x
;}
double
m_x
;
};
// NOLINT
...
...
src/core/dataHandler/datastructures/WFiberCluster.cpp
View file @
e5913ba5
...
...
@@ -39,7 +39,7 @@
// information. Since we don't have the possibility of multiple
// InputConnectors we must agglomerate those into one object. Please remove this.
// initializes the variable and provides a linker reference
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
boost
::
shared_ptr
<
WPrototyped
>
WFiberCluster
::
m_prototype
=
boost
::
shared_ptr
<
WPrototyped
>
();
// \endcond
...
...
@@ -100,7 +100,7 @@ void WFiberCluster::merge( WFiberCluster& other ) // NOLINT
}
// NODOXYGEN
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
void
WFiberCluster
::
setDataSetReference
(
boost
::
shared_ptr
<
const
WDataSetFiberVector
>
fibs
)
{
m_fibs
=
fibs
;
...
...
src/core/dataHandler/datastructures/WFiberCluster.h
View file @
e5913ba5
...
...
@@ -192,7 +192,7 @@ public:
// dataset is, we need it in the WMVoxelizer module as well as the clustering
// information. Since we don't have the possibility of multiple
// InputConnectors we must agglomerate those into one object. Please remove this.
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
void
setDataSetReference
(
boost
::
shared_ptr
<
const
WDataSetFiberVector
>
fibs
);
boost
::
shared_ptr
<
const
WDataSetFiberVector
>
getDataSetReference
()
const
;
static
boost
::
shared_ptr
<
WPrototyped
>
getPrototype
();
...
...
@@ -227,7 +227,7 @@ protected:
// dataset is, we need it in the WMVoxelizer module as well as the clustering
// information. Since we don't have the possibility of multiple
// InputConnectors we must agglomerate those into one object. Please remove this.
// \cond Supress_Doxygen
// \cond Sup
p
ress_Doxygen
static
boost
::
shared_ptr
<
WPrototyped
>
m_prototype
;
// \endcond
...
...
src/modules/writeTracts/WMWriteTracts.cpp
View file @
e5913ba5
...
...
@@ -621,7 +621,7 @@ bool WMWriteTracts::savePOVRay( boost::shared_ptr< const WDataSetFibers > fibers
"}"
<<
std
::
endl
<<
std
::
endl
;
}
dataFileScene
<<
"// Enable Phong lighting for all th
e
geometry"
<<
std
::
endl
<<
dataFileScene
<<
"// Enable Phong lighting for all th
e
geometry"
<<
std
::
endl
<<
dataFileScene
<<
"#default{"
<<
std
::
endl
<<
" finish{"
<<
std
::
endl
<<
" ambient 0"
<<
std
::
endl
<<
...
...
tools/packaging/README
View file @
e5913ba5
...
...
@@ -2,10 +2,10 @@ OpenWalnut Packaging - README
*****************************
This directory contains several helpers and configurations for building
OpenWalnut source and binary pckages. These scripts/configs ease the release-
OpenWalnut source and binary p
a
ckages. These scripts/configs ease the release-
management and reduce the manual overhead.
Basicall, there are three important scripts for _automatically_ building and
Basicall
y
, there are three important scripts for _automatically_ building and
packaging OpenWalnut. Here is an overview:
1. owpack - wrapping the build and packaging process. This script does
...
...
@@ -18,8 +18,8 @@ packaging OpenWalnut. Here is an overview:
we can build packages for different distributions by utilizing a chroot
environment containing the target distribution (and architecture). We can
ensure that OpenWalnut builds on these distributions properly and are able to
ensure, that our listed req
irements are sufficient, since the build-chroot is
a minimal system which only contains the needed packages.
ensure, that our listed req
uirements are sufficient, since the build-chroot
is
a minimal system which only contains the needed packages.
3. owuberbuild - automates building and packaging for multiple distributions and
architectures using owpack and owbuildchroot. This basically calls
...
...
tools/packaging/owbuildchroot
View file @
e5913ba5
...
...
@@ -128,7 +128,7 @@ chroot_check()
{
echo
"* Checking
\"
$CHROOTDIR
\"
."
if
[
!
-d
$CHROOTDIR
]
;
then
echo
" * The chroot envir
no
ment does not exist."
echo
" * The chroot envir
on
ment does not exist."
exit
1
fi
...
...
tools/packaging/owpack
View file @
e5913ba5
...
...
@@ -150,10 +150,10 @@ Builder_DEB()
source
$CONFIG_FILE
# set some debian specifics
# The directory upstream-name names. This is important as some builder need
# The directory upstream-name names. This is important as some builder
s
need
# this and have special requirements on them (like debuild)
BUILDER_DEB_UPSTREAM_SRC_DIR
=
OpenWalnut-
$VERSION
# Debuild reqires a different upstream tar name ...
# Debuild req
u
ires a different upstream tar name ...
BUILDER_DEB_UPSTREAM_SRC_TAR
=
openwalnut_
$VERSION
.orig.tar.gz
# create some place to work in
...
...
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