[Title] Fixed bug on chart item
authorkamuru <kamuru@kamuru-Samsung-Desktop-System.(none)>
Tue, 17 Dec 2013 07:52:54 +0000 (16:52 +0900)
committerkamuru <kamuru@kamuru-Samsung-Desktop-System.(none)>
Tue, 17 Dec 2013 07:52:54 +0000 (16:52 +0900)
[Desc.] Fixed a bug that wrong height item shows when select pid combo
[Issue]

12 files changed:
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItem.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextTreeTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java

index 52738d1..c4cc7c0 100644 (file)
@@ -452,7 +452,7 @@ public class DAChartBoard extends Composite {
                itemList.setSize(itemListScrollComp.getClientArea().width, listHeight);
        }
 
-       public DAChartBoardItemList getChartComposite() {
+       public DAChartBoardItemList getItemList() {
                return itemList;
        }
 
index 3dcf5c7..8038e3b 100644 (file)
@@ -44,7 +44,7 @@ public class DAChartBoardItem extends Composite {
        protected double heightRatio;
 
        protected boolean childFolded = true;
-       private boolean isHide = false;
+       private boolean isHidden = false;
 
        private final static int DEFAULT_ITEM_HEIGHT = 80;
        public final static int DEFAULT_NAME_CELL_WIDTH = 99;
@@ -67,7 +67,7 @@ public class DAChartBoardItem extends Composite {
        }
 
        public DAChartBoardItem(DAChartBoard parent, String itemName) {
-               super(parent.getChartComposite(), SWT.NONE);
+               super(parent.getItemList(), SWT.NONE);
                parentBoard = parent;
                initWidget(itemName, null, DAChart.CHART_STYLE_NORMAL);
                parentBoard.registerItem(this);
@@ -75,7 +75,7 @@ public class DAChartBoardItem extends Composite {
 
        public DAChartBoardItem(DAChartBoard parent, String itemName, Image icon,
                        int chartStyle) {
-               super(parent.getChartComposite(), SWT.NONE);
+               super(parent.getItemList(), SWT.NONE);
                parentBoard = parent;
                initWidget(itemName, icon, chartStyle);
                parentBoard.registerItem(this);
@@ -339,23 +339,27 @@ public class DAChartBoardItem extends Composite {
                itemCell.contentsClear();
        }
 
-       boolean setHide(boolean isHide) {
-               if (this.isHide == isHide) {
-                       return false;
-               } else {
-                       this.isHide = isHide;
-                       if (false == isHide) {
-                               FormData data = (FormData) itemCell.getLayoutData();
-                               data.height = getItemHeight();
-                               itemCell.setLayoutData(data);
-                               this.layout();
-                       }
-                       return true;
-               }
+       boolean isHidden() {
+               return isHidden;
+       }
+       
+       void hide() {
+               isHidden = true;
+       }
+
+       void show() {
+               isHidden = false;
+               FormData data = (FormData) itemCell.getLayoutData();
+               data.height = getItemHeight();
+               itemCell.setLayoutData(data);
+               this.layout();
+               
+               refreshItemCellHeight();
+               callNotifyResizeChild();
        }
 
        int getItemHeight() {
-               if (isHide) {
+               if (isHidden) {
                        return 0;
                } else if (childFolded) {
                        return (int) (heightRatio * DEFAULT_ITEM_HEIGHT);
index 5982ba2..b13345d 100644 (file)
@@ -149,7 +149,8 @@ public class DAChartBoardItemList extends Composite {
        public void hideItem(int index) {
                DAChartBoardItem child = childItems.get(index);
 
-               if (true == child.setHide(true)) {
+               if(!child.isHidden()) {
+                       child.hide();
                        FormData data = (FormData) child.getLayoutData();
                        data.height = 0;
                        child.setLayoutData(data);
@@ -158,13 +159,14 @@ public class DAChartBoardItemList extends Composite {
        }
 
        public void showItem(int index) {
-               DAChartBoardItem child = childItems.get(index);
+               DAChartBoardItem childItem = childItems.get(index);
 
-               if (true == child.setHide(false)) {
-                       int height = child.getItemHeight();
-                       FormData data = (FormData) child.getLayoutData();
+               if (childItem.isHidden()) {
+                       childItem.show();
+                       int height = childItem.getItemHeight();
+                       FormData data = (FormData) childItem.getLayoutData();
                        data.height = height;
-                       child.setLayoutData(data);
+                       childItem.setLayoutData(data);
                }
                this.layout();
        }
index 58d4962..60d6724 100755 (executable)
@@ -332,6 +332,20 @@ public class DBTableManager {
                                options[i] = EMPTY;
                                if (i == GLContextDBEnum.FRAME_INDEX.ordinal()) {
                                        types[i] = INTEGER;
+                               } else if (i == GLContextDBEnum.SHADER_SRC.ordinal()) {
+                                       types[i] = "VARCHAR(20000)";
+                               } else if (i == GLContextDBEnum.SHADER_TYPE.ordinal()) {
+                                       types[i] = "VARCHAR(20000)";
+                               } else if (i == GLContextDBEnum.PROGRAM_ATTRIB_NAME.ordinal()) {
+                                       types[i] = "VARCHAR(20000)";
+                               } else if (i == GLContextDBEnum.PROGRAM_ATTRIB_TYPE.ordinal()) {
+                                       types[i] = "VARCHAR(20000)";
+                               } else if (i == GLContextDBEnum.PROGRAM_UNIFORM_NAME.ordinal()) {
+                                       types[i] = "VARCHAR(20000)";
+                               } else if (i == GLContextDBEnum.PROGRAM_UNIFORM_TYPE.ordinal()) {
+                                       types[i] = "VARCHAR(20000)";
+                               } else if (i == GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal()) {
+                                       types[i] = "VARCHAR(20000)";
                                } else {
                                        types[i] = TEXT;
                                }
index f8535ab..9f1e39a 100644 (file)
@@ -387,7 +387,7 @@ public class FileDataMaker {
        }
 
        private void chartFilteringByPId() {
-               if(null == board || null == board.getChartComposite()){
+               if(null == board || null == board.getItemList()){
                        return;
                }
                int selectedPid = ToolbarArea.getInstance().getSelectedPid();
@@ -402,9 +402,9 @@ public class FileDataMaker {
                }
 
                if (isCheck) {
-                       int parentSize = board.getChartComposite().getItemSize();
+                       int parentSize = board.getItemList().getItemSize();
                        for (int i = 0; i < parentSize; i++) {
-                               DAChartBoardItem parentItem = board.getChartComposite().get(i);
+                               DAChartBoardItem parentItem = board.getItemList().get(i);
                                int childSize = parentItem.getChildItemList().getItemSize();
                                int hidedCount = 0;
                                for (int j = 0; j < childSize; j++) {
index d9afb57..261babb 100755 (executable)
@@ -448,7 +448,7 @@ public class ContextSwitchingChartView extends DAView {
        }
 
        private void rearrangeChart() {
-               DAChartBoardItemList itemList = contextChart.getChartComposite();
+               DAChartBoardItemList itemList = contextChart.getItemList();
                int listsize = itemList.getItemSize();
 
                TreeMap<KernelDataPerThread, Integer> sortedmap = new TreeMap<KernelDataPerThread, Integer>(
index fdd4838..00160b0 100644 (file)
@@ -558,7 +558,7 @@ public class NetworkDataMaker {
        }
 
        private void chartFilteringByPId() {
-               if(null == board || null == board.getChartComposite()){
+               if(null == board || null == board.getItemList()){
                        return;
                }
                int selectedPid = ToolbarArea.getInstance().getSelectedPid();
@@ -573,9 +573,9 @@ public class NetworkDataMaker {
                }
 
                if (isCheck) {
-                       int parentSize = board.getChartComposite().getItemSize();
+                       int parentSize = board.getItemList().getItemSize();
                        for (int i = 0; i < parentSize; i++) {
-                               DAChartBoardItem parentItem = board.getChartComposite().get(i);
+                               DAChartBoardItem parentItem = board.getItemList().get(i);
                                int childSize = parentItem.getChildItemList().getItemSize();
                                int hidedCount = 0;
                                for (int j = 0; j < childSize; j++) {
@@ -630,9 +630,9 @@ public class NetworkDataMaker {
 
        private void hideUnConnectedItem() {
                if (isUnknownChart == true && isAddressChart == true) {
-                       int parentSize = board.getChartComposite().getItemSize();
+                       int parentSize = board.getItemList().getItemSize();
                        for (int i = 0; i < parentSize; i++) {
-                               DAChartBoardItem parentItem = board.getChartComposite().get(i);
+                               DAChartBoardItem parentItem = board.getItemList().get(i);
                                NetworkChartData itme = (NetworkChartData) parentItem.getData();
                                if (itme.getChartKeyName().equals(
                                                NetworkPageLabels.NETWORK_CHART_NOTCONNECT)) {
index 102a539..7dac523 100644 (file)
@@ -176,12 +176,14 @@ public class GLContextTreeTable extends DATreeComposite {
                                updateTree();
                                table.setSelection(selectionIndex);
 
-                               if (!naviButtonLeftComposite.isDisposed()) {
+                               if (naviButtonLeftComposite != null
+                                               && !naviButtonLeftComposite.isDisposed()) {
                                        naviButtonLeftComposite
                                                        .setBackground(ColorResources.TABLE_CONTENTS_SELECTED_END);
                                }
 
-                               if (!naviButtonRightComposite.isDisposed()) {
+                               if (naviButtonRightComposite != null
+                                               && !naviButtonRightComposite.isDisposed()) {
                                        naviButtonRightComposite
                                                        .setBackground(ColorResources.TABLE_CONTENTS_SELECTED_END);
                                }
index e7d8809..7e46310 100644 (file)
@@ -420,7 +420,7 @@ public class ThreadPageSyncDataManager {
        }
 
        private void chartFilteringByPid() {
-               if(null == board || null == board.getChartComposite()){
+               if(null == board || null == board.getItemList()){
                        return;
                }
                int selectedPid = ToolbarArea.getInstance().getSelectedPid();
@@ -435,9 +435,9 @@ public class ThreadPageSyncDataManager {
                }
 
                if (isCheck) {
-                       int parentSize = board.getChartComposite().getItemSize();
+                       int parentSize = board.getItemList().getItemSize();
                        for (int i = 0; i < parentSize; i++) {
-                               DAChartBoardItem parentItem = board.getChartComposite().get(i);
+                               DAChartBoardItem parentItem = board.getItemList().get(i);
 /*
                                int childSize = parentItem.getChildItemList().getItemSize();
                                int hidedCount = 0;
@@ -479,6 +479,9 @@ public class ThreadPageSyncDataManager {
                                int itemPid = getItemPid(parentItem);
                                if (itemPid == selectedPid) {
                                        board.showItem(i);
+//                                     for(int j = 0; j < parentItem.getChildItemList().getItemSize(); j++) {
+//                                             parentItem.getChildItemList().showItem(j);
+//                                     }
                                } else if (selectedPid == 0) {
                                        board.showItem(i);
                                } else if (itemPid == -1) {
index 7677297..5fdf74b 100644 (file)
@@ -1045,7 +1045,7 @@ public class ThreadPageThreadDataManager {
        }
 
        private void chartFilteringByPid() {
-               if(null == board || null == board.getChartComposite()){
+               if(null == board || null == board.getItemList()){
                        return;
                }
                int selectedPid = ToolbarArea.getInstance().getSelectedPid();
@@ -1060,9 +1060,9 @@ public class ThreadPageThreadDataManager {
                }
 
                if (isCheck) {
-                       int parentSize = board.getChartComposite().getItemSize();
+                       int parentSize = board.getItemList().getItemSize();
                        for (int i = 0; i < parentSize; i++) {
-                               DAChartBoardItem parentItem = board.getChartComposite().get(i);
+                               DAChartBoardItem parentItem = board.getItemList().get(i);
 /*
                                int childSize = parentItem.getChildItemList().getItemSize();
                                int hidedCount = 0;
index 29341ec..131ed1d 100644 (file)
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.swt.widgets.Display;
+import org.tizen.dynamicanalyzer.common.CommonConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;
@@ -96,7 +97,7 @@ public class CPUChart extends TimelineChart {
        @Override
        public DAChartBoardItem createBoardItem(DAChartBoard board) {
                chartBoard = board;
-               
+
                item = super.createBoardItem(board);
 
                chart.addSeries(totalLoadSeries);
@@ -152,15 +153,18 @@ public class CPUChart extends TimelineChart {
                        Display.getDefault().syncExec(new Runnable() {
                                @Override
                                public void run() {
-                                       processItem = new DAChartBoardHeightChangeableItem(item, "Processes");
+                                       processItem = new DAChartBoardHeightChangeableItem(item,
+                                                       "Processes");
                                        processItem.useExpand(false);
 
                                        DAChart processesChart = processItem.getChart();
-                                       processesChart.setChartRenderer(new ProcessesChartRenderer());
+                                       processesChart
+                                                       .setChartRenderer(new ProcessesChartRenderer());
                                        DAChartPlot processChartPlot = processesChart.getPlot();
                                        DAChartPlotTooltip tooltip = new DAChartPlotTooltip(-1);
 
-                                       processChartPlot.setBackgroundImage(ImageResources.BG_GRADIENT);
+                                       processChartPlot
+                                                       .setBackgroundImage(ImageResources.BG_GRADIENT);
                                        tooltip.setFont(FontResources.CHART_TOOLTIP_FONT);
                                        processChartPlot.setTooltip(tooltip);
                                        processChartPlot.setAxisFont(FontResources.CHART_AXIS_FONT);
@@ -185,17 +189,13 @@ public class CPUChart extends TimelineChart {
                        });
                }
 
-               int max = 20;
-               String[] processLoadDatas = new String[max * 2];
-               for(int i = 1; i <= max * 2; i++) {
-                       processLoadDatas[i - 1] = Integer.toString(i);
-                       processLoadDatas[++i - 1] = Integer.toString(1);
-               }
+               String[] processLoadDatas = logData.getProcessLoad().split(
+                               CommonConstants.COMMA);
 
                int prevChildSize = childSeriesMap.size();
                for (int i = 0; i < processLoadDatas.length; i++) {
                        String processLoad = processLoadDatas[i];
-                       if (null == processLoad || processLoad.isEmpty()) {
+                       if (processLoad == null || processLoad.isEmpty()) {
                                continue;
                        }
                        int pid = Integer.parseInt(processLoad);
@@ -211,7 +211,6 @@ public class CPUChart extends TimelineChart {
                                                        ColorResources.SERIES_COLOR_CPU_SYSTEM);
                                        newSeries.addSeriesItem(new DAChartSeriesItem(time, load,
                                                        Formatter.toPercentageFormat(load)));
-                                       //FIXME debug
                                        try {
                                                processItem.getChart().addSeries(newSeries);
                                        } catch (NullPointerException e) {
@@ -231,10 +230,10 @@ public class CPUChart extends TimelineChart {
                                @Override
                                public void run() {
                                        int size = childSeriesMap.size();
-                                       if(size > 1) {
+                                       if (size > 1) {
                                                processItem.getChart().getPlot().setShowAxis(false);
                                        }
-                                       
+
                                        if (size > 3) {
                                                processItem.setHeightRatio(size / 3.0);
                                        }
index 6b4be84..4de2ecb 100755 (executable)
@@ -641,12 +641,12 @@ public class AnalyzerUtil {
                /** for debug */
                BinaryInfo binInfo1 = processInfo.getTargetBinary(input.getPcAddr());
                if (binInfo1 == null) {
-                       System.out.println("msg id : " + toHexdecimal(input.getId())
-                                       + " pid : " + processInfo.getPid() + " low : "
-                                       + toHexdecimal(processInfo.getLowestAddress())
-                                       + " input addr : " + toHexdecimal(input.getPcAddr())
-                                       + "  high : "
-                                       + toHexdecimal(processInfo.getHighestAddress()));
+//                     System.out.println("msg id : " + toHexdecimal(input.getId())
+//                                     + " pid : " + processInfo.getPid() + " low : "
+//                                     + toHexdecimal(processInfo.getLowestAddress())
+//                                     + " input addr : " + toHexdecimal(input.getPcAddr())
+//                                     + "  high : "
+//                                     + toHexdecimal(processInfo.getHighestAddress()));
                        return null;
                }
                // String binPath1 = binInfo1.getTargetBinaryPath();