* Refactor expression variables

git-svn-id: trunk@37675 -

packages/fcl-report/demos/rptgrouping.pp

@@ -193,11 +193,11 @@ begin
 
 
   {*** variables ***}
-  rpt.Variables.AddExprVariable('population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat);
-  rpt.Variables.AddExprVariable('grp_sum_population', 'sum(StrToFloat(population))', rtFloat, rtGroup, GroupHeader);
-  rpt.Variables.AddExprVariable('grp_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, rtGroup, GroupHeader);
-  rpt.Variables.AddExprVariable('sum_population', 'sum(StrToFloat(population))', rtFloat);
-  rpt.Variables.AddExprVariable('sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat);
+  rpt.Variables.AddExprVariable('population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, rtNone, '');
+  rpt.Variables.AddExprVariable('grp_sum_population', 'sum(StrToFloat(population))',rtFloat , GroupHeader);
+  rpt.Variables.AddExprVariable('grp_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, GroupHeader);
+  rpt.Variables.AddExprVariable('sum_population', 'sum(StrToFloat(population))', rtFloat, rtnone, '');
+  rpt.Variables.AddExprVariable('sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat,rtnone,'');
 
 
   {*** detail ***}

packages/fcl-report/demos/rptgrouping2.pp

@@ -227,7 +227,7 @@ begin
   Memo.Layout.Height := 8;
   Memo.UseParentFont := False;
   Memo.TextAlignment.Horizontal := taRightJustified;
-  Memo.Text := '[FormatFloat(''#,###0.00'',sum(data.population/1000000))] million';
+  Memo.Text := 'Total for [data.continent]: [FormatFloat(''#,###0.00'',sum(data.population/1000000))] million.';
 //  Memo.Options:=Memo.Options+[moNoResetAggregateOnPrint];
   Memo.Font.Size := 16;
 

packages/fcl-report/demos/rptnestedgroups.pp

@@ -559,13 +559,13 @@ begin
 
   {*** variables ***}
 
-  rpt.Variables.AddExprVariable('population_in_M', 'StrToFloat(population) / 1000000', rtFloat);
-  rpt.Variables.AddExprVariable('grp1region_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, rtGroup, GroupHeader1Region);
-  rpt.Variables.AddExprVariable('grp1region_sum_population', 'sum(StrToFloat(population))', rtFloat, rtGroup, GroupHeader1Region);
-  rpt.Variables.AddExprVariable('grp2subregion_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, rtGroup, GroupHeader2Subregion);
-  rpt.Variables.AddExprVariable('grp2subregion_sum_population', 'sum(StrToFloat(population))', rtFloat, rtGroup, GroupHeader2Subregion);
-  rpt.Variables.AddExprVariable('grp3initial_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, rtGroup, GroupHeader3Initial);
-  rpt.Variables.AddExprVariable('grp3initial_sum_population', 'sum(StrToFloat(population))', rtFloat, rtGroup, GroupHeader3Initial);
+  rpt.Variables.AddExprVariable('population_in_M', 'StrToFloat(population) / 1000000', rtFloat, rtNone, '');
+  rpt.Variables.AddExprVariable('grp1region_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, GroupHeader1Region);
+  rpt.Variables.AddExprVariable('grp1region_sum_population', 'sum(StrToFloat(population))', rtFloat, GroupHeader1Region);
+  rpt.Variables.AddExprVariable('grp2subregion_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, GroupHeader2Subregion);
+  rpt.Variables.AddExprVariable('grp2subregion_sum_population', 'sum(StrToFloat(population))', rtFloat, GroupHeader2Subregion);
+  rpt.Variables.AddExprVariable('grp3initial_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat, GroupHeader3Initial);
+  rpt.Variables.AddExprVariable('grp3initial_sum_population', 'sum(StrToFloat(population))', rtFloat, GroupHeader3Initial);
   rpt.Variables.AddExprVariable('total_sum_population_in_M', 'sum(StrToFloat(population) / 1000000)', rtFloat);
   rpt.Variables.AddExprVariable('total_sum_population', 'sum(StrToFloat(population))', rtFloat);
 

packages/fcl-report/src/fpreport.pp

@@ -1411,8 +1411,8 @@ type
     Function FindVariable(aName : String)  : TFPReportVariable;
     Function AddVariable(aName : String)  : TFPReportVariable;
     Function AddDataVariable(aName : String)  : TFPReportVariable;
-    Function AddExprVariable(aName : String; aExpr: String; aType: TResultType = rtString; aResetType: TFPReportResetType = rtNone; aResetGroup: TFPReportCustomGroupHeaderBand = nil) : TFPReportVariable;
-    Function AddExprVariable(aName : String; aExpr: String; aType: TResultType; aResetType: TFPReportResetType; aResetValueExpression: String) : TFPReportVariable;
+    Function AddExprVariable(aName : String; aExpr: String; aType: TResultType; aResetGroup: TFPReportCustomGroupHeaderBand) : TFPReportVariable;
+    Function AddExprVariable(aName : String; aExpr: String; aType: TResultType; aResetType: TFPReportResetType = rtnone; aResetValueExpression: String = '') : TFPReportVariable;
     Property Variable[aIndex : Integer] : TFPReportVariable Read GetV Write SetV; default;
   end;
 
@@ -2165,8 +2165,10 @@ resourcestring
   SErrUnknownElementName = 'Unknown element name : %s';
   SErrUnknownElementClass = 'Unknown element class : %s';
   SErrResetGroupMissing = 'ResetType is rtGroup but no ResetGroup specified';
+  SErrEmptyResetValue = 'ResetType is specified, but no ResetExpression is provided';
   SErrExprVarisbleAggregateOnWrongLevel= 'ExprVariable has Aggregate but not on highest level: %s';
 
+
 { includes Report Checkbox element images }
 {$I fpreportcheckbox.inc}
 
@@ -2747,9 +2749,7 @@ begin
   end;
 end;
 
-function TFPReportVariables.AddExprVariable(aName: String; aExpr: String;
-  aType: TResultType; aResetType: TFPReportResetType;
-  aResetGroup: TFPReportCustomGroupHeaderBand): TFPReportVariable;
+function TFPReportVariables.AddExprVariable(aName: String; aExpr: String; aType: TResultType; aResetGroup: TFPReportCustomGroupHeaderBand): TFPReportVariable;
 var
   lGrp: TFPReportCustomGroupHeaderBand;
   lResetValueExpression: String;
@@ -2766,27 +2766,16 @@ var
   end;
 
 begin
-  if (aResetType = rtGroup)
-  and not Assigned(aResetGroup) then
+  if not Assigned(aResetGroup) then
     raise EReportError.Create(SErrResetGroupMissing);
   lResetValueExpression:='';
-  if Assigned(aResetGroup) then
-  begin
-    case aResetType of
-      rtGroup:
-      begin
-        lGrp:=aResetGroup;
-        while Assigned(lGrp) do
-        begin
-          ExtendResetValueExpression(lGrp.GroupCondition, false);
-          lGrp:=lGrp.ParentGroupHeader;
-        end;
-      end;
-      rtPage:   lResetValueExpression:='PageNo';
-      rtColumn: lResetValueExpression:='ColNo';
+  lGrp:=aResetGroup;
+  while Assigned(lGrp) do
+    begin
+    ExtendResetValueExpression(lGrp.GroupCondition, false);
+    lGrp:=lGrp.ParentGroupHeader;
     end;
-  end;
-  Result := AddExprVariable(aName, aExpr, aType, aResetType, lResetValueExpression);
+  Result := AddExprVariable(aName, aExpr, aType, rtGroup, lResetValueExpression);
 end;
 
 function TFPReportVariables.AddExprVariable(aName: String; aExpr: String;
@@ -2796,14 +2785,21 @@ begin
   if (IndexOfVariable(aName)<>-1) then
     raise EReportError.CreateFmt(SErrDuplicateVariable, [aName]);
   Result:=add as TFPReportVariable;
+  if (aResetValueExpression='') then
+    case aResetType of
+      rtPage:   aResetValueExpression:='PageNo';
+      rtColumn: aResetValueExpression:='ColNo';
+    end;
+  if (aResetType<>rtNone) and (aResetValueExpression='') then
+    raise EReportError.CreateFmt(SErrEmptyResetValue, [aName]);
   with Result do
-  begin
+    begin
     Name:=aName;
     FExpression:=aExpr;
     DataType:=aType;
     FResetType:=aResetType;
     FResetValueExpression:=aResetValueExpression;
-  end;
+    end;
 end;
 
 { TFPReportVariable }