Startup
This commit is contained in:
@@ -523,6 +523,7 @@ public class ScreenPanel3 extends Panel {
|
||||
}
|
||||
});
|
||||
renderer.getPopupMenu().setVisible(false);
|
||||
buttonScale.setSelected(renderer.getShowColormapScale());
|
||||
clearMarker();
|
||||
|
||||
showFit = buttonFit.isSelected();
|
||||
@@ -1000,7 +1001,12 @@ public class ScreenPanel3 extends Panel {
|
||||
imageBuffer.add(currentFrame);
|
||||
if (imageBuffer.size() > imageBufferLenght) {
|
||||
imageBuffer.remove(0);
|
||||
setBufferFull(true);
|
||||
} else {
|
||||
setBufferFull(false);
|
||||
}
|
||||
} else {
|
||||
setBufferFull(true);
|
||||
}
|
||||
//Update data
|
||||
if (!renderer.isPaused()) {
|
||||
@@ -1108,16 +1114,24 @@ public class ScreenPanel3 extends Panel {
|
||||
|
||||
@Override
|
||||
public void onImage(Object o, BufferedImage bi, Data data) {
|
||||
if (continuous) {
|
||||
buffer.add(data);
|
||||
if (buffer.size() >= numImages) {
|
||||
for (Data d : buffer) {
|
||||
process(d);
|
||||
try{
|
||||
if (continuous) {
|
||||
buffer.add(data);
|
||||
if (buffer.size() >= numImages) {
|
||||
for (Data d : buffer) {
|
||||
process(d);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
buffer.add(null); //Just to count
|
||||
process(data);
|
||||
}
|
||||
} else {
|
||||
buffer.add(null); //Just to count
|
||||
process(data);
|
||||
} catch (Exception ex){
|
||||
buffer.clear();
|
||||
integration = null;
|
||||
ImageIntegrator.this.pushData(null);
|
||||
ex.printStackTrace();
|
||||
return;
|
||||
}
|
||||
if (buffer.size() >= numImages) {
|
||||
if (continuous) {
|
||||
@@ -1148,6 +1162,17 @@ public class ScreenPanel3 extends Panel {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
boolean bufferFull = true;
|
||||
|
||||
void setBufferFull(boolean value){
|
||||
if (value != bufferFull){
|
||||
SwingUtilities.invokeLater(()->{
|
||||
buttonPause.setBackground(value ? buttonSave.getBackground() : buttonSave.getBackground().brighter());
|
||||
});
|
||||
bufferFull = value;
|
||||
}
|
||||
}
|
||||
|
||||
volatile Dimension imageSize;
|
||||
|
||||
@@ -1163,6 +1188,7 @@ public class ScreenPanel3 extends Panel {
|
||||
renderer.refresh();
|
||||
}
|
||||
|
||||
|
||||
void checkMarker(Point p) throws IOException {
|
||||
if (camera != null) {
|
||||
if (buttonMarker.isSelected()) {
|
||||
@@ -1477,7 +1503,7 @@ public class ScreenPanel3 extends Panel {
|
||||
updateColormap();
|
||||
updateButtons();
|
||||
checkHistogram.setSelected((histogramDialog != null) && (histogramDialog.isShowing()));
|
||||
|
||||
buttonScale.setSelected(renderer.getShowColormapScale());
|
||||
try{
|
||||
Frame frame = getCurrentFrame();
|
||||
if (frame!=lastFrame){
|
||||
@@ -2652,6 +2678,7 @@ public class ScreenPanel3 extends Panel {
|
||||
buttonProfile = new javax.swing.JToggleButton();
|
||||
buttonFit = new javax.swing.JToggleButton();
|
||||
buttonReticle = new javax.swing.JToggleButton();
|
||||
buttonScale = new javax.swing.JToggleButton();
|
||||
buttonTitle = new javax.swing.JToggleButton();
|
||||
pauseSelection = new ch.psi.pshell.swing.ValueSelection();
|
||||
panelCameraSelection = new javax.swing.JPanel();
|
||||
@@ -3335,6 +3362,19 @@ public class ScreenPanel3 extends Panel {
|
||||
});
|
||||
toolBar.add(buttonReticle);
|
||||
|
||||
buttonScale.setIcon(getIcon("Scale"));
|
||||
buttonScale.setSelected(true);
|
||||
buttonScale.setText(" ");
|
||||
buttonScale.setToolTipText("Show Colormap Scale");
|
||||
buttonScale.setFocusable(false);
|
||||
buttonScale.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
|
||||
buttonScale.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonScaleActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
toolBar.add(buttonScale);
|
||||
|
||||
buttonTitle.setIcon(getIcon("Title"));
|
||||
buttonTitle.setSelected(true);
|
||||
buttonTitle.setText(" ");
|
||||
@@ -3963,6 +4003,14 @@ public class ScreenPanel3 extends Panel {
|
||||
}
|
||||
}//GEN-LAST:event_buttonTitleActionPerformed
|
||||
|
||||
private void buttonScaleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScaleActionPerformed
|
||||
try {
|
||||
renderer.setShowColormapScale(buttonScale.isSelected());
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonScaleActionPerformed
|
||||
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
private javax.swing.JButton btFixColormapRange;
|
||||
private javax.swing.JRadioButton buttonAutomatic;
|
||||
@@ -3980,6 +4028,7 @@ public class ScreenPanel3 extends Panel {
|
||||
private javax.swing.JToggleButton buttonProfile;
|
||||
private javax.swing.JToggleButton buttonReticle;
|
||||
private javax.swing.JToggleButton buttonSave;
|
||||
private javax.swing.JToggleButton buttonScale;
|
||||
private javax.swing.JRadioButton buttonServer;
|
||||
private javax.swing.JToggleButton buttonSidePanel;
|
||||
private javax.swing.JButton buttonStreamData;
|
||||
|
||||
Reference in New Issue
Block a user