From 481360d1f8f52cd0a2f6bc0e0f05de16c5ec48dc Mon Sep 17 00:00:00 2001 From: root Date: Fri, 7 Feb 2020 12:04:14 +0100 Subject: [PATCH] ScrenPanel6 --- config/variables.properties | 4 +-- plugins/ScreenPanel6.form | 51 +++++++++++++++---------------------- plugins/ScreenPanel6.java | 43 +++++++++++++------------------ 3 files changed, 40 insertions(+), 58 deletions(-) diff --git a/config/variables.properties b/config/variables.properties index 53d029b..6045bfe 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Thu Feb 06 18:39:13 CET 2020 -FileSequentialNumber=1250 +#Fri Feb 07 11:46:23 CET 2020 +FileSequentialNumber=1251 diff --git a/plugins/ScreenPanel6.form b/plugins/ScreenPanel6.form index dabc144..8fede15 100644 --- a/plugins/ScreenPanel6.form +++ b/plugins/ScreenPanel6.form @@ -620,14 +620,22 @@ - + + + + + + + + + + - @@ -639,8 +647,12 @@ - - + + + + + + @@ -653,38 +665,15 @@ - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/ScreenPanel6.java b/plugins/ScreenPanel6.java index f104956..1487432 100644 --- a/plugins/ScreenPanel6.java +++ b/plugins/ScreenPanel6.java @@ -3518,14 +3518,20 @@ public class ScreenPanel6 extends Panel { panelScreen2Layout.setHorizontalGroup( panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelScreen2Layout.createSequentialGroup() - .addContainerGap() .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelScreen2Layout.createSequentialGroup() + .addContainerGap() + .addComponent(checkAveraging) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(labelAvFrames, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(labelAvMode, javax.swing.GroupLayout.Alignment.TRAILING))) + .addGroup(panelScreen2Layout.createSequentialGroup() + .addContainerGap() .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(checkGoodRegion) .addComponent(checkRotation) - .addComponent(checkThreshold) - .addComponent(checkAveraging)) + .addComponent(checkThreshold)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -3533,8 +3539,11 @@ public class ScreenPanel6 extends Panel { .addComponent(labelAngle, javax.swing.GroupLayout.Alignment.TRAILING)) .addComponent(labelGrScale, javax.swing.GroupLayout.Alignment.TRAILING))) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreen2Layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(labelAvMode))) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(labelConstant, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(labelMode, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(labelGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING)))) .addGap(2, 2, 2) .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -3548,29 +3557,13 @@ public class ScreenPanel6 extends Panel { .addComponent(spinnerAvMode)) .addContainerGap()) .addComponent(panelSlicing, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreen2Layout.createSequentialGroup() - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(labelGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreen2Layout.createSequentialGroup() - .addComponent(labelConstant) - .addGap(2, 2, 2))) - .addGap(106, 106, 106)) .addGroup(panelScreen2Layout.createSequentialGroup() - .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(panelScreen2Layout.createSequentialGroup() - .addGap(6, 6, 6) - .addComponent(checkBackground)) - .addGroup(panelScreen2Layout.createSequentialGroup() - .addGap(111, 111, 111) - .addComponent(labelAvFrames)) - .addGroup(panelScreen2Layout.createSequentialGroup() - .addGap(122, 122, 122) - .addComponent(labelMode))) - .addGap(106, 106, 106)) + .addContainerGap() + .addComponent(checkBackground) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - panelScreen2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerAvFrames, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold}); + panelScreen2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold}); panelScreen2Layout.setVerticalGroup( panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)