Commit 9f970e5a authored by Robert Frohl's avatar Robert Frohl

[MERGE] rev4170

parents 5ac1f205 c465e29c
[usersubs] [usersubs]
wiebel@informatik.uni-leipzig.de = * all-openwalnut-commits@lists.informatik.uni-leipzig.de = *
math@informatik.uni-leipzig.de = * \ No newline at end of file
ebaum@informatik.uni-leipzig.de = *
reichenbach@informatik.uni-leipzig.de = *
philips@zimbra.cbs.mpg.de = *
\ No newline at end of file
wiebel Alexander_Wiebel wiebel Alexander_Wiebel
wiebel@hegel.informatik.uni-leipzig.de Alexander_Wiebel wiebel@hegel.informatik.uni-leipzig.de Alexander_Wiebel
openwalnut@dergrosse.de Alexander_Wiebel openwalnut@dergrosse.de Alexander_Wiebel
wiebel@openwalnut.org Alexander_Wiebel
wiebel_openwalnut@dergrosse.de Alexander_Wiebel wiebel_openwalnut@dergrosse.de Alexander_Wiebel
wiebel@bsv_2008a Alexander_Wiebel wiebel@bsv_2008a Alexander_Wiebel
math Mathias_Goldau math Mathias_Goldau
lmath@voltaire.informatik.uni-leipzig.de Mathias_Goldau lmath@voltaire.informatik.uni-leipzig.de Mathias_Goldau
math@informatik.uni-leipzig.de Mathias_Goldau math@informatik.uni-leipzig.de Mathias_Goldau
schurade@spinat.cbs.mpg.de Ralph_Schurade
schurade Ralph_Schurade schurade Ralph_Schurade
ebaum Sebastian_Eichelbaum ebaum Sebastian_Eichelbaum
eichelbaum@informatik.uni-leipzig.de Sebastian_Eichelbaum eichelbaum@informatik.uni-leipzig.de Sebastian_Eichelbaum
...@@ -16,3 +18,11 @@ mai02igw@informatik.uni-leipzig.de Robin_Ledig ...@@ -16,3 +18,11 @@ mai02igw@informatik.uni-leipzig.de Robin_Ledig
mai02ifw@informatik.uni-leipzig.de Robin_Ledig mai02ifw@informatik.uni-leipzig.de Robin_Ledig
mai02igw@studserv.uni-leipzig.de Robin_Ledig mai02igw@studserv.uni-leipzig.de Robin_Ledig
heine@informatik.uni-leipzig.de Christian_Heine heine@informatik.uni-leipzig.de Christian_Heine
reichenbach@berkeley.informatik.uni-leipzig.de Andre_Reichenbach
reichenbach Andre_Reichenbach
philips@informatik.uni-leipzig.de Stefan_Philips
frohl.robert@googlemail.com Robert_Frohl
dirk_albrecht@gmx.net Dirk_Albrecht
albrecht Dirk_Albrecht
mstuber Marcus_Stuber
skiunke Sebastian_Kiunke
\ No newline at end of file
This directory is intended to serve as the place where one can compile OpenWalnut. This directory is intended to serve as the place where one can compile OpenWalnut.
This .README file is in the build directory so that the directory will be recognized and created by mercurial. Only remove it if you know what you are doing or if the behavior of mercurial concerning empty directories has changed. This .README file is in the build directory so that the directory will be recognized and created by mercurial (hg). Only remove it if you know what you are doing or if the behavior of mercurial concerning empty directories has changed.
\ No newline at end of file \ No newline at end of file
...@@ -7,10 +7,7 @@ the currect working directory to be project's main directory, ...@@ -7,10 +7,7 @@ the currect working directory to be project's main directory,
the following steps should do the trick: the following steps should do the trick:
> cd build > cd build
> ccmake ../src > cmake ../src
PRESS 'c' for configuration
PRESS 'c' again for further configuration
PRESS 'g' to generate the build system including the Makefiles.
> make > make
Now the subdirectory "bin" of the "build" directory should contain an executable named walnut. Now the subdirectory "bin" of the "build" directory should contain an executable named walnut.
......
...@@ -31,7 +31,7 @@ PROJECT_NAME = OpenWalnut ...@@ -31,7 +31,7 @@ PROJECT_NAME = OpenWalnut
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 1.0+ PROJECT_NUMBER = 1.1+
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.
...@@ -1030,7 +1030,7 @@ FORMULA_FONTSIZE = 10 ...@@ -1030,7 +1030,7 @@ FORMULA_FONTSIZE = 10
# typically be disabled. For large projects the javascript based search engine # typically be disabled. For large projects the javascript based search engine
# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
SEARCHENGINE = NO SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index # When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup # file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
...@@ -1324,7 +1324,11 @@ INCLUDE_FILE_PATTERNS = ...@@ -1324,7 +1324,11 @@ INCLUDE_FILE_PATTERNS =
PREDEFINED = OUTLINE \ PREDEFINED = OUTLINE \
_GNU_SOURCE \ _GNU_SOURCE \
NODEBUG NODEBUG \
WGE_EXPORT \
OWCOMMON_EXPORT \
OWDATAHANDLER_EXPORT \
OWKERNEL_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded. # this tag can be used to specify a list of macro names that should be expanded.
......
...@@ -31,7 +31,7 @@ PROJECT_NAME = OpenWalnut ...@@ -31,7 +31,7 @@ PROJECT_NAME = OpenWalnut
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 1.0+ PROJECT_NUMBER = 1.1+
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.
...@@ -1030,7 +1030,7 @@ FORMULA_FONTSIZE = 10 ...@@ -1030,7 +1030,7 @@ FORMULA_FONTSIZE = 10
# typically be disabled. For large projects the javascript based search engine # typically be disabled. For large projects the javascript based search engine
# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
SEARCHENGINE = NO SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index # When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup # file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
...@@ -1324,7 +1324,11 @@ INCLUDE_FILE_PATTERNS = ...@@ -1324,7 +1324,11 @@ INCLUDE_FILE_PATTERNS =
PREDEFINED = OUTLINE \ PREDEFINED = OUTLINE \
_GNU_SOURCE \ _GNU_SOURCE \
NODEBUG NODEBUG \
WGE_EXPORT \
OWCOMMON_EXPORT \
OWDATAHANDLER_EXPORT \
OWKERNEL_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded. # this tag can be used to specify a list of macro names that should be expanded.
......
...@@ -43,17 +43,25 @@ compatiblesToolBarStyle = 0 # this pref allows the compatibles toolbar to have a ...@@ -43,17 +43,25 @@ compatiblesToolBarStyle = 0 # this pref allows the compatibles toolbar to have a
# 2 -> left # 2 -> left
# 3 -> right # 3 -> right
# 4 -> hide completely # 4 -> hide completely
# 5 -> inside the dataset browser ( not possible for compatiblesToolBarPos! This will be mapped to right (=3) ) # 5 -> inside the control panel ( not possible for compatiblesToolBarPos! This will be mapped to right (=3) )
toolBarPos = 0 # default position of the toolbars toolBarPos = 0 # default position of the toolbars
compatiblesToolBarPos = 0 # position of the compatibles toolbar (overrides toolBarPos) compatiblesToolBarPos = 0 # position of the compatibles toolbar (overrides toolBarPos)
#################################################################### ####################################################################
# Dataset Browser # Control panel
# combineTreeAndRoiAndTextureSorter = yes # should the module tree, ROI tree and the Texture Sorter be combined in ONE Tab widget? # combineTreeAndRoiAndTextureSorter = yes # should the module tree, ROI tree and the Texture Sorter be combined in ONE Tab widget?
# dsbWidth = 400 # the width of the dataset browser # dsbWidth = 400 # the width of the control panel
# dsbInvisibleByDefault = yes # hide the dataset browser on startup. Can be shown using F9. # dsbInvisibleByDefault = yes # hide the control panel on startup. Can be shown using F9.
# dsbFloatingByDefault = yes # should the dataset browser be undocked on startup? # dsbFloatingByDefault = yes # should the control panel be undocked on startup?
# Here you can put any key sequence you would like to result in removing modules or ROIs
# Examples:
# deleteKey = Backspace
# deleteKey = Ctrl+J
# deleteKey = B
deleteModuleKey = Backspace
deleteROIKey = Del
#################################################################### ####################################################################
# Other GUI settings # Other GUI settings
...@@ -65,4 +73,4 @@ compatiblesToolBarPos = 0 # position of the compatibles toolbar (overrides toolB ...@@ -65,4 +73,4 @@ compatiblesToolBarPos = 0 # position of the compatibles toolbar (overrides toolB
# bgColor.g = .9 # background color (green part) # bgColor.g = .9 # background color (green part)
# bgColor.b = .9 # background color (blue part) # bgColor.b = .9 # background color (blue part)
zoomTrackballManipulator.allowThrow = yes # allow the auto-rotation thing when "throwing" an object with the mouse zoomTrackballManipulator.allowThrow = yes # allow the auto-rotation thing when "throwing" an object with the mouse
# multiThreadedViewers = no # Use multiple threads for the multiple viewers. Causes hanging on some machines when opening a new view. multiThreadedViewers = no # Use multiple threads for the multiple viewers. Causes hanging on some machines when opening a new view.
## This is a sample configuration file for OpenWalnut. ## This is a sample configuration file for OpenWalnut.
## Uncomment the options you are interested in. ## Uncomment the options you are interested in.
[general]
allowOnlyOneFiberDataSet = yes # This will prevent you from accidently loading multiple fiber data sets.
[modules] [modules]
## use this to specify the default module to add during load. ## use this to specify the default module to add during load.
## It is a comma seperated list. If this is not specified the ## It is a comma seperated list. If this is not specified the
...@@ -12,7 +9,7 @@ allowOnlyOneFiberDataSet = yes # This will prevent you from accidently loading m ...@@ -12,7 +9,7 @@ allowOnlyOneFiberDataSet = yes # This will prevent you from accidently loading m
# default=HUD # default=HUD
## A list of modules that will be provided through the GUI. ## A list of modules that will be provided through the GUI.