Skip to content

Commit 5b638c0

Browse files
loeslerloesler
authored
Redundancy format (#320)
- Format type for total group redundancy set to statistic type - max. group residual in table foot added
1 parent 3ac1b4a commit 5b638c0

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎JAG3D/resources/ftl/jag3d/default/observation_tfoot.ftlh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
</#if>
5555

5656
<#if group.type == "GNSS2D" || group.type == "GNSS3D">
57-
<td><@printFormattedNumber value=group.redundancy_y format=df_percentage/></td>
58-
<td><@printFormattedNumber value=group.redundancy_x format=df_percentage/></td>
57+
<td><@printFormattedNumber value=group.redundancy_y format=df_statistic/></td>
58+
<td><@printFormattedNumber value=group.redundancy_x format=df_statistic/></td>
5959
</#if>
6060
<#if group.type == "GNSS1D" || group.type == "GNSS3D">
61-
<td><@printFormattedNumber value=group.redundancy_z format=df_percentage/></td>
61+
<td><@printFormattedNumber value=group.redundancy_z format=df_statistic/></td>
6262
</#if>
6363

6464
<#if group.type == "GNSS2D" || group.type == "GNSS3D">
@@ -104,7 +104,7 @@
104104
</#if>
105105
<#else>
106106
<td></td>
107-
<td><@printFormattedNumber value=group.redundancy format=df_percentage/></td>
107+
<td><@printFormattedNumber value=group.redundancy format=df_statistic/></td>
108108
<#if apply_angle_unit>
109109
<#if sexagesimal_angle_residual??>
110110
<#assign signum = (group.max_residual < 0)?then(-1, 1)>
@@ -117,7 +117,7 @@
117117
<td><@printFormattedNumber value=group.max_residual format=df_angle_residual/></td>
118118
</#if>
119119
<#else>
120-
<td><@printFormattedNumber value=group.max_gross_error format=df_length_residual/></td>
120+
<td><@printFormattedNumber value=group.max_residual format=df_length_residual/></td>
121121
</#if>
122122
<#if apply_angle_unit>
123123
<#if sexagesimal_angle_residual??>

‎JAG3D/resources/ftl/jag3d/default/point_tfoot.ftlh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262

6363
<#if group.type == "STOCHASTIC_POINT">
6464
<#if group.dimension != 1>
65-
<td><@printFormattedNumber value=group.redundancy_y format=df_percentage/></td>
66-
<td><@printFormattedNumber value=group.redundancy_x format=df_percentage/></td>
65+
<td><@printFormattedNumber value=group.redundancy_y format=df_statistic/></td>
66+
<td><@printFormattedNumber value=group.redundancy_x format=df_statistic/></td>
6767
</#if>
6868

6969
<#if group.dimension != 2>
70-
<td><@printFormattedNumber value=group.redundancy_z format=df_percentage/></td>
70+
<td><@printFormattedNumber value=group.redundancy_z format=df_statistic/></td>
7171
</#if>
7272
</#if>
7373

‎JAG3D/resources/ftl/jag3d/default/vertical_deflection_tfoot.ftlh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</#if>
2323

2424
<#if group.type == "STOCHASTIC_VERTICAL_DEFLECTION">
25-
<td><@printFormattedNumber value=group.redundancy_y format=df_percentage/></td>
26-
<td><@printFormattedNumber value=group.redundancy_x format=df_percentage/></td>
25+
<td><@printFormattedNumber value=group.redundancy_y format=df_statistic/></td>
26+
<td><@printFormattedNumber value=group.redundancy_x format=df_statistic/></td>
2727
</#if>
2828

2929
<#if group.type != "REFERENCE_POINT">

‎JAG3D/src/org/applied_geodesy/jag3d/ui/io/report/FTLReport.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -975,10 +975,10 @@ else if(type == Types.BOOLEAN)
975975
groupParam.put("dimension", dim);
976976
groupParam.put("type", pointType.name());
977977

978-
groupParam.put("redundancy_x", options.convertPercentToView(redundancyGroupX));
979-
groupParam.put("redundancy_y", options.convertPercentToView(redundancyGroupY));
980-
groupParam.put("redundancy_z", options.convertPercentToView(redundancyGroupZ));
981-
groupParam.put("redundancy", options.convertPercentToView(redundancyGroupX+redundancyGroupY+redundancyGroupZ));
978+
groupParam.put("redundancy_x", redundancyGroupX);
979+
groupParam.put("redundancy_y", redundancyGroupY);
980+
groupParam.put("redundancy_z", redundancyGroupZ);
981+
groupParam.put("redundancy", redundancyGroupX+redundancyGroupY+redundancyGroupZ);
982982

983983
groupParam.put("max_gross_error_x", options.convertLengthResidualToView(maxGrossErrorGroupX));
984984
groupParam.put("max_gross_error_y", options.convertLengthResidualToView(maxGrossErrorGroupY));
@@ -1154,9 +1154,9 @@ else if(type == Types.BOOLEAN)
11541154
groupParam.put("significant", significantGroup);
11551155
groupParam.put("type", verticalDeflectionType.name());
11561156

1157-
groupParam.put("redundancy_x", options.convertPercentToView(redundancyGroupX));
1158-
groupParam.put("redundancy_y", options.convertPercentToView(redundancyGroupY));
1159-
groupParam.put("redundancy", options.convertPercentToView(redundancyGroupX+redundancyGroupY));
1157+
groupParam.put("redundancy_x", redundancyGroupX);
1158+
groupParam.put("redundancy_y", redundancyGroupY);
1159+
groupParam.put("redundancy", redundancyGroupX+redundancyGroupY);
11601160

11611161
groupParam.put("max_gross_error_x", options.convertAngleResidualToView(maxGrossErrorGroupX));
11621162
groupParam.put("max_gross_error_y", options.convertAngleResidualToView(maxGrossErrorGroupY));
@@ -1381,7 +1381,7 @@ else if(type == Types.BOOLEAN)
13811381
groupParam.put("observations", observations);
13821382
groupParam.put("dimension", 1);
13831383
groupParam.put("omega", omegaGroup);
1384-
groupParam.put("redundancy", options.convertPercentToView(redundancyGroup));
1384+
groupParam.put("redundancy", redundancyGroup);
13851385
groupParam.put("significant", significantGroup);
13861386

13871387
if (groupUncertainties != null && !groupUncertainties.isEmpty())
@@ -1604,10 +1604,10 @@ else if(type == Types.BOOLEAN)
16041604
//break;
16051605
}
16061606

1607-
groupParam.put("redundancy_x", options.convertPercentToView(redundancyGroupX));
1608-
groupParam.put("redundancy_y", options.convertPercentToView(redundancyGroupY));
1609-
groupParam.put("redundancy_z", options.convertPercentToView(redundancyGroupZ));
1610-
groupParam.put("redundancy", options.convertPercentToView(redundancyGroupX+redundancyGroupY+redundancyGroupZ));
1607+
groupParam.put("redundancy_x", redundancyGroupX);
1608+
groupParam.put("redundancy_y", redundancyGroupY);
1609+
groupParam.put("redundancy_z", redundancyGroupZ);
1610+
groupParam.put("redundancy", redundancyGroupX+redundancyGroupY+redundancyGroupZ);
16111611

16121612
groupParam.put("max_gross_error_x", options.convertLengthResidualToView(maxGrossErrorGroupX));
16131613
groupParam.put("max_gross_error_y", options.convertLengthResidualToView(maxGrossErrorGroupY));

0 commit comments

Comments
 (0)