Revize 7e9b3050

Make initial elimination optional (refs #7518)

sources/imiger-core/src/main/java/cz/zcu/kiv/offscreen/servlets/UploadFiles.java

@@ -65 +65 @@
             Map<String, String> formFields = fileLoader.loadFormFields();
             String fileType = formFields.get("fileFormat");
             String fileName = formFields.get("filename");
+            String initialElimination = formFields.get("enableInitialElimination");
 
             if (fileType == null || fileName == null) {
                 throw new IllegalArgumentException("Missing parameter");
@@ -85 +86 @@
             request.getSession().setAttribute("diagram_string", fileContent);
             request.getSession().setAttribute("diagram_type", fileType);
             request.getSession().setAttribute("diagram_filename", fileName);
+            request.getSession().setAttribute("diagram_initial_elimination",
+                    initialElimination != null ? initialElimination : "false");
             response.sendRedirect(getServletContext().getInitParameter("APP_HOME_URL") + "graph");
             logger.debug("send redirect to /graph");
 

sources/imiger-core/src/main/java/cz/zcu/kiv/offscreen/servlets/api/GetSessionDiagram.java

@@ -40 +40 @@
         String diagramToDisplay = (String) request.getSession().getAttribute("diagram_string");
         String diagramType = (String) request.getSession().getAttribute("diagram_type");
         String filename = (String) request.getSession().getAttribute("diagram_filename");
+        String initialElimination = (String) request.getSession().getAttribute("diagram_initial_elimination");
 
         if (StringUtils.isNotBlank(diagramToDisplay) && diagramType != null) {
 
@@ -61 +62 @@
             JsonObject jsonObject = new JsonObject();
             jsonObject.addProperty("graph_json", rawJson);
             jsonObject.addProperty("name", filename);
+            jsonObject.addProperty("initial_elimination", initialElimination);
 
             response.setStatus(HttpServletResponse.SC_OK);
             response.getWriter().write(jsonObject.toString());

sources/imiger-core/src/main/webapp/js/services/graphLoader.js

@@ -9 +9 @@
 	/**
 	 * Loads a new graph using graph data passed as parameters.
 	 * @param {object} data Data of the graph.
+	 * @param {boolean} enableInitialElimination Enable initial elimination
 	 * @throws {AJVValidationError} Thrown when graph data are incomplete.
 	 */
-	run(data) {
+	run(data, enableInitialElimination) {
 		let isValid = this._ajv.validate(GraphLoader.rawInputSchema, data);
 		if (isValid === false) {
 			throw new AJVValidationError(this._ajv.errorsText(), this._ajv.errors);
@@ -183 +184 @@
 			});
 		}
 
+		if (enableInitialElimination) {
+			let MAX_VISIBLE_COMPONENTS = 20;
+			new InitialElimination(MAX_VISIBLE_COMPONENTS).run();
+        }
+
 		// center viewport
 		app.viewportComponent.center();
 
@@ -198 +204 @@
 		if (Utils.isDefined(highlightedNode)) {
 			highlightedNode.highlightWithNeighbours(true);
 		}
-
-		let MAX_VISIBLE_COMPONENTS = 20;
-		new InitialElimination(MAX_VISIBLE_COMPONENTS).run();
 	}
 }
 

sources/imiger-core/src/main/webapp/js/showGraphApp.js

@@ -253 +253 @@
 			document.dispatchEvent(new DiagramUpdatedEvent(graphData));
 
 			// construct graph
-			this.graphLoader.run(JSON.parse(graphData.graph_json));
+			let initialElimination = (graphData.initial_elimination === undefined)
+					? true : graphData.initial_elimination == 'true';
+			this.graphLoader.run(JSON.parse(graphData.graph_json), initialElimination);
 
 			this.spinLoaderComponent.disable();
 

sources/imiger-core/src/main/webapp/uploadFiles.jsp

@@ -78 +78 @@
 						</c:forEach>
 					</div>
 
+					<div class="form-field">
+						<input type="checkbox" id="enableInitialElimination" name="enableInitialElimination" value="true" checked>
+						<label for="enableInitialElimination">Initial elimination</label><br>
+					</div>
+
 					<button id="btnLoad" type="submit">Start visualization</button>
 				</form>
 			</section>