Browse Source

Add PDFSharp-MigraDocFoundation-1_32.zip, adjust PageBuilders

reports
Peter Forstmeier 13 years ago
parent
commit
52f2e88e47
  1. 3
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
  2. 6
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs
  3. 7
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/Irony/ReportingLanguageRuntime.cs
  4. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs
  5. 3
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/FormPageBuilder.cs
  6. 13
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/IntegrationTests.cs
  7. BIN
      src/AddIns/Misc/Reporting/Packages/PdfSharp/PDFSharp-MigraDocFoundation-1_32.zip

3
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj

@ -50,6 +50,9 @@
<Reference Include="Irony.Interpreter"> <Reference Include="Irony.Interpreter">
<HintPath>..\Libraries\Irony.Interpreter.dll</HintPath> <HintPath>..\Libraries\Irony.Interpreter.dll</HintPath>
</Reference> </Reference>
<Reference Include="PdfSharp-WPF">
<HintPath>..\Libraries\PdfSharp-WPF.dll</HintPath>
</Reference>
<Reference Include="PresentationCore"> <Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework> <RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference> </Reference>

6
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs

@ -60,9 +60,9 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
var str = ExpressionHelper.ExtractExpressionPart(exportColumn.Text); var str = ExpressionHelper.ExtractExpressionPart(exportColumn.Text);
var result = evaluator.Evaluate(str); var result = evaluator.Evaluate(str);
exportColumn.Text = result.ToString(); exportColumn.Text = result.ToString();
} catch (Exception) { } catch (Exception e) {
var s = String.Format("SharpReport.Exprssions -> {0}",e.Message);
throw; Console.WriteLine(s);
} }
} }
} }

7
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/Irony/ReportingLanguageRuntime.cs

@ -21,13 +21,14 @@ namespace ICSharpCode.Reporting.Expressions.Irony
base.Init(); base.Init();
//add built-in methods, special form IIF, import Math and Environment methods //add built-in methods, special form IIF, import Math and Environment methods
// BuiltIns.AddMethod(BuiltInPrintMethod, "print"); // BuiltIns.AddMethod(BuiltInPrintMethod, "print");
// BuiltIns.AddMethod(BuiltInFormatMethod, "format"); BuiltIns.AddMethod(BuiltInFormatMethod, "format");
BuiltIns.AddSpecialForm(SpecialFormsLibrary.Iif, "iif", 3, 3); BuiltIns.AddSpecialForm(SpecialFormsLibrary.Iif, "iif", 3, 3);
BuiltIns.ImportStaticMembers(typeof(System.Math)); BuiltIns.ImportStaticMembers(typeof(System.Math));
BuiltIns.ImportStaticMembers(typeof(Environment)); BuiltIns.ImportStaticMembers(typeof(Environment));
} }
/*
private object BuiltInPrintMethod(ScriptThread thread, object[] args) { private object BuiltInPrintMethod(ScriptThread thread, object[] args) {
string text = string.Empty; string text = string.Empty;
switch(args.Length) { switch(args.Length) {
@ -56,6 +57,6 @@ namespace ICSharpCode.Reporting.Expressions.Irony
return text; return text;
} }
*/
} }
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs

@ -39,7 +39,7 @@ namespace ICSharpCode.Reporting.PageBuilder
BuildDetail(); BuildDetail();
base.BuildReportFooter(); base.BuildReportFooter();
base.AddPage(CurrentPage); base.AddPage(CurrentPage);
// RunExpressions(); RunExpressions();
} }
void BuildDetail() void BuildDetail()

3
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/FormPageBuilder.cs

@ -32,8 +32,7 @@ namespace ICSharpCode.Reporting.PageBuilder
base.AddPage(CurrentPage); base.AddPage(CurrentPage);
RunDebugVisitor(); RunDebugVisitor();
RunExpressions();
// RunExpressions();
} }

13
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/IntegrationTests.cs

@ -24,6 +24,12 @@ namespace ICSharpCode.Reporting.Test.Expressions
} }
[Test]
public void ReportSyntaxError() {
collection[0].Text = "= myText";
expressionVisitor.Visit(collection[0]);
}
[Test] [Test]
public void SimpleMath() { public void SimpleMath() {
collection[0].Text = "=3 + 6"; collection[0].Text = "=3 + 6";
@ -71,6 +77,13 @@ namespace ICSharpCode.Reporting.Test.Expressions
Assert.That(collection[0].Text,Is.EqualTo("11")); Assert.That(collection[0].Text,Is.EqualTo("11"));
} }
[Test]
public void aa () {
var script = "=Globals!UserName";
collection[0].Text = script;
expressionVisitor.Visit(collection[0]);
Assert.That(collection[0].Text,Is.EqualTo("11"));
}
#endregion #endregion
[SetUp] [SetUp]

BIN
src/AddIns/Misc/Reporting/Packages/PdfSharp/PDFSharp-MigraDocFoundation-1_32.zip

Binary file not shown.
Loading…
Cancel
Save