Skip to content
Snippets Groups Projects
Commit d48439c0 authored by Katy Saintin's avatar Katy Saintin
Browse files

DataBrowser : Open spectrum selection dialog relatively to DataBrowser tree

parent b48fb6a1
No related branches found
No related tags found
No related merge requests found
......@@ -73,6 +73,7 @@ import fr.soleil.comete.swing.util.CometeTreeModel;
import fr.soleil.comete.swing.util.CometeUtils;
import fr.soleil.data.service.HistoryKey;
import fr.soleil.data.service.IKey;
import fr.soleil.lib.project.awt.WindowUtils;
public class TreeViewer extends JPanel implements MouseListener, ITreeNodeSelectionListener, DocumentListener,
TreeWillExpandListener {
......@@ -540,9 +541,7 @@ public class TreeViewer extends JPanel implements MouseListener, ITreeNodeSelect
}
}
createSpectrumImageDialog();
displayOpenItemDialog.setLocationRelativeTo(null);
displayOpenItemDialog.setVisible(true);
displayOpenItemDialog.toFront();
displayDialog();
}
private void openDialogXForOpenedMatrixItems() {
......@@ -568,10 +567,16 @@ public class TreeViewer extends JPanel implements MouseListener, ITreeNodeSelect
}
}
createSpectrumImageDialog();
displayOpenItemDialog.setLocationRelativeTo(null);
displayDialog();
}
private void displayDialog() {
if (displayOpenItemDialog != null) {
displayOpenItemDialog.setLocationRelativeTo(this);
displayOpenItemDialog.setVisible(true);
displayOpenItemDialog.toFront();
}
}
private void openDialogForOpenedSpectrumItems() {
spectrumMenu = true;
......@@ -599,14 +604,12 @@ public class TreeViewer extends JPanel implements MouseListener, ITreeNodeSelect
}
createSpectrumImageDialog();
displayOpenItemDialog.setLocationRelativeTo(null);
displayOpenItemDialog.setVisible(true);
displayOpenItemDialog.toFront();
displayDialog();
}
private void createSpectrumImageDialog() {
if (displayOpenItemDialog == null) {
displayOpenItemDialog = new JDialog();
displayOpenItemDialog = new JDialog(WindowUtils.getWindowForComponent(this));
JPanel panel = new JPanel();
panel.setLayout(new BorderLayout());
final JXTable table = new JXTable();
......@@ -659,11 +662,13 @@ public class TreeViewer extends JPanel implements MouseListener, ITreeNodeSelect
public Object getValueAt(int row, int column) {
Item item = null;
if (spectrumMenu) {
if (controller.getOpenedNumericalSpectrumItems() != null && row < controller.getOpenedNumericalSpectrumItems().size()) {
if (controller.getOpenedNumericalSpectrumItems() != null
&& row < controller.getOpenedNumericalSpectrumItems().size()) {
item = controller.getOpenedNumericalSpectrumItems().get(row);
}
} else {
if ( controller.getOpenedNumericalMatrixItems() != null && row < controller.getOpenedNumericalMatrixItems().size()) {
if (controller.getOpenedNumericalMatrixItems() != null
&& row < controller.getOpenedNumericalMatrixItems().size()) {
item = controller.getOpenedNumericalMatrixItems().get(row);
}
}
......@@ -702,8 +707,7 @@ public class TreeViewer extends JPanel implements MouseListener, ITreeNodeSelect
item = (Item) table.getValueAt(index, 0);
if (putKeyOnX) {
item.setXKey(iKey, selectedBrowser, dataType, format);
}
else {
} else {
item.setYKey(iKey, selectedBrowser, dataType, format);
}
controller.setItemScale(item);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment