Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ public void createEventHandlers() {
final String json = FileUtils.readFileToString(file.toString());
SettingsAdapter adapter = new SettingsAdapter(model_);
adapter.convert(json);
//System.out.println(json);
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,25 +320,6 @@ private void setOrigin() {
}
}

// Home and Stop

// public void stop() {
// try {
// core_.stop(deviceName_);
// } catch (Exception e) {
// model_.studio().logs().showError(deviceName_ + " stop() failed!");
// }
// }

// // TODO: needed?
// private void home() {
// try {
// core_.home(deviceName_);
// } catch (Exception e) {
// model_.studio().logs().showError("failed!");
// }
// }

//// Galvo

// the galvo position is read inside the try, so a failed read skips the move instead of
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ private void createUserInterface() {
pnlText.add(txtSlope_, "wrap");
pnlText.add(lblOffset, "");
pnlText.add(lblOffsetValue_, "");

// Panel pnlFields = new Panel();
// pnlFields.setMinimumSize(new Dimension(20, 30));
pnlText.add(txtOffset_, "");
pnlText.add(txtOffset_, "");

switch (geometryType) {
case DISPIM:
Expand All @@ -140,7 +137,6 @@ private void createUserInterface() {
break;
case SCAPE:
add(pnlText, "wrap");
// add(pnlFields, "wrap");
add(btnUpdate_, "wrap, span 2, align center");
add(btnRunAutofocus_, "span 2, align center");
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -678,32 +678,6 @@ public void close() {
}, Acquisition.BEFORE_HARDWARE_HOOK);


// final PLogicSCAPE finalController = controller;
// currentAcquisition_.addHook(new AcquisitionHook() {
// @Override
// public AcquisitionEvent run(AcquisitionEvent event) {
// System.out.println("After hardware hook");
// // for stage scanning: restore speed and set up scan at new position
// // non-multi-position situation is handled in prepareControllerForAcquisition instead
//// if (acqSettings_.stageScan().enabled() && acqSettings_.isUsingMultiplePositions()) {
//// final ASIXYStage xyStage = model_.devices().getDevice("SampleXY");
//// final Point2D.Double pos = xyStage.getXYPosition();
//// xyStage.setSpeedX(scanSpeedX_);
//// xyStage.setAccelerationX(scanAccelX_);
//// System.out.println("AFTER_HARDWARE_HOOK trigger");
//// finalController.prepareStageScanForAcquisition(pos.x, pos.y, acqSettings_);
///// finalController.triggerControllerStartAcquisition(acqSettings_.acquisitionMode(),
//// acqSettings_.volumeSettings().firstView());
//// }
// return event;
// }
//
// @Override
// public void close() {
//
// }
// }, Acquisition.AFTER_HARDWARE_HOOK);

final PLogicScape controllerInstance = controller_;
// TODO This after camera hook is called after the camera has been readied to acquire a
// sequence. I assume we want to tell the Tiger to start sending TTLs etc here
Expand Down Expand Up @@ -1707,9 +1681,6 @@ public void recalculateSliceTiming() {
asb_.timingBuilder(getTimingFromExposure());
}
// Note: sliceDurationMs is computed automatically when build() is called
//final double sliceDurationMs = getSliceDuration(asb_.timingSettingsBuilder().build());
//asb_.timingSettingsBuilder().sliceDurationMs(sliceDurationMs);
//System.out.println(asb_.timingSettingsBuilder());
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ private GeometryUtils() {
* @return factor, e.g. 1.0 for 45 degrees, sqrt(3) for 60 degrees, etc.
*/
public static double getStageGeometricShiftFactor(double angle, final boolean pathA) {
//double angle = 1.0; // TODO: props_.getPropValueFloat(Devices.Keys.PLUGIN, Properties.Keys.PLUGIN_STAGESCAN_ANGLE_PATHA);
if (angle < 1) { // case when property not defined
angle = 45.0;
//angle = ASIdiSPIM.oSPIM ? 60.0 : 45.0;
}
if (!pathA) {
angle = 90.0 - angle;
}
Expand All @@ -36,11 +31,6 @@ public static double getStageGeometricShiftFactor(double angle, final boolean pa
* @return factor, e.g. 1/sqrt(2) for 45 degrees, 0.5 for 60 degrees, etc.
*/
public static double getStageTopViewCompressFactor(double angle, final boolean pathA) {
//double angle = 1.0; // TODO: props_.getPropValueFloat(Devices.Keys.PLUGIN, Properties.Keys.PLUGIN_STAGESCAN_ANGLE_PATHA);
if (angle < 1) { // case when property not defined
angle = 45.0;
//angle = ASIdiSPIM.oSPIM ? 60.0 : 45.0;
}
if (!pathA) {
angle = 90.0 - angle;
}
Expand Down
Loading