Merge remote branch 'release-2018.11'

Author: codeling

modules/DynamicVolumeLines/dlg_DynamicVolumeLines.cpp

@@ -69,6 +69,7 @@
 
 const double impInitValue = 0.025;
 const double offsetY = 1000;
+const QString plotColor = "DVL-Metro Colors (max. 17)";	// Brewer Qualitaive 1 (max. 8) // DVL-Metro Colors (max. 17)
 
 void winModCallback(vtkObject *caller, long unsigned int vtkNotUsed(eventId),
 	void* vtkNotUsed(client), void* vtkNotUsed(callData))
@@ -388,7 +389,7 @@ void dlg_DynamicVolumeLines::visualize()
 			m_linearScaledPlot->graph()->setVisible(false);
 			m_linearScaledPlot->graph()->setSelectable(QCP::stMultipleDataRanges);
 			m_linearScaledPlot->graph()->setPen(getDatasetPen(it - m_DatasetIntensityMap.begin(),
-				m_DatasetIntensityMap.size(), 2, "DVL-Metro Colors (max. 17)"));
+				m_DatasetIntensityMap.size(), 2, plotColor));
 			m_linearScaledPlot->graph()->setName(it->first);
 			QCPScatterStyle scatter;
 			scatter.setShape(QCPScatterStyle::ssNone);	 // Check ssDisc/ssDot to show single selected points
@@ -447,7 +448,7 @@ void dlg_DynamicVolumeLines::visualize()
 		m_nonlinearScaledPlot->graph()->setVisible(false);
 		m_nonlinearScaledPlot->graph()->setSelectable(QCP::stMultipleDataRanges);
 		m_nonlinearScaledPlot->graph()->setPen(getDatasetPen(it - m_DatasetIntensityMap.begin(),
-			m_DatasetIntensityMap.size(), 2, "DVL-Metro Colors (max. 17)"));
+			m_DatasetIntensityMap.size(), 2, plotColor));
 		m_nonlinearScaledPlot->graph()->setName(it->first);
 		QCPScatterStyle scatter;
 		scatter.setShape(QCPScatterStyle::ssNone);	 // Check ssDisc/ssDot to show single selected points

modules/DynamicVolumeLines/dlg_DynamicVolumeLines.ui

@@ -283,6 +283,12 @@ then the visualization mode is switch from histogram heatmap to line plots</stri
        </item>
        <item>
         <widget class="QSpinBox" name="sb_RngSwtVal">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="toolTip">
           <string>Range Switch Value: if the number of indices is below this value,
 then the visualization mode is switch from histogram heatmap to line plots</string>
@@ -291,7 +297,10 @@ then the visualization mode is switch from histogram heatmap to line plots</stri
           <number>50</number>
          </property>
          <property name="maximum">
-          <number>65535</number>
+          <number>100000</number>
+         </property>
+         <property name="value">
+          <number>300</number>
          </property>
         </widget>
        </item>