Xpressive plugin updates (#5217)

* Updated plugin artwork.

* Update the formula in the presets to use integrate(f) instead of
  t*f, as integrate operation is more robust to frequency changes.

* rename X-Pressive to Xpressive in help window title.

* Xpressive.cpp, spaces to tabs and remove commented code.
This commit is contained in:
Kapandaria
2019-11-18 22:29:08 +02:00
committed by Oskar Wallgren
parent 256ae6dad6
commit 2f0010270e
57 changed files with 694 additions and 408 deletions

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

@@ -53,9 +53,9 @@
extern "C" {
Plugin::Descriptor PLUGIN_EXPORT xpressive_plugin_descriptor = { STRINGIFY(
PLUGIN_NAME), "X-Pressive", QT_TRANSLATE_NOOP("pluginBrowser",
"Mathematical expression parser"), "Orr Dvori", 0x0100,
Plugin::Instrument, new PluginPixmapLoader("logo"), NULL, NULL };
PLUGIN_NAME), "Xpressive", QT_TRANSLATE_NOOP("pluginBrowser",
"Mathematical expression parser"), "Orr Dvori", 0x0100,
Plugin::Instrument, new PluginPixmapLoader("logo"), NULL, NULL };
}
@@ -257,7 +257,6 @@ public:
setCenterPointY(14.5);
setInnerRadius(4);
setOuterRadius(9);
setOuterColor(QColor(0x519fff));
setTotalAngle(300.0);
setLineWidth(3);
}
@@ -277,14 +276,18 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
InstrumentViewFixedSize(_instrument, _parent)
{
const int COL_KNOBS = 194;
const int ROW_KNOBSA1 = 26;
const int ROW_KNOBSA2 = 26 + 32;
const int ROW_KNOBSA3 = 26 + 64;
const int ROW_KNOBSP1 = 126;
const int ROW_KNOBSP2 = 126 + 32;
const int ROW_KNOBREL = 126 + 64;
const int ROW_WAVEBTN = 234;
const int COL_KNOBS = 191;
const int BASE_START = 2;
const int ROW_KNOBSA1 = BASE_START;
const int ROW_KNOBSA2 = BASE_START + 32;
const int ROW_KNOBSA3 = BASE_START + 64;
const int ROW_KNOBSP1 = BASE_START + 100;
const int ROW_KNOBSP2 = BASE_START + 100 + 32;
const int ROW_KNOBREL = BASE_START + 100 + 64;
const int ROW_BTN = BASE_START + 85;
const int ROW_WAVEBTN = BASE_START + 233 - 26;
const int EXPR_TEXT_Y = BASE_START + 102;
const int EXPR_TEXT_H = 90;
setAutoFillBackground(true);
QPalette pal;
@@ -293,7 +296,7 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
setPalette(pal);
m_graph = new Graph(this, Graph::LinearStyle, 180, 81);
m_graph->move(9, 27);
m_graph->move(3, BASE_START + 1);
m_graph->setAutoFillBackground(true);
m_graph->setGraphColor(QColor(255, 255, 255));
m_graph->setEnabled(false);
@@ -313,37 +316,37 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
PixmapButton * m_helpBtn;
m_w1Btn = new PixmapButton(this, NULL);
m_w1Btn->move(9, 111);
m_w1Btn->move(3, ROW_BTN);
m_w1Btn->setActiveGraphic(PLUGIN_NAME::getIconPixmap("w1_active"));
m_w1Btn->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("w1_inactive"));
ToolTip::add(m_w1Btn, tr("Select oscillator W1"));
m_w2Btn = new PixmapButton(this, NULL);
m_w2Btn->move(32, 111);
m_w2Btn->move(26, ROW_BTN);
m_w2Btn->setActiveGraphic(PLUGIN_NAME::getIconPixmap("w2_active"));
m_w2Btn->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("w2_inactive"));
ToolTip::add(m_w2Btn, tr("Select oscillator W2"));
m_w3Btn = new PixmapButton(this, NULL);
m_w3Btn->move(55, 111);
m_w3Btn->move(49, ROW_BTN);
m_w3Btn->setActiveGraphic(PLUGIN_NAME::getIconPixmap("w3_active"));
m_w3Btn->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("w3_inactive"));
ToolTip::add(m_w3Btn, tr("Select oscillator W3"));
m_o1Btn = new PixmapButton(this, NULL);
m_o1Btn->move(85, 111);
m_o1Btn->move(79, ROW_BTN);
m_o1Btn->setActiveGraphic(PLUGIN_NAME::getIconPixmap("o1_active"));
m_o1Btn->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("o1_inactive"));
ToolTip::add(m_o1Btn, tr("Select output O1"));
m_o2Btn = new PixmapButton(this, NULL);
m_o2Btn->move(107, 111);
m_o2Btn->move(101, ROW_BTN);
m_o2Btn->setActiveGraphic(PLUGIN_NAME::getIconPixmap("o2_active"));
m_o2Btn->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("o2_inactive"));
ToolTip::add(m_o2Btn, tr("Select output O2"));
m_helpBtn = new PixmapButton(this, NULL);
m_helpBtn->move(139, 111);
m_helpBtn->move(133, ROW_BTN);
m_helpBtn->setActiveGraphic(PLUGIN_NAME::getIconPixmap("help_active"));
m_helpBtn->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("help_inactive"));
ToolTip::add(m_helpBtn, tr("Open help window"));
@@ -359,38 +362,38 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
m_selectedGraphGroup->setModel(&e->selectedGraph());
m_sinWaveBtn = new PixmapButton(this, tr("Sine wave"));
m_sinWaveBtn->move(10, ROW_WAVEBTN);
m_sinWaveBtn->move(4, ROW_WAVEBTN);
m_sinWaveBtn->setActiveGraphic(embed::getIconPixmap("sin_wave_active"));
m_sinWaveBtn->setInactiveGraphic(embed::getIconPixmap("sin_wave_inactive"));
ToolTip::add(m_sinWaveBtn, tr("Sine wave"));
m_moogWaveBtn = new PixmapButton(this, tr("Moog-saw wave"));
m_moogWaveBtn->move(10, ROW_WAVEBTN-14);
m_moogWaveBtn->move(4, ROW_WAVEBTN-14);
m_moogWaveBtn->setActiveGraphic(
embed::getIconPixmap( "moog_saw_wave_active" ) );
m_moogWaveBtn->setInactiveGraphic(embed::getIconPixmap("moog_saw_wave_inactive"));
ToolTip::add(m_moogWaveBtn, tr("Moog-saw wave"));
m_expWaveBtn = new PixmapButton(this, tr("Exponential wave"));
m_expWaveBtn->move(10 +14, ROW_WAVEBTN-14);
m_expWaveBtn->move(4 +14, ROW_WAVEBTN-14);
m_expWaveBtn->setActiveGraphic(embed::getIconPixmap( "exp_wave_active" ) );
m_expWaveBtn->setInactiveGraphic(embed::getIconPixmap( "exp_wave_inactive" ) );
ToolTip::add(m_expWaveBtn, tr("Exponential wave"));
m_sawWaveBtn = new PixmapButton(this, tr("Saw wave"));
m_sawWaveBtn->move(10 + 14 * 2, ROW_WAVEBTN-14);
m_sawWaveBtn->move(4 + 14 * 2, ROW_WAVEBTN-14);
m_sawWaveBtn->setActiveGraphic(embed::getIconPixmap("saw_wave_active"));
m_sawWaveBtn->setInactiveGraphic(embed::getIconPixmap("saw_wave_inactive"));
ToolTip::add(m_sawWaveBtn, tr("Saw wave"));
m_usrWaveBtn = new PixmapButton(this, tr("User-defined wave"));
m_usrWaveBtn->move(10 + 14 * 3, ROW_WAVEBTN-14);
m_usrWaveBtn->move(4 + 14 * 3, ROW_WAVEBTN-14);
m_usrWaveBtn->setActiveGraphic(embed::getIconPixmap("usr_wave_active"));
m_usrWaveBtn->setInactiveGraphic(embed::getIconPixmap("usr_wave_inactive"));
ToolTip::add(m_usrWaveBtn, tr("User-defined wave"));
m_triangleWaveBtn = new PixmapButton(this, tr("Triangle wave"));
m_triangleWaveBtn->move(10 + 14, ROW_WAVEBTN);
m_triangleWaveBtn->move(4 + 14, ROW_WAVEBTN);
m_triangleWaveBtn->setActiveGraphic(
embed::getIconPixmap("triangle_wave_active"));
m_triangleWaveBtn->setInactiveGraphic(
@@ -398,14 +401,14 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
ToolTip::add(m_triangleWaveBtn, tr("Triangle wave"));
m_sqrWaveBtn = new PixmapButton(this, tr("Square wave"));
m_sqrWaveBtn->move(10 + 14 * 2, ROW_WAVEBTN);
m_sqrWaveBtn->move(4 + 14 * 2, ROW_WAVEBTN);
m_sqrWaveBtn->setActiveGraphic(embed::getIconPixmap("square_wave_active"));
m_sqrWaveBtn->setInactiveGraphic(
embed::getIconPixmap("square_wave_inactive"));
ToolTip::add(m_sqrWaveBtn, tr("Square wave"));
m_whiteNoiseWaveBtn = new PixmapButton(this, tr("White noise"));
m_whiteNoiseWaveBtn->move(10 + 14 * 3, ROW_WAVEBTN);
m_whiteNoiseWaveBtn->move(4 + 14 * 3, ROW_WAVEBTN);
m_whiteNoiseWaveBtn->setActiveGraphic(
embed::getIconPixmap("white_noise_wave_active"));
m_whiteNoiseWaveBtn->setInactiveGraphic(
@@ -415,16 +418,16 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
m_waveInterpolate = new LedCheckBox("Interpolate", this, tr("WaveInterpolate"),
LedCheckBox::Green);
m_waveInterpolate->move(120, 230);
m_waveInterpolate->move(2, 230);
m_expressionValidToggle = new LedCheckBox("", this, tr("ExpressionValid"),
LedCheckBox::Red);
m_expressionValidToggle->move(174, 216);
m_expressionValidToggle->move(168, EXPR_TEXT_Y+EXPR_TEXT_H-2);
m_expressionValidToggle->setEnabled( false );
m_expressionEditor = new QPlainTextEdit(this);
m_expressionEditor->move(9, 128);
m_expressionEditor->resize(180, 90);
m_expressionEditor->move(3, EXPR_TEXT_Y);
m_expressionEditor->resize(180, EXPR_TEXT_H);
m_generalPurposeKnob[0] = new XpressiveKnob(this,"A1");
m_generalPurposeKnob[0]->setHintText(tr("General purpose 1:"), "");
@@ -452,9 +455,16 @@ XpressiveView::XpressiveView(Instrument * _instrument, QWidget * _parent) :
m_smoothKnob=new Knob(this,"Smoothness");
m_smoothKnob=new Knob(knobStyled, this, "Smoothness");
m_smoothKnob->setFixedSize(25, 25);
m_smoothKnob->setCenterPointX(12.5);
m_smoothKnob->setCenterPointY(12.5);
m_smoothKnob->setInnerRadius(4);
m_smoothKnob->setOuterRadius(9);
m_smoothKnob->setTotalAngle(280.0);
m_smoothKnob->setLineWidth(3);
m_smoothKnob->setHintText(tr("Smoothness"), "");
m_smoothKnob->move(80, 220);
m_smoothKnob->move(66, EXPR_TEXT_Y + EXPR_TEXT_H + 4);
connect(m_generalPurposeKnob[0], SIGNAL(sliderMoved(float)), this,
SLOT(expressionChanged()));
@@ -748,7 +758,7 @@ void XpressiveView::updateLayout() {
void XpressiveView::sinWaveClicked() {
if (m_output_expr)
m_expressionEditor->appendPlainText("sinew(t*f)");
m_expressionEditor->appendPlainText("sinew(integrate(f))");
else
m_expressionEditor->appendPlainText("sinew(t)");
Engine::getSong()->setModified();
@@ -756,7 +766,7 @@ void XpressiveView::sinWaveClicked() {
void XpressiveView::triangleWaveClicked() {
if (m_output_expr)
m_expressionEditor->appendPlainText("trianglew(t*f)");
m_expressionEditor->appendPlainText("trianglew(integrate(f))");
else
m_expressionEditor->appendPlainText("trianglew(t)");
Engine::getSong()->setModified();
@@ -764,7 +774,7 @@ void XpressiveView::triangleWaveClicked() {
void XpressiveView::sawWaveClicked() {
if (m_output_expr)
m_expressionEditor->appendPlainText("saww(t*f)");
m_expressionEditor->appendPlainText("saww(integrate(f))");
else
m_expressionEditor->appendPlainText("saww(t)");
Engine::getSong()->setModified();
@@ -772,7 +782,7 @@ void XpressiveView::sawWaveClicked() {
void XpressiveView::sqrWaveClicked() {
if (m_output_expr)
m_expressionEditor->appendPlainText("squarew(t*f)");
m_expressionEditor->appendPlainText("squarew(integrate(f))");
else
m_expressionEditor->appendPlainText("squarew(t)");
Engine::getSong()->setModified();
@@ -786,7 +796,7 @@ void XpressiveView::noiseWaveClicked() {
void XpressiveView::moogSawWaveClicked()
{
if (m_output_expr)
m_expressionEditor->appendPlainText("moogsaww(t*f)");
m_expressionEditor->appendPlainText("moogsaww(integrate(f))");
else
m_expressionEditor->appendPlainText("moogsaww(t)");
Engine::getSong()->setModified();
@@ -794,7 +804,7 @@ void XpressiveView::moogSawWaveClicked()
void XpressiveView::expWaveClicked()
{
if (m_output_expr)
m_expressionEditor->appendPlainText("expw(t*f)");
m_expressionEditor->appendPlainText("expw(integrate(f))");
else
m_expressionEditor->appendPlainText("expw(t)");
Engine::getSong()->setModified();
@@ -861,7 +871,7 @@ QString XpressiveHelpView::s_helpText=
XpressiveHelpView::XpressiveHelpView():QTextEdit(s_helpText)
{
setWindowTitle ( "X-Pressive Help" );
setWindowTitle ( "Xpressive Help" );
setTextInteractionFlags ( Qt::TextSelectableByKeyboard | Qt::TextSelectableByMouse );
gui->mainWindow()->addWindowedWidget( this );
parentWidget()->setAttribute( Qt::WA_DeleteOnClose, false );

View File

@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="17in"
height="11in"
viewBox="0 0 431.8 279.4"
version="1.1"
id="svg8"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="Xpressive.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.61780345"
inkscape:cx="1006.8716"
inkscape:cy="872.08024"
inkscape:document-units="mm"
inkscape:current-layer="g956"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:measure-start="234.5,1092.07"
inkscape:measure-end="180.984,1024.7"
inkscape:window-width="1853"
inkscape:window-height="1025"
inkscape:window-x="67"
inkscape:window-y="27"
inkscape:window-maximized="1"
units="in" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-17.6)">
<path
sodipodi:nodetypes="ccccccccccccccscssccccc"
inkscape:connector-curvature="0"
id="path819"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:0.65183502"
d="M 85.029931,192.14174 H 72.13582 L 56.369561,164.82578 40.603301,192.14174 H 27.709189 l 22.18276,-38.62122 c -3.259176,-5.78503 -6.681309,-11.65155 -10.2664,-17.59955 -3.544354,-5.94799 -6.212803,-10.61268 -8.005349,-13.99407 -1.751807,-3.3814 -2.74993,-5.2758 -2.994369,-5.68319 -0.203692,-0.44814 -0.203692,-0.89628 0,-1.34442 0.529617,-1.09997 1.833288,-1.58884 3.911012,-1.46662 h 7.333145 l 16.499573,28.8437 16.499574,-28.8437 h 7.638692 c 1.914764,0 3.096215,0.38702 3.544352,1.16108 0.448135,0.73332 0.549987,1.3444 0.305548,1.83329 -0.244441,0.48886 -0.896272,1.64994 -1.955505,3.48325 -1.059232,1.83328 -2.485121,4.27765 -4.277667,7.33313 -1.751808,3.01474 -3.523983,6.04984 -5.31653,9.10532 -1.751807,3.05548 -3.483244,6.04984 -5.194309,8.98311 -1.711066,2.8925 -3.299915,5.62206 -4.766544,8.18867 7.39425,12.87374 14.788506,25.74748 22.182759,38.62122 z" />
<path
inkscape:connector-curvature="0"
id="path821"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 98.901794,135.55432 q 3.972116,-2.87215 8.860876,-2.87215 h 4.27767 q 7.76091,0 12.40524,4.461 4.64432,4.39988 4.64432,12.34413 v 24.4438 q 0,12.77189 -8.61645,16.74402 -2.99437,1.3444 -7.21091,1.3444 h -6.72205 q -3.97212,0 -6.722053,-2.99437 v 29.88257 H 89.246488 l 0.0611,-86.22555 h 9.594197 z m 19.738376,37.58236 v -22.18277 q 0,-4.76654 -1.03886,-6.35537 -1.89439,-2.93327 -6.29429,-2.93327 h -5.25541 q -1.8944,0 -3.42213,0.97775 -2.811043,1.71107 -2.811043,3.54435 v 30.7381 q 0,1.83329 1.588843,3.36102 2.87215,2.68882 4.64433,2.68882 h 5.25541 q 6.11096,0 7.0276,-6.04984 0.30555,-1.77217 0.30555,-3.78879 z" />
<path
inkscape:connector-curvature="0"
id="path823"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 162.92377,141.60416 -6.17207,-0.0611 q -7.6998,0 -10.02196,5.56097 -0.79442,1.8944 -0.79442,4.33878 v 40.63783 h -10.44973 l -0.0611,-54.14304 q -2.68882,0 -2.68882,-2.01661 v -3.54436 h 12.03858 v 5.56097 q 0.85553,-2.44438 3.11658,-4.03324 2.26105,-1.58884 4.82765,-1.58884 h 10.20529 z" />
<path
inkscape:connector-curvature="0"
id="path825"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 208.51148,178.45321 q -0.1833,9.22754 -7.14982,12.58857 -2.32216,1.09996 -5.31653,1.09996 h -14.48296 q -5.43874,0 -9.0442,-3.97211 -3.54436,-3.8499 -3.54436,-9.34977 v -33.3658 q 0,-5.43874 3.17769,-9.22754 3.48325,-4.03323 8.79978,-4.03323 h 15.52183 q 5.43873,0 8.79977,4.33878 3.11658,3.97212 3.11658,9.53308 v 7.94424 q 0,5.37765 -2.87215,9.04422 -3.05549,3.97211 -8.43311,3.97211 h -17.84398 v 11.06083 q 0,4.88876 4.94987,4.88876 h 9.28866 q 2.07772,0 3.2999,-1.16108 1.28331,-1.22219 1.22218,-3.36102 z m -24.32159,-36.78794 q -4.94987,0 -4.94987,5.1332 v 11.18304 H 192.623 q 2.32216,0 3.91101,-1.2833 1.64997,-1.3444 1.64997,-3.8499 v -6.29428 q 0,-2.5666 -1.64997,-3.72768 -1.58885,-1.16108 -3.91101,-1.16108 z" />
<path
inkscape:connector-curvature="0"
id="path827"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 242.67037,145.51517 q 0.1222,-3.42213 -4.21656,-3.42213 h -7.63868 q -5.25542,0 -4.76656,7.14981 0.12219,1.77218 0.12219,3.29991 0,4.58322 4.64434,4.58322 h 10.69417 q 5.49985,0 8.92198,3.97212 3.36103,3.8499 3.36103,9.28865 v 8.18868 q 0,5.62208 -3.60547,9.53309 -3.72766,4.09433 -9.28864,4.09433 h -13.4441 q -5.98874,0 -9.47199,-3.91101 -3.2999,-3.78878 -3.2999,-9.77753 h 10.51084 q -0.12219,2.13885 1.03887,3.05548 1.22218,0.85554 3.17769,0.85554 h 8.86088 q 4.64433,0 4.64433,-4.58322 v -6.11095 q 0,-4.76654 -4.64433,-4.76654 H 228.1874 q -5.56098,0 -9.22756,-3.42213 -3.66656,-3.48325 -3.66656,-9.04421 v -8.92199 q 0,-5.49986 3.29991,-9.28866 3.60547,-4.03322 8.9831,-4.03322 h 13.13856 q 5.62207,0 9.16642,3.84989 3.2999,3.66657 3.2999,9.41087 z" />
<path
inkscape:connector-curvature="0"
id="path829"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 287.16347,145.51517 q 0.12219,-3.42213 -4.21658,-3.42213 h -7.63867 q -5.25544,0 -4.76656,7.14981 0.1222,1.77218 0.1222,3.29991 0,4.58322 4.64434,4.58322 h 10.69416 q 5.49985,0 8.92198,3.97212 3.36104,3.8499 3.36104,9.28865 v 8.18868 q 0,5.62208 -3.60547,9.53309 -3.72768,4.09433 -9.28865,4.09433 h -13.4441 q -5.98873,0 -9.47198,-3.91101 -3.29991,-3.78878 -3.29991,-9.77753 h 10.51082 q -0.12219,2.13885 1.03887,3.05548 1.2222,0.85554 3.1777,0.85554 h 8.86089 q 4.64431,0 4.64431,-4.58322 v -6.11095 q 0,-4.76654 -4.64431,-4.76654 h -10.08309 q -5.56094,0 -9.22752,-3.42213 -3.66657,-3.48325 -3.66657,-9.04421 v -8.92199 q 0,-5.49986 3.29991,-9.28866 3.60548,-4.03322 8.98311,-4.03322 h 13.13855 q 5.62207,0 9.16642,3.84989 3.29991,3.66657 3.29991,9.41087 z" />
<path
inkscape:connector-curvature="0"
id="path831"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 312.24186,114.71597 q 6.72205,0 6.72205,6.84427 0,6.90537 -6.72205,6.90537 -3.29991,0 -5.07211,-1.77218 -1.77215,-1.83328 -1.77215,-5.13319 0,-3.29993 1.77215,-5.0721 1.7722,-1.77217 5.07211,-1.77217 z m 5.13318,77.12023 h -10.51082 v -59.39847 h 10.51082 z" />
<path
inkscape:connector-curvature="0"
id="path833"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 345.66878,178.02544 q 0.61108,-2.5666 10.93861,-45.5266 h 6.23315 q 2.13884,0 3.23882,1.9555 0.36666,0.54999 0.36666,1.2833 0,0.67222 -0.61111,3.29992 -0.54998,2.5666 -1.52772,6.29429 -0.91664,3.72768 -2.13885,8.31089 -1.22218,4.58322 -2.56658,9.34976 -1.28331,4.76654 -2.56661,9.47198 -1.28331,4.64432 -2.38326,8.55533 -2.56662,9.04421 -2.99438,10.75528 h -11.97747 q -0.42778,-1.40552 -1.34442,-4.461 -0.85552,-3.05548 -2.07771,-7.08871 -1.2222,-4.09433 -2.62772,-8.79976 -1.40551,-4.76655 -2.81103,-9.53309 -1.40553,-4.76655 -2.68883,-9.28865 -1.2833,-4.52212 -2.26104,-8.12758 -2.26105,-8.06644 -2.26105,-9.22753 0,-1.16108 0.97775,-1.95551 1.03885,-0.79442 2.26104,-0.79442 h 6.78316 q 6.84427,25.6049 12.03859,45.5266 z" />
<path
inkscape:connector-curvature="0"
id="path835"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#eff3ff;fill-opacity:1;stroke:#001800;stroke-width:0.65183502;stroke-opacity:1"
d="m 411.48372,178.45321 q -0.18328,9.22754 -7.14981,12.58857 -2.32217,1.09996 -5.31654,1.09996 h -14.48295 q -5.43876,0 -9.04421,-3.97211 -3.54437,-3.8499 -3.54437,-9.34977 v -33.3658 q 0,-5.43874 3.17771,-9.22754 3.48322,-4.03323 8.79976,-4.03323 h 15.52182 q 5.43876,0 8.79979,4.33878 3.11659,3.97212 3.11659,9.53308 v 7.94424 q 0,5.37765 -2.87215,9.04422 -3.0555,3.97211 -8.43312,3.97211 h -17.84399 v 11.06083 q 0,4.88876 4.94987,4.88876 h 9.28864 q 2.07773,0 3.29994,-1.16108 1.28327,-1.22219 1.22218,-3.36102 z m -24.3216,-36.78794 q -4.94987,0 -4.94987,5.1332 v 11.18304 h 13.38299 q 2.32217,0 3.91102,-1.2833 1.64993,-1.3444 1.64993,-3.8499 v -6.29428 q 0,-2.5666 -1.64993,-3.72768 -1.58885,-1.16108 -3.91102,-1.16108 z" />
<path
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#50626e;fill-opacity:1;stroke:#000000;stroke-width:0.65183496;stroke-opacity:1"
d="m 31.793889,113.41583 c -1.648687,0.0267 -2.704098,0.52071 -3.167508,1.48318 -0.203699,0.44815 -0.203699,0.89628 0,1.34442 0.244438,0.40739 1.242553,2.30179 2.994367,5.68318 1.792541,3.3814 4.460996,8.04609 8.005349,13.99409 2.997776,4.97358 5.874553,9.88684 8.644447,14.74649 l 6.472519,-11.23524 -14.872528,-25.99957 h -7.333144 c -0.259717,-0.0152 -0.507975,-0.0203 -0.743502,-0.0165 z m 32.622309,42.83525 -6.47379,11.29889 14.193961,24.59149 H 85.030481 C 78.159057,180.178 71.287615,168.21454 64.416198,156.25108 Z"
id="path819-7"
inkscape:connector-curvature="0" />
<g
id="g956"
style="stroke:#000000;stroke-opacity:1"
transform="matrix(2.4636285,0,0,2.4636285,-59.948071,75.031414)">
<path
d="m 47.213951,36.448011 -6.399609,11.087694 h -5.233789 l 9.004101,-15.676562 2.629297,-4.564063 6.697266,-11.707812 2.980857,-5.060626 138.949186,-0.0013 c 0.79306,-7e-6 0.30296,4.198952 -0.53489,4.167335 l -135.515802,-4e-6 c 0,0 -1.116851,1.91157 -1.21607,2.110007 -0.09922,0.198437 -0.363802,0.669726 -0.79375,1.413867 -0.429948,0.744141 -1.008724,1.736328 -1.736328,2.976562 -0.711068,1.223698 -1.430404,2.455664 -2.158008,3.695899 -0.711068,1.240234 -1.413867,2.455665 -2.108398,3.64629 -0.694531,1.174088 -1.339453,2.282031 -1.934766,3.323827 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#41bbff;fill-opacity:1;stroke:#000000;stroke-width:0.26465029;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
id="path819-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccsccssccccc" />
<path
sodipodi:nodetypes="ccccccccccc"
id="path819-7-3"
d="m 28.89259,32.41518 c -0.669211,0.01085 -1.097608,0.211356 -1.285708,0.602031 -0.08268,0.181901 -0.08268,0.363802 0,0.545703 0.09922,0.165365 0.504359,0.93431 1.215429,2.306836 0.727602,1.372526 1.810743,3.26595 3.249415,5.680273 1.216813,2.018806 2.384512,4.013124 3.508827,5.985682 l 2.62723,-4.560446 -6.036839,-10.553361 h -2.976562 c -0.105421,-0.0062 -0.20619,-0.0083 -0.301792,-0.0067 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#009acd;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1;stroke-linejoin:round;stroke-linecap:round"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="10in"
height="10in"
viewBox="0 0 254 254"
version="1.1"
id="svg8"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="Xpressive_square.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.61780345"
inkscape:cx="457.11509"
inkscape:cy="666.64265"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:measure-start="234.5,1092.07"
inkscape:measure-end="180.984,1024.7"
inkscape:window-width="1853"
inkscape:window-height="1025"
inkscape:window-x="67"
inkscape:window-y="27"
inkscape:window-maximized="1"
units="in" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-43)">
<path
sodipodi:nodetypes="ccccccccccccccscssccccc"
inkscape:connector-curvature="0"
id="path819"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:1.22181463"
d="M 146.74936,246.42818 H 122.58033 L 93.027698,195.22652 63.475055,246.42818 H 39.306034 l 41.579877,-72.39251 c -6.109073,-10.84359 -12.5236,-21.83994 -19.243577,-32.989 -6.643618,-11.14906 -11.645421,-19.89265 -15.005411,-26.23082 -3.283627,-6.33817 -5.154532,-9.88907 -5.612714,-10.65269 -0.381805,-0.84 -0.381805,-1.68001 0,-2.52001 0.992726,-2.061805 3.436357,-2.978157 7.330891,-2.749069 H 62.100517 L 93.027698,152.95937 123.95488,98.894081 h 14.31815 c 3.58906,0 5.80362,0.725445 6.6436,2.176359 0.84001,1.37455 1.03091,2.51998 0.57274,3.43635 -0.45819,0.91634 -1.67999,3.0927 -3.66545,6.52909 -1.98545,3.43634 -4.65817,8.01812 -8.01815,13.74539 -3.28363,5.6509 -6.60544,11.33996 -9.96544,17.06722 -3.28362,5.72727 -6.52907,11.33996 -9.73632,16.83815 -3.20727,5.42177 -6.18544,10.53811 -8.93453,15.34903 13.85995,24.13085 27.71991,48.26168 41.57988,72.39251 z" />
<path
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#50626e;fill-opacity:1;stroke:#000000;stroke-width:1.22181451;stroke-opacity:1"
d="m 46.96249,98.862515 c -3.090337,0.05013 -5.068624,0.976029 -5.93725,2.780105 -0.381818,0.84003 -0.381818,1.68001 0,2.52002 0.458181,0.76362 2.32907,4.31453 5.61271,10.65268 3.359981,6.33817 8.361795,15.08177 15.005413,26.23085 5.619099,9.3226 11.011397,18.53211 16.20335,27.64116 L 89.978952,147.62774 62.101542,98.893528 H 48.356127 c -0.486819,-0.02856 -0.95216,-0.03805 -1.393637,-0.03093 z m 61.14801,80.291385 -12.134621,21.1789 26.605491,46.09485 h 24.16902 C 133.87043,224.00307 120.99044,201.57848 108.1105,179.1539 Z"
id="path819-7"
inkscape:connector-curvature="0" />
<g
id="g956"
style="stroke:#000000;stroke-opacity:1"
transform="matrix(4.6178822,0,0,4.6178822,-125.00076,26.913875)">
<path
d="m 47.213951,36.448011 -6.399609,11.087694 h -5.233789 l 9.004101,-15.676562 2.629297,-4.564063 6.697266,-11.707812 2.980857,-5.060626 24.385361,-0.0013 c 0.79306,-4.2e-5 0.30296,4.198952 -0.53489,4.167335 l -20.951977,-4e-6 c 0,0 -1.116851,1.91157 -1.21607,2.110007 -0.09922,0.198437 -0.363802,0.669726 -0.79375,1.413867 -0.429948,0.744141 -1.008724,1.736328 -1.736328,2.976562 -0.711068,1.223698 -1.430404,2.455664 -2.158008,3.695899 -0.711068,1.240234 -1.413867,2.455665 -2.108398,3.64629 -0.694531,1.174088 -1.339453,2.282031 -1.934766,3.323827 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#41bbff;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
id="path819-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccsccssccccc" />
<path
sodipodi:nodetypes="ccccccccccc"
id="path819-7-3"
d="m 28.89259,32.41518 c -0.669211,0.01085 -1.097608,0.211356 -1.285708,0.602031 -0.08268,0.181901 -0.08268,0.363802 0,0.545703 0.09922,0.165365 0.504359,0.93431 1.215429,2.306836 0.727602,1.372526 1.810743,3.26595 3.249415,5.680273 1.216813,2.018806 2.384512,4.013124 3.508827,5.985682 l 2.62723,-4.560446 -6.036839,-10.553361 h -2.976562 c -0.105421,-0.0062 -0.20619,-0.0083 -0.301792,-0.0067 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.79999924px;line-height:1.25;font-family:Uroob;-inkscape-font-specification:Uroob;letter-spacing:0px;word-spacing:0px;fill:#009acd;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
inkscape:connector-curvature="0" />
</g>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.5626235;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 152.95675,100.4412 v 5.70357 139.55424 h 92.87918 V 100.4412 Z m 11.40714,11.40486 h 70.06718 v 122.44809 h -70.06718 z"
id="rect825"
inkscape:connector-curvature="0" />
</g>
<style
id="style854"
type="text/css">
.st0{fill:#E0995E;}
.st1{opacity:0.2;}
.st2{fill:#231F20;}
.st3{fill:#4F5D73;}
.st4{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
.st5{fill:none;stroke:#E0E0D1;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
.st6{fill:none;stroke:#F5CF87;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;}
</style>
</svg>

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 840 B

After

Width:  |  Height:  |  Size: 546 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 806 B

After

Width:  |  Height:  |  Size: 549 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 548 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 508 B

After

Width:  |  Height:  |  Size: 512 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 653 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 602 B

After

Width:  |  Height:  |  Size: 589 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 590 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 554 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 715 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 662 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 771 B

After

Width:  |  Height:  |  Size: 705 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 626 B

After

Width:  |  Height:  |  Size: 652 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB