Bulk commit on behalf of SeisComP3 development team

Author: gempa-jabe

Doxyfile

@@ -4,8 +4,8 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = SeisComP3
-PROJECT_NUMBER         = 0.9
-OUTPUT_DIRECTORY       = doc
+PROJECT_NUMBER         = 2.1.0
+OUTPUT_DIRECTORY       = api-doc
 CREATE_SUBDIRS         = YES
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
@@ -82,7 +82,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = src/core/libs/seiscomp3
+INPUT                  = src/trunk/libs/seiscomp3
 FILE_PATTERNS          = *.c \
                          *.cc \
                          *.cxx \
@@ -135,7 +135,7 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = yes
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */.svn
+EXCLUDE_PATTERNS       = */.git
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO

Modules/CreateLibrary.cmake

@@ -38,19 +38,25 @@ ENDMACRO(SC_BEGIN_PACKAGE)
 MACRO(SC_ADD_SUBDIRS)
 	FILE(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "[^.]*")
 	SET(dirs "")
-	SET(prio_dir " ")
+	SET(prio_dirs " ")
 	IF (${ARGC} GREATER 0)
-		SET(prio_dir ${ARGV0})
+		SET(prio_dirs ${ARGN})
+		LIST(REVERSE prio_dirs)
 	ENDIF (${ARGC} GREATER 0)
 	FOREACH(dir ${files})
 		IF (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${dir})
-			IF (${dir} STREQUAL ${prio_dir})
-				SET(dirs ${dir} ${dirs})
-			ELSE (${dir} STREQUAL ${prio_dir})
-				SET(dirs ${dirs} ${dir})
-			ENDIF (${dir} STREQUAL ${prio_dir})
+			SET(dirs ${dirs} ${dir})
 		ENDIF (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${dir})
 	ENDFOREACH(dir ${files})
+	IF(prio_dirs)
+		FOREACH(prio_dir ${prio_dirs})
+			LIST(FIND dirs ${prio_dir} dirs_index)
+			IF(${dirs_index} GREATER -1)
+				LIST(REMOVE_AT dirs ${dirs_index})
+				SET(dirs ${prio_dir} ${dirs})
+			ENDIF(${dirs_index} GREATER -1)
+		ENDFOREACH(prio_dir ${prio_dirs})
+	ENDIF(prio_dirs)
 	SUBDIRS(${dirs})
 ENDMACRO(SC_ADD_SUBDIRS)
 

src/CMakeLists.txt

@@ -1,3 +1,3 @@
 # System directory has highest priority, so pass its name to make it the first
-# item in the result list if available
-SC_ADD_SUBDIRS(system)
+# item in the result list if available, then trunk and then gui-qt4
+SC_ADD_SUBDIRS(system trunk gui-qt4)

src/gui-qt4/apps/descriptions/global_gui.xml

@@ -363,9 +363,35 @@
 				</group>
 
 				<group name="marker">
-					<parameter name="lineWidth" type="color">
+					<parameter name="lineWidth" type="int">
 						<description>
-							The line width of the marker (e.g. picks of manual picker).
+						The line width of the marker (e.g. picks of manual picker).
+						</description>
+					</parameter>
+				</group>
+
+				<group name="records">
+					<parameter name="lineWidth" type="int" default="1">
+						<description>
+						The line width of the records / traces.
+						</description>
+					</parameter>
+					<parameter name="antiAliasing" type="bool" default="false">
+						<description>
+						Configures antialiasing of records / traces. Antialiasing
+						needs more processing time and does not look as good as
+						possible due to point optimizations. To get the best
+						visual quality, disable trace optimization as well.
+						</description>
+					</parameter>
+					<parameter name="optimize" type="bool" default="true">
+						<description>
+						Configures optimization of trace polylines. If activated
+						then lines on the same pixel line or same pixel row
+						collapse into single lines. Optimization does not look
+						as good as possible in combination with antialiasing.
+						For best quality disable optimization and enable
+						antialiasing.
 						</description>
 					</parameter>
 				</group>

src/gui-qt4/apps/scmv/mvmainwindow.cpp

@@ -34,7 +34,7 @@
 #include <seiscomp3/datamodel/inventory.h>
 #include <seiscomp3/datamodel/utils.h>
 
-#include <seiscomp3/processing/parameters.h>
+#include <seiscomp3/utils/keyvalues.h>
 
 #include <seiscomp3/math/math.h>
 #include <seiscomp3/math/filter.h>
@@ -1105,8 +1105,8 @@ bool MvMainWindow::readStationsFromDataBase() {
 			std::string net = cs->networkCode();
 			std::string sta = cs->stationCode();
 
-			Processing::Parameters params;
-			params.readFrom(ps);
+			Util::KeyValues params;
+			params.init(ps);
 
 			std::string location;
 			std::string channel;

src/gui-qt4/apps/scrttv/mainwindow.cpp

@@ -25,7 +25,7 @@
 #include <seiscomp3/datamodel/origin.h>
 #include <seiscomp3/datamodel/messages.h>
 #include <seiscomp3/datamodel/utils.h>
-#include <seiscomp3/processing/parameters.h>
+#include <seiscomp3/utils/keyvalues.h>
 #include <seiscomp3/math/geo.h>
 #include <seiscomp3/utils/timer.h>
 #include <seiscomp3/gui/core/recordviewitem.h>
@@ -729,6 +729,8 @@ void MainWindow::setStationEnabled(const string& networkCode,
 		Notifier::Enable();
 		module->add(newCs.get());
 		Notifier::Disable();
+
+		cs = newCs.get();
 	}
 
 	if ( cs->enabled() != enable ) {
@@ -1349,8 +1351,8 @@ void MainWindow::openAcquisition() {
 							continue;
 						}
 
-						Processing::Parameters params;
-						params.readFrom(ps);
+						Util::KeyValues params;
+						params.init(ps);
 
 						std::string net, sta, loc, cha;
 						net = station->networkCode();