Browse Source

CQA - OverviewReport, Parameters missing

reports
Peter Forstmeier 12 years ago
parent
commit
cf9c74ac8d
  1. 2
      src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml
  2. 6
      src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs
  3. 32
      src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs
  4. 16
      src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd
  5. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/BaseClasses/BasicParameter.cs
  6. 3
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs
  7. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs
  8. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs
  9. 1
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

2
src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml

@ -12,7 +12,7 @@
<Menu Background="White" x:Name="printMenu" Visibility="Hidden"> <Menu Background="White" x:Name="printMenu" Visibility="Hidden">
<MenuItem Header="Reports"> <MenuItem Header="Reports">
<!--<MenuItem Header="Overview" Click="OverviewReport_Click"></MenuItem>--> <MenuItem Header="Overview" Click="OverviewReport_Click"></MenuItem>
<MenuItem Header="Dependecies" Click=" DependecyReport_Click"></MenuItem> <MenuItem Header="Dependecies" Click=" DependecyReport_Click"></MenuItem>
</MenuItem> </MenuItem>

6
src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs

@ -45,9 +45,9 @@ namespace ICSharpCode.CodeQuality.Reporting
Assembly asm = Assembly.GetExecutingAssembly(); Assembly asm = Assembly.GetExecutingAssembly();
System.IO.Stream stream = asm.GetManifestResourceStream("ICSharpCode.CodeQuality.Reporting.DependencyReport.srd"); System.IO.Stream stream = asm.GetManifestResourceStream("ICSharpCode.CodeQuality.Reporting.DependencyReport.srd");
var rf = new ReportingFactory(); var reportingFactory = new ReportingFactory();
var reportCreator = rf.ReportCreator (stream,newList); var reportCreator = reportingFactory.ReportCreator (stream,newList);
ReportSettings = rf.ReportModel.ReportSettings; ReportSettings = reportingFactory.ReportModel.ReportSettings;
reportCreator.BuildExportList(); reportCreator.BuildExportList();
return reportCreator; return reportCreator;
} }

32
src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs

@ -23,6 +23,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using ICSharpCode.NRefactory.Utils; using ICSharpCode.NRefactory.Utils;
using ICSharpCode.Reporting;
using ICSharpCode.Reporting.Interfaces; using ICSharpCode.Reporting.Interfaces;
using ICSharpCode.CodeQuality.Engine.Dom; using ICSharpCode.CodeQuality.Engine.Dom;
@ -41,23 +42,36 @@ namespace ICSharpCode.CodeQuality.Reporting
public IReportCreator Run(ReadOnlyCollection<AssemblyNode> list) public IReportCreator Run(ReadOnlyCollection<AssemblyNode> list)
{ {
var asm = Assembly.GetExecutingAssembly();
var stream = asm.GetManifestResourceStream("ICSharpCode.CodeQuality.Reporting.Overviewreport.srd");
var newList = from c in list
select new OverviewViewModel { Node = c};
var reportingFactory = new ReportingFactory();
var reportCreator = reportingFactory.ReportCreator (stream,newList);
ReportSettings = reportingFactory.ReportModel.ReportSettings;
var reportParameters = new ParameterCollection();
reportParameters.Add(new BasicParameter ("param1",base.FileNames[0]));
reportParameters.Add(new BasicParameter ("param2",list.Count.ToString()));
ReportSettings.ParameterCollection.AddRange(reportParameters);
reportCreator.BuildExportList();
return reportCreator;
/* /*
System.Reflection.Assembly asm = Assembly.GetExecutingAssembly(); var model = ReportEngine.LoadReportModel(stream);
System.IO.Stream stream = asm.GetManifestResourceStream("ICSharpCode.CodeQuality.Reporting.Overviewreport.srd");
var model = ReportEngine.LoadReportModel(stream);
ReportSettings = model.ReportSettings; ReportSettings = model.ReportSettings;
var r = from c in list
select new OverviewViewModel { Node = c};
var p = new ReportParameters();
p.Parameters.Add(new BasicParameter ("param1",base.FileNames[0]));
p.Parameters.Add(new BasicParameter ("param2",list.Count.ToString()));
IReportCreator creator = ReportEngine.CreatePageBuilder(model,r.ToList(),p); IReportCreator creator = ReportEngine.CreatePageBuilder(model,r.ToList(),p);
creator.BuildExportList(); creator.BuildExportList();
return creator; return creator;
*/ */
return null; return null;
} }

16
src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd

