diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp index 2c1920de5a65c72cbd16946a4a4175d753e40dc7..aff675250558d4926858c5ccd93a8c14aa3784f5 100644 --- a/GUI/View/SampleDesigner/LayerForm.cpp +++ b/GUI/View/SampleDesigner/LayerForm.cpp @@ -68,8 +68,6 @@ LayerForm::LayerForm(QWidget* parent, LayerItem* layerItem, SampleEditorControll { m_moveButton = new WidgetMoverButton(this, this, 1); m_moveButton->setToolTip("Move layer up/down"); - connect(m_moveButton, &WidgetMoverButton::startingToMove, ec, - &SampleEditorController::onStartingToMoveLayer); connect(m_moveButton, &WidgetMoverButton::finishedMoving, ec, &SampleEditorController::onStoppedToMoveLayer); m_collapser->addWidget(m_moveButton); diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp index 50dc0dd2fd431398b065eec9972c253ab89dc176..70a0b9bdd081ff26e3c02396deeb047999aaf3e9 100644 --- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp +++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp @@ -30,7 +30,6 @@ LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent, ProjectDoc , m_currentSampleWidget(nullptr) , m_undoAction(nullptr) , m_redoAction(nullptr) - , m_showInlineEditButtonsAction(nullptr) , m_currentSample(nullptr) , m_document(document) { @@ -39,20 +38,12 @@ LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent, ProjectDoc m_scrollArea->setWidget(createEmptyWidget()); m_toolbar = new StyledToolbar(this); - m_toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); auto* mainLayout = new QVBoxLayout(this); mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setSpacing(0); mainLayout->addWidget(m_toolbar); mainLayout->addWidget(m_scrollArea); - - m_showInlineEditButtonsAction = new QAction(QIcon(":/images/edit.svg"), "Edit structure", this); - connect(m_showInlineEditButtonsAction, &QAction::toggled, this, - &LayerOrientedSampleEditor::onShowInlineEditButtonsToggled); - m_showInlineEditButtonsAction->setCheckable(true); - m_showInlineEditButtonsAction->setChecked(true); - m_toolbar->addAction(m_showInlineEditButtonsAction); } LayerOrientedSampleEditor::~LayerOrientedSampleEditor() @@ -105,7 +96,6 @@ void LayerOrientedSampleEditor::setCurrentSample(SampleItem* sampleItem) ec->setSampleForm(m_currentSampleWidget); m_currentSampleWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); m_scrollArea->setWidget(m_currentSampleWidget); - m_currentSampleWidget->showInlineEditButtons(m_showInlineEditButtonsAction->isChecked()); updateActionEnabling(); } @@ -119,12 +109,6 @@ void LayerOrientedSampleEditor::updateActionEnabling() m_redoAction->setVisible(false); } -void LayerOrientedSampleEditor::onShowInlineEditButtonsToggled(bool checked) -{ - if (m_currentSampleWidget) - m_currentSampleWidget->showInlineEditButtons(checked); -} - void LayerOrientedSampleEditor::createLayerColors() // #baLayerEditor move to better place { if (!m_currentSample) diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h index a9ee93651166ad436eee7abf3f93f5709db8da35..cf32dc15da78895e65de242c3d4e538d9fdb2d52 100644 --- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h +++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.h @@ -43,7 +43,6 @@ signals: private: void updateActionEnabling(); - void onShowInlineEditButtonsToggled(bool checked); void createLayerColors(); @@ -56,7 +55,6 @@ private: QToolBar* m_toolbar; QAction* m_undoAction; // dedicated to the current sample QAction* m_redoAction; - QAction* m_showInlineEditButtonsAction; SampleItem* m_currentSample = nullptr; QMap<SampleItem*, SampleEditorController*> m_editControllers; ProjectDocument* m_document; diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp index 569d941ee2f96455e2c38d5accb622533d7305dc..0020e2f6353c05e9721ff365682327f24fe3ae0f 100644 --- a/GUI/View/SampleDesigner/SampleEditorController.cpp +++ b/GUI/View/SampleDesigner/SampleEditorController.cpp @@ -151,7 +151,6 @@ void SampleEditorController::removeLayerItemFromUndo(int atIndex) emit aboutToRemoveItem(layer); m_sampleForm->onAboutToRemoveLayer(layer); m_sampleItem->removeLayer(layer); - m_sampleForm->updateRowVisibilities(); emit modified(); } @@ -384,8 +383,7 @@ void SampleEditorController::setDoubleFromUndo(double newValue, const QString& p spinBox->setPropertyValue(newValue); - m_sampleForm->ensureVisible(spinBox); - QSignalBlocker b(spinBox); + QSignalBlocker _(spinBox); spinBox->setBaseValue(newValue); spinBox->setFocus(); spinBox->selectAll(); @@ -459,17 +457,9 @@ void SampleEditorController::setDensityRelatedValue(InterferenceItem* interferen } } -void SampleEditorController::onStartingToMoveLayer() -{ - ASSERT(m_sampleForm); - m_sampleForm->showAddLayerButtons(false); -} - void SampleEditorController::onStoppedToMoveLayer(QWidget* widgetToMove, QWidget* moveAboveThisWidget) { - ASSERT(m_sampleForm); - m_sampleForm->showAddLayerButtons(true); auto* itemToMove = dynamic_cast<LayerForm*>(widgetToMove)->layerItem(); const auto* moveAboveThisLayerForm = m_sampleForm->findNextLayerForm(moveAboveThisWidget); diff --git a/GUI/View/SampleDesigner/SampleEditorController.h b/GUI/View/SampleDesigner/SampleEditorController.h index 7f747e542be8b4c314d451c0e0c9a31c2d288eb2..2a2c6d3937fbb3427c3c78f52996256e4243e559 100644 --- a/GUI/View/SampleDesigner/SampleEditorController.h +++ b/GUI/View/SampleDesigner/SampleEditorController.h @@ -122,7 +122,6 @@ public: void setDensityRelatedValue(InterferenceItem* interferenceItem, double newValue, DoubleProperty& d); - void onStartingToMoveLayer(); void onStoppedToMoveLayer(QWidget* widgetToMove, QWidget* moveAboveThisWidget); void setSampleName(const QString& name); diff --git a/GUI/View/SampleDesigner/SampleForm.cpp b/GUI/View/SampleDesigner/SampleForm.cpp index 594d7d105f1b7ab7b29424ed757eef898f5c7586..8a24df9a0547c403bf398e118b8a0b2b6eb94acc 100644 --- a/GUI/View/SampleDesigner/SampleForm.cpp +++ b/GUI/View/SampleDesigner/SampleForm.cpp @@ -112,12 +112,6 @@ SampleForm::SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorCont m_layout->addStretch(1); } -void SampleForm::showInlineEditButtons(bool b) -{ - m_showInlineEditButtons = b; - updateRowVisibilities(); -} - void SampleForm::onLayerAdded(LayerItem* layerItem) { const int rowInMultiLayer = m_sampleItem->layerItems().indexOf(layerItem); @@ -128,8 +122,6 @@ void SampleForm::onLayerAdded(LayerItem* layerItem) // same row => button is above! m_layout->insertWidget(rowInLayout, new AddLayerWidget(this, layerItem, m_ec)); - - updateRowVisibilities(); } void SampleForm::onLayerMoved(LayerItem* layerItem) @@ -161,8 +153,6 @@ void SampleForm::onLayerMoved(LayerItem* layerItem) // same row => button is above! m_layout->insertWidget(rowInLayout, al); - - updateRowVisibilities(); } void SampleForm::onAboutToRemoveLayer(LayerItem* layerItem) @@ -192,42 +182,6 @@ void SampleForm::onAboutToRemoveLayer(LayerItem* layerItem) delete addLayerWidget; } -void SampleForm::updateRowVisibilities() -{ - for (auto* c : findChildren<QWidget*>()) { - if (auto* w = dynamic_cast<LayerForm*>(c)) - w->enableStructureEditing(m_showInlineEditButtons); - if (auto* w = dynamic_cast<ParticleLayoutForm*>(c)) - w->enableStructureEditing(m_showInlineEditButtons); - if (auto* w = dynamic_cast<ParticleForm*>(c)) - w->enableStructureEditing(m_showInlineEditButtons); - if (auto* w = dynamic_cast<CompoundForm*>(c)) - w->enableStructureEditing(m_showInlineEditButtons); - if (auto* w = dynamic_cast<CoreAndShellForm*>(c)) - w->enableStructureEditing(m_showInlineEditButtons); - if (auto* w = dynamic_cast<MesocrystalForm*>(c)) - w->enableStructureEditing(m_showInlineEditButtons); - } - - showAddLayerButtons(m_showInlineEditButtons); - - for (auto* c : findChildren<LayerForm*>()) - c->updateLayerPositionDependentElements(); -} - - -void SampleForm::ensureVisible(QWidget* /*w*/) -{ - // #baLayerEditor implement ensureVisible -} - -void SampleForm::showAddLayerButtons(bool show) -{ - for (auto* c : findChildren<QWidget*>()) - if (dynamic_cast<AddLayerWidget*>(c)) - c->setVisible(show); -} - LayerForm* SampleForm::findNextLayerForm(QWidget* w) { while (w != nullptr && dynamic_cast<LayerForm*>(w) == nullptr) { diff --git a/GUI/View/SampleDesigner/SampleForm.h b/GUI/View/SampleDesigner/SampleForm.h index 2cee8dddf26addf0de623b9581f6eefca7eb5018..99cd0317405eca24379d86bcb3a1f642d762e09b 100644 --- a/GUI/View/SampleDesigner/SampleForm.h +++ b/GUI/View/SampleDesigner/SampleForm.h @@ -29,9 +29,6 @@ class SampleForm : public QWidget { public: SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorController* ec); - //! Show or hide all buttons related to structure editing (like "add layer", "remove particle") - void showInlineEditButtons(bool b); - //! Create widgets for the new layer. void onLayerAdded(LayerItem* layerItem); @@ -45,13 +42,6 @@ public: //! Any widgets related to the item will be deleted or scheduled for later deletion. void onAboutToRemoveLayer(LayerItem* layerItem); - void updateRowVisibilities(); - - void ensureVisible(QWidget* w); - - //! Shows or hides the "Add Layer" buttons. - void showAddLayerButtons(bool show); - //! Search for the next LayerForm, starting from the given widget. //! //! The search starts with the given widget itself If it is a LayerForm, it is returned. @@ -62,7 +52,6 @@ private: QVBoxLayout* m_layout; SampleItem* m_sampleItem; //!< Ptr is borrowed, don't delete SampleEditorController* m_ec; //!< Ptr is borrowed, don't delete - bool m_showInlineEditButtons = false; QList<QPushButton*> m_addLayerButtons; }; diff --git a/GUI/gui.qrc b/GUI/gui.qrc index da7f42ed7854ad887024c5992bb9276e9deeda23..c65363c384c2c62f90e8cb8a0612bb9060b4a0c8 100644 --- a/GUI/gui.qrc +++ b/GUI/gui.qrc @@ -9,7 +9,6 @@ <file>images/treeview-vline.png</file> <file>images/BornAgain.ico</file> <file>images/collapse_arrow.png</file> - <file>images/edit.svg</file> <file>images/library.svg</file> <file>images/expand_arrow.png</file> <file>images/splashscreen.png</file> @@ -73,8 +72,6 @@ <file>images/1D_OK.png</file> <file>images/2D_OK.png</file> <file>images/warning_16x16.png</file> - <file>images/unit_nm.svg</file> - <file>images/unit_angstrom.svg</file> <file>styles/Native.stylesheet</file> <file>styles/Base.stylesheet</file> <file>styles/Dark.stylesheet</file> diff --git a/GUI/images/edit.svg b/GUI/images/edit.svg deleted file mode 100644 index 91779b6bc1d1bf40f40604156f88e818c078bdc8..0000000000000000000000000000000000000000 --- a/GUI/images/edit.svg +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - inkscape:version="1.1 (c68e22c387, 2021-05-23)" - sodipodi:docname="edit.svg" - id="svg4" - viewBox="0 0 24 24" - height="24" - width="24" - version="1.1" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata - id="metadata10"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs8"> - <inkscape:path-effect - effect="fill_between_many" - method="originald" - linkedpaths="#path47568,0,1" - id="path-effect47736" /> - <inkscape:path-effect - effect="fill_between_many" - method="originald" - linkedpaths="#path47568,0,1" - id="path-effect47760" /> - </defs> - <sodipodi:namedview - inkscape:current-layer="svg4" - inkscape:window-maximized="0" - inkscape:window-y="0" - inkscape:window-x="571" - inkscape:cy="10.859634" - inkscape:cx="9.3321706" - inkscape:zoom="47.791668" - showgrid="false" - id="namedview6" - inkscape:window-height="1561" - inkscape:window-width="2637" - inkscape:pageshadow="2" - inkscape:pageopacity="0" - guidetolerance="10" - gridtolerance="10" - objecttolerance="10" - borderopacity="1" - bordercolor="#666666" - pagecolor="#ffffff" - inkscape:pagecheckerboard="0" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:1.50205" - id="path2" - d="m 22.456843,18.933379 -20.6625972,0.05866 v 2.68601 l 20.6625972,0.05866 z" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:1.39642" - id="path2-5" - d="m 16.543648,3.053311 -8.6331942,9.417549 2.7513672,2.554907 8.75337,-9.3059537 z" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0983853" - d="m 6.0877442,16.391465 c 0.040174,-0.350234 1.5540236,-3.567398 1.6456489,-3.553913 0.06025,0.0089 0.4396847,0.453438 1.1245006,1.064663 l 1.5171343,1.4461 -3.7707868,2.113231 C 4.9089687,18.411614 6.0768418,16.486521 6.0877442,16.391465 Z" - id="path6974" - sodipodi:nodetypes="ccccsc" /> - <path - inkscape:original-d="M 0,0" - inkscape:path-effect="#path-effect47760" - d="M 0,0" - id="path47762" /> -</svg> diff --git a/GUI/images/unit_angstrom.svg b/GUI/images/unit_angstrom.svg deleted file mode 100644 index d275342a7be3b2178f57233abe6ddec6a0f24258..0000000000000000000000000000000000000000 --- a/GUI/images/unit_angstrom.svg +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - inkscape:version="1.1 (c68e22c387, 2021-05-23)" - sodipodi:docname="unit_angstrom.svg" - id="svg4" - viewBox="0 0 24 24" - height="24" - width="24" - version="1.1" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata - id="metadata10"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs8" /> - <sodipodi:namedview - inkscape:current-layer="svg4" - inkscape:window-maximized="0" - inkscape:window-y="0" - inkscape:window-x="571" - inkscape:cy="8.9136878" - inkscape:cx="-11.340889" - inkscape:zoom="23.895834" - showgrid="false" - id="namedview6" - inkscape:window-height="1561" - inkscape:window-width="2637" - inkscape:pageshadow="2" - inkscape:pageopacity="0" - guidetolerance="10" - gridtolerance="10" - objecttolerance="10" - borderopacity="1" - bordercolor="#666666" - pagecolor="#ffffff" - inkscape:pagecheckerboard="0" /> - <g - id="g25714" - transform="rotate(-90,11.950788,12.329164)"> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.196516" - id="path2" - d="M 3.9822142,4.1255449 H 3.3643168 c -0.042657,0 -0.092715,-0.1089236 -0.091571,0.9956408 l 0.014333,13.8413253 c 0.00114,1.104564 0.03458,1.163034 0.077237,1.163034 h 0.6178974 c 0.042657,0 0.062904,0.06708 0.062904,-1.037489 V 5.2885789 c 0,-1.1045695 -0.020247,-1.163034 -0.062904,-1.163034" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.110498" - id="path2-9" - d="M 8.2962914,4.1342801 H 4.3102157 c -0.275181,0 -0.5981043,-0.00534 -0.5907253,0.048796 l 0.092465,0.678357 c 0.00738,0.054134 0.2230785,0.057 0.4982594,0.057 h 3.9860757 c 0.2751801,0 0.4057931,0.00329 0.4057931,-0.050847 v -0.676306 c 0,-0.054134 -0.1306064,-0.057 -0.4057931,-0.057" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.110498" - id="path2-9-9" - d="M 7.885445,19.374909 H 3.8993691 c -0.275181,0 -0.5981043,-0.0053 -0.5907253,0.0488 l 0.092465,0.678357 c 0.00738,0.05413 0.2230785,0.057 0.4982594,0.057 H 7.885444 c 0.27518,0 0.405793,0.0033 0.405793,-0.05085 V 19.43191 c 0,-0.05413 -0.130606,-0.057 -0.405793,-0.057" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.110498" - id="path2-9-3" - d="M 8.0629922,11.326098 H 4.0769165 c -0.275181,0 -0.5981043,-0.0053 -0.5907253,0.0488 l 0.092465,0.678357 c 0.00738,0.05413 0.2230785,0.057 0.4982594,0.057 h 3.9860757 c 0.2751799,0 0.4057929,0.0033 0.4057929,-0.05085 v -0.676306 c 0,-0.05413 -0.130606,-0.057 -0.4057929,-0.057" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5" - d="M 6.0347219,6.4005264 H 4.2306985 c -0.124542,0 -0.270691,-0.00459 -0.267351,0.041969 l 0.04185,0.5834502 c 0.0033,0.046561 0.100961,0.049025 0.225503,0.049025 h 1.8040234 c 0.124541,0 0.183654,0.00283 0.183654,-0.043733 V 6.4495515 c 0,-0.046561 -0.05911,-0.049025 -0.183654,-0.049025" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5-6" - d="M 5.9953181,8.8086125 H 4.1912947 c -0.124542,0 -0.270691,-0.0046 -0.267351,0.04197 l 0.04185,0.58345 c 0.0033,0.04656 0.100961,0.04903 0.225503,0.04903 h 1.8040234 c 0.124541,0 0.183654,0.0028 0.183654,-0.04373 v -0.581686 c 0,-0.04656 -0.05911,-0.04903 -0.183654,-0.04903" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5-5" - d="M 6.0371665,13.894711 H 4.2331431 c -0.124542,0 -0.270691,-0.0046 -0.267351,0.04197 l 0.04185,0.583451 c 0.0033,0.04656 0.100961,0.04903 0.225503,0.04903 h 1.8040234 c 0.124541,0 0.183654,0.0028 0.183654,-0.04373 v -0.581694 c 0,-0.04656 -0.05911,-0.04903 -0.183654,-0.04903" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5-66" - d="M 5.9743941,16.481405 H 4.1703707 c -0.124542,0 -0.270691,-0.0046 -0.267351,0.04197 l 0.04185,0.58345 c 0.0033,0.04656 0.100961,0.04903 0.225503,0.04903 h 1.8040234 c 0.124541,0 0.183654,0.0028 0.183654,-0.04373 v -0.581686 c 0,-0.04656 -0.05911,-0.04902 -0.183654,-0.04902" - sodipodi:nodetypes="csssssssc" /> - </g> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1;stroke:none" - x="7.323452" - y="12.721884" - id="text1686"><tspan - sodipodi:role="line" - id="tspan1684" - x="7.323452" - y="12.721884">Ã…</tspan></text> -</svg> diff --git a/GUI/images/unit_nm.svg b/GUI/images/unit_nm.svg deleted file mode 100644 index d7b483ce2379a09e3525b5888a7f166e1174221f..0000000000000000000000000000000000000000 --- a/GUI/images/unit_nm.svg +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - inkscape:version="1.1 (c68e22c387, 2021-05-23)" - sodipodi:docname="unit_nm.svg" - id="svg4" - viewBox="0 0 24 24" - height="24" - width="24" - version="1.1" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata - id="metadata10"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs8" /> - <sodipodi:namedview - inkscape:current-layer="svg4" - inkscape:window-maximized="0" - inkscape:window-y="0" - inkscape:window-x="571" - inkscape:cy="20.840453" - inkscape:cx="27.034001" - inkscape:zoom="23.895834" - showgrid="false" - id="namedview6" - inkscape:window-height="1561" - inkscape:window-width="2637" - inkscape:pageshadow="2" - inkscape:pageopacity="0" - guidetolerance="10" - gridtolerance="10" - objecttolerance="10" - borderopacity="1" - bordercolor="#666666" - pagecolor="#ffffff" - inkscape:pagecheckerboard="0" /> - <g - id="g25714" - transform="rotate(-90,11.950788,12.329164)"> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.196516" - id="path2" - d="M 3.9822142,4.1255449 H 3.3643168 c -0.042657,0 -0.092715,-0.1089236 -0.091571,0.9956408 l 0.014333,13.8413253 c 0.00114,1.104564 0.03458,1.163034 0.077237,1.163034 h 0.6178974 c 0.042657,0 0.062904,0.06708 0.062904,-1.037489 V 5.2885789 c 0,-1.1045695 -0.020247,-1.163034 -0.062904,-1.163034" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.110498" - id="path2-9" - d="M 8.2962914,4.1342801 H 4.3102157 c -0.275181,0 -0.5981043,-0.00534 -0.5907253,0.048796 l 0.092465,0.678357 c 0.00738,0.054134 0.2230785,0.057 0.4982594,0.057 h 3.9860757 c 0.2751801,0 0.4057931,0.00329 0.4057931,-0.050847 v -0.676306 c 0,-0.054134 -0.1306064,-0.057 -0.4057931,-0.057" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.110498" - id="path2-9-9" - d="M 7.885445,19.374909 H 3.8993691 c -0.275181,0 -0.5981043,-0.0053 -0.5907253,0.0488 l 0.092465,0.678357 c 0.00738,0.05413 0.2230785,0.057 0.4982594,0.057 H 7.885444 c 0.27518,0 0.405793,0.0033 0.405793,-0.05085 V 19.43191 c 0,-0.05413 -0.130606,-0.057 -0.405793,-0.057" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.110498" - id="path2-9-3" - d="M 8.0629922,11.326098 H 4.0769165 c -0.275181,0 -0.5981043,-0.0053 -0.5907253,0.0488 l 0.092465,0.678357 c 0.00738,0.05413 0.2230785,0.057 0.4982594,0.057 h 3.9860757 c 0.2751799,0 0.4057929,0.0033 0.4057929,-0.05085 v -0.676306 c 0,-0.05413 -0.130606,-0.057 -0.4057929,-0.057" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5" - d="M 6.0347219,6.4005264 H 4.2306985 c -0.124542,0 -0.270691,-0.00459 -0.267351,0.041969 l 0.04185,0.5834502 c 0.0033,0.046561 0.100961,0.049025 0.225503,0.049025 h 1.8040234 c 0.124541,0 0.183654,0.00283 0.183654,-0.043733 V 6.4495515 c 0,-0.046561 -0.05911,-0.049025 -0.183654,-0.049025" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5-6" - d="M 5.9953181,8.8086125 H 4.1912947 c -0.124542,0 -0.270691,-0.0046 -0.267351,0.04197 l 0.04185,0.58345 c 0.0033,0.04656 0.100961,0.04903 0.225503,0.04903 h 1.8040234 c 0.124541,0 0.183654,0.0028 0.183654,-0.04373 v -0.581686 c 0,-0.04656 -0.05911,-0.04903 -0.183654,-0.04903" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5-5" - d="M 6.0371665,13.894711 H 4.2331431 c -0.124542,0 -0.270691,-0.0046 -0.267351,0.04197 l 0.04185,0.583451 c 0.0033,0.04656 0.100961,0.04903 0.225503,0.04903 h 1.8040234 c 0.124541,0 0.183654,0.0028 0.183654,-0.04373 v -0.581694 c 0,-0.04656 -0.05911,-0.04903 -0.183654,-0.04903" - sodipodi:nodetypes="csssssssc" /> - <path - style="fill:#838686;fill-opacity:1;stroke-width:0.0689405" - id="path2-5-66" - d="M 5.9743941,16.481405 H 4.1703707 c -0.124542,0 -0.270691,-0.0046 -0.267351,0.04197 l 0.04185,0.58345 c 0.0033,0.04656 0.100961,0.04903 0.225503,0.04903 h 1.8040234 c 0.124541,0 0.183654,0.0028 0.183654,-0.04373 v -0.581686 c 0,-0.04656 -0.05911,-0.04902 -0.183654,-0.04902" - sodipodi:nodetypes="csssssssc" /> - </g> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1;stroke:none" - x="2.4690492" - y="10.545773" - id="text1686"><tspan - sodipodi:role="line" - id="tspan1684" - x="2.4690492" - y="10.545773">nm</tspan></text> -</svg>