Merge pull request #115 from Dessia-tech/dev

Towards 0.8.0

plot_data/templates.py

@@ -139,11 +139,11 @@
     <script src=$core_path ></script>
     
     <script type="text/javascript">
-        var width = 750,
+        var width = 750;
         var height = 400;
     
         var data = $data;
-        var number_plot_data = data.length
+        var number_plot_data = data.length;
     
         var globalWidth = 1500;
         var globalHeight = 800;

src/color_conversion.ts

@@ -0,0 +1,183 @@
+export function string_to_hex(str:string): string {
+    if (!Object.keys(string_to_hex_dict).includes(str)) {throw new Error('string_to_hex -> Invalid color : ' + str + ' not in list');}
+    return string_to_hex_dict[str];
+}
+
+
+function reverse_string_to_hex_dict() {
+  var entries = Object.entries(string_to_hex_dict);
+  for (let i=0; i<entries.length; i++) {
+    entries[i].reverse();
+  }
+  return Object.fromEntries(entries);
+}
+
+export const string_to_hex_dict = {
+  red: '#f70000', lightred: '#ed8080', blue: '#0013fe', lightblue: '#c3e6fc', lightskyblue: '#87cefa', green: '#00c112', lightgreen: '#89e892', yellow: '#f4ff00', lightyellow: '#f9ff7b', orange: '#ff8700',
+  lightorange: '#ff8700', cyan: '#13f0f0', lightcyan: '#90f7f7', rose: '#ff69b4', lightrose: '#ffc0cb', violet: '#ee82ee', lightviolet: '#eaa5f6', white: '#ffffff', black: '#000000', brown: '#cd8f40',
+  lightbrown: '#deb887', grey: '#a9a9a9', lightgrey: '#d3d3d3'
+};
+
+export const hex_to_string_dict = reverse_string_to_hex_dict();
+
+function get_rgb_to_string_dict() {
+  var entries = Object.entries(hex_to_string_dict);
+  for (let i=0; i<entries.length; i++) {
+    entries[i][0] = hex_to_rgb(entries[i][0]);
+  }
+  return Object.fromEntries(entries);
+}
+export const rgb_to_string_dict = get_rgb_to_string_dict();
+
+function componentToHex(c) {
+  var hex = c.toString(16);
+  return hex.length == 1 ? "0" + hex : hex;
+}
+
+export function rgb_to_hex(rgb:string): string {
+  var tokens = rgb.slice(4, rgb.length - 1).split(',');
+  var r = parseInt(tokens[0],10);
+  var g = parseInt(tokens[1],10);
+  var b = parseInt(tokens[2],10);
+  return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
+}
+
+export function isColorInDict(str:string): boolean {
+  var colors = Object.keys(string_to_hex_dict);
+  return colors.includes(str);
+}
+
+export function hex_to_string(hexa:string): string {
+  if (!Object.keys(hex_to_string_dict).includes(hexa)) { throw new Error('hex_to_string -> Invalid color : ' + hexa + ' is not in list'); }
+  return hex_to_string_dict[hexa];
+}
+
+export function hexToRgbObj(hex):Object { // Returns an object {r: ..., g: ..., b: ...}
+  // var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  var result = [hex[1]+hex[2], hex[3]+hex[4], hex[5]+hex[6]];
+  return result ? {
+    r: parseInt(result[0], 16),
+    g: parseInt(result[1], 16),
+    b: parseInt(result[2], 16)
+  } : null;
+}
+
+export function hex_to_rgb(hex:string): string {
+  // var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  var result = [hex[1]+hex[2], hex[3]+hex[4], hex[5]+hex[6]];
+  var r = parseInt(result[0], 16);
+  var g = parseInt(result[1], 16);
+  var b = parseInt(result[2], 16);
+  return rgb_vectorToStr(r, g, b);
+}
+
+export function rgb_to_string(rgb:string): string {
+  if (rgb_to_string_dict[rgb]) return rgb_to_string_dict[rgb];
+  // otherwise, returns the closest color
+  var min_dist = Infinity;
+  var closest_string = '';
+  var rgb_vect = rgb_strToVector(rgb);
+  for (let dict_rgb of Object.keys(rgb_to_string_dict)) {
+    let dict_rgb_vect = rgb_strToVector(dict_rgb);
+    let distance = Math.sqrt(Math.pow(rgb_vect[0] - dict_rgb_vect[0], 2) +
+                             Math.pow(rgb_vect[1] - dict_rgb_vect[1], 2) +
+                             Math.pow(rgb_vect[2] - dict_rgb_vect[2], 2));
+    if (distance < min_dist) {
+      closest_string = rgb_to_string_dict[dict_rgb];
+      min_dist = distance;
+    }
+  }
+  return closest_string;
+}
+
+export function string_to_rgb(str:string) {
+  return hex_to_rgb(string_to_hex(str));
+}
+
+export function color_to_string(color:string): string {
+  if (isHex(color)) {
+    return hex_to_string(color);
+  } else if (isRGB(color)) {
+    return rgb_to_string(color);
+  } else {
+    return color;
+  }
+  // else if (isColorInDict(color)) {
+  //   return color;
+  // }
+  throw new Error('color_to_string : ' + color + ' is not in hex neither in rgb');
+}
+
+export function average_color(rgb1:string, rgb2:string): string {
+  var rgb_vect1 = rgb_strToVector(rgb1);
+  var rgb_vect2 = rgb_strToVector(rgb2);
+  var new_r = (rgb_vect1[0] + rgb_vect2[0])/2;
+  var new_g = (rgb_vect1[1] + rgb_vect2[1])/2;
+  var new_b = (rgb_vect1[2] + rgb_vect2[2])/2;
+  return rgb_vectorToStr(new_r, new_g, new_b);
+}
+
+export function rgb_interpolation([r1, g1, b1], [r2, g2, b2], n:number): string[] {
+  var color_list = [];
+  for (var k=0; k<n; k++) {
+    var r = Math.floor(r1*(1-k/n) + r2*k/n);
+    var g = Math.floor(g1*(1-k/n) + g2*k/n);
+    var b = Math.floor(b1*(1-k/n) + b2*k/n);
+    color_list.push(rgb_vectorToStr(r,g,b));
+  }
+  return color_list;
+}
+
+export function rgb_interpolations(rgbs:[number, number, number][], nb_pts:number): string[] {
+  var nb_seg = rgbs.length - 1;
+  var arr = [];
+  var color_list = [];
+  for (var i=0; i<nb_seg; i++) {arr.push(0);}
+  for (var i=0; i<nb_pts; i++) {
+    arr[i%nb_seg]++;
+  }
+  for (let i=0; i<nb_seg; i++) {
+    var interpolation_colors = rgb_interpolation(rgbs[i], rgbs[i+1], arr[i]);
+    for (let j=0; j<interpolation_colors.length; j++) {
+      color_list.push(interpolation_colors[j]);
+    }
+  }
+  return color_list;
+}
+
+export function rgb_strToVector(rgb:string): [number, number, number] {
+  var tokens = rgb.slice(4, rgb.length - 1).split(',');
+  var r = parseInt(tokens[0],10);
+  var g = parseInt(tokens[1],10);
+  var b = parseInt(tokens[2],10);
+  return [r,g,b];
+}
+
+export function rgb_vectorToStr(r:number, g:number, b:number): string {
+  return 'rgb(' + r.toString() + ',' + g.toString() + ',' + b.toString() + ')';
+}
+
+export function tint_rgb(rgb:string, coeff:number): string { //coeff must be between 0 and 1. The higher coeff, the lighter the color
+  var result = rgb_strToVector(rgb);
+  var r = result[0] + (255 - result[0])*coeff;
+  var g = result[1] + (255 - result[1])*coeff;
+  var b = result[2] + (255 - result[2])*coeff;
+  return rgb_vectorToStr(r,g,b);
+}
+
+export function darken_rgb(rgb: string, coeff:number) { //coeff must be between 0 ans 1. The higher the coeff, the darker the color
+  var result = rgb_strToVector(rgb);
+  var r = result[0]*(1 - coeff);
+  var g = result[1]*(1 - coeff);
+  var b = result[2]*(1 - coeff);
+  return rgb_vectorToStr(r,g,b);
+}
+
+
+export function isRGB(str:string):boolean {
+  return str.substring(0,4) == 'rgb(';
+}
+
+export function isHex(str:string):boolean {
+  return str.substring(0,1) == '#';
+}

src/core.ts

@@ -0,0 +1,2 @@
+export { MultiplePlots } from "./multiplots";
+export { PlotContour, PlotScatter, ParallelPlot, PrimitiveGroupContainer, Histogram } from './subplots';