Improved Rendering tab.

ovilab · Jul 29, 2017 · 93154f5 · 93154f5
1 parent 075d22e
commit 93154f5
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 86 deletions.
diff --git a/src/LammpsWrappers/modifiers/periodicimages.h b/src/LammpsWrappers/modifiers/periodicimages.h
@@ -21,9 +21,6 @@ class PeriodicImages : public Modifier
 
 public:
     PeriodicImages();
-
-    // Modifier interface
-public:
     virtual void apply(class AtomData &atomData) override;
     int numberOfCopiesX() const;
     int numberOfCopiesY() const;

diff --git a/src/qml/desktop/RightBar/PeriodicImagesControl.qml b/src/qml/desktop/RightBar/PeriodicImagesControl.qml
@@ -0,0 +1,89 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.1
+import QtQuick.Controls 1.5 as QQC1
+import QtQuick.Dialogs 1.2
+import Atomify 1.0
+import Qt.labs.settings 1.0
+import "../../visualization"
+
+GroupBox {
+    id: periodicImagesRoot
+    property PeriodicImages periodicImages
+    height: periodicImages.enabled ? undefined : label.height
+    label: CheckBox {
+        id: checkBox
+        checked: false
+        onCheckedChanged: periodicImages.enabled = checked
+        text: qsTr("Periodic images")
+    }
+    Column {
+        width: parent.width
+        visible: periodicImagesRoot.periodicImages.enabled
+        spacing: 10
+        Row {
+            width: parent.width
+            height: periodicXSlider.height
+            Label {
+                width: parent.width*0.4
+                text: "X: "+periodicXSlider.value
+            }
+            QQC1.Slider {
+                id: periodicXSlider
+                width: parent.width*0.6
+                minimumValue: 1
+                maximumValue: 5.0
+                stepSize: 1
+                value: periodicImages.numberOfCopiesX
+                Binding {
+                    target: periodicImages
+                    property: "numberOfCopiesX"
+                    value: periodicXSlider.value
+                }
+            }
+        }
+
+        Row {
+            width: parent.width
+            height: periodicYSlider.height
+            Label {
+                width: parent.width*0.4
+                text: "Y: "+periodicYSlider.value
+            }
+            QQC1.Slider {
+                id: periodicYSlider
+                width: parent.width*0.6
+                minimumValue: 1
+                maximumValue: 5.0
+                stepSize: 1
+                value: periodicImages.numberOfCopiesY
+                Binding {
+                    target: visualizer.periodicImages
+                    property: "numberOfCopiesY"
+                    value: periodicYSlider.value
+                }
+            }
+        }
+
+        Row {
+            width: parent.width
+            height: periodicZSlider.height
+            Label {
+                width: parent.width*0.4
+                text: "Z: "+periodicZSlider.value
+            }
+            QQC1.Slider {
+                id: periodicZSlider
+                width: parent.width*0.6
+                minimumValue: 1
+                maximumValue: 5.0
+                stepSize: 1
+                value: periodicImages.numberOfCopiesZ
+                Binding {
+                    target: visualizer.periodicImages
+                    property: "numberOfCopiesZ"
+                    value: periodicZSlider.value
+                }
+            }
+        }
+    }
+}
diff --git a/src/qml/desktop/RightBar/Rendering.qml b/src/qml/desktop/RightBar/Rendering.qml
@@ -27,9 +27,19 @@ Pane {
                 right: parent.right
                 margins: 10
             }
-
             spacing: 10
 
+            SliceControl {
+                id: sliceControl
+                width: parent.width
+                slice: visualizer.sliceModifier
+            }
+            PeriodicImagesControl {
+                id: periodicCopiesControl
+                width: parent.width
+                periodicImages: visualizer.periodicImages
+            }
+
             GroupBox {
                 anchors {
                     left: parent.left
@@ -77,84 +87,6 @@ Pane {
                 }
             }
 
-            SliceControl {
-                id: sliceControl
-                width: parent.width
-                slice: visualizer.sliceModifier
-            }
-            GroupBox {
-                width: parent.width
-                title: "Periodic images"
-                Column {
-                    width: parent.width
-                    Row {
-                        width: parent.width
-                        height: periodicXSlider.height
-                        Label {
-                            width: parent.width*0.4
-                            text: "X: "+periodicXSlider.value
-                        }
-                        QQC1.Slider {
-                            id: periodicXSlider
-                            width: parent.width*0.6
-                            minimumValue: 1
-                            maximumValue: 5.0
-                            stepSize: 1
-                            value: visualizer.periodicImages.numberOfCopiesX
-                            Binding {
-                                target: visualizer.periodicImages
-                                property: "numberOfCopiesX"
-                                value: periodicXSlider.value
-                            }
-                        }
-                    }
-
-                    Row {
-                        width: parent.width
-                        height: periodicYSlider.height
-                        Label {
-                            width: parent.width*0.4
-                            text: "Y: "+periodicYSlider.value
-                        }
-                        QQC1.Slider {
-                            id: periodicYSlider
-                            width: parent.width*0.6
-                            minimumValue: 1
-                            maximumValue: 5.0
-                            stepSize: 1
-                            value: visualizer.periodicImages.numberOfCopiesY
-                            Binding {
-                                target: visualizer.periodicImages
-                                property: "numberOfCopiesY"
-                                value: periodicYSlider.value
-                            }
-                        }
-                    }
-
-                    Row {
-                        width: parent.width
-                        height: periodicZSlider.height
-                        Label {
-                            width: parent.width*0.4
-                            text: "Z: "+periodicZSlider.value
-                        }
-                        QQC1.Slider {
-                            id: periodicZSlider
-                            width: parent.width*0.6
-                            minimumValue: 1
-                            maximumValue: 5.0
-                            stepSize: 1
-                            value: visualizer.periodicImages.numberOfCopiesZ
-                            Binding {
-                                target: visualizer.periodicImages
-                                property: "numberOfCopiesZ"
-                                value: periodicZSlider.value
-                            }
-                        }
-                    }
-                }
-            }
-
             GroupBox {
                 width: parent.width
                 title: "Rendering mode"

diff --git a/src/qml/desktop/RightBar/SliceControl.qml b/src/qml/desktop/RightBar/SliceControl.qml
@@ -16,10 +16,10 @@ GroupBox {
         onCheckedChanged: slice.enabled = checked
         text: qsTr("Slice")
     }
-    ColumnLayout {
+    Column {
         id: columnLayout
         width: parent.width
-        visible: slice.enabled
+        visible: sliceRoot.slice.enabled
         spacing: 10
 
         Label {
@@ -94,7 +94,7 @@ GroupBox {
         }
 
         CheckBox {
-            text: "Reversed: "
+            text: "Reversed"
             checked: slice.reversed
             onCheckedChanged: slice.reversed = checked
         }

diff --git a/src/qml/qml.qrc b/src/qml/qml.qrc
@@ -84,5 +84,6 @@
         <file>events/EventMenuItem.qml</file>
         <file>events/EventCatcher.qml</file>
         <file>desktop/items/ScrollableNumberField.qml</file>
+        <file>desktop/RightBar/PeriodicImagesControl.qml</file>
     </qresource>
 </RCC>
diff --git a/src/qml/visualization/AtomifyVisualizer.qml b/src/qml/visualization/AtomifyVisualizer.qml
@@ -440,7 +440,6 @@ Scene3D {
 
         PeriodicImages {
             id: periodicImages
-            enabled: true
             numberOfCopiesX: 1
             numberOfCopiesY: 1
             numberOfCopiesZ: 1