Merge pull request #123 from kdbinsidebrains/charting

Charting

Author: smklimenko

CHANGELOG.md

@@ -1,5 +1,18 @@
 # KdbInsideBrains Changelog
 
+## [6.1.0]
+
+### Changed
+
+- Charting View tools redesigned:
+  - Crosshair tool supports multiple range axes as well as candlestick
+  - Values tools supports candlestick
+  - Enabled tools stored in new optimized format
+
+### Fixed
+
+- #122: QSpec configurable can't be created
+
 ## [6.0.1]
 
 ### Fixed

gradle.properties

@@ -14,7 +14,7 @@ pluginJavaVersion=17
 #pluginVerifierVersions=2022.3, 2022.3.3, 2023.3.7, 2024.1.5, 2024.3
 pluginVerifierVersions=2022.3, 2023.3, 2024.3.5, 2025.1
 platformType=IC
-#platformVersion=251.14649-EAP-CANDIDATE-SNAPSHOT
+#platformVersion=251.1
 #platformPlugins=java, PsiViewer:251.175
 platformVersion=2024.3.5
 platformPlugins=java, PsiViewer:243.7768

src/main/java/org/kdb/inside/brains/lang/qspec/QSpecConfigurable.java

@@ -8,14 +8,12 @@
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtil;
-import com.intellij.openapi.wm.WindowManager;
 import org.apache.commons.io.FilenameUtils;
 import org.jetbrains.annotations.Nullable;
 import org.kdb.inside.brains.UIUtils;
 import org.kdb.inside.brains.settings.KdbConfigurable;
 
 import javax.swing.*;
-import java.awt.*;
 
 import static com.intellij.openapi.util.text.StringUtil.notNullize;
 
@@ -32,7 +30,7 @@ public class QSpecConfigurable extends KdbConfigurable {
 
     protected QSpecConfigurable() {
         super(SETTINGS_PAGE_ID, "QSpec Framework");
-        init(guessActiveProject());
+        init(ProjectManager.getInstance().getDefaultProject());
     }
 
     public JComponent init(@Nullable Project project) {
@@ -91,17 +89,6 @@ public void reset() {
         customScriptPanel.setText(libraryService.getCustomScript());
     }
 
-    private Project guessActiveProject() {
-        Project[] projects = ProjectManager.getInstance().getOpenProjects();
-        for (Project project : projects) {
-            Window window = WindowManager.getInstance().suggestParentWindow(project);
-            if (window != null && window.isActive()) {
-                return project;
-            }
-        }
-        return null;
-    }
-
     public static void showConfigurable(Project project) {
         // Safe model change here
         ShowSettingsUtil.getInstance().showSettingsDialog(project, QSpecConfigurable.class);

src/main/java/org/kdb/inside/brains/view/chart/BaseChartPanel.java

@@ -40,11 +40,6 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         this.emptyActionsGroup = new AnAction[]{showTemplatesManager};
     }
 
-    @Override
-    public void actionPerformed(@NotNull AnActionEvent e) {
-        super.actionPerformed(e);
-    }
-
     @Override
     public AnAction @NotNull [] getChildren(@Nullable AnActionEvent e) {
         final TableResult tableResult = resultSupplier.get();

src/main/java/org/kdb/inside/brains/view/chart/ChartActionGroup.java

@@ -28,6 +28,7 @@ private ChartColors() {
                     .map(s -> s.replace("#", "0x").trim())
                     .map(Color::decode)
                     .toArray(Color[]::new);
+
     private static final String colorsMatrixChatOriginal = """
             #3366cc #dc3912 #ff9900 #109618 #990099 #0099c6 #dd4477
             #66aa00 #b82e2e #316395 #994499 #22aa99 #aaaa11 #6633cc

src/main/java/org/kdb/inside/brains/view/chart/ChartColors.java

@@ -10,28 +10,28 @@
 import java.awt.*;
 import java.util.Set;
 
-public record ColumnDefinition(String name, KdbType type) {
+public record ChartColumn(String name, KdbType type) {
     static final Set<KdbType> SYMBOL_TYPES = Set.of(KdbType.SYMBOL, KdbType.CHAR, KdbType.CHAR_LIST);
 
     static final Set<KdbType> NUMBER_TYPES = Set.of(KdbType.BYTE, KdbType.SHORT, KdbType.INT, KdbType.LONG, KdbType.REAL, KdbType.FLOAT);
 
     static final Set<KdbType> TEMPORAL_TYPES = Set.of(KdbType.SECOND, KdbType.MINUTE, KdbType.MONTH, KdbType.TIME, KdbType.DATE, KdbType.DATETIME, KdbType.TIMESPAN, KdbType.TIMESTAMP);
 
-    public ColumnDefinition(QTableModel.QColumnInfo info) {
+    public ChartColumn(QTableModel.QColumnInfo info) {
         this(info.getName(), KdbType.typeOf(info.getColumnClass()));
     }
 
     public String getLabel() {
         return "<html>" + name + " <font color=\"gray\">(" + type.getTypeName().toLowerCase() + ")</font></html>";
     }
 
-    public static ColumnDefinition restore(Element element) {
+    public static ChartColumn restore(Element element) {
         if (element == null) {
             return null;
         }
         final String name = element.getAttributeValue("name");
         final KdbType type = KdbType.typeOf(element.getAttributeValue("type").charAt(0));
-        return new ColumnDefinition(name, type);
+        return new ChartColumn(name, type);
     }
 
     public static boolean isSymbol(KdbType type) {
@@ -50,7 +50,7 @@ public static TableCellRenderer createTableCellRenderer() {
         return new DefaultTableCellRenderer() {
             @Override
             public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-                final ColumnDefinition cc = (ColumnDefinition) value;
+                final ChartColumn cc = (ChartColumn) value;
                 return super.getTableCellRendererComponent(table, cc == null ? null : cc.getLabel(), isSelected, hasFocus, row, column);
             }
         };
@@ -60,7 +60,7 @@ public static ListCellRenderer<Object> createListCellRenderer() {
         return new DefaultListCellRenderer() {
             @Override
             public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-                final ColumnDefinition cc = (ColumnDefinition) value;
+                final ChartColumn cc = (ChartColumn) value;
                 return super.getListCellRendererComponent(list, cc == null ? null : cc.getLabel(), index, isSelected, cellHasFocus);
             }
         };

…/brains/view/chart/ColumnDefinition.java …nside/brains/view/chart/ChartColumn.javasrc/main/java/org/kdb/inside/brains/view/chart/ColumnDefinition.java renamed to src/main/java/org/kdb/inside/brains/view/chart/ChartColumn.java src/main/java/org/kdb/inside/brains/view/chart/ColumnDefinition.java renamed to src/main/java/org/kdb/inside/brains/view/chart/ChartColumn.java

@@ -8,23 +8,23 @@
 import java.util.List;
 
 public interface ChartConfig {
-    ChartType getChartType();
+    boolean isInvalid();
 
 
     KdbType getDomainType();
 
-    List<ColumnDefinition> getRequiredColumns();
-
-
-    boolean isInvalid();
+    ChartType getChartType();
 
 
     Element store();
 
     String toHumanString();
 
 
+    List<ChartColumn> getRequiredColumns();
+
+
     default boolean isApplicable(ChartDataProvider dataProvider) {
         return new HashSet<>(dataProvider.getColumns()).containsAll(getRequiredColumns());
     }
-}
+}

src/main/java/org/kdb/inside/brains/view/chart/ChartConfig.java

@@ -1,5 +1,5 @@
 package org.kdb.inside.brains.view.chart;
 
-public interface ChartViewListener {
+public interface ChartConfigListener {
     void configChanged();
 }