Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.tex =================================================================== diff -u -r2077 -r2082 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.tex (.../DAM UI - Functional Design.tex) (revision 2077) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.tex (.../DAM UI - Functional Design.tex) (revision 2082) @@ -52,7 +52,7 @@ %------------------------------------------------------------------------------ \appendix\chapter*{Appendix} \addcontentsline{toc}{chapter}{Appendix} -\include{DataCombination} +\include{AppendixA} Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.pdf =================================================================== diff -u -r1336 -r2082 Binary files differ Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DAM_UI_FO.tex =================================================================== diff -u -r2077 -r2082 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DAM_UI_FO.tex (.../DAM_UI_FO.tex) (revision 2077) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DAM_UI_FO.tex (.../DAM_UI_FO.tex) (revision 2082) @@ -55,15 +55,18 @@ Main purpose of the \ProgramName The \ProgramName can import data and combines this data to make geotechnical calculations. After calculations (made by DAM Engine) the \ProgramName shows the results and make analyzation possible. -\section{User story Import project} -As a geotechnical engineer I want to open existing projects to see what data is used and which calculations are made with what result.The design of this functionality is described in\autoref{sec:USImportProject}. +\section{User story Open project} +As a geotechnical engineer I want to open existing projects to see what data is used and which calculations are made with what result. \section{User story Data format} As a geotechnical engineer I want to store my data in a predescribed format, so that I can reuse the data. The design of this functionality is described in \autoref{sec:USDataFormat}. -\section{User story Data combination} -As a geotechnical engineer I want to combine data per location, so that I don't have to do that by hand. The design of this functionality is described in \autoref{sec:USDataCombi}. +\section{User story GIS Data combination} +As a geotechnical engineer I want to combine GIS data per location, so that I don't have to do that by hand. The design of this functionality is described in \autoref{sec:DataExtraction} +\section{User story Soil Data combination} +As a geotechnical engineer I want to combine subsoil with surfaceline per location, so that I don't have to draw 2D geometries. The design of this functionality is described in \autoref{sec:GeometryGeneration} + \section{User story Data display} As a geotechnical engineer I want to see the data per location in tables, cross section and map view, so I can check the data before calculation. The design of this functionality is described in \autoref{sec:USDataDisplay}. @@ -72,15 +75,15 @@ \section{User story Calculation settings} As a geotechnical engineer I want to see and be able to adept the calculations settings, so I can decide what calculations are made. -The design of this functionality is described in \autoref{sec:USCalcSettings}. +%The design of this functionality is described in \autoref{sec:USCalcSettings}. \section{User story Display result} As a geotechnical engineer I want to see the results of the calculations of the DAM Engine, so I can evaluate the calculations. -The design of this functionality is described in \autoref{sec:USDisplayResults}. +%The design of this functionality is described in \autoref{sec:USDisplayResults}. \section{User story Export data} As a geotechnical engineer I want to export data as tables (CSV-format) and/or shapes, so I can use the data for other purposes. -The design of this functionality is described in \autoref{sec:USExportData}. +The design of this functionality is described in \autoref{sec:USDataExport}. Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataCombination.tex =================================================================== diff -u -r2077 -r2082 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataCombination.tex (.../DataCombination.tex) (revision 2077) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/DataCombination.tex (.../DataCombination.tex) (revision 2082) @@ -1,16 +1,16 @@ \chapter{Data combination}\label{sec:USDataCombi} -\section{REQ Data.Generation.Geometry}\label{sec:REQDataGenerationGeometry} -The \ProgramName can combine a surface line with a subsoil scenario. The result is a geometry, usable for the failure mechanism Macrostability. +\section{Data extraction}\label{sec:DataExtraction} - -\section{Location}\label{sec:location} The locations are described with a name and RD-coordinates; a point element in GIS files. Each location is connected to a crosssection; a line element in GIS files. The combination of data from GIS files is made based on these point and line elements.\\ If the input data is available in a GIS file with line elements the data is collected at the intersection of the crosssection with the line element, see \autoref{fig:GISLine}. +When a parameter is available in a line shape, \ProgramName will check, during import of data, if the cross section of a location intersects the shapefile of the parameter. When so, this parameter is connected to this location. +If a cross section intersects more than one line of the shapefile, no parameters is connected at all and a message is given that this location is not imported. + \begin{figure}[H] \centering \includegraphics[width=0.7\textwidth]{pictures/GISLine.png} @@ -29,6 +29,10 @@ If the inputdata is not available in GIS files, all input data can be linked to each location via a table (csv-format). +\section{GeoemetryGeneration}\label{sec:GeometryGeneration} + +The \ProgramName can combine a surface line with a subsoil scenario. The result is a geometry, usable for the failure mechanism Macrostability. + \section{Subsoil} The subsoil model is made up of the following elements: \begin{itemize} Index: DamClients/DamUI/trunk/doc/DAM UI - Functional Design/Dataformat.tex =================================================================== diff -u -r2077 -r2082 --- DamClients/DamUI/trunk/doc/DAM UI - Functional Design/Dataformat.tex (.../Dataformat.tex) (revision 2077) +++ DamClients/DamUI/trunk/doc/DAM UI - Functional Design/Dataformat.tex (.../Dataformat.tex) (revision 2082) @@ -1,55 +1,19 @@ \chapter{Data format}\label{sec:USDataFormat} -All required data is place in table OverDataUIAndEngine.xls +All required and optional import data is placed in table OverviewDataUIAndEngine.xls, tab DAM\_input -\section{Validation}\label{sec:Validation} -If the validation consits of minimum and maximum value, it can be found in the OverDataUIAndEngine.xls table. -More complex validations are placed in this section. +\ProgramName can import data from csv files and shape files +The sequence of import is + 1. csv files (except scenarios.csv), overwritten by: + 2. shape files, overwritten by: + 3. scenario.csv -\subsection(Validation characteristic points}\label{ValidationCharPoints} +\textbf{Presence} +If data is not present in the import, though required, \ProgramName uses the default value from OverviewDataUIAndEngine.xls, tab DAM\_input. +\textbf{Validation} +In OverviewDataUIAndEngine.xls, tab DAM\_input the required data is listed. If not present, an error must be given. +In OverviewDataUIAndEngine.xls, tab DAM\_input the optional data is listed. If not present, no error or warning is given. -\begin{table}[] -\begin{tabular}{lllllll} -Name-ENG & Required & Pull down & Set & Validation X value & & \\ -1 & Maaiveld buitenwaarts & SurfaceLevelOutside & yes & no & & Not editable \\ -2 & Teen dijk buitenwaarts & DikeToeAtRiver & yes & yes & & X value \textless X value next present characteristic point \\ -3 & Kruin buitenberm & ShoulderTopOutside & no, only if other characteristic point of set is present & yes & ShoulderOutside & X value \textless X value next present characteristic point \\ -4 & Insteek buitenberm & ShoulderBaseOutside & no, only if other characteristic point of set is present & yes & ShoulderOutside & X value \textless X value next present characteristic point \\ -5 & Kruin buitentalud & DikeTopAtRiver & yes & yes & & X value \textless X value next present characteristic point \\ -6 & Kruin binnentalud & DikeTopAtPolder & yes & yes & & X value \textless X value next present characteristic point \\ -7 & Insteek binnenberm & ShoulderBaseInside & no, only if other characteristic point of set is present & yes & ShoulderInside & X value \textless X value next present characteristic point \\ -8 & Kruin binnenberm & ShoulderTopInside & no, only if other characteristic point of set is present & yes & ShoulderInside & X value \textless X value next present characteristic point \\ -9 & Teen dijk binnenwaarts & DikeToeAtPolder & yes & yes & & X value \textless X value next present characteristic point \\ -10 & Insteek sloot dijkzijde & DitchDikeSide & no, only if other characteristic point of set is present & yes & Ditch & X value \textless X value next present characteristic point \\ -11 & Slootbodem dijkzijde & BottomDitchDikeSide & no, only if other characteristic point of set is present & yes & Ditch & X value \textless X value next present characteristic point \\ -12 & Slootbodem polderzijde & BottomDitchPolderSide & no, only if other characteristic point of set is present & yes & Ditch & X value \textless X value next present characteristic point \\ -13 & Insteek sloot polderzijde & DitchPolderSide & no, only if other characteristic point of set is present & yes & Ditch & X value \textgreater X value previous present characteristic point \\ -14 & Maaiveld binnenwaarts & SurfaceLevelInside & yes & no & & Not editable \\ -n.a. & Verkeersbelasting kant buitenwaarts & TrafficLoadOutside & no, only if other characteristic point of set is present & yes & TrafficLoad & SurfaceLevelOutside\textless{}TrafficLoadOutside\textless{}TrafficLoadInside\textless{}SurfaceLevelInside \\ -n.a. & Verkeersbelasting kant binnenwaarts & TrafficLoadInside & no, only if other characteristic point of set is present & yes & TrafficLoad & SurfaceLevelOutside\textless{}TrafficLoadOutside\textless{}TrafficLoadInside\textless{}SurfaceLevelInside -\end{tabular} -\caption{Overview Characteristic points} -\label{fig:CharPoints} -\end{table} +The data is validated by the used kernels. - -X value\newline -All characteristic points must have an x-value for which SurfaceLevelOutside