This commit is contained in:
2023-05-01 11:28:04 +02:00
parent 3a83f3cf34
commit abe3bcb19c
265 changed files with 28663 additions and 1295 deletions

View File

@@ -37,6 +37,7 @@ import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
/**
*
@@ -103,20 +104,30 @@ public class ScreenPanel extends Panel implements CamServerViewer.CamServerViewe
if (App.hasArgument("instance_format")) {
camServerViewer.setInstanceNameFormat(App.getArgumentValue("instance_format"));
}
camServerViewer.setShowFit(true);
camServerViewer.setShowProfile(true);
camServerViewer.setShowReticle(true);
}
@Override
public void onStart() {
super.onStart();
super.onStart();
try {
camServerViewer.setCameraServerUrl(App.getArgumentValue(ARG_CAMERA_SERVER));
camServerViewer.setPipelineServerUrl(App.getArgumentValue(ARG_PIPELINE_SERVER));
camServerViewer.setStartupStream(App.getArgumentValue(ARG_CAMERA));
camServerViewer.initialize(CamServerViewer.SourceSelecionMode.Cameras);
SwingUtilities.invokeLater(()->{
try {
camServerViewer.initialize(CamServerViewer.SourceSelecionMode.Cameras);
} catch (Exception ex) {
Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
}
updateDialogTitle();
});
} catch (Exception ex) {
logger.log(Level.SEVERE, null, ex);
}
updateDialogTitle();
}
}
@Override
@@ -195,7 +206,7 @@ public class ScreenPanel extends Panel implements CamServerViewer.CamServerViewe
@Override
public void onOpeningStream(String name) throws Exception {
System.out.println("Initializing stream " + name);
System.out.println("Initializing stream " + name);
if ((devicesInitTask != null) && (devicesInitTask.isAlive())) {
devicesInitTask.interrupt();
}
@@ -207,6 +218,7 @@ public class ScreenPanel extends Panel implements CamServerViewer.CamServerViewe
filter.close();
filter = null;
}
updateDialogTitle();
}
@@ -272,7 +284,7 @@ public class ScreenPanel extends Panel implements CamServerViewer.CamServerViewe
devicesInitTask.start();
}
}
updateDialogTitle();
}
public void onSavedSnapshot(String name, String instancee, String snapshotFile) throws Exception {