Skip to content

Commit 9e3ba0a

Browse files
committed
More transparent by default. fixed ui.
1 parent d528ce1 commit 9e3ba0a

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

src/Interface/Modules/Render/ViewSceneControlsDock.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ using namespace SCIRun::Render;
3535
ViewSceneControlsDock::ViewSceneControlsDock(const QString& name, ViewSceneDialog* parent) : QDockWidget(parent)
3636
{
3737
setupUi(this);
38-
scene_ = parent;
38+
//scene_ = parent;
3939

4040
close();
4141
setWindowTitle(name);
@@ -44,10 +44,10 @@ ViewSceneControlsDock::ViewSceneControlsDock(const QString& name, ViewSceneDialo
4444
setVisible(false);
4545
setEnabled(false);
4646

47-
scene_->menuMouseControlChanged(mouseControlComboBox_->currentIndex());
47+
parent->menuMouseControlChanged(mouseControlComboBox_->currentIndex());
4848

49-
connect(orientationCheckBox_, SIGNAL(clicked(bool)), scene_, SLOT(showOrientationChecked(bool)));
50-
connect(mouseControlComboBox_, SIGNAL(currentIndexChanged(int)), scene_, SLOT(menuMouseControlChanged(int)));
49+
connect(orientationCheckBox_, SIGNAL(clicked(bool)), parent, SLOT(showOrientationChecked(bool)));
50+
connect(mouseControlComboBox_, SIGNAL(currentIndexChanged(int)), parent, SLOT(menuMouseControlChanged(int)));
5151

5252
}
5353

src/Interface/Modules/Render/ViewSceneControlsDock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace SCIRun {
5454
~ViewSceneControlsDock();
5555

5656
private:
57-
ViewSceneDialog* scene_;
57+
//ViewSceneDialog* scene_;
5858

5959
};
6060

src/Interface/Modules/Visualization/ShowField.ui

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@
458458
<rect>
459459
<x>10</x>
460460
<y>10</y>
461-
<width>79</width>
461+
<width>171</width>
462462
<height>17</height>
463463
</rect>
464464
</property>
@@ -497,6 +497,9 @@
497497
<height>20</height>
498498
</rect>
499499
</property>
500+
<property name="toolTip">
501+
<string>Set Transparency Alpha</string>
502+
</property>
500503
<property name="maximum">
501504
<double>1.000000000000000</double>
502505
</property>
@@ -512,7 +515,7 @@
512515
<rect>
513516
<x>11</x>
514517
<y>35</y>
515-
<width>123</width>
518+
<width>171</width>
516519
<height>17</height>
517520
</rect>
518521
</property>

src/Interface/Modules/Visualization/ShowFieldDialog.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,5 @@ void ShowFieldDialog::pushEdgeType()
122122

123123
void ShowFieldDialog::pushTransparencyValue()
124124
{
125-
state_->setValue(ShowFieldModule::FaceTransparencyValue, transparencyDoubleSpinBox_->value());
125+
state_->setValue(ShowFieldModule::FaceTransparencyValue, 0.50f);
126126
}

src/Modules/Visualization/ShowField.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ void ShowFieldModule::setStateDefaults()
7777
state->setValue(NodeAsSpheres, false);
7878
state->setValue(EdgesAsLines, true);
7979
state->setValue(EdgesAsCylinders, false);
80-
state->setValue(FaceTransparency, 0.75f);
81-
transparencyValue_ = 0.75f;
80+
state->setValue(FaceTransparencyValue, 0.50f);
81+
transparencyValue_ = 0.50f;
8282

8383
// NOTE: We need to add radio buttons for USE_DEFAULT_COLOR, COLORMAP, and
8484
// COLOR_CONVERT. USE_DEFAULT_COLOR is selected by default. COLOR_CONVERT

0 commit comments

Comments
 (0)