Commit 12bbdf7e authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Minor improvements

parent d08a691d

GUI/src/main/java/cz/fidentis/analyst/gui/task/symmetry/SymmetryPanel.form

+9 −7
Original line number Diff line number Diff line
@@ -46,7 +46,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="Symmetry from mesh">

            <TitledBorder title="Mesh sub-sampling">

              <ResourceString PropertyName="titleX" bundle="cz/fidentis/analyst/gui/task/symmetry/Bundle.properties" key="SymmetryPanel.jPanel1.border.title_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

              <Font PropertyName="font" name="Dialog" size="14" style="1"/>

            </TitledBorder>
@@ -74,7 +74,7 @@ 
                      <Component id="spinSlider1" min="-2" max="-2" attributes="0"/>

                      <Component id="spinSlider2" min="-2" max="-2" attributes="0"/>

                  </Group>

                  <EmptySpace pref="74" max="32767" attributes="0"/>

                  <EmptySpace pref="25" max="32767" attributes="0"/>

              </Group>

          </Group>

        </DimensionLayout>
@@ -160,7 +160,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="Precision: ">

            <TitledBorder title="Precision of symmetry planes: ">

              <ResourceString PropertyName="titleX" bundle="cz/fidentis/analyst/gui/task/symmetry/Bundle.properties" key="SymmetryPanel.jPanel2.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>

              <Font PropertyName="font" name="Dialog" size="12" style="1"/>

            </TitledBorder>
@@ -272,11 +272,13 @@ 
          <Group type="103" groupAlignment="0" attributes="0">

              <Group type="102" alignment="0" attributes="0">

                  <EmptySpace max="-2" attributes="0"/>

                  <Group type="103" groupAlignment="0" attributes="0">

                      <Component id="infoLinkButton1" alignment="0" min="-2" pref="35" max="-2" attributes="0"/>

                      <Group type="103" groupAlignment="3" attributes="0">

                          <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/>

                          <Component id="selectableComboBox1" alignment="3" min="-2" max="-2" attributes="0"/>

                          <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>

                      <Component id="infoLinkButton1" alignment="0" min="-2" pref="35" max="-2" attributes="0"/>

                      </Group>

                  </Group>

                  <EmptySpace max="32767" attributes="0"/>

              </Group>

GUI/src/main/java/cz/fidentis/analyst/gui/task/symmetry/SymmetryPanel.java

+11 −10
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ public class SymmetryPanel extends ControlPanel { 
    );

    

    public static final List<String> SYMMETRY_ALGORITHMS = List.of(

        "mesh - fast",

        "mesh - robust",

        "vertices - robust",

        "mesh surface (fast)",

        "mesh surface (robust)",

        "mesh vertices (robust)",

        "feature points"

    );
@@ -60,7 +60,7 @@ public class SymmetryPanel extends ControlPanel { 
        initComponents();



        infoLinkButton1.setUri(URI.create(SYMMETRY_HELP_URL));

        infoLinkButton1.setUri(URI.create(SAMPLING_HELP_URL));

        infoLinkButton2.setUri(URI.create(SAMPLING_HELP_URL));

        

        SYMMETRY_ALGORITHMS.forEach(v -> selectableComboBox1.addItem(v, true));

        selectableComboBox1.setSelectedIndex(0);
@@ -245,7 +245,7 @@ public class SymmetryPanel extends ControlPanel { 
                        .addComponent(infoLinkButton2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))

                    .addComponent(spinSlider1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)

                    .addComponent(spinSlider2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))

                .addContainerGap(74, Short.MAX_VALUE))

                .addContainerGap(25, Short.MAX_VALUE))

        );

        jPanel1Layout.setVerticalGroup(

            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -344,11 +344,12 @@ public class SymmetryPanel extends ControlPanel { 
            jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

            .addGroup(jPanel3Layout.createSequentialGroup()

                .addContainerGap()

                .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

                    .addComponent(infoLinkButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)

                    .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)

                        .addComponent(jButton2)

                        .addComponent(selectableComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)

                    .addComponent(jLabel4)

                    .addComponent(infoLinkButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE))

                        .addComponent(jLabel4)))

                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))

        );

GUI/src/main/resources/cz/fidentis/analyst/gui/task/symmetry/Bundle.properties

+5 −5
Original line number Diff line number Diff line
@@ -21,16 +21,16 @@ SymmetryPanelNew.minNormAngleCosTF.text= 
SymmetryPanelNew.maxRelDistTF.text=

SymmetryPanelNew.averaging.text=

SymmetryPanel.jButton2.text=Compute

SymmetryPanel.jPanel2.border.title=Precision: 

SymmetryPanel.jPanel2.border.title=Precision of symmetry planes: 

SymmetryPanel.jTextField1.text=

SymmetryPanel.jLabel7.text=Face 1:

SymmetryPanel.jLabel8.text=Face 2:

SymmetryPanel.jTextField2.text=

SymmetryPanel.jPanel3.border.title=Strategy

SymmetryPanel.jLabel9.text=Point sampling strategy

SymmetryPanel.jLabel1.text_1=Sampling strength 1

SymmetryPanel.jPanel1.border.title_1=Symmetry from mesh

SymmetryPanel.jLabel3.text=Sampling strength 2

SymmetryPanel.jLabel9.text=Sub-sampling strategy

SymmetryPanel.jLabel1.text_1=Strength for candidate search

SymmetryPanel.jPanel1.border.title_1=Mesh sub-sampling

SymmetryPanel.jLabel3.text=Strength for pruning candidates

ProfilesPanel.text=jLabel4

CuttingPlanesPanel.hausdorffDistancePanel.border.title=Cross-section similarity

CuttingPlanesPanel.jButton1.text=Export

Rendering/src/main/java/cz/fidentis/analyst/drawables/DrawablePointCloud.java

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ import java.util.List; 
public class DrawablePointCloud extends Drawable {

    

    public static final Color DEFAULT_COLOR = Color.BLACK.darker();

    public static final float FP_DEFAULT_SIZE = 2.0f;

    public static final float FP_DEFAULT_SIZE = 2.5f;

    

    private final List<MeshPoint> points;