From 7a37d3fdf4f072311422a97758a7bd073bfcae45 Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Fri, 27 Jul 2018 17:19:31 +0200
Subject: [PATCH] add name in connector (syscams)
---
.../syscamstranslator/SysCAMSTConnector.java | 10 ++++++--
src/main/java/ui/SysCAMSPanelTranslator.java | 4 +++-
.../java/ui/syscams/SysCAMSPortConnector.java | 23 +++++++++++++++----
3 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/main/java/syscamstranslator/SysCAMSTConnector.java b/src/main/java/syscamstranslator/SysCAMSTConnector.java
index d28d43884d..19963497f8 100644
--- a/src/main/java/syscamstranslator/SysCAMSTConnector.java
+++ b/src/main/java/syscamstranslator/SysCAMSTConnector.java
@@ -47,13 +47,15 @@ package syscamstranslator;
*/
public class SysCAMSTConnector{
-
private SysCAMSTConnectingPoint connectingPoint1;
private SysCAMSTConnectingPoint connectingPoint2;
+
+ private String name;
- public SysCAMSTConnector(SysCAMSTConnectingPoint _connectingPoint1, SysCAMSTConnectingPoint _connectingPoint2) {
+ public SysCAMSTConnector(SysCAMSTConnectingPoint _connectingPoint1, SysCAMSTConnectingPoint _connectingPoint2, String _name) {
connectingPoint1 = _connectingPoint1;
connectingPoint2 = _connectingPoint2;
+ name = _name;
}
public SysCAMSTConnectingPoint get_p1() {
@@ -63,4 +65,8 @@ public class SysCAMSTConnector{
public SysCAMSTConnectingPoint get_p2() {
return connectingPoint2;
}
+
+ public String getName() {
+ return name;
+ }
}
diff --git a/src/main/java/ui/SysCAMSPanelTranslator.java b/src/main/java/ui/SysCAMSPanelTranslator.java
index ef4ea91df3..348cff8317 100644
--- a/src/main/java/ui/SysCAMSPanelTranslator.java
+++ b/src/main/java/ui/SysCAMSPanelTranslator.java
@@ -261,6 +261,8 @@ public class SysCAMSPanelTranslator {
TGConnectingPoint connectingPoint1 = connector.get_p1();
TGConnectingPoint connectingPoint2 = connector.get_p2();
+
+ String name = connector.getValue();
TGComponent owner_p1 = syscamsDiagramPanel.getComponentToWhichBelongs(connectingPoint1);
TGComponent owner_p2 = syscamsDiagramPanel.getComponentToWhichBelongs(connectingPoint2);
@@ -271,7 +273,7 @@ public class SysCAMSPanelTranslator {
SysCAMSTConnectingPoint avConnectingPoint1 = new SysCAMSTConnectingPoint(avowner_p1);
SysCAMSTConnectingPoint avConnectingPoint2 = new SysCAMSTConnectingPoint(avowner_p2);
- SysCAMSTConnector avconnector = new SysCAMSTConnector(avConnectingPoint1, avConnectingPoint2);
+ SysCAMSTConnector avconnector = new SysCAMSTConnector(avConnectingPoint1, avConnectingPoint2, name);
syscamsConnectors.add(avconnector);
}
}
diff --git a/src/main/java/ui/syscams/SysCAMSPortConnector.java b/src/main/java/ui/syscams/SysCAMSPortConnector.java
index b57a640757..cbbc03ae15 100644
--- a/src/main/java/ui/syscams/SysCAMSPortConnector.java
+++ b/src/main/java/ui/syscams/SysCAMSPortConnector.java
@@ -40,13 +40,13 @@ package ui.syscams;
import ui.*;
import ui.util.IconManager;
+import ui.window.JDialogELNConnector;
+import ui.window.JDialogSysCAMSConnector;
import java.awt.*;
-import java.awt.geom.Point2D;
import java.util.Vector;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
+import javax.swing.JFrame;
import myutil.GraphicLib;
@@ -65,8 +65,8 @@ public class SysCAMSPortConnector extends TGConnector implements ScalableTGCompo
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
- value = "Connector between ports";
- editable = false;
+ value = "";
+ editable = true;
oldScaleFactor = tdp.getZoom();
p1 = _p1;
@@ -81,8 +81,21 @@ public class SysCAMSPortConnector extends TGConnector implements ScalableTGCompo
return p2;
}
+ public boolean editOndoubleClick(JFrame frame) {
+ JDialogSysCAMSConnector jde = new JDialogSysCAMSConnector(this);
+ jde.setVisible(true);
+ return true;
+ }
+
protected void drawLastSegment(Graphics gr, int x1, int y1, int x2, int y2) {
Graphics2D g = (Graphics2D) gr;
+
+ int w = g.getFontMetrics().stringWidth(value);
+ Font fold = g.getFont();
+ Font f = fold.deriveFont(Font.ITALIC, (float) (tdp.getFontSize()));
+ g.setFont(f);
+ g.drawString(value, (x1 + x2 - w) / 2, (y1 + y2) / 2);
+ g.setFont(fold);
try {
SysCAMSPortConnectingPoint pt1 = (SysCAMSPortConnectingPoint) p1;
--
GitLab