From bbf2f48a37d39789b862e309fd47c5a911dd1d74 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Fri, 21 Feb 2025 14:30:55 +0100
Subject: [PATCH] Improving drawing of avatar spec
---
src/main/java/ui/AvatarPanelDrawer.java | 4 ++--
src/main/java/ui/MainGUI.java | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/ui/AvatarPanelDrawer.java b/src/main/java/ui/AvatarPanelDrawer.java
index 8a221b1b7..89874aea7 100644
--- a/src/main/java/ui/AvatarPanelDrawer.java
+++ b/src/main/java/ui/AvatarPanelDrawer.java
@@ -483,7 +483,7 @@ public class AvatarPanelDrawer {
if ((p1 == null) || (p2 == null)) {
if (p1 == null) {
- p1 = tranSourceMap.get(t).closerFreeTGConnectingPointNoOverlay(x, y, true, false);
+ p1 = tranSourceMap.get(t).closerFreeTGConnectingPointNoOverlay(x, y, false, true);
//p1 = tranSourceMap.get(t).closerFreeTGConnectingPoint(x, y, false, true);
if (p1 == null) {
TraceManager.addDev("NULL P1 in " + tranSourceMap.get(t).getName() + "/" + tranSourceMap.get(t).getValue());
@@ -505,7 +505,7 @@ public class AvatarPanelDrawer {
}
}
if (p2 == null) {
- p2 = locMap.get(tranDestMap.get(t)).closerFreeTGConnectingPointNoOverlay(x, y, false, true);
+ p2 = locMap.get(tranDestMap.get(t)).closerFreeTGConnectingPointNoOverlay(x, y, true, false);
//p2 = locMap.get(tranDestMap.get(t)).closerFreeTGConnectingPoint(x, y, true, false);
if (p2 == null) {
TraceManager.addDev("NULL P2 in " + locMap.get(tranDestMap.get(t)).getName() + "/" + locMap.get(tranDestMap.get(t)).getValue());
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 3e567cacf..b43953b2f 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -215,10 +215,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
public static boolean picoZebre;
public static boolean openLast;
public static Object BACK_COLOR;
- public boolean isxml = false;
+
public JFrame frame; // Main Frame
public Container framePanel; // Main pane
- public Container panelForTab, panelForTree; // panelForAnalysisTab; //panelForDesignTab;
+ public Container panelForTab;
public JSplitPane split, split1;
// Multi analysis / design / deployment
public Vector<TURTLEPanel> tabs;
@@ -318,8 +318,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
private JFrameAvatarInteractiveSimulation jfais;
private JFrameCompareSimulationTraces cSimTrace;
-
- private LatencyDetailedAnalysisMain LatencyDetailedAnalysisMain;
+ private LatencyDetailedAnalysisMain latencyDetailedAnalysisMain;
// Help
@@ -3242,7 +3241,8 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
FileOutputStream fos = new FileOutputStream(file);
fos.write(data.getBytes());
fos.close();
-
+ TraceManager.addDev("SysML v2 specification successfully saved in " + file.getAbsolutePath());
+ status.setText("SysML v2 specification successfully saved in " + file.getAbsolutePath());
return true;
} catch (Exception e) {
JOptionPane.showMessageDialog(frame, "File could not be saved because " + e.getMessage(), "File Error",
@@ -10236,7 +10236,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
public void compareLatencyForXML(SimulationTrace selectedST, boolean b) {
try {
- LatencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(1, this, selectedST, b, false, 0);
+ latencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(1, this, selectedST, b, false, 0);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -10248,7 +10248,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
throws XPathExpressionException, ParserConfigurationException, SAXException, IOException {
try {
- LatencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(2, this, selectedST, b, compare, j);
+ latencyDetailedAnalysisMain = new LatencyDetailedAnalysisMain(2, this, selectedST, b, compare, j);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
--
GitLab