Commit 1b563727 by Sebastian Eichelbaum

[ADD] - added some icons

[CHANGE] - crashed modules can be deleted now
parent 3caa4325
......@@ -34,6 +34,7 @@
#include "projOpen.xpm"
#include "projSave.xpm"
#include "quit.xpm"
#include "remove.xpm"
#include "axial.xpm"
#include "cor.xpm"
......@@ -43,4 +44,7 @@
#include "question.xpm"
#include "o.xpm"
#include "moduleBusy.xpm"
#include "moduleCrashed.xpm"
#endif // WICONS_H
/* XPM */
static char * moduleBusy_xpm[] = {
"32 32 307 2",
" c None",
". c #6497CA",
"+ c #6295C8",
"@ c #6194C8",
"# c #6093C7",
"$ c #5E92C6",
"% c #5D91C6",
"& c #5D90C6",
"* c #6193C7",
"= c #5D91C5",
"- c #5A8FC4",
"; c #558BC2",
"> c #4F87BF",
", c #4983BD",
"' c #4781BB",
") c #457FBA",
"! c #598FC4",
"~ c #6093C6",
"{ c #5F91C5",
"] c #5C90C4",
"^ c #568CC2",
"/ c #4F87BE",
"( c #447FB9",
"_ c #3C78B5",
": c #2F6FB0",
"< c #1F65AB",
"[ c #1A61A9",
"} c #1D63A9",
"| c #2F70B0",
"1 c #5C90C3",
"2 c #588DC2",
"3 c #5087BE",
"4 c #447EB9",
"5 c #3775B3",
"6 c #2065AB",
"7 c #2768AA",
"8 c #6B91B7",
"9 c #A6B4C2",
"0 c #C3C6C9",
"a c #CFCDCC",
"b c #2768AB",
"c c #5A8EC2",
"d c #558AC0",
"e c #4B83BC",
"f c #3C78B6",
"g c #2C6DAF",
"h c #2467AB",
"i c #98ADC1",
"j c #DDD9D5",
"k c #E3E2E0",
"l c #E8E9EA",
"m c #EEEEEE",
"n c #EFF0F0",
"o c #598CC0",
"p c #5489BE",
"q c #4982BB",
"r c #3976B4",
"s c #2468AD",
"t c #5484B5",
"u c #DCD9D6",
"v c #E8E8E9",
"w c #F0F0F0",
"x c #EDEDED",
"y c #578BBF",
"z c #4A82BB",
"A c #3A78B5",
"B c #266AAE",
"C c #6E95BC",
"D c #E7E3E0",
"E c #EEEEEF",
"F c #ECECEC",
"G c #5488BD",
"H c #4C84BB",
"I c #3F7AB7",
"J c #2F70B3",
"K c #5B8ABA",
"L c #E8E4E0",
"M c #EBEBEB",
"N c #E6E6E6",
"O c #F2F2F2",
"P c #5B8ABB",
"Q c #2F70B2",
"R c #5488BC",
"S c #4F85BB",
"T c #457EB9",
"U c #3877B6",
"V c #3072B4",
"W c #E1DEDA",
"X c #EAEAEA",
"Y c #E9E9E9",
"Z c #C5C5C5",
"` c #7B7B7B",
" . c #E7E7E7",
".. c #F0F0F1",
"+. c #E9E5E2",
"@. c #3577BA",
"#. c #3777B6",
"$. c #5085BB",
"%. c #5186BA",
"&. c #4B82BA",
"*. c #3F7CB8",
"=. c #2D71B5",
"-. c #A7BACE",
";. c #E4E4E5",
">. c #D0D0D0",
",. c #636363",
"'. c #767676",
"). c #949494",
"!. c #777778",
"~. c #707D8B",
"{. c #2E73B8",
"]. c #3F7BB8",
"^. c #4F84B9",
"/. c #4780B9",
"(. c #3E7CBA",
"_. c #3E7CBB",
":. c #E5E1DC",
"<. c #EAE9E9",
"[. c #EFEFEF",
"}. c #727272",
"|. c #6C6C6C",
"1. c #BDBDBD",
"2. c #B1B1B1",
"3. c #6A6A6A",
"4. c #6D6D6D",
"5. c #666666",
"6. c #E8E4E1",
"7. c #3D7BBB",
"8. c #4F83B7",
"9. c #4D83B8",
"0. c #4580BB",
"a. c #3D7CBC",
"b. c #86A9CC",
"c. c #E0DFDE",
"d. c #C8C8C8",
"e. c #6E6E6E",
"f. c #737373",
"g. c #CBCBCB",
"h. c #747474",
"i. c #6B6B6B",
"j. c #909090",
"k. c #E5E5E5",
"l. c #DFDEDD",
"m. c #4D83B9",
"n. c #4E82B6",
"o. c #4C82B8",
"p. c #4681BC",
"q. c #387BBE",
"r. c #C0CCD9",
"s. c #DDDEDF",
"t. c #8B8B8B",
"u. c #797979",
"v. c #ABABAB",
"w. c #F4F4F4",
"x. c #DFDFDF",
"y. c #939393",
"z. c #787878",
"A. c #777777",
"B. c #828282",
"C. c #D5D5D5",
"D. c #E8E8E8",
"E. c #DEDEDF",
"F. c #BFCCD9",
"G. c #4D81B5",
"H. c #4B82B9",
"I. c #4883BF",
"J. c #3D7FC1",
"K. c #DCDEE1",
"L. c #E0E1E1",
"M. c #DEDEDE",
"N. c #606060",
"O. c #9C9C9C",
"P. c #7F7F7F",
"Q. c #7E7E7E",
"R. c #C2C2C2",
"S. c #F1F1F1",
"T. c #4B80B4",
"U. c #4C82B9",
"V. c #4B86C1",
"W. c #4686C6",
"X. c #E7E6E4",
"Y. c #E3E4E4",
"Z. c #E4E4E4",
"`. c #535353",
" + c #505050",
".+ c #848484",
"++ c #AFAFAF",
"@+ c #4C86C1",
"#+ c #4B7FB3",
"$+ c #4C83B9",
"%+ c #4F89C3",
"&+ c #4C8AC9",
"*+ c #E9E8E7",
"=+ c #E5E6E6",
"-+ c #F3F3F3",
";+ c #454545",
">+ c #646464",
",+ c #444444",
"'+ c #497DB2",
")+ c #528BC4",
"!+ c #4D8CCB",
"~+ c #E2E5E7",
"{+ c #E7E7E8",
"]+ c #BCBCBC",
"^+ c #393939",
"/+ c #4C83B8",
"(+ c #487CB0",
"_+ c #4C81B7",
":+ c #538BC3",
"<+ c #528FCD",
"[+ c #CEDAE6",
"}+ c #F5F5F5",
"|+ c #497CB0",
"1+ c #477BAE",
"2+ c #4A7FB4",
"3+ c #538AC1",
"4+ c #5C95CF",
"5+ c #A2C1E0",
"6+ c #EFEEEC",
"7+ c #487BB0",
"8+ c #5186BC",
"9+ c #5E96CD",
"0+ c #6DA3D9",
"a+ c #F7F3F0",
"b+ c #EFEFEE",
"c+ c #5087BC",
"d+ c #4478AC",
"e+ c #4C81B6",
"f+ c #5A90C6",
"g+ c #619BD5",
"h+ c #CADBEB",
"i+ c #4276A9",
"j+ c #477BAF",
"k+ c #5388BD",
"l+ c #649AD0",
"m+ c #73A8DD",
"n+ c #F9F7F4",
"o+ c #F2F3F3",
"p+ c #4275A9",
"q+ c #4A7EB2",
"r+ c #6BA0D6",
"s+ c #9CC2E7",
"t+ c #FCF9F6",
"u+ c #3F72A5",
"v+ c #5F93C7",
"w+ c #6CA3D9",
"x+ c #B1CFEC",
"y+ c #FEFBF8",
"z+ c #F7F7F7",
"A+ c #5E93C7",
"B+ c #3D71A4",
"C+ c #5F94C7",
"D+ c #6EA3D9",
"E+ c #A2C7EB",
"F+ c #FEFDFB",
"G+ c #F8F9F9",
"H+ c #F9F9F9",
"I+ c #3C6FA2",
"J+ c #4174A8",
"K+ c #4C80B3",
"L+ c #6DA1D4",
"M+ c #7FB1E2",
"N+ c #D7E7F6",
"O+ c #FFFFFD",
"P+ c #FDFDFB",
"Q+ c #FAFAFB",
"R+ c #FAFBFB",
"S+ c #FBFBFB",
"T+ c #3A6DA0",
"U+ c #3E71A5",
"V+ c #467AAD",
"W+ c #5487BA",
"X+ c #6497C9",
"Y+ c #6DA2D6",
"Z+ c #83B3E3",
"`+ c #BBD6F1",
" @ c #E2EEFA",
".@ c #F7FBFD",
"+@ c #FFFFFF",
"@@ c #4679AD",
"#@ c #386B9E",
"$@ c #3A6DA1",
"%@ c #3F73A5",
"&@ c #477AAE",
"*@ c #5386B8",
"=@ c #5F91C3",
"-@ c #679BCD",
";@ c #699FD3",
">@ c #6FA4D8",
",@ c #74A8DB",
"'@ c #699ED3",
")@ c #679ACD",
"!@ c #36699C",
"~@ c #36699D",
"{@ c #396C9F",
"]@ c #3C70A3",
"^@ c #4275A8",
"/@ c #477AAD",
"(@ c #4D80B2",
"_@ c #5184B6",
":@ c #5486B8",
"<@ c #34679B",
"[@ c #35689C",
"}@ c #376A9D",
"|@ c #3B6DA0",
"1@ c #326699",
"2@ c #336699",
" . . . . . . . . ",
" + + @ # $ % & & % $ # @ + + ",
" * # = - ; > , ' ) ) ' , > ; ! = ~ * ",
" { ] ^ / ( _ : < [ } } [ < | _ ( / ^ ] { ",
" 1 2 3 4 5 6 7 8 9 0 a a 0 9 8 b 6 5 4 3 2 1 ",
" c d e f g h i j k l m n n m l k j i h g f e d c ",
" o p q r s t u v w m x m m m m x m w v u t s r q p o ",
" y p z A B C D E F x x x x x x x x x x F E D C B A z p y ",
" G H I J K L x M F N O M F F F F F F F F M x L P Q I H G ",
" R S T U V W F X X Y Z ` .X X X X X X X X X X ..+.@.#.T $.R ",
" %.&.*.=.-.;.X M M Y >.,.'.O X M M M M M X F Y ).!.~.{.].&.%. ",
" ^./.(._.:.<.Y Y Y X [.}.|.1.M X Y Y X X w 2.3.4.5.6.7.(./.^. ",
"8.9.0.a.b.c.X X X X Y Y d.e.f.x Y X Y w g.` h.i.j.k.l.b.a.0.m.8.",
"n.o.p.q.r.s.Y Y X X X X w t.u.v.w.m x.y.z.A.B.C.[.D.E.F.q.p.o.n.",
"G.H.I.J.K.L. .Y X X X Y Y M.e.N.,.O.P.B.Q.R.S.Y X .L.K.J.I.H.G.",
"T.U.V.W.X.Y.Z.X X X X X X O `.t.t. +.+++x X X X X Z.Y.X.W.@+U.T.",
"#+$+%+&+*+=+N D.M M M M X -+;+>+>+,+X x X M M M D.N =+*+&+%+$+#+",
"'+$+)+!+~+{+D.D.X M M M M F ]+^+^+]+M M M M M X D.D.{+~+!+)+/+'+",
"(+_+:+<+[+l X X X X F F F F x }+}+x F F F F X X X X l [+<+:+_+|+",
"1+2+3+4+5+6+F F F F F F x x x x x x x x F F F F F F 6+5+4+3+2+1+",
" 7+8+9+0+a+b+[.[.[.[.[.m m m m m m m m [.[.[.[.[.b+a+0+9+c+7+ ",
" d+e+f+g+h+..S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S...h+g+f+e+d+ ",
" i+j+k+l+m+n+o+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+o+n+m+l+k+j+i+ ",
" p+q+- r+s+t+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+}+t+s+r+- q+p+ ",
" u+i+G.v+w+x+y+z+z+z+z+z+z+z+z+z+z+z+z+z+z+y+x+w+A+G.i+u+ ",
" B+i+n.C+D+E+F+G+H+H+H+H+H+H+H+H+H+H+G+F+E+D+v+n.i+B+ ",
" I+J+K+1 L+M+N+O+P+Q+R+S+S+R+Q+P+O+N+M+L+1 K+J+I+ ",
" T+U+V+W+X+Y+Z+`+ @.@+@+@.@ @`+Z+Y+X+W+@@U+T+ ",
" #@$@%@&@*@=@-@;@>@,@,@>@'@)@=@*@&@%@$@#@ ",
" !@~@{@]@^@/@(@_@:@:@_@(@/@^@]@{@~@!@ ",
" <@<@[@}@{@T+|@T+T+{@}@[@<@<@ ",
" 1@1@2@2@2@2@2@1@ "};
/* XPM */
static char * remove_xpm[] = {
"32 32 230 2",
" c None",
". c #B55959",
"+ c #9A1B1B",
"@ c #8C0000",
"# c #8D0000",
"$ c #8E0000",
"% c #900000",
"& c #920000",
"* c #950000",
"= c #980000",
"- c #9B0000",
"; c #9F0000",
"> c #A30000",
", c #A70000",
"' c #AB0000",
") c #B00000",
"! c #B50000",
"~ c #BA0000",
"{ c #BF0000",
"] c #C50000",
"^ c #CA0000",
"/ c #D00000",
"( c #D70000",
"_ c #DF1919",
": c #EA5858",
"< c #BF6E6E",
"[ c #C07474",
"} c #9D2C2C",
"| c #810000",
"1 c #820000",
"2 c #830000",
"3 c #850000",
"4 c #860000",
"5 c #890000",
"6 c #8F0000",
"7 c #930000",
"8 c #960000",
"9 c #9A0000",
"0 c #A40000",
"a c #A80000",
"b c #AE0000",
"c c #B30000",
"d c #B90000",
"e c #C40000",
"f c #CB0000",
"g c #D10000",
"h c #DD2929",
"i c #EA7171",
"j c #EF6C6C",
"k c #9C1E1E",
"l c #AE5050",
"m c #C48484",
"n c #D39696",
"o c #C77272",
"p c #C87474",
"q c #C97474",
"r c #CA7474",
"s c #CC7474",
"t c #CD7474",
"u c #CE7474",
"v c #D07474",
"w c #D17474",
"x c #D37474",
"y c #D57474",
"z c #D67373",
"A c #D77373",
"B c #D97373",
"C c #DA7373",
"D c #DB7373",
"E c #DC7373",
"F c #DD7373",
"G c #DE7272",
"H c #DF7373",
"I c #DF7171",
"J c #E27272",
"K c #E89D9D",
"L c #EB8181",
"M c #EB4E4E",
"N c #ED1E1E",
"O c #8E0303",
"P c #931B1B",
"Q c #D09393",
"R c #C53C3C",
"S c #CA4343",
"T c #CD4343",
"U c #D04343",
"V c #D44343",
"W c #D64343",
"X c #D94343",
"Y c #DB4343",
"Z c #DE4343",
"` c #E04343",
" . c #E14343",
".. c #E24343",
"+. c #E34343",
"@. c #DE4444",
"#. c #DC4444",
"$. c #D73D3D",
"%. c #D84949",
"&. c #D86565",
"*. c #B13A3A",
"=. c #7E0000",
"-. c #D37373",
";. c #E31A1A",
">. c #E90303",
",. c #7D0000",
"'. c #BD6666",
"). c #C33F3F",
"!. c #C84545",
"~. c #CC4545",
"{. c #D04545",
"]. c #D34545",
"^. c #D64545",
"/. c #DA4545",
"(. c #DC4545",
"_. c #DF4545",
":. c #E14545",
"<. c #E34545",
"[. c #E44545",
"}. c #E54545",
"|. c #E64646",
"1. c #E54747",
"2. c #E44343",
"3. c #E13E3E",
"4. c #E24848",
"5. c #E46565",
"6. c #DA6565",
"7. c #BC3535",
"8. c #9D0000",
"9. c #C64B4B",
"0. c #DE0000",
"a. c #E70000",
"b. c #7A0000",
"c. c #B96161",
"d. c #BF3B3B",
"e. c #C54141",
"f. c #C94040",
"g. c #CD4040",
"h. c #D14141",
"i. c #D54040",
"j. c #D84040",
"k. c #DC4040",
"l. c #DF4040",
"m. c #E14040",
"n. c #E33E3E",
"o. c #E53C3C",
"p. c #E63F3F",
"q. c #E84949",
"r. c #EA5959",
"s. c #E96464",
"t. c #E25959",
"u. c #D33939",
"v. c #BF0707",
"w. c #970000",
"x. c #880000",
"y. c #C34646",
"z. c #DC0000",
"A. c #E50000",
"B. c #780000",
"C. c #A85050",
"D. c #9E1414",
"E. c #AF2323",
"F. c #BB2B2B",
"G. c #C43030",
"H. c #CB3535",
"I. c #D03636",
"J. c #D53A3A",
"K. c #D93C3C",
"L. c #DD3E3E",
"M. c #E04040",
"N. c #E23A3A",
"O. c #E03232",
"P. c #DD2525",
"Q. c #D70A0A",
"R. c #D20000",
"S. c #CE0000",
"T. c #C20000",
"U. c #B80000",
"V. c #A20000",
"W. c #840000",
"X. c #DB0000",
"Y. c #E30000",
"Z. c #790000",
"`. c #770B0B",
" + c #9A4141",
".+ c #9B3B3B",
"++ c #9D3A3A",
"@+ c #A03939",
"#+ c #A43A3A",
"$+ c #A93A3A",
"%+ c #AC3A3A",
"&+ c #B13939",
"*+ c #B43838",
"=+ c #B83636",
"-+ c #BC3636",
";+ c #C13939",
">+ c #C73D3D",
",+ c #C93D3D",
"'+ c #CA3C3C",
")+ c #C93C3C",
"!+ c #C83C3C",
"~+ c #C63B3B",
"{+ c #C43B3B",
"]+ c #C13B3B",
"^+ c #C53F3F",
"/+ c #D60B0B",
"(+ c #DA0000",
"_+ c #E10000",
":+ c #6F0000",
"<+ c #650000",
"[+ c #620000",
"}+ c #640000",
"|+ c #660000",
"1+ c #6A0000",
"2+ c #6D0000",
"3+ c #710000",
"4+ c #750000",
"5+ c #7F0000",
"6+ c #940000",
"7+ c #A10000",
"8+ c #B40000",
"9+ c #BB0000",
"0+ c #D90000",
"a+ c #6C0000",
"b+ c #610000",
"c+ c #690000",
"d+ c #760000",
"e+ c #8A0000",
"f+ c #BC0000",
"g+ c #C30000",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . + @ @ @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : ",
" < [ } | 1 1 2 3 4 5 @ 6 7 8 9 ; 0 a b c d { e f g h i j ",
" k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N ",
" O P Q R S T U V W X Y Z ` ...+.+.+...` @.#.$.%.&.*.=.-.;.>. ",
" 5 ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.* 4 9.0.a. ",
" 4 b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.c b > w.x.y.z.A. ",
" 3 B.C.D.E.F.G.H.I.J.K.L.M.3.N.O.P.Q.R.S.^ T.U.b V.* W.!.X.Y. ",
" W.Z.`. +.+++@+#+$+%+&+*+=+-+;+R >+,+'+'+'+)+!+~+{+]+^+/+(+_+ ",
" B.:+<+[+[+[+}+|+1+2+3+4+Z.5+W.5 6 6+- 7+, b 8+9+T.^ R.0+ ",
" a+<+[+b+[+}+|+c+2+3+d+b.5+W.e+6 * - 7+a b ! f+g+^ g ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
......@@ -80,6 +80,9 @@ void WMainWindow::setupGUI()
m_iconManager.addIcon( std::string( "logo" ), logoIcon_xpm );
m_iconManager.addIcon( std::string( "help" ), question_xpm );
m_iconManager.addIcon( std::string( "quit" ), quit_xpm );
m_iconManager.addIcon( std::string( "moduleBusy" ), moduleBusy_xpm );
m_iconManager.addIcon( std::string( "moduleCrashed" ), moduleCrashed_xpm );
m_iconManager.addIcon( std::string( "remove" ), remove_xpm );
if( objectName().isEmpty() )
{
......
......@@ -49,6 +49,7 @@
#include "../events/WEventTypes.h"
#include "../guiElements/WQtApplyModulePushButton.h"
#include "../WMainWindow.h"
#include "../WQt4Gui.h"
#include "WQtNumberEdit.h"
#include "WQtNumberEditDouble.h"
#include "WQtTextureSorter.h"
......@@ -413,12 +414,20 @@ void WQtDatasetBrowser::selectTreeItem()
break;
case DATASET:
module = ( static_cast< WQtDatasetTreeItem* >( m_moduleTreeWidget->selectedItems().at( 0 ) ) )->getModule();
if ( module->isCrashed()() )
{
return;
}
props = module->getProperties();
infoProps = module->getInformationProperties();
createCompatibleButtons( module );
break;
case MODULE:
module = ( static_cast< WQtModuleTreeItem* >( m_moduleTreeWidget->selectedItems().at( 0 ) ) )->getModule();
if ( module->isCrashed()() )
{
return;
}
props = module->getProperties();
infoProps = module->getInformationProperties();
createCompatibleButtons( module );
......
......@@ -136,9 +136,19 @@ void WQtTreeItem::updateState()
if ( m_module->isCrashed()() )
{
setText( 0, ( m_name + " (problem occurred)" ).c_str() );
// strike out the name of the module to show the crash visually.
QFont curFont = font( 0 );
curFont.setStrikeOut( true );
setFont( 0, curFont );
setIcon( 0, WQt4Gui::getMainWindow()->getIconManager()->getIcon( "moduleCrashed" ) );
// this ensures that crashed modules can be deleted
setDisabled( false );
}
else if ( p->isPending() )
{
setIcon( 0, WQt4Gui::getMainWindow()->getIconManager()->getIcon( "moduleBusy" ) );
std::ostringstream title;
if ( p->isDetermined() )
{
......@@ -155,6 +165,7 @@ void WQtTreeItem::updateState()
}
else
{
setIcon( 0, QIcon() );
setText( 0, m_name.c_str() );
}
......
......@@ -157,6 +157,7 @@ void WMNavSlices::moduleMain()
m_viewer = ge->getViewerByName( "main" );
WAssert( m_viewer, "Requested viewer not found." );
m_viewer->getPickHandler()->getPickSignal()->connect( boost::bind( &WMNavSlices::setSlicePosFromPick, this, _1 ) );
WAssert( false, "Requested viewer not found." );
m_viewer = ge->getViewerByName( "axial" );
if( m_viewer )
......
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