|
@@ -1517,8 +1517,7 @@ namespace OTSIncAReportGraph.Controls
|
|
|
|
|
|
|
|
|
//------------------------------------分解结果内容部份------------------------------------
|
|
|
- //SIZECALMETHOM sizeCalculate_type;
|
|
|
- //string con = "";
|
|
|
+
|
|
|
var conItem = currentConditionValue[OTS_REPORT_PROP_GRID_ITEMS.IMAGEGRID_DIS_TYPE];
|
|
|
if (conItem == null)
|
|
|
{
|
|
@@ -1531,15 +1530,16 @@ namespace OTSIncAReportGraph.Controls
|
|
|
{
|
|
|
foreach (DisplayParticle ls_dp in m_list_baseobject)
|
|
|
{
|
|
|
+ ls_dp.displayState = DisplayState.NORMALDISPLAY;
|
|
|
if (!FLNameList.ContainsKey(ls_dp.TypeName))
|
|
|
{
|
|
|
List<DisplayParticle> newParts = new List<DisplayParticle>();
|
|
|
- newParts.Add(ls_dp);
|
|
|
+ newParts.Add(ls_dp.Clone() as DisplayParticle);
|
|
|
FLNameList.Add(ls_dp.TypeName, newParts);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- FLNameList[ls_dp.TypeName].Add(ls_dp);
|
|
|
+ FLNameList[ls_dp.TypeName].Add(ls_dp.Clone() as DisplayParticle);
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -1587,6 +1587,7 @@ namespace OTSIncAReportGraph.Controls
|
|
|
}
|
|
|
foreach (DisplayParticle ls_dp in m_list_baseobject)
|
|
|
{
|
|
|
+ //ls_dp.displayState = DisplayState.NORMALDISPLAY;
|
|
|
var sizeCalItem = currentConditionValue[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
|
|
|
switch ((SIZECALMETHOM)sizeCalItem.itemVal)
|
|
|
{
|