Explorar el Código

✨ expose numberOfClusters in the UI

jmacura hace 4 años
padre
commit
829af4c309

+ 9 - 0
src/adjuster/adjuster.directive.html

@@ -7,6 +7,10 @@
       <div class="text-warning pt-2" [hidden]="!noDataSelected() || errorMsg">{{'ADJUSTER.noDataSelectedMsg' | translate}}</div>
       <div class="text-danger pt-2" [hidden]="!errorMsg">{{'ADJUSTER.serverError' | translate}}: {{errorMsg}}</div>
     </div>
+    <div class="p-2 center-block">
+      <div class="pt-2 text-secondary">{{'ADJUSTER.numberOfClusters' | translate}}: {{adjusterService.numberOfClusters}}</div>
+      <input type="range" class="custom-range" [(ngModel)]="adjusterService.numberOfClusters" min="5" max="15" step="1">
+    </div>
     <div *ngFor="let factor of adjusterService.factors; let datasetlistVisible = false">
       <div class="d-flex flex-row">
         <div class="p-2 flex-grow-1">
@@ -37,5 +41,10 @@
         </div>
       </div>
     </div>
+    <hr>
+    <div class="pt-3 center-block" [hidden]="!adjusterService.clustersLoaded()">
+      {{'ADJUSTER.layerManagerLink1' | translate}}<br>
+      {{'ADJUSTER.layerManagerLink2' | translate}} <a href="" (click)="hsLayoutService.setMainPanel('layermanager');$event.preventDefault();">{{'ADJUSTER.layerManagerLinkLMName' | translate}}</a>
+    </div>
   </div>
 </div>

+ 6 - 1
src/adjuster/adjuster.service.ts

@@ -21,7 +21,6 @@ export class AdjusterService {
   /** To be read from a config file */
   serviceBaseUrl: string;
   factors = [];
-  //clusters = [];
   numberOfClusters;
   //method: string;
   methods: Array<{
@@ -31,6 +30,7 @@ export class AdjusterService {
     type: string;
   }>;
   private _clusteringInProcess: boolean;
+  private _clustersLoaded: boolean;
   private _loadInProcess: boolean;
   private _raiInProcess: boolean;
 
@@ -259,6 +259,7 @@ export class AdjusterService {
         console.timeEnd('forEach-Cluster');
         console.log('clustering done!');
         //this.clusters = clusters;
+        this._clustersLoaded = true;
         this._clusteringInProcess = false;
         this.adjusterEventService.loaded.next({
           success: true,
@@ -316,6 +317,10 @@ export class AdjusterService {
       });
   }
 
+  clustersLoaded(): boolean {
+    return this._clustersLoaded;
+  }
+
   /**
    * @returns {boolean} true if clustering or index processing is in process or loading data, false otherwise
    */

+ 8 - 0
src/translations.json

@@ -5,10 +5,14 @@
       "calculate": "Vypočítat",
       "calcAttractivity": "Počítám atraktivitu",
       "calcClusters": "Počítám shluky",
+      "layerManagerLink1": "Vrstvy můžete prozkoumat",
+      "layerManagerLink2": "ve",
+      "layerManagerLinkLMName": "Správci vrstev",
       "loading": "Načítám",
       "loadingData": "Načítám data",
       "noDataSelectedMsg":
         "Vyberte alespoň jednu datovou sadu a nastavte váhu aspoň jednoho faktoru na ne-nulovou hodnotu.",
+      "numberOfClusters": "Počet shluků k vytvoření",
       "serverError": "Chyba serveru"
     }
   },
@@ -18,9 +22,13 @@
       "calculate": "Calculate",
       "calcAttractivity": "Calculating attractivity",
       "calcClusters": "Calculating clusters",
+      "layerManagerLink1": "You can investigate the layers",
+      "layerManagerLink2": "in the",
+      "layerManagerLinkLMName": "Layer Manager",
       "loading": "Loading",
       "loadingData": "Loading data",
       "noDataSelectedMsg": "Select at least one dataset and set at least one factor's weight to a non-zero value.",
+      "numberOfClusters": "Number of clusters to create",
       "serverError": "Server error"
     }
   }