Seminar

.github/conda/meta.yaml

@@ -19,7 +19,7 @@ requirements:
   - clingo>=5.6.0
   - clorm>=1.4.1
   - clingo-dl
-  - fastapi==0.103.*
+  - fastapi
   - networkx
   - uvicorn
   - clingraph

.github/deploy.yml

@@ -43,7 +43,7 @@ conda:
           - clingo>=5.6.0
           - clorm>=1.4.1
           - clingo-dl
-          - fastapi==0.103.*
+          - fastapi
           - networkx
           - uvicorn
           - clingraph

.github/requirements.txt

@@ -1,9 +1,9 @@
 clingo>=5.6.0
 clorm>=1.4.1
 clingo-dl
-fastapi==0.103.*
+fastapi
 networkx
 uvicorn
 clingraph
 Pillow
-clingexplaid>=1.0.14
+clingexplaid>=1.0.14

.pylintrc

@@ -14,6 +14,8 @@ max-public-methods=20
 max-returns=10
 max-statements=50
 min-public-methods=1
+max-positional-arguments=7
+
 
 [SIMILARITIES]
 

CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## clinguin 2.1.1
+
+  * Bug fix
+    * Menu bar fixed to top
+
+
+## clinguin 2.0.1
+
+  * Bug fix
+    * Message elements now on top
+  * Docs
+    * Added documentation for mouse events
+
 ## clinguin 2.0.0
 
 

angular_frontend/angular.json

@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "ClinGraphViz": {
+    "ClinguinAngular": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -32,8 +32,7 @@
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": [
-            ]
+            "scripts": []
           },
           "configurations": {
             "production": {
@@ -66,18 +65,18 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "ClinGraphViz:build:production"
+              "browserTarget": "ClinguinAngular:build:production"
             },
             "development": {
-              "browserTarget": "ClinGraphViz:build:development"
+              "browserTarget": "ClinguinAngular:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "ClinGraphViz:build"
+            "browserTarget": "ClinguinAngular:build"
           }
         },
         "test": {

angular_frontend/package.json

@@ -37,7 +37,7 @@
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.1.0",
+    "karma-jasmine-html-reporter": "~2.1.1",
     "typescript": "~5.1.3"
   }
-}
+}

angular_frontend/src/app/app.component.spec.ts

@@ -14,16 +14,16 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   });
 
-  it(`should have as title 'ClinGraphViz'`, () => {
+  it(`should have as title 'ClinguinAngular'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
-    expect(app.title).toEqual('ClinGraphViz');
+    expect(app.title).toEqual('ClinguinAngular');
   });
 
   it('should render title', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('.content span')?.textContent).toContain('ClinGraphViz app is running!');
+    expect(compiled.querySelector('.content span')?.textContent).toContain('ClinguinAngular app is running!');
   });
 });

angular_frontend/src/app/app.module.ts

@@ -14,8 +14,6 @@ import { MenuBarComponent } from './menu-bar/menu-bar.component';
 import { ButtonComponent } from './button/button.component';
 import { CanvasComponent } from './canvas/canvas.component';
 import { MessageComponent } from './message/message.component';
-import { MainPageComponent } from './clingraphviz/main-page/main-page.component';
-import { GraphOptionsComponent } from './clingraphviz/graph-options/graph-options.component';
 import { ConfigService } from './config.service';
 import { LocatorService } from './locator.service';
 import { TextfieldComponent } from './textfield/textfield.component';
@@ -47,8 +45,6 @@ export function appConfigInit(appConfigService: ConfigService) {
     ButtonComponent,
     CanvasComponent,
     MessageComponent,
-    MainPageComponent,
-    GraphOptionsComponent,
     TextfieldComponent,
     ModalComponent,
     ContextMenuComponent,

angular_frontend/src/app/callback-helper.service.ts

@@ -109,6 +109,8 @@ function handleRightClick(operation: string, event: Event) {
 
 
 function handleUpdate(when: WhenDto, event: Event | null) {
+  console.log("---- Handling update", when)
+
   let elementLookupService = LocatorService.injector.get(ElementLookupService)
 
   let operation = when.operation
@@ -265,6 +267,7 @@ function handleCallback(when: WhenDto, event: Event | null) {
 }
 
 function handleContext(when: WhenDto, event: Event | null) {
+  console.log("---- Handling context", when)
   let contextService = LocatorService.injector.get(ContextService)
   let operation = when.operation
   operation = replaceContext(operation)

angular_frontend/src/app/canvas/canvas.component.ts

@@ -67,10 +67,8 @@ export class CanvasComponent {
     let svgNodeElements = this.svgContainer.nativeElement.querySelectorAll(".node, .edge")
     // let svgEdgeElements = this.svgContainer.nativeElement.querySelectorAll(".edge")
 
-    // console.log(svgNodeElements)
     let nodeIdNodeElementLookup: { "key": string, "value": ElementDto }[] = []
     element.children.forEach(child => {
-      // console.log(child)
       let id_attr = this.attributeService.findAttribute("clingraph_id", child.attributes)
 
       if (id_attr != null) {
@@ -99,25 +97,17 @@ export class CanvasComponent {
 
   generateSvgNodeUiNodeAssociationList(svgNodeElements: any, nodeIdNodeElementLookup: { "key": string, "value": ElementDto }[]) {
 
-    // console.log(nodeIdNodeElementLookup)
     let svgNodeUiNodeAssociationList: { "svg": HTMLElement, "ui": ElementDto }[] = []
 
     svgNodeElements.forEach((svgNodeElement: HTMLElement) => {
-      // svgNodeElement.tooltip('hide')
       let correspondingElementDtoNode: null | ElementDto = null
-      // console.error("----")
-      // console.error(svgNodeElement.id)
       nodeIdNodeElementLookup.forEach((item: { "key": string, "value": ElementDto }) => {
 
         if (svgNodeElement.id == item.key) {
           correspondingElementDtoNode = item.value
         } else {
-          // if  (svgNodeElement.id.startsWith("edge")){
-          // key =
-          // }
           for (const child of Array.from(svgNodeElement.children)) {
             if (child.tagName == "title") {
-              // console.log(child.innerHTML)
               if (child.innerHTML == item.key) {
                 correspondingElementDtoNode = item.value
               }
@@ -131,7 +121,7 @@ export class CanvasComponent {
         svgNodeUiNodeAssociationList.push({ "svg": svgNodeElement, "ui": correspondingElementDtoNode })
 
       } else {
-        console.log("Warning: Could not find for the following svgElement a corresponding clingraph node or edge!")
+        console.debug("Warning: No svgElement defined for clingraph element", svgNodeElement.id)
       }
     })
 
@@ -145,32 +135,7 @@ export class CanvasComponent {
       let clickRelatedDoList: WhenDto[] = []
       this.callbackService.setCallbacks(elem.svg, elem.ui.when)
 
-      /*
-      uiElement.when.forEach((do_: WhenDto) => {
-        if (do_.actionType == "click") {
-          clickRelatedDoList.push(do_)
-        }
-      })
-
-      elem.svg.addEventListener("click",function(){
-        clickRelatedDoList.forEach((do_:WhenDto) => {
-          if (do_.interactionType == "update") {
-
 
-            let searchedElement : null | HTMLElement = document.getElementById(id)
-            if (searchedElement != null) {
-              if (key == "visibility") {
-                if (value == "hidden") {
-                  searchedElement.style.visibility = "hidden"
-                } else if (value == "shown") {
-                  searchedElement.style.visibility = "visible"
-                }
-              }
-            }
-          }
-        })
-      })
-      */
     })
   }