[Title] Fix nl bugs, Fix bugs in core chart and heap chart

[Desc.]
[Issue]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
index 0a0efff..fb786d4 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
@@ -80,17 +80,7 @@ COOLBAR_AREA_UI=UI
 COOLBAR_AREA_TIMELINE=Timeline
 COOLBAR_AREA_RANGE=Range
 COOLBAR_AREA_NETWORK=Network
-<<<<<<< Updated upstream
-
-#COOLBAR_AREA_TIMELINE_TOOLTIP=Timeline [Ctrl + 1]
-#COOLBAR_AREA_FILE_TOOLTIP=File [Ctrl + 2]
-#COOLBAR_AREA_THREAD_TOOLTIP=Thread [Ctrl + 3]
-#COOLBAR_AREA_UI_TOOLTIP=UI [Ctrl + 4]
-#COOLBAR_AREA_SUMMARY_TOOLTIP=Summary  [Ctrl + 5]
-#COOLBAR_AREA_RANGE_TOOLTIP=Range [Ctrl + 6]
-=======
 COOLBAR_AREA_GRAPHICS=Graphics
->>>>>>> Stashed changes
 
 COOLBAR_AREA_TIMELINE_TOOLTIP=Timeline [Ctrl + 1]
 COOLBAR_AREA_FILE_TOOLTIP=File [Ctrl + 2]
@@ -101,16 +91,6 @@ COOLBAR_AREA_GRAPHICS_TOOLTIP=Graphics [Command + 6]
 COOLBAR_AREA_SUMMARY_TOOLTIP=Summary  [Ctrl + 7]
 COOLBAR_AREA_RANGE_TOOLTIP=Range [Ctrl + 8]
 
-<<<<<<< Updated upstream
-
-#COOLBAR_AREA_TIMELINE_TOOLTIP_MAC=Timeline [Command + 1]
-#COOLBAR_AREA_FILE_TOOLTIP_MAC=File [Command + 2]
-#COOLBAR_AREA_THREAD_TOOLTIP_MAC=Thread [Command + 3]
-#COOLBAR_AREA_UI_TOOLTIP_MAC=UI [Command + 4]
-#COOLBAR_AREA_SUMMARY_TOOLTIP_MAC=Summary  [Command + 5]
-#COOLBAR_AREA_RANGE_TOOLTIP_MAC=Range [Command + 6]
-=======
->>>>>>> Stashed changes
 COOLBAR_AREA_TIMELINE_TOOLTIP_MAC=Timeline [Command + 1]
 COOLBAR_AREA_FILE_TOOLTIP_MAC=File [Command + 2]
 COOLBAR_AREA_NETWORK_TOOLTIP_MAC=Network [Command + 3]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
index 7b35337..6388755 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
@@ -1,16 +1,14 @@
-OFF=off
-ON=on
-INTERNALCALL=Internal call
-RANGEAUTOSELECT=Range auto select
-FEATURE_SCREENSHOT=Snapshot
-PLATFORM=Platform
-PLATFORM_ETC=etc
-SHOWLOG=Show log
-SAMPLINGPERIOD=Sampling period
-PROCESSSIZE=Process size
-SINGLETON_FOCUS_DA_PID=Singleton focus DA PID
-CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST=Available chart list
-CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST=Selected chart list
+FEATURE_TABLE_TITLE=Default Settings for Analysis Features
+FEATURE_TABLE_FEATURE_EMPTY=
+FEATURE_TABLE_FEATURE_NAME=Name
+FEATURE_DETAIL_TITLE=Details
+
+SETTING_TABLE_TITLE=Appearance Settings
+SETTING_WHITE=White
+SETTING_BLACK=Black
+SETTING_CONFIGURATION_TITLE=Configuration Settings
+
+WELCONE_ASK_USE_AGAIN=Use this as the default and do not ask again.
 
 FEATURE_FUNCTION_PROFILING=Function_Profiling
 FEATURE_MEMORY_ALLOCATION=Memory_Allocation
@@ -38,6 +36,7 @@ FEATURE_SYSTEM_NETWORK=System Network
 FEATURE_SYSTEM_DEVICE=System Device
 FEATURE_SYSTEM_ENERGY=System Energy
 
+
 DETAIL_FUNCTIONPROFILING=Shows the function profile.
 DETAIL_ALLOCATION=Shows the heap memory allocation.
 DETAIL_FILE=Shows the file usage analysis on the File tab and the file chart on the Timeline tab.
@@ -46,15 +45,24 @@ DETAIL_USERINTERFACE=Shows the UI component hierarchy and UI-related function pr
 DETAIL_SNAPSHOT=Shows application screenshots.
 DETAIL_EVENT=Shows UI events that occur on the device.
 DETAIL_RECORDING= Record profiling information for playback.
-THEME=theme
-FEATURE_TABLE_TITLE=Default Settings for Analysis Features
-FEATURE_TABLE_FEATURE_EMPTY=
-FEATURE_TABLE_FEATURE_NAME=Name
-FEATURE_DETAIL_TITLE=Details
-SETTING_TABLE_TITLE=Appearance Settings
-SETTING_WHITE=White
-SETTING_BLACK=Black
-SETTING_CONFIGURATION_TITLE=Configuration Settings
+
 SHOW_INITIAL=Do not show the configuration at start-up.
 AUTO_STOP=Auto-stop while replaying
-WELCONE_ASK_USE_AGAIN=Use this as the default and do not ask again.
\ No newline at end of file
+
+OFF=off
+ON=on
+INTERNALCALL=Internal call
+RANGEAUTOSELECT=Range auto select
+FEATURE_SCREENSHOT=Snapshot
+PLATFORM=Platform
+PLATFORM_ETC=etc
+SHOWLOG=Show log
+SAMPLINGPERIOD=Sampling period
+PROCESSSIZE=Process size
+SINGLETON_FOCUS_DA_PID=Singleton focus DA PID
+CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST=Available chart list
+CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST=Selected chart list
+
+INTERNAL_LOG_LEVEL=Internal log level
+
+THEME=theme
\ No newline at end of file

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java
index 9714ceb..e06bd79 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java
@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
+import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
@@ -121,7 +122,8 @@ public class CPUCoreChart extends TimelineChart {
                        String[] cpuRates = logData.getCpuLoad().split(","); //$NON-NLS-1$
                        double value = 0;
                        if (coreSize == TimelineConstants.NOT_INITED) {
-                               coreSize = cpuRates.length - 1;
+                               coreSize = DACommunicator.getSelectedDevice().getTargetInfo()
+                                               .getCpuCount();
                        }
 
                        for (int i = 0; i < coreSize; i++) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java
index 05d7105..2809b20 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java
@@ -99,7 +99,7 @@ public class CPUFrequencyChart extends TimelineChart {
                        double time = logData.getTime() / TimelineConstants.MEGA_DOUBLE;
                        String[] cpuFreqs = logData.getCpuFrequency().split(","); //$NON-NLS-1$
 
-                       double freq0 = Double.parseDouble(cpuFreqs[0]) * (double) 1000;
+                       double freq0 = Double.parseDouble(cpuFreqs[0]) *  1000.0;
                        frequencySeries.addSeriesItem(new DAChartSeriesItem(time, freq0,
                                        Formatter.toHzFormat(freq0)));
                } catch (NumberFormatException ne) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java
index 29e5fa3..002affd 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java
@@ -30,7 +30,6 @@ import java.util.HashMap;
 import java.util.List;
 
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
-import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
@@ -101,8 +100,8 @@ public class HeapChart extends TimelineChart {
 
        @Override
        public void parseLogPackage(LogPackage logPack) {
-               Logs memoryLogs = logPack.getLogs(LogCenterConstants.LOG_MEMORY);
-               Logs deviceLogs = logPack.getLogs(LogCenterConstants.LOG_DEVICE);
+               Logs memoryLogs = logPack.getLogs(AnalyzerConstants.MSG_PROBE_MEMORY);
+               Logs deviceLogs = logPack.getLogs(probeType);
 
                List<LogData> memoryLogList = memoryLogs == null ? null
                                : memoryLogs.getLogs();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java
index 0c9ff7f..fc3486f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java
@@ -45,6 +45,7 @@ import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener;
 import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter;
 import org.tizen.dynamicanalyzer.ui.common.UICommonConstants;
 import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
+import org.tizen.dynamicanalyzer.ui.timeline.chart.HeapChart;
 import org.tizen.dynamicanalyzer.ui.timeline.chart.ScreenshotChart;
 import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart;
 import org.tizen.dynamicanalyzer.ui.timeline.chart.UIEventChart;
@@ -183,35 +184,35 @@ public class TimelineView extends DAView {
                }
 
                Logs deviceLogs = logPack.getLogs(AnalyzerConstants.MSG_DATA_SYSTEM);
-               if (deviceLogs != null && deviceLogs.getLogs() != null
-                               && !deviceLogs.getLogs().isEmpty()) {
+               if (deviceLogs != null && !deviceLogs.getLogs().isEmpty()) {
                        deviceLogParser.parseLogPackage(logPack);
                }
 
+               Logs memoryLogs = logPack.getLogs(AnalyzerConstants.MSG_PROBE_MEMORY);
+               if (memoryLogs != null && !memoryLogs.getLogs().isEmpty()) {
+                       HeapChart.getInstance().parseLogPackage(logPack);
+               }
+
                Logs recorderLogs = logPack
                                .getLogs(AnalyzerConstants.MSG_PROBE_UIEVENT);
-               if (recorderLogs != null && recorderLogs.getLogs() != null
-                               && !recorderLogs.getLogs().isEmpty()) {
+               if (recorderLogs != null && !recorderLogs.getLogs().isEmpty()) {
                        UIEventChart.getInstance().parseLogPackage(logPack);
                }
 
                Logs customLogs = logPack.getLogs(AnalyzerConstants.MSG_PROBE_CUSTOM);
-               if (customLogs != null && customLogs.getLogs() != null
-                               && !customLogs.getLogs().isEmpty()) {
+               if (customLogs != null && !customLogs.getLogs().isEmpty()) {
                        customLogParser.parseLogPackage(logPack);
                }
 
                Logs lifecycleLogs = logPack
                                .getLogs(AnalyzerConstants.MSG_PROBE_LIFECYCLE);
-               if (lifecycleLogs != null && lifecycleLogs.getLogs() != null
-                               && !lifecycleLogs.getLogs().isEmpty()) {
+               if (lifecycleLogs != null && !lifecycleLogs.getLogs().isEmpty()) {
                        lifecycleLogParser.parseLogPackage(logPack);
                }
 
                Logs screenShotLogs = logPack
                                .getLogs(AnalyzerConstants.MSG_PROBE_SCREENSHOT);
-               if (screenShotLogs != null && screenShotLogs.getLogs() != null
-                               && !screenShotLogs.getLogs().isEmpty()) {
+               if (screenShotLogs != null && !screenShotLogs.getLogs().isEmpty()) {
                        ScreenshotChart.getInstance().parseLogPackage(logPack);
                }
        }