@ -15,15 +15,7 @@
<AvailableFieldsCollection /> <AvailableFieldsCollection />
<SortColumnsCollection /> <SortColumnsCollection />
<GroupColumnsCollection /> <GroupColumnsCollection />
<ParameterCollection> <ParameterCollection />
<BasicParameter>
<ParameterName>param1</ParameterName>
<Type>System.String</Type>
</BasicParameter>
<BasicParameter>
<ParameterName>param2</ParameterName>
</BasicParameter>
</ParameterCollection>
<SqlParameters /> <SqlParameters />
<ConnectionString /> <ConnectionString />
<CommandText /> <CommandText />
@ -70,7 +62,7 @@
<CanGrow>False</CanGrow> <CanGrow>False</CanGrow>
<CanShrink>False</CanShrink> <CanShrink>False</CanShrink>
<RTL>No</RTL> <RTL>No</RTL>
<Text>=Today()</Text> <Text>=Today</Text>
<DrawBorder>False</DrawBorder> <DrawBorder>False</DrawBorder>
<FrameColor>Black</FrameColor> <FrameColor>Black</FrameColor>
<ForeColor>ControlText</ForeColor> <ForeColor>ControlText</ForeColor>
@ -100,7 +92,7 @@
<CanGrow>False</CanGrow> <CanGrow>False</CanGrow>
<CanShrink>False</CanShrink> <CanShrink>False</CanShrink>
<RTL>No</RTL> <RTL>No</RTL>
<Text>=Parameters!param2</Text> <Text>Parameters!param2</Text>
<DrawBorder>False</DrawBorder> <DrawBorder>False</DrawBorder>
<FrameColor>Black</FrameColor> <FrameColor>Black</FrameColor>
<ForeColor>ControlText</ForeColor> <ForeColor>ControlText</ForeColor>
@ -132,7 +124,7 @@
<CanGrow>False</CanGrow> <CanGrow>False</CanGrow>
<CanShrink>False</CanShrink> <CanShrink>False</CanShrink>
<RTL>No</RTL> <RTL>No</RTL>
<Text>=Parameters!param1</Text> <Text>Parameters!param1</Text>
<DrawBorder>False</DrawBorder> <DrawBorder>False</DrawBorder>
<FrameColor>Black</FrameColor> <FrameColor>Black</FrameColor>
<ForeColor>ControlText</ForeColor> <ForeColor>ControlText</ForeColor>

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/BaseClasses/BasicParameter.cs

@ -16,7 +16,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
namespace ICSharpCode.Reporting.BaseClasses namespace ICSharpCode.Reporting
{ {
/// <summary> /// <summary>
/// Description of BasicParameter. /// Description of BasicParameter.

3
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs

@ -30,9 +30,6 @@ namespace ICSharpCode.Reporting
public class SortColumnCollection: Collection<AbstractColumn> public class SortColumnCollection: Collection<AbstractColumn>
{ {
public SortColumnCollection()
{
}
public AbstractColumn Find (string columnName) public AbstractColumn Find (string columnName)
{ {

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs

@ -33,7 +33,7 @@ namespace ICSharpCode.Reporting.Items
public ReportSettings() public ReportSettings()
{ {
this.pageSize = Globals.GlobalValues.DefaultPageSize; this.pageSize = GlobalValues.DefaultPageSize;
BaseValues(); BaseValues();
} }

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs

@ -56,8 +56,6 @@ namespace ICSharpCode.Reporting
public IReportCreator ReportCreator (Stream stream) public IReportCreator ReportCreator (Stream stream)
{ {
ReportModel = LoadReportModel (stream); ReportModel = LoadReportModel (stream);
// IReportCreator builder = null;
// builder = ReportCreatorFactory.ExporterFactory(ReportModel);
var builder = new FormPageBuilder(ReportModel); var builder = new FormPageBuilder(ReportModel);
return builder; return builder;
} }
@ -65,8 +63,6 @@ namespace ICSharpCode.Reporting
public IReportCreator ReportCreator (ReportModel reportModel) { public IReportCreator ReportCreator (ReportModel reportModel) {
ReportModel = reportModel; ReportModel = reportModel;
// IReportCreator builder = null;
// builder = ReportCreatorFactory.ExporterFactory(ReportModel);
var builder = new FormPageBuilder(ReportModel); var builder = new FormPageBuilder(ReportModel);
return builder; return builder;
} }

1
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

@ -110,6 +110,7 @@ namespace ICSharpCode.Reporting.Xml
protected void ProcessChildProperties(XmlNode node, object parent) protected void ProcessChildProperties(XmlNode node, object parent)
{ {
var t=parent.GetType(); var t=parent.GetType();
// children of a class must always be properties // children of a class must always be properties

Loading…
Cancel
Save