REPORT-2897 9.0设计器修改

缩放条在不同的sheet切换不应该继承
去掉表单缩放条

designer/src/com/fr/design/mainframe/ElementCasePane.java

@@ -1325,7 +1325,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
      * @return 返回正在编辑的状态.
      */
     public EditingState createEditingState() {
-        return new ElementCaseEditingState(this.selection, this.verScrollBar.getValue(), this.horScrollBar.getValue());
+        return new ElementCaseEditingState(this.selection, this.verScrollBar.getValue(), this.horScrollBar.getValue(), this.resolution);
     }
 
     public void setCellNeedTOFormat(CellSelection selection) {
@@ -1341,8 +1341,9 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         protected Selection selection;
         protected int verticalValue = 0;
         protected int horizontalValue = 0;
+        protected int resolution = ScreenResolution.getScreenResolution();
 
-        protected ElementCaseEditingState(Selection selection, int verticalValue, int horizontalValue) {
+        protected ElementCaseEditingState(Selection selection, int verticalValue, int horizontalValue, int resolution) {
             try {
                 this.selection = selection.clone();
             } catch (CloneNotSupportedException e) {
@@ -1350,6 +1351,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
             }
             this.verticalValue = verticalValue;
             this.horizontalValue = horizontalValue;
+            this.resolution = resolution;
         }
 
         @Override
@@ -1363,7 +1365,8 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
 
             ElementCasePane.this.getVerticalScrollBar().setValue(this.verticalValue);
             ElementCasePane.this.getHorizontalScrollBar().setValue(this.horizontalValue);
-
+//            ElementCasePane.this.setResolution(this.resolution);
+            HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(this.resolution);
             // 重绘.
             ElementCasePane.this.repaint();
         }

designer/src/com/fr/design/mainframe/ReportComponentComposite.java

@@ -120,12 +120,16 @@ public class ReportComponentComposite extends JComponent {
             EditingState reportPaneEditState = templateStateList.get(newIndex);
             if (reportPaneEditState != null) {
                 reportPaneEditState.revert();
+                updateJSlider();
             }
         } else {
             while (templateStateList.size() <= newIndex) {
                 templateStateList.add(null);
             }
             centerCardPane.editingComponet.setSelection(centerCardPane.editingComponet.getDefaultSelectElement());
+            if (jSliderContainer != null){
+                jSliderContainer.reset();
+            }
         }
 
         if (centerCardPane.editingComponet.elementCasePane == null) {
@@ -141,6 +145,15 @@ public class ReportComponentComposite extends JComponent {
         }
     }
 
+    private void updateJSlider(){
+        if (centerCardPane.editingComponet.elementCasePane == null) {
+            jSliderContainer.getShowVal().setValue(centerCardPane.getPolyDezi().getResolution() * HUND / ScreenResolution.getScreenResolution());
+        }else {
+            jSliderContainer.getShowVal().setValue(centerCardPane.editingComponet.elementCasePane.getResolution() * HUND / ScreenResolution.getScreenResolution());
+        }
+
+    }
+
     /**
      * 移除选中状态
      *

designer/src/com/fr/poly/PolyDesigner.java

@@ -687,14 +687,16 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      * @return 返回正在编辑的状态.
      */
     public EditingState createEditingState() {
-        return new PolyDesignerEditingState(selection);
+        return new PolyDesignerEditingState(selection, resolution);
     }
 
     private class PolyDesignerEditingState implements EditingState {
         private String blockName;
         private Selection select;
+        protected int resolution = ScreenResolution.getScreenResolution();
 
-        public PolyDesignerEditingState(BlockCreator creator) {
+        public PolyDesignerEditingState(BlockCreator creator, int resolution) {
+            this.resolution = resolution;
             if (creator == null) {
                 return;
             }
@@ -710,6 +712,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         public void revert() {
             PolyDesigner.this.addedData = new AddedData(PolyDesigner.this);
             stopEditingState();
+            HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(this.resolution);
             initPolyBlocks();
             startEditing(blockName);
             if (selection == null) {

designer_base/src/com/fr/design/mainframe/JSliderPane.java

@@ -337,6 +337,10 @@ public class JSliderPane extends JPanel {
         return this.showValue;
     }
 
+    public void reset(){
+        this.showValSpinner.setValue(HUNDRED);
+    }
+
     public static double divide(double v1, double v2, int scale) {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));

designer_form/src/com/fr/design/mainframe/FormArea.java

@@ -119,7 +119,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
 //    	slidePane = new UINumberSlidePane(SLIDER_MIN, SLIDER_FLOAT);
 //    	slidePane.setPreferredSize(new Dimension(260,20));
         slidePane = JFormSliderPane.getInstance();
-        slidePane.setPreferredSize(new Dimension(350, 20));
+        slidePane.setPreferredSize(new Dimension(200, 20));
 
 
         JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
@@ -130,8 +130,8 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         setWidgetsConfig();
         // 先初始话滑块及对应事件，然后获取分辨率调整容器的显示大小
         slidePane.setEnabled(false);
-        slidePane.setVisible(true);
+        slidePane.setVisible(false);
-        initTransparent();
+//        initTransparent();
         initCalculateSize();
     }