Minor refactor in MachineService, ElectronService, PixiTHUMDER_CycleC…

…lockDiagram and PixiTHUMDER_Pipeline. Clear file-system-storage.service and file-system.service with new @angular/fire/firestore. Default name from components app-component to THUMDER-component. THUMDER-monaco-editor with modular @input.
nonodev96 · May 3, 2022 · 03534a5 · 03534a5
1 parent df914a1
commit 03534a5
Show file tree

Hide file tree

Showing 46 changed files with 469 additions and 351 deletions.
diff --git a/UML/0.Project/0.0.Config.puml b/UML/0.Project/0.0.Config.puml
@@ -6,8 +6,9 @@
 skinparam defaultFontName consolas
 skinparam minClassWidth 100
 skinparam conditionStyle inside
-
+skinparam dpi 250
 'printscale daily zoom 2
+ganttscale daily zoom 2
 saturday are closed and are colored in pink
 sunday are closed and are colored in pink
 @enduml

diff --git a/UML/0.Project/0.0.Gantt-2021-08.puml b/UML/0.Project/0.0.Gantt-2021-08.puml
@@ -1,20 +1,10 @@
 @startgantt
 !include ./0.0.Config.puml!Config
-
-Project starts the 1st of November 2021
-
--- Planteamiento del proyecto --
-
--- Desarrollo de los prototipos --
-
--- Análisis y Diseño--
-
--- Implementación --
-
--- Pruebas --
-
--- Entregas --
-
--- Reuniones --
+'
+'Project starts the 1st of September 2021
+'
+'-- Planteamiento del proyecto --
+'
+'[Test] lasts 2 days
 
 @endgantt
diff --git a/UML/0.Project/0.0.Gantt-2021-11.puml b/UML/0.Project/0.0.Gantt-2021-11.puml
@@ -15,7 +15,7 @@ Project starts the 29 of October 2021
 
 'L+L+L                => 3+3+3          = 9 días
 [UML - Manager files] lasts 5 days and starts 0 days before [Pre release v1.0.0]'s end
-[Component-view Manager files] lasts 13 days and starts 0 days after [UML - Manager accounts]'s end
+[Component-view Manager files] lasts 13 days and starts 0 days after [UML - Manager files]'s end
 [Tests - Manager files] lasts 4 days and starts 0 days after [Component-view Manager files]'s end
 
 [Pre release v1.1.0] happens at [Tests - Manager accounts]'s end

diff --git a/UML/0.Project/0.0.Gantt-2021-12.puml b/UML/0.Project/0.0.Gantt-2021-12.puml
@@ -11,12 +11,12 @@ Project starts 30 29 of November 2021
 'M+S+S+S+S+S+S+S+L+XL => 2+1+1+1+1+1+1+1+3+4  = 16 días
 [UML - Config] lasts 2 days and starts 0 days before [Pre release v1.1.0]'s end
 then [Component-view Config] lasts 6 days
-then [Tests - Config] lasts 2 days
+then [Tests - Config] lasts 2 days and starts 0 days after [Component-view Config]'s end
 
 'M+M+M+L+L+XL         => 2+2+2+3+3+4    = 16 días
 [UML - Editor of files] lasts 2 days and starts 0 days before [Pre release v1.1.0]'s end
-[Component-view Editor of files] lasts 5 days and starts 0 days after [UML - Config]'s end
-[Tests - Editor of files] lasts 2 days and starts 0 days after [Component-view Config]'s end
+[Component-view Editor of files] lasts 6 days and starts 0 days after [UML - Editor of files]'s end
+[Tests - Editor of files] lasts 2 days and starts 0 days after [Component-view Editor of files]'s end
 
 [Pre release v1.2.0] happens at 0 day after [Tests - Config]'s end
 [Pre release v1.2.0] happens at 0 day after [Tests - Editor of files]'s end
@@ -33,6 +33,6 @@ then [Tests - Config] lasts 2 days
 2021/12/15 to 2021/12/31 are closed
 2021/12/15 to 2021/12/31 are named [Holidays]
 2021/12/15 to 2022/01/01 are colored salmon
-'2021/12/15 to 2022/01/14 are colored in lightgreen and are named [Sprint 3]
+2022/01/01 to 2022/01/16 are colored in lightgreen and are named [Sprint 4]
 
 @endgantt
diff --git a/UML/0.Project/0.0.Gantt-2022-01.puml b/UML/0.Project/0.0.Gantt-2022-01.puml
@@ -11,7 +11,7 @@ Project starts the 14 of December 2021
 'S+S+M+L+M+M+L+XL     => 1+1+2+3+2+2+3+4  = 18 días
 [UML - Manager Registers] lasts 5 days and starts 0 days after [Pre release v1.2.0]'s end
 [Component-view Registers] lasts 10 days and starts 17 days after [UML - Manager Registers]'s end
-[Tests - Manager Registers] lasts 5 days and starts 0 days after [Component-view Registers]'s end
+[Tests - Manager Registers] lasts 5 days and starts 3 days after [Component-view Registers]'s end
 
 'M+XXL                 => 2+6            = 8 días
 [UML - Manager Memory] lasts 5 days and starts 0 days after [Pre release v1.2.0]'s end
@@ -29,6 +29,7 @@ Project starts the 14 of December 2021
 
 2021/12/15 to 2021/12/31 are closed
 2021/12/15 to 2021/12/31 are named [Holidays]
+2021/12/15 to 2021/12/31 are colored in salmon
 2022/01/01 to 2022/01/14 are colored in lightblue and are named [Sprint 4]
 2022/01/15 to 2022/01/31 are colored in lightgreen and are named [Sprint 5]
 

diff --git a/UML/0.Project/0.0.Gantt-2022-02.puml b/UML/0.Project/0.0.Gantt-2022-02.puml
@@ -15,8 +15,8 @@ then [Tests - Component Cycle Clock] lasts 3 days
 
 'XL                   => 4              = 4 días
 [UML - Component Pipeline] lasts 2 days and starts 0 days after [Pre release v1.3.0]'s end
-[Component-view Pipeline] lasts 10 days and starts 0 days before [UML - Component Cycle Clock]'s end
-[Tests - Component Pipeline] lasts 3 days and starts 0 days after [Component-view Cycle Clock]'s end
+[Component-view Pipeline] lasts 10 days and starts 3 days after [UML - Component Pipeline]'s end
+[Tests - Component Pipeline] lasts 3 days and starts 5 days after [Component-view Pipeline]'s end
 
 [Pre release v1.4.0] happens at 0 days after [Tests - Component Cycle Clock]'s end
 [Pre release v1.4.0] happens at 0 days after [Tests - Component Pipeline]'s end
@@ -29,5 +29,6 @@ then [Tests - Component Cycle Clock] lasts 3 days
 
 2022/02/01 to 2022/02/14 are colored in lightblue and are named [Sprint 6]
 2022/02/15 to 2022/02/28 are colored in lightgreen and are named [Sprint 7]
+2022/03/01 to 2022/03/14 are colored in lightblue and are named [Sprint 8]
 
 @endgantt
diff --git a/UML/0.Project/0.0.Gantt-2022-03.puml b/UML/0.Project/0.0.Gantt-2022-03.puml
@@ -15,8 +15,8 @@ then [Tests - Component Statistics] lasts 2 days
 
 'L                    => 4              = 4 días
 [UML - Component Código] lasts 2 days and starts 0 days before [Pre release v1.4.0]'s end
-[Component-view Código] lasts 5 days and starts 0 days after [UML - Component Statistics]'s end
-[Tests - Component Código] lasts 2 days and starts 0 days after [Component-view Statistics]'s end
+[Component-view Código] lasts 5 days and starts 0 days after [UML - Component Código]'s end
+[Tests - Component Código] lasts 2 days and starts 1 days after [Component-view Código]'s end
 
 
 [Pre release v1.5.0] happens at 0 days after [Tests - Component Código]'s end
@@ -30,8 +30,8 @@ then [Tests - Component Statistics] lasts 2 days
 
 'M                    => 2              = 2 días
 [UML - Component Calculator] lasts 1 days and starts 0 days before [Pre release v1.5.0]'s end
-[Component-view Calculator] lasts 3 days and starts 0 days after [UML - Component Multiview]'s end
-[Tests - Component Calculator] lasts 1 days and starts 0 days after [Component-view Multiview]'s end
+[Component-view Calculator] lasts 3 days and starts 1 days after [UML - Component Calculator]'s end
+[Tests - Component Calculator] lasts 1 days and starts 7 days after [Component-view Calculator]'s end
 
 
 [Pre release v1.6.0] happens at 0 days after [Tests - Component Multiview]'s end

diff --git a/UML/0.Project/0.0.Gantt-2022-04.puml b/UML/0.Project/0.0.Gantt-2022-04.puml
@@ -12,12 +12,12 @@ Project starts the 31st of March 2022
 ' About           TODO
 [UML - Component Documentation] lasts 3 days and starts 0 days before [Pre release v1.6.0]'s end
 then [Component-view Documentation] lasts 6 days
-then [Tests - Component Documentation] lasts 1 days
+then [Tests - Component Documentation] lasts 1 days and starts 0 days after [Component-view Documentation]'s end
 
 ' Documentation   TODO
 [UML - Component About] lasts 2 days and starts 0 days before [Pre release v1.6.0]'s end
-[Component-view About] lasts 5 days and starts 0 days after [UML - Component Documentation]'s end
-[Tests - Component About] lasts 1 days and starts 0 days after [Component-view Documentation]'s end
+[Component-view About] lasts 5 days and starts 1 days after [UML - Component About]'s end
+[Tests - Component About] lasts 1 days and starts 1 days after [Component-view About]'s end
 
 
 [Pre release v1.7.0] happens at 0 days after [Tests - Component Documentation]'s end

diff --git a/UML/0.Project/0.0.Gantt.puml b/UML/0.Project/0.0.Gantt.puml
@@ -15,7 +15,7 @@
 ' 50 % de los días para planteamiento
 ' 50 % de los días para la implementación
 '2+2+2+4+4+6
-
+ganttscale daily zoom 1
 
 Project starts the 1st of September 2021
 
@@ -60,7 +60,7 @@ then [Proyecto plantilla - Tests] lasts 4 days
 
 'L+L+L                => 3+3+3          = 9 días      and starts 0 days before [Servicio Manager accounts]'s end
 [UML - Manager files] lasts 5 days and starts 0 days before [Pre release v1.0.0]'s end
-[Component-view Manager files] lasts 13 days and starts 0 days after [UML - Manager accounts]'s end
+[Component-view Manager files] lasts 13 days and starts 0 days after [UML - Manager files]'s end
 [Tests - Manager files] lasts 4 days and starts 0 days after [Component-view Manager files]'s end
 
 [Pre release v1.1.0] happens at [Tests - Manager accounts]'s end
@@ -76,8 +76,8 @@ then [Tests - Config] lasts 2 days
 
 'M+M+M+L+L+XL         => 2+2+2+3+3+4    = 16 días
 [UML - Editor of files] lasts 2 days and starts 0 days before [Pre release v1.1.0]'s end
-[Component-view Editor of files] lasts 5 days and starts 0 days after [UML - Config]'s end
-[Tests - Editor of files] lasts 2 days and starts 0 days after [Component-view Config]'s end
+[Component-view Editor of files] lasts 5 days and starts 0 days after [UML - Editor of files]'s end
+[Tests - Editor of files] lasts 2 days and starts 1 days after [Component-view Editor of files]'s end
 
 [Pre release v1.2.0] happens at 0 day after [Tests - Config]'s end
 [Pre release v1.2.0] happens at 0 day after [Tests - Editor of files]'s end
@@ -91,7 +91,7 @@ then [Tests - Config] lasts 2 days
 'S+S+M+L+M+M+L+XL     => 1+1+2+3+2+2+3+4  = 18 días
 [UML - Manager Registers] lasts 5 days and starts 0 days after [Pre release v1.2.0]'s end
 [Component-view Registers] lasts 10 days and starts 17 days after [UML - Manager Registers]'s end
-[Tests - Manager Registers] lasts 5 days and starts 0 days after [Component-view Registers]'s end
+[Tests - Manager Registers] lasts 5 days and starts 3 days after [Component-view Registers]'s end
 
 'M+XXL                 => 2+6            = 8 días
 [UML - Manager Memory] lasts 5 days and starts 0 days after [Pre release v1.2.0]'s end
@@ -114,8 +114,8 @@ then [Tests - Component Cycle Clock] lasts 3 days
 
 'XL                   => 4              = 4 días
 [UML - Component Pipeline] lasts 2 days and starts 0 days after [Pre release v1.3.0]'s end
-[Component-view Pipeline] lasts 10 days and starts 0 days before [UML - Component Cycle Clock]'s end
-[Tests - Component Pipeline] lasts 3 days and starts 0 days after [Component-view Cycle Clock]'s end
+[Component-view Pipeline] lasts 10 days and starts 2 days after [UML - Component Pipeline]'s end
+[Tests - Component Pipeline] lasts 3 days and starts 5 days after [Component-view Pipeline]'s end
 
 [Pre release v1.4.0] happens at 0 days after [Tests - Component Cycle Clock]'s end
 [Pre release v1.4.0] happens at 0 days after [Tests - Component Pipeline]'s end
@@ -128,14 +128,14 @@ then [Tests - Component Cycle Clock] lasts 3 days
 
 
 ' Statistics TODO
-[UML - Component Statistics] lasts 1 days and starts 1 days after [Pre release v1.4.0]'s end
-then [Component-view Statistics] lasts 6 days
+[UML - Component Statistics] lasts 1 days and starts 0 days after [Pre release v1.4.0]'s end
+then [Component-view Statistics] lasts 6 days and starts 1 days after [UML - Component Statistics]'s end
 then [Tests - Component Statistics] lasts 2 days
 
 'L                    => 4              = 4 días
 [UML - Component Código] lasts 2 days and starts 0 days before [Pre release v1.4.0]'s end
-[Component-view Código] lasts 5 days and starts 0 days after [UML - Component Statistics]'s end
-[Tests - Component Código] lasts 2 days and starts 0 days after [Component-view Statistics]'s end
+[Component-view Código] lasts 5 days and starts 0 days after [UML - Component Código]'s end
+[Tests - Component Código] lasts 2 days and starts 1 days after [Component-view Código]'s end
 
 
 [Pre release v1.5.0] happens at 0 days after [Tests - Component Código]'s end
@@ -151,9 +151,9 @@ then [Tests - Component Statistics] lasts 2 days
 [Tests - Component Multiview] lasts 3 days and starts 0 days after [Component-view Multiview]'s end
 
 'M                    => 2              = 2 días
-[UML - Component Calculator] lasts 1 days and starts 0 days before [Pre release v1.5.0]'s end
-[Component-view Calculator] lasts 3 days and starts 0 days after [UML - Component Multiview]'s end
-[Tests - Component Calculator] lasts 1 days and starts 0 days after [Component-view Multiview]'s end
+[UML - Component Calculator] lasts 1 days and starts 0 days after [Pre release v1.5.0]'s end
+[Component-view Calculator] lasts 3 days and starts 1 days after [UML - Component Calculator]'s end
+[Tests - Component Calculator] lasts 1 days and starts 7 days after [Component-view Calculator]'s end
 
 
 [Pre release v1.6.0] happens at 0 days after [Tests - Component Multiview]'s end
@@ -171,8 +171,8 @@ then [Tests - Component Documentation] lasts 1 days
 
 ' Documentation   TODO
 [UML - Component About] lasts 2 days and starts 0 days before [Pre release v1.6.0]'s end
-[Component-view About] lasts 5 days and starts 0 days after [UML - Component Documentation]'s end
-[Tests - Component About] lasts 1 days and starts 0 days after [Component-view Documentation]'s end
+[Component-view About] lasts 5 days and starts 1 days after [UML - Component About]'s end
+[Tests - Component About] lasts 1 days and starts 1 days after [Component-view About]'s end
 
 
 [Pre release v1.7.0] happens at 0 days after [Tests - Component Documentation]'s end

diff --git a/...5.ClassAndPackages/5.2.ManagerMemory.puml → ...tistics_Breakpoints_Registers_Memory.puml b/...5.ClassAndPackages/5.2.ManagerMemory.puml → ...tistics_Breakpoints_Registers_Memory.puml
diff --git a/UML/THUMDER-Diagram-Shared.puml b/UML/THUMDER-Diagram-Shared.puml
@@ -0,0 +1,22 @@
+@startuml
+'https://plantuml.com/class-diagram
+!theme plain
+'skinparam linetype ortho
+'skinparam linetype polyline
+'left to right direction
+
+package Shared {
+
+  [Guard]-down-Auth
+  [Guard]-down-NoAuth
+
+  [components]-down-PageNotFound
+
+  [Directives]-down-AsyncAwait
+
+  [Pipes]-down-Filter
+  [Pipes]-down-Numbers
+  [Pipes]-down-Objects
+}
+
+@enduml
diff --git a/_2_generate_png.sh b/_2_generate_png.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+echo 'Running Script'
+
+PATH_UML_INPUT="/Users/nonodev96/WebstormProjects/THUMDER/UML/0.Project/"
+PATH_UML_OUTPUT="/Users/nonodev96/PNG/"
+
+FILES="
+0.0.Gantt-2021-08
+0.0.Gantt-2021-09
+0.0.Gantt-2021-10
+0.0.Gantt-2021-11
+0.0.Gantt-2021-12
+0.0.Gantt-2022-01
+0.0.Gantt-2022-02
+0.0.Gantt-2022-03
+0.0.Gantt-2022-04
+"
+for filename in $FILES ; do
+  echo $filename
+  # Generamos un png a partir del uml
+  java -jar /Users/nonodev96/Applications/plantuml/plantuml.jar "${PATH_UML_INPUT}${filename}.puml" -png -o "${PATH_UML_OUTPUT}"
+  # Generamos un pdf optimizado mediante el svg anterior
+#  inkscape --export-filename="${PATH_UML_OUTPUT}${filename}.pdf" "${PATH_UML_INPUT}${filename}.svg" &> /dev/null
+done
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thumder",
-  "version": "1.3.9",
+  "version": "1.5.0",
   "private": true,
   "description": "TFG - THUMDER (THe UltiMate Dlx EmulatoR): emulador multiplataforma DLX con fines didácticos",
   "keywords": [

diff --git a/src/app/Types.ts b/src/app/Types.ts
@@ -1,4 +1,4 @@
-import {InterfaceRegisters} from "./__core/DLX/interfaces";
+import { InterfaceRegisters } from "./__core/DLX/interfaces";
 
 declare global {
   interface Window {
@@ -662,6 +662,17 @@ export type TypePipeline = {
   arrows: TypeArrowCycle[];
 };
 
+export type TypePipelineInstructions = {
+  IF: { text: string; draw: boolean | TypeStall; };
+  ID: { text: string; draw: boolean | TypeStall; };
+  intEX: { text: string; draw: boolean | TypeStall; };
+  MEM: { text: string; draw: boolean | TypeStall; };
+  WB: { text: string; draw: boolean | TypeStall; };
+  faddEX: { unit: number; text: string; draw: boolean | TypeStall; }[]
+  fmultEX: { unit: number; text: string; draw: boolean | TypeStall; }[]
+  fdivEX: { unit: number; text: string; draw: boolean | TypeStall; }[]
+};
+
 export type TypeErrorInCode = {
   line: number;
   message: string;

diff --git a/src/app/__core/machine/PixiTHUMDER_CycleClockDiagram.ts b/src/app/__core/machine/PixiTHUMDER_CycleClockDiagram.ts
@@ -38,7 +38,9 @@ export class PixiTHUMDER_CycleClockDiagram extends PIXI.Container {
 
   public realStep: number;
 
-  public instructions: number;
+  public num_instructions: number;
+
+  public num_arrows: number;
 
   private table: PixiTHUMDER_Table;
 
@@ -58,8 +60,6 @@ export class PixiTHUMDER_CycleClockDiagram extends PIXI.Container {
 
   private stepToStart: number;
 
-  private last: number;
-
   // K => { Row = instruction, Column = step}
   // private timerVoid: PixiUtils.THUMDER_Map<TypeCellPosition, PIXI.Graphics>;
   // private timer: PixiUtils.THUMDER_Map<TypeCellPosition, PIXI.Graphics>;
@@ -71,10 +71,10 @@ export class PixiTHUMDER_CycleClockDiagram extends PIXI.Container {
     this.tableSteps = new PixiTHUMDER_Table();
     this.tableInstructions = new PixiTHUMDER_Table();
 
-    this.instructions = 0;
+    this.num_instructions = 0;
+    this.num_arrows = 0;
     this.realStep = 0;
     this.stepToStart = 0;
-    this.last = 0;
 
     this.borderTitle = new PIXI.Graphics();
     this.borderLeft = new PIXI.Graphics();
@@ -111,10 +111,10 @@ export class PixiTHUMDER_CycleClockDiagram extends PIXI.Container {
       this.tableSteps.deleteCell(position.row, position.col);
     }
 
-    this.instructions = 0;
+    this.num_instructions = 0;
+    this.num_arrows = 0;
     this.realStep = 0;
     this.stepToStart = 0;
-    this.last = 1;
 
     // this.timerVoid = new PixiUtils.THUMDER_Map();
     // this.timer = new PixiUtils.THUMDER_Map();
@@ -230,12 +230,12 @@ export class PixiTHUMDER_CycleClockDiagram extends PIXI.Container {
 
   public addInstruction(text: string) {
     this.drawInstruction(text);
-    this.instructions++;
+    this.num_instructions++;
   }
 
-
   public addArrow(instructionArrow: TypeArrowDirection, color: number) {
     this.drawArrow(instructionArrow, color);
+    this.num_arrows++;
   }
 
   /**
@@ -267,8 +267,8 @@ export class PixiTHUMDER_CycleClockDiagram extends PIXI.Container {
     text.position.x += (rectangle.width / 2) - (text.width / 2);
     text.position.y += ((rectangle.height - text.height) / 2) - 2.5;
     rectangle.addChild(text);
-    this.tableInstructions.setCell(this.instructions, 0, rectangle);
-    this.tableInstructions.drawCell(this.instructions, 0);
+    this.tableInstructions.setCell(this.num_instructions, 0, rectangle);
+    this.tableInstructions.drawCell(this.num_instructions, 0);
   }
 
   private drawSteps(displayStep: number = this.realStep) {