Skip to content

GitLab

Commit 8fdc9e4c authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

SCHNApps: update control dock minimum size

parent 178a31ca
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 86 deletions
SCHNApps/Plugins/surface_render/forms/surface_render.ui
View file @ 8fdc9e4c
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>246</width>
<width>240</width>
<height>600</height>
</rect>
</property>
......
SCHNApps/Plugins/surface_renderTopo/forms/surface_renderTopo.ui
View file @ 8fdc9e4c
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>337</width>
<width>230</width>
<height>600</height>
</rect>
</property>
......@@ -14,17 +14,17 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="check_drawPhi1">
<property name="text">
<string>draw phi1</string>
<item row="7" column="2">
<widget class="QSlider" name="slider_edgesScaleFactor">
<property name="value">
<number>50</number>
</property>
<property name="checked">
<bool>true</bool>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0" colspan="4">
<item row="3" column="0" colspan="3">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -37,81 +37,56 @@
</property>
</spacer>
</item>
<item row="2" column="3">
<widget class="ColorComboBox" name="combo_phi1Color"/>
</item>
<item row="3" column="3">
<item row="2" column="2">
<widget class="ColorComboBox" name="combo_phi2Color"/>
</item>
<item row="1" column="3">
<widget class="ColorComboBox" name="combo_dartsColor"/>
<item row="8" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>explod faces :</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="check_drawPhi2">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="check_drawPhi1">
<property name="text">
<string>draw phi2</string>
<string>draw phi1</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="13" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<item row="5" column="0" colspan="3">
<widget class="QLabel" name="label_map_param">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>explod faces</string>
<string>Per map parameters</string>
</property>
</widget>
</item>
<item row="13" column="2" colspan="2">
<widget class="QSlider" name="slider_facesScaleFactor">
<property name="value">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
<item row="0" column="2">
<widget class="ColorComboBox" name="combo_dartsColor"/>
</item>
<item row="10" column="2" colspan="2">
<widget class="QComboBox" name="combo_positionAttribute">
<item row="6" column="0">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>- select attribute -</string>
</property>
</item>
</widget>
</item>
<item row="12" column="2" colspan="2">
<widget class="QSlider" name="slider_edgesScaleFactor">
<property name="value">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="text">
<string>Position :</string>
</property>
</widget>
</item>
<item row="15" column="0" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>156</width>
<height>161</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="0" colspan="3">
<item row="4" column="0" colspan="3">
<widget class="Line" name="line_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
......@@ -130,7 +105,27 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<item row="7" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>explod edges :</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="ColorComboBox" name="combo_phi1Color"/>
</item>
<item row="8" column="2">
<widget class="QSlider" name="slider_facesScaleFactor">
<property name="value">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="check_drawDarts">
<property name="text">
<string>draw darts</string>
......@@ -140,38 +135,43 @@
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<widget class="QLabel" name="label">
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="check_drawPhi2">
<property name="text">
<string>explod edges</string>
<string>draw phi2</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="10" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<item row="6" column="1" colspan="2">
<widget class="QComboBox" name="combo_positionAttribute">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Position :</string>
</property>
<item>
<property name="text">
<string>- select attribute -</string>
</property>
</item>
</widget>
</item>
<item row="7" column="0" colspan="4">
<widget class="QLabel" name="label_map_param">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
<item row="9" column="0" colspan="3">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="text">
<string>Per map parameters</string>
<property name="sizeHint" stdset="0">
<size>
<width>156</width>
<height>161</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</widget>
......
SCHNApps/forms/controlDock_CameraTabWidget.ui
View file @ 8fdc9e4c
......@@ -92,7 +92,7 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="6" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......
SCHNApps/forms/controlDock_MapTabWidget.ui
View file @ 8fdc9e4c
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>218</width>
<width>200</width>
<height>673</height>
</rect>
</property>
......
SCHNApps/forms/controlDock_PluginTabWidget.ui
View file @ 8fdc9e4c
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>222</width>
<width>200</width>
<height>621</height>
</rect>
</property>
......
SCHNApps/src/schnapps.cpp
View file @ 8fdc9e4c
......@@ -57,6 +57,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
m_controlDock = new QDockWidget("Control Dock", this);
m_controlDock->setAllowedAreas(Qt::LeftDockWidgetArea);
m_controlDock->setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
m_controlDock->setMaximumWidth(200);
m_controlDockTabWidget = new QTabWidget(m_controlDock);
m_controlDockTabWidget->setObjectName("ControlDockTabWidget");
......@@ -75,8 +76,6 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
m_controlPluginTab = new ControlDock_PluginTab(this);
m_controlDockTabWidget->addTab(m_controlPluginTab, m_controlPluginTab->title());
// m_controlDockTabWidget->setMaximumWidth(m_controlCameraTab->width());
connect(action_ShowHideControlDock, SIGNAL(triggered()), this, SLOT(showHideControlDock()));
// create & setup plugin dock
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment