Commit ca8451a0 authored by Peter Čonga's avatar Peter Čonga Committed by Radek Ošlejšek
Browse files

Introduce cutting planes with distance to batch processing.

parent e93925ab
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
@@ -231,6 +231,32 @@ public class PlaneManipulationPanel extends JPanel {
        symmetryCuttingPlane = null;
    }
    
    /**
     * Removes cutting plane from scene
     */
    public void deleteBboxCuttingPlane() {
        int slot = -1;
        for(DrawableCuttingPlane dcp : canvas.getScene().getCuttingPlanes()){
            slot++;
            if (dcp.equals(this.bboxCuttingPlane)) {
                break;
            }
        }
        if (slot == -1) {
            return;
        }
        canvas.getScene().setDrawableCuttingPlane(slot, null);
    }
    
    /**
     * Compares this.face to parameter face
     * @param face face to compare this.face to
     * @return true when the two faces are equal, false otherwise
     */
    public boolean isFaceSame(HumanFace face) {
        return this.face.equals(face);
    }

    /**
     * Creates cutting plane from symmetry plane computed in symmetry panel.
     */
+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import cz.fidentis.analyst.canvas.Canvas;
import cz.fidentis.analyst.gui.task.batch.distance.BatchDistanceAction;
import cz.fidentis.analyst.gui.task.batch.registration.BatchRegistrationAction;
import cz.fidentis.analyst.gui.task.batch.FacesProxyDecorator;
import cz.fidentis.analyst.gui.task.batch.symmetry.BatchCuttingPlanesAction;
import cz.fidentis.analyst.gui.task.curvature.CurvatureAction;
import cz.fidentis.analyst.gui.task.distance.DistanceAction;
import cz.fidentis.analyst.gui.task.faceinfo.FaceOverviewAction;
@@ -251,6 +252,7 @@ public class TaskWindow extends TopComponent {
                FacesProxyDecorator batchFacesProxy = new FacesProxyDecorator(faces);
                new BatchRegistrationAction(canvas, batchFacesProxy, controlPanel);
                new BatchDistanceAction(canvas, batchFacesProxy, controlPanel);
                new BatchCuttingPlanesAction(canvas, batchFacesProxy, controlPanel);
                break;
        }
    }
+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="0" max="-2" attributes="0">
                  <Component id="jPanel4" max="32767" attributes="0"/>
                  <Component id="jPanel2" pref="0" max="32767" attributes="0"/>
                  <Component id="jPanel2" max="32767" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="jPanel3" min="-2" max="-2" attributes="0"/>
+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ public class BatchDistancePanel extends ControlPanel {
        return getStaticIcon();
    }

    /**
     * Updates drop-down menu to select currently shown face
     */
    public void updateDatasetMenu() {
        facesProxyDecorator.syncSelectionMenu(true, jComboBox1);
    }
+1 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@
      <Properties>
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
            <TitledBorder title="Averaging options">
            <TitledBorder title="Averaing options">
              <ResourceString PropertyName="titleX" bundle="cz/fidentis/analyst/gui/task/batch/registration/Bundle.properties" key="BatchRegistrationPanel.jPanel1.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
              <Font PropertyName="font" name="Ubuntu" size="15" style="1"/>
            </TitledBorder>
@@ -376,9 +376,6 @@
          <ResourceString bundle="cz/fidentis/analyst/gui/task/batch/registration/Bundle.properties" key="BatchRegistrationPanel.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JButton" name="jButton5">
      <Properties>
Loading