Skip to content
Snippets Groups Projects
Commit 5f7cba22 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

DetectorItem rm members that controlled collapse of x/y axis groupbox

parent abced399
No related branches found
No related tags found
1 merge request!2058GUI instrument editor: detector section made more compact
Pipeline #117424 failed
......@@ -25,8 +25,6 @@ const QString Alignment("Alignment");
const QString DirectionVector("DirectionVector");
const QString Distance("Distance");
const QString ExpandResolutionFuncGroupbox("ExpandResolutionFuncGroupbox");
const QString ExpandXaxisGroupBox("ExpandXaxisGroupBox");
const QString ExpandYaxisGroupBox("ExpandYaxisGroupBox");
const QString Height("Height");
const QString NormalVector("NormalVector");
const QString ResolutionFunction("ResolutionFunction");
......@@ -200,16 +198,6 @@ void DetectorItem::writeTo(QXmlStreamWriter* w) const
w->writeStartElement(Tag::Distance);
m_distance.writeTo(w);
w->writeEndElement();
// x axis groupbox: is expanded?
w->writeStartElement(Tag::ExpandXaxisGroupBox);
XML::writeAttribute(w, XML::Attrib::value, m_expandXaxis);
w->writeEndElement();
// y axis groupbox: is expanded?
w->writeStartElement(Tag::ExpandYaxisGroupBox);
XML::writeAttribute(w, XML::Attrib::value, m_expandYaxis);
w->writeEndElement();
}
void DetectorItem::readFrom(QXmlStreamReader* r)
......@@ -280,16 +268,6 @@ void DetectorItem::readFrom(QXmlStreamReader* r)
m_distance.readFrom(r);
XML::gotoEndElementOfTag(r, tag);
// x axis groupbox: is expanded?
} else if (tag == Tag::ExpandXaxisGroupBox) {
XML::readAttribute(r, XML::Attrib::value, &m_expandXaxis);
XML::gotoEndElementOfTag(r, tag);
// y axis groupbox: is expanded?
} else if (tag == Tag::ExpandYaxisGroupBox) {
XML::readAttribute(r, XML::Attrib::value, &m_expandYaxis);
XML::gotoEndElementOfTag(r, tag);
} else
r->skipCurrentElement();
}
......
......@@ -92,12 +92,6 @@ public:
const DoubleProperty& distance() const { return m_distance; }
void setDistance(double v) { m_distance.setValue(v); }
bool isExpandXaxis() const { return m_expandXaxis; }
void setExpandXaxis(bool b) { m_expandXaxis = b; }
bool isExpandYaxis() const { return m_expandYaxis; }
void setExpandYaxis(bool b) { m_expandYaxis = b; }
private:
std::unique_ptr<IResolutionFunction2D> createResolutionFunction() const;
......@@ -122,9 +116,6 @@ private:
DoubleProperty m_u0;
DoubleProperty m_v0;
DoubleProperty m_distance;
bool m_expandXaxis = true;
bool m_expandYaxis = true;
};
template <typename T>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment