Commit 653037fe authored by whitlocb's avatar whitlocb

Small GUI fixes. Add operator icon.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@19272 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2bf5b0df
<?xml version="1.0"?>
<Plugin name="CartographicProjection" type="operator" label="CartographicProjection" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" category="Transforms">
<Plugin name="CartographicProjection" type="operator" label="Cartographic Projection" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="CartographicProjection.xpm" category="Transforms">
<LIBS components="ESer">
vtkGeovis
</LIBS>
......
/* XPM */
static const char * CartographicProjection_xpm[] = {
"32 32 254 2",
"q+ c None",
". c #065290",
"+ c #005694",
"@ c #00588F",
"# c #00579B",
"$ c #005896",
"% c #0F5493",
"& c #005997",
"* c #005B8C",
"= c #005B93",
"- c #005A9F",
"; c #005B9A",
"> c #005C9F",
", c #015D96",
"' c #035C9B",
") c #035F91",
"! c #065D9C",
"~ c #055E97",
"{ c #005F9C",
"] c #00609D",
"^ c #006198",
"/ c #085F98",
"( c #05628E",
"_ c #096193",
": c #0C6099",
"< c #1C5D90",
"[ c #0F619A",
"} c #00669E",
"| c #0A668C",
"1 c #0E6591",
"2 c #106496",
"3 c #13639C",
"4 c #1F6687",
"5 c #21658C",
"6 c #25667B",
"7 c #286580",
"8 c #146A90",
"9 c #176995",
"0 c #1F6984",
"a c #266693",
"b c #246A8B",
"c c #1F6A9D",
"d c #286B7A",
"e c #1F6D81",
"f c #286A92",
"g c #356E4B",
"h c #256E88",
"i c #306B87",
"j c #2C6E7E",
"k c #326D77",
"l c #2F6D83",
"m c #306F73",
"n c #266FA2",
"o c #25719E",
"p c #3D6C89",
"q c #327086",
"r c #2D7192",
"s c #436C84",
"t c #3C7075",
"u c #2E747D",
"v c #39737D",
"w c #2B75A2",
"x c #37748A",
"y c #3D7384",
"z c #3C7295",
"A c #49764E",
"B c #467569",
"C c #49737A",
"D c #4B727F",
"E c #3C7592",
"F c #4E755F",
"G c #42767B",
"H c #3D7782",
"I c #3F7877",
"J c #4A786D",
"K c #45797E",
"L c #397A9C",
"M c #547A52",
"N c #5E7758",
"O c #447A8B",
"P c #497C6A",
"Q c #5B785E",
"R c #497896",
"S c #4F7D54",
"T c #3E7BA4",
"U c #5E7585",
"V c #577B5F",
"W c #497D76",
"X c #517C6B",
"Y c #557D5B",
"Z c #517992",
"` c #5A7C5B",
" . c #4E7B8D",
".. c #4E7E7E",
"+. c #527D84",
"@. c #427FA7",
"#. c #5B8159",
"$. c #4B80A4",
"%. c #5A826B",
"&. c #5A8082",
"*. c #4682AB",
"=. c #608261",
"-. c #677E77",
";. c #5B8461",
">. c #598473",
",. c #647F88",
"'. c #5F855D",
"). c #688263",
"!. c #65845D",
"~. c #4186B4",
"{. c #63836E",
"]. c #638564",
"^. c #5E857B",
"/. c #67827F",
"(. c #608871",
"_. c #5E8A6D",
":. c #64896D",
"<. c #738288",
"[. c #658878",
"}. c #718578",
"|. c #6B886E",
"1. c #6D8A5D",
"2. c #698A69",
"3. c #518CB6",
"4. c #6B8B76",
"5. c #76896A",
"6. c #6B8A81",
"7. c #5F8B9D",
"8. c #718A76",
"9. c #828481",
"0. c #588CB0",
"a. c #6E8D66",
"b. c #698E72",
"c. c #7A8B66",
"d. c #818872",
"e. c #7B8A72",
"f. c #7C897D",
"g. c #6D8C8F",
"h. c #7A8A84",
"i. c #7F8A79",
"j. c #5B8FB3",
"k. c #7F8D64",
"l. c #628FAE",
"m. c #738F80",
"n. c #878986",
"o. c #5792BC",
"p. c #8F8976",
"q. c #848E6B",
"r. c #5E92B6",
"s. c #7E8F7D",
"t. c #6891AA",
"u. c #6592B2",
"v. c #7B9278",
"w. c #8A8D7E",
"x. c #8D8C84",
"y. c #7F9089",
"z. c #7B946E",
"A. c #829179",
"B. c #8F8E74",
"C. c #85907F",
"D. c #88926F",
"E. c #A8896B",
"F. c #80966A",
"G. c #8C946B",
"H. c #7F9871",
"I. c #849399",
"J. c #8F9283",
"K. c #8C9388",
"L. c #93946D",
"M. c #919473",
"N. c #909667",
"O. c #98936E",
"P. c #9C9274",
"Q. c #B28C70",
"R. c #8B9685",
"S. c #A6917C",
"T. c #729BB5",
"U. c #93997C",
"V. c #709DBD",
"W. c #A89673",
"X. c #779FB9",
"Y. c #A7996F",
"Z. c #969E75",
"`. c #AE9883",
" + c #B29978",
".+ c #7FA2B7",
"++ c #A99C78",
"@+ c #7BA3BE",
"#+ c #8DA0AB",
"$+ c #A89F6D",
"%+ c #A69F73",
"&+ c #94A0A1",
"*+ c #B49A8C",
"=+ c #AB9E8D",
"-+ c #BD9B77",
";+ c #AE9D92",
">+ c #83A7BC",
",+ c #A9A19A",
"'+ c #7CAACA",
")+ c #ABA38A",
"!+ c #ABA57F",
"~+ c #8CA8BE",
"{+ c #B6A18B",
"]+ c #B5A191",
"^+ c #A1AAB1",
"/+ c #A5ACA1",
"(+ c #8CB0C5",
"_+ c #99B0C1",
":+ c #9AB2B7",
"<+ c #AFAEA5",
"[+ c #C3AB8F",
"}+ c #BAAD9B",
"|+ c #C0AC9C",
"1+ c #8EB6D1",
"2+ c #CAAB92",
"3+ c #B7B19D",
"4+ c #A4B4BA",
"5+ c #9DB5C6",
"6+ c #ABB4AF",
"7+ c #B8B4A6",
"8+ c #C8B19C",
"9+ c #A6B9C5",
"0+ c #B3B8BB",
"a+ c #A1BDD4",
"b+ c #C8B9A1",
"c+ c #AABEC9",
"d+ c #AEBEC4",
"e+ c #D2B99D",
"f+ c #AFC3CF",
"g+ c #DEBC9C",
"h+ c #D7C39F",
"i+ c #B8C8CE",
"j+ c #CEC5AB",
"k+ c #D5C5AD",
"l+ c #CDD2D5",
"m+ c #C5D9E5",
"n+ c #D5D7D4",
"o+ c #D6DCDE",
"p+ c #E0DAD9",
"r+ c #DBDDDA",
"s+ c #E2DCDB",
"t+ c #E4DEDD",
"u+ c #DEE0DD",
"v+ c #E6E0DF",
"w+ c #E7E2E0",
"x+ c #E9E3E2",
"y+ c #ECE4DD",
"z+ c #ECE6E5",
"A+ c #EFE6DF",
"B+ c #E5EEF7",
"C+ c #EFECF1",
"D+ c #EDF2F5",
"E+ c #F6F4F8",
"F+ c #FBF8FD",
"q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+",
"q+q+q+q+q+q+q+q+q+q+q+x+C+C+C+C+C+C+C+C+C+x+q+q+q+q+q+q+q+q+q+q+",
"q+q+q+q+q+q+q+q+q+x+F+F+F+F+F+F+F+F+F+F+F+F+F+x+q+q+q+q+q+q+q+q+",
"q+q+q+q+q+q+q+q+.+X.(+d+#+o F+= = 1 ~ I.&+7.4+(+x+q+q+q+q+q+q+q+",
"q+q+q+q+q+q+_+g.}.}.K.Z R V.c ' x ^.[.m.s.v.s.i.K.0+q+q+q+q+q+q+",
"q+q+q+q+q+l.@ f 6.%.+.E r & ; 2 l u ].:.b._.(.v.h ( $.q+q+q+q+q+",
"q+q+q+q+*.+ / ( q.|.J >.b ] ' h %.!.k.L.O.q.8.5.2.b + w q+q+q+q+",
"q+q+q+u.$ / ; C O.{.B t / ' ~ _ Q )...h.{+P.S.`.M.W ~ $ @.q+q+q+",
"q+q+5++ ] ~ ) P.M.!.k - ~ / ' D < 7 -./.=+x.|+;+B.j 5 ' % .+q+q+",
"q+q+3 / / / 9 W.k.` ' / / ~ ' s [+_ f )+*+w.^+6+c.q e ' : & l+q+",
"q+X.+ ~ / / 2 P.v _ ] ~ / ] & ]+2+k+7+}+n.2+A.y.{.].# / ~ $ 0.q+",
"q+[ : / ~ / ; d.; 8 / / ] ; L g+b+8+3+,+/+z G.Y N B ] ] / [ , p+",
"f+$ : / / / ' G m / / ~ / ; z h+8+j+e+<.<+# {.) V _ ) ~ ] / + _+",
"@+. ~ ] ] ] ~ - j : ~ ] ] ; x $+!+!+++C.a # G > j 0 | ' / ~ + T.",
"0.$ ] / ] ~ ] ] ~ X a._ ] ] , '.2.F.F.O.R ; _ ^ ( / | ^ / / $ @.",
"j.$ / ] / ] ] / > X S P # / ] , , S ;.Y.: / ' ] 4 d d ! ' / & T ",
"j.$ ] ~ / / ] ] ! M g Y H ; ] / / S =...# ~ / / ( d 6 0 d ] & T ",
"j.$ ~ ] / / / / ! F A '.L., ] / ; >.H.K # / / ~ ' | ( - I ) @ @.",
">+% ] / ~ ] ~ ] ; O #.1.|.# ~ ~ ; 4.z...) ] ] ] ] ' / y 9 ' + T.",
"i+$ : / ~ ] ] ] ] & R.1.%.- ~ / ' U.N.j 1 / ] ] / # f.%+H > $ 9+",
"q+} : ] ] ~ / / / & y.1.4 ] ] / ; J.D.( _ / ] / ; U Q. +..> : t+",
"q+~+% / ] / ~ / / ; ,.c.^ ] ] / > 9.&.# ] ] ] / # p.E.-+l # u.q+",
"q+q+c / / / / / / ' D Z.> ] / ~ ! 5 _ ] / ~ ] / / i x e.# _ n+q+",
"q+q+c+. ] ] ] ] ] ' i /.& ] ] ] ~ ' ] / ] ~ ~ ~ ] > | ; * :+q+q+",
"q+q+q+X.% / ~ ~ ] ] 1 p ' ~ ~ ] ] ~ ] ~ / ] ] ] ~ ] ] = t.q+q+q+",
"q+q+q+q+0.. / ~ ~ ] & ., [ ~ / ] ~ ] ~ / ] ] ] ~ / . @.q+q+q+q+",
"q+q+q+q+q+T.. ] / / ~ ] ~ / ~ / ~ / $ & $ $ $ ~ ] . l.q+q+q+q+q+",
"q+q+q+q+q+q+d+n % ] ~ $ / n , + . . ~.n o.3.o.& 3 5+q+q+q+q+q+q+",
"q+q+q+q+q+q+q+q+~+F+] r.'+a+. 1+D+D+C+E+F+B+m+F+s+q+q+q+q+q+q+q+",
"q+q+q+q+q+q+q+q+q+F+F+F+C+F+F+F+F+F+F+F+F+F+F+x+q+q+q+q+q+q+q+q+",
"q+q+q+q+q+q+q+q+q+q+q+C+C+C+C+C+C+C+C+C+x+q+q+q+q+q+q+q+q+q+q+q+",
"q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+q+"};
......@@ -76,7 +76,7 @@ extern "C" OP_EXPORT GUIOperatorPluginInfo* CartographicProjection_GetGUIInfo()
QString *
CartographicProjectionGUIPluginInfo::GetMenuName() const
{
return new QString(qApp->translate("OperatorNames", "CartographicProjection"));
return new QString(qApp->translate("OperatorNames", "Cartographic Projection"));
}
......@@ -106,3 +106,23 @@ CartographicProjectionGUIPluginInfo::CreatePluginWindow(int type, AttributeSubje
caption, shortName, notepad);
}
// ****************************************************************************
// Method: CartographicProjectionGUIPluginInfo::XPMIconData
//
// Purpose:
// Return a pointer to the icon data.
//
// Returns: A pointer to the icon data.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
#include <CartographicProjection.xpm>
const char **
CartographicProjectionGUIPluginInfo::XPMIconData() const
{
return CartographicProjection_xpm;
}
......@@ -84,6 +84,7 @@ class CartographicProjectionGUIPluginInfo : public virtual GUIOperatorPluginInfo
virtual QvisPostableWindowObserver *CreatePluginWindow(int type,
AttributeSubject *attr, const QString &caption, const QString &shortName,
QvisNotepadArea *notepad);
virtual const char **XPMIconData() const;
};
class CartographicProjectionViewerPluginInfo : public virtual ViewerOperatorPluginInfo, public virtual CartographicProjectionCommonPluginInfo
......@@ -99,6 +100,7 @@ class CartographicProjectionViewerPluginInfo : public virtual ViewerOperatorPlug
const ViewerPlot *plot,
const bool fromDefault);
virtual QString *GetMenuName() const;
virtual const char **XPMIconData() const;
static void InitializeGlobalObjects();
private:
......
......@@ -225,6 +225,26 @@ CartographicProjectionViewerPluginInfo::InitializeOperatorAtts(AttributeSubject
QString *
CartographicProjectionViewerPluginInfo::GetMenuName() const
{
return new QString(qApp->translate("OperatorNames", "CartographicProjection"));
return new QString(qApp->translate("OperatorNames", "Cartographic Projection"));
}
// ****************************************************************************
// Method: CartographicProjectionViewerPluginInfo::XPMIconData
//
// Purpose:
// Return a pointer to the icon data.
//
// Returns: A pointer to the icon data.
//
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
#include <CartographicProjection.xpm>
const char **
CartographicProjectionViewerPluginInfo::XPMIconData() const
{
return CartographicProjection_xpm;
}
......@@ -69,7 +69,7 @@ using std::string;
//
// Note: Autogenerated by xml2window.
//
// Programmer: xml2window
// Programmer: Jean Favre
// Creation: omitted
//
// Modifications:
......@@ -95,7 +95,7 @@ QvisCartographicProjectionWindow::QvisCartographicProjectionWindow(const int typ
//
// Note: Autogenerated by xml2window.
//
// Programmer: xml2window
// Programmer: Jean Favre
// Creation: omitted
//
// Modifications:
......@@ -115,7 +115,7 @@ QvisCartographicProjectionWindow::~QvisCartographicProjectionWindow()
//
// Note: Autogenerated by xml2window.
//
// Programmer: xml2window
// Programmer: Jean Favre
// Creation: omitted
//
// Modifications:
......@@ -128,30 +128,28 @@ QvisCartographicProjectionWindow::CreateWindowContents()
QGridLayout *mainLayout = new QGridLayout(0);
topLayout->addLayout(mainLayout);
projectionIDLabel = new QLabel(tr("projection type"), central);
projectionIDLabel = new QLabel(tr("Projection type"), central);
mainLayout->addWidget(projectionIDLabel,0,0);
int sp = 30+(int)mainLayout->verticalSpacing();
mainLayout->setVerticalSpacing(sp);
projectionID = new QWidget(central);
projectionIDCombo = new QComboBox(projectionID);
projectionIDCombo->addItem("Aitoff");
projectionIDCombo->addItem("Eckert IV");
projectionIDCombo->addItem("Equidistant Conic");
projectionIDCombo->addItem("Hammer");
projectionIDCombo->addItem("Lambert Azimuthal Equal Area");
projectionIDCombo->addItem("Lambert Conformal Conic");
projectionIDCombo->addItem("Mercator");
projectionIDCombo->addItem("Miller Cylindrical");
projectionIDCombo->addItem("Mollweide");
projectionIDCombo->addItem("Orthographic");
projectionIDCombo->addItem("Winkel II");
projectionIDCombo = new QComboBox(central);
projectionIDCombo->addItem(tr("Aitoff"));
projectionIDCombo->addItem(tr("Eckert IV"));
projectionIDCombo->addItem(tr("Equidistant Conic"));
projectionIDCombo->addItem(tr("Hammer"));
projectionIDCombo->addItem(tr("Lambert Azimuthal Equal Area"));
projectionIDCombo->addItem(tr("Lambert Conformal Conic"));
projectionIDCombo->addItem(tr("Mercator"));
projectionIDCombo->addItem(tr("Miller Cylindrical"));
projectionIDCombo->addItem(tr("Mollweide"));
projectionIDCombo->addItem(tr("Orthographic"));
projectionIDCombo->addItem(tr("Winkel II"));
connect(projectionIDCombo, SIGNAL(activated(int)),
this, SLOT(projectionIDChanged(int)));
mainLayout->addWidget(projectionID, 0,1);
mainLayout->addWidget(projectionIDCombo, 0,1);
projectionIDCombo->setCurrentIndex(atts->GetProjectionID());
}
......@@ -163,7 +161,7 @@ QvisCartographicProjectionWindow::CreateWindowContents()
//
// Note: Autogenerated by xml2window.
//
// Programmer: xml2window
// Programmer: Jean Favre
// Creation: omitted
//
// Modifications:
......@@ -204,7 +202,7 @@ QvisCartographicProjectionWindow::UpdateWindow(bool doAll)
//
// Note: Autogenerated by xml2window.
//
// Programmer: xml2window
// Programmer: Jean Favre
// Creation: omitted
//
// Modifications:
......
......@@ -64,7 +64,7 @@ class QvisVariableButton;
//
// Notes: Autogenerated by xml2window.
//
// Programmer: xml2window
// Programmer: Jean Favre
// Creation: omitted
//
// Modifications:
......@@ -88,9 +88,8 @@ class QvisCartographicProjectionWindow : public QvisOperatorWindow
private slots:
void projectionIDChanged(int val);
private:
QWidget *projectionID;
QComboBox *projectionIDCombo;
QLabel *projectionIDLabel;
QLabel *projectionIDLabel;
CartographicProjectionAttributes *atts;
};
......
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