floraachy
/
MooInfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

detail form first step

This commit is contained in:
RememBerBer 2021-11-23 20:07:10 +08:00
parent 73870140f3
commit 80844c6253
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java
View File

@ -97,13 +97,35 @@ public class CpuForm {
private static void initCpuInfo() { private static void initCpuInfo() {
CpuForm cpuForm = getInstance(); CpuForm cpuForm = getInstance();
JTextPane cpuInfoTextPane = cpuForm.getCpuInfoTextPane(); JTextPane cpuInfoTextPane = cpuForm.getCpuInfoTextPane();
String contentType = "text/html; charset=utf-8";
cpuInfoTextPane.setContentType(contentType);
cpuInfoTextPane.setText(getCpuInfo());
}
public static String getCpuInfo() {
StringBuilder builder = new StringBuilder();
CentralProcessor processor = App.si.getHardware().getProcessor();
CentralProcessor.ProcessorIdentifier processorIdentifier = processor.getProcessorIdentifier();
builder.append("<b>Name: </b>").append(processorIdentifier.getName());
builder.append("<br/><b>Identifier: </b>").append(processorIdentifier.getIdentifier());
builder.append("<br/><b>Micro Architecture: </b>").append(processorIdentifier.getMicroarchitecture());
builder.append("<br/><b>Model: </b>").append(processorIdentifier.getModel());
builder.append("<br/><b>Family: </b>").append(processorIdentifier.getFamily());
builder.append("<br/><b>Processor ID: </b>").append(processorIdentifier.getProcessorID());
builder.append("<br/><b>Vendor: </b>").append(processorIdentifier.getVendor());
builder.append("<br/><b>Vendor Freq: </b>").append(processorIdentifier.getVendorFreq());
builder.append("<br/><b>Stepping: </b>").append(processorIdentifier.getStepping());
builder.append("<br/>");
builder.append("<br/><b>Physical Package Count: </b>").append(processor.getPhysicalPackageCount());
builder.append("<br/><b>Physical Processor Count: </b>").append(processor.getPhysicalProcessorCount());
builder.append("<br/><b>Logical Processor Count: </b>").append(processor.getLogicalProcessorCount());
builder.append("<br/><b>Max Freq: </b>").append(processor.getMaxFreq());
builder.append("<br/><b>Interrupts: </b>").append(processor.getInterrupts());
builder.append("<br/><b>Context Switches: </b>").append(processor.getContextSwitches());
return builder.toString();
CentralProcessor cpu = App.si.getHardware().getProcessor();
StringBuilder sb = new StringBuilder();
sb.append(cpu);
sb.append(cpu.getProcessorIdentifier());
cpuInfoTextPane.setText(sb.toString());
// cpu.getCurrentFreq()
} }
private static void initInfo() { private static void initInfo() {

33
src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java
View File

@ -9,10 +9,7 @@ import com.luoboduner.moo.info.App;
import com.luoboduner.moo.info.ui.Style; import com.luoboduner.moo.info.ui.Style;
import com.luoboduner.moo.info.util.ScrollUtil; import com.luoboduner.moo.info.util.ScrollUtil;
import lombok.Getter; import lombok.Getter;
import oshi.hardware.Baseboard; import oshi.hardware.*;
import oshi.hardware.CentralProcessor;
import oshi.hardware.ComputerSystem;
import oshi.hardware.HardwareAbstractionLayer;
import oshi.software.os.OperatingSystem; import oshi.software.os.OperatingSystem;
import javax.swing.*; import javax.swing.*;
@ -114,7 +111,7 @@ public class DetailForm {
detailForm.getOsTextPane().setText(getOsInfo()); detailForm.getOsTextPane().setText(getOsInfo());
detailForm.getComputerTextPane().setText(getComputerInfo()); detailForm.getComputerTextPane().setText(getComputerInfo());
detailForm.getBaseBoardTextPane().setText(getBaseBoardInfo()); detailForm.getBaseBoardTextPane().setText(getBaseBoardInfo());
detailForm.getCpuTextPane().setText(getCpuInfo()); detailForm.getCpuTextPane().setText(CpuForm.getCpuInfo());
detailForm.getPowerSourceTextPane().setText(PowerSourceForm.getPowerInfoText(hardware.getPowerSources())); detailForm.getPowerSourceTextPane().setText(PowerSourceForm.getPowerInfoText(hardware.getPowerSources()));
} }
@ -168,30 +165,14 @@ public class DetailForm {
return builder.toString(); return builder.toString();
} }
private static String getCpuInfo() { /**
* @return
*/
private static String getMemoryInfo() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
CentralProcessor processor = App.si.getHardware().getProcessor(); GlobalMemory globalMemory = App.si.getHardware().getMemory();
CentralProcessor.ProcessorIdentifier processorIdentifier = processor.getProcessorIdentifier();
builder.append("<b>Name: </b>").append(processorIdentifier.getName());
builder.append("<br/><b>Identifier: </b>").append(processorIdentifier.getIdentifier());
builder.append("<br/><b>Micro Architecture: </b>").append(processorIdentifier.getMicroarchitecture());
builder.append("<br/><b>Model: </b>").append(processorIdentifier.getModel());
builder.append("<br/><b>Family: </b>").append(processorIdentifier.getFamily());
builder.append("<br/><b>Processor ID: </b>").append(processorIdentifier.getProcessorID());
builder.append("<br/><b>Vendor: </b>").append(processorIdentifier.getVendor());
builder.append("<br/><b>Vendor Freq: </b>").append(processorIdentifier.getVendorFreq());
builder.append("<br/><b>Stepping: </b>").append(processorIdentifier.getStepping());
builder.append("<br/>");
builder.append("<br/><b>Physical Package Count: </b>").append(processor.getPhysicalPackageCount());
builder.append("<br/><b>Physical Processor Count: </b>").append(processor.getPhysicalProcessorCount());
builder.append("<br/><b>Logical Processor Count: </b>").append(processor.getLogicalProcessorCount());
builder.append("<br/><b>Max Freq: </b>").append(processor.getMaxFreq());
builder.append("<br/><b>Interrupts: </b>").append(processor.getInterrupts());
builder.append("<br/><b>Context Switches: </b>").append(processor.getContextSwitches());
return builder.toString(); return builder.toString();
} }
{ {