summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Helfrich <helfrich9000@gmail.com>2008-03-19 04:09:26 +0000
committerBrian Helfrich <helfrich9000@gmail.com>2008-03-19 04:09:26 +0000
commit48eafb6bce830297b025082648f430e6505c5743 (patch)
tree2743b1ebd35a3d1b2f9a28e5a11fe213dc570a72
parentdb1dccf44a920ac1df90df4a43a1be5f816d2e1c (diff)
downloadnanoengineer-theirix-48eafb6bce830297b025082648f430e6505c5743.tar.gz
nanoengineer-theirix-48eafb6bce830297b025082648f430e6505c5743.zip
Bug 2640 solution: Make the results tree look like the mockup.
Diffstat
-rwxr-xr-xcad/plugins/NanoVision-1/src/Icons/Model_Tree.pngbin764 -> 0 bytes
-rwxr-xr-xcad/plugins/NanoVision-1/src/Icons/nanoENGINEER-1.icobin9662 -> 0 bytes
-rw-r--r--cad/plugins/NanoVision-1/src/Icons/nh5_file.pngbin0 -> 1457 bytes
-rw-r--r--cad/plugins/NanoVision-1/src/Icons/results_tree.pngbin0 -> 1457 bytes
-rw-r--r--cad/plugins/NanoVision-1/src/LogHandlerWidget.cpp1
-rw-r--r--cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui4
-rw-r--r--cad/plugins/NanoVision-1/src/ResultsWindow.cpp37
-rw-r--r--cad/plugins/NanoVision-1/src/ResultsWindow.h4
-rw-r--r--cad/plugins/NanoVision-1/src/application.qrc3
-rw-r--r--cad/plugins/NanoVision-1/src/nv1.cpp4
10 files changed, 32 insertions, 21 deletions
diff --git a/cad/plugins/NanoVision-1/src/Icons/Model_Tree.png b/cad/plugins/NanoVision-1/src/Icons/Model_Tree.png
deleted file mode 100755
index 2674b0948..000000000
--- a/cad/plugins/NanoVision-1/src/Icons/Model_Tree.png
+++ /dev/null
Binary files differ
diff --git a/cad/plugins/NanoVision-1/src/Icons/nanoENGINEER-1.ico b/cad/plugins/NanoVision-1/src/Icons/nanoENGINEER-1.ico
deleted file mode 100755
index 8443bdf67..000000000
--- a/cad/plugins/NanoVision-1/src/Icons/nanoENGINEER-1.ico
+++ /dev/null
Binary files differ
diff --git a/cad/plugins/NanoVision-1/src/Icons/nh5_file.png b/cad/plugins/NanoVision-1/src/Icons/nh5_file.png
new file mode 100644
index 000000000..0fcf319d5
--- /dev/null
+++ b/cad/plugins/NanoVision-1/src/Icons/nh5_file.png
Binary files differ
diff --git a/cad/plugins/NanoVision-1/src/Icons/results_tree.png b/cad/plugins/NanoVision-1/src/Icons/results_tree.png
new file mode 100644
index 000000000..0fcf319d5
--- /dev/null
+++ b/cad/plugins/NanoVision-1/src/Icons/results_tree.png
Binary files differ
diff --git a/cad/plugins/NanoVision-1/src/LogHandlerWidget.cpp b/cad/plugins/NanoVision-1/src/LogHandlerWidget.cpp
index 6f1c89e2a..3fed65edd 100644
--- a/cad/plugins/NanoVision-1/src/LogHandlerWidget.cpp
+++ b/cad/plugins/NanoVision-1/src/LogHandlerWidget.cpp
@@ -37,7 +37,6 @@ void LogHandlerWidget::publish(LogRecord logRecord) {
if (logRecord.getLogLevel() == 3)
bgcolor = "yellow";
if (logRecord.getLogLevel() == 4) {
- color = "";
bgcolor = "orange";
}
QString level =
diff --git a/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui b/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui
index 5807faa00..89dea9bc5 100644
--- a/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui
+++ b/cad/plugins/NanoVision-1/src/MainWindowTabWidget.ui
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>300</height>
+ <width>200</width>
+ <height>200</height>
</rect>
</property>
<property name="windowTitle" >
diff --git a/cad/plugins/NanoVision-1/src/ResultsWindow.cpp b/cad/plugins/NanoVision-1/src/ResultsWindow.cpp
index c3256f40d..c19079488 100644
--- a/cad/plugins/NanoVision-1/src/ResultsWindow.cpp
+++ b/cad/plugins/NanoVision-1/src/ResultsWindow.cpp
@@ -11,6 +11,8 @@ ResultsWindow::ResultsWindow(NXEntityManager* entityManager, QWidget* parent)
: QWidget(parent), Ui_ResultsWindow(),
workspace(NULL), windowMapper(NULL),
entityManager(NULL), curFile(), resultsTree(NULL),
+ resultsTreeIcon( tr(":/Icons/results_tree.png")),
+ nh5FileIcon( tr(":/Icons/nh5_file.png")),
mmpFileIcon( tr(":/Icons/nanoENGINEER-1.ico")),
atomIcon( tr(":/Icons/atom.png")),
atomSetIcon( tr(":/Icons/atom_set.png")),
@@ -35,7 +37,7 @@ ResultsWindow::ResultsWindow(NXEntityManager* entityManager, QWidget* parent)
resultsTree = new QTreeWidget(tabWidget);
resultsTree->setHeaderLabel(tr(""));
tabWidget->removeTab(0);
- tabWidget->insertTab(0,resultsTree,tr("Results Tree"));
+ tabWidget->insertTab(0, resultsTree, resultsTreeIcon, "");
splitter->insertWidget(1, workspace);
delete widget;
@@ -111,6 +113,9 @@ void ResultsWindow::setupResultsTree(void)
else if (dataStoreInfo->isSimulationResults()) {
setupSimulationResultsTree();
}
+
+ resultsTree->resizeColumnToContents(0);
+
connect(resultsTree,
SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
this,
@@ -135,26 +140,31 @@ void ResultsWindow::setupSimulationResultsTree(void)
QWidget *tab1Widget = tabWidget->widget(0);
resultsTree = dynamic_cast<QTreeWidget*>(tab1Widget);
resultsTree->clear();
- resultsTree->setHeaderLabel("Sim Results");
+ QTreeWidgetItem* rootNode = new QTreeWidgetItem(resultsTree);
+ rootNode->setText(0, userFriendlyCurrentFile());
+ rootNode->setIcon(0, nh5FileIcon);
+ rootNode->setFlags(Qt::ItemIsEnabled);
+ rootNode->setExpanded(true);
+ resultsTree->addTopLevelItem(rootNode);
// input parameters
NXProperties *inputParameters = dataStoreInfo->getInputParameters();
if (inputParameters != NULL) {
DataWindowTreeItem* inputParametersItem =
- new InputParametersTreeItem(this, resultsTree);
+ new InputParametersTreeItem(this, rootNode);
inputParametersItem->setIcon(0, inputParametersIcon);
inputParametersItem->setText(0, tr("Input parameters"));
inputParametersItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
- resultsTree->addTopLevelItem(inputParametersItem);
}
// input files
vector<string> inputFileNames = dataStoreInfo->getInputFileNames();
if (inputFileNames.size() > 0) {
- QTreeWidgetItem *inputFilesItem = new QTreeWidgetItem(resultsTree);
+ QTreeWidgetItem *inputFilesItem = new QTreeWidgetItem(rootNode);
inputFilesItem->setIcon(0, inputFilesIcon);
inputFilesItem->setText(0, tr("Input files"));
inputFilesItem->setFlags(Qt::ItemIsEnabled);
+ inputFilesItem->setExpanded(true);
vector<string>::const_iterator inputFileNameIter;
for (inputFileNameIter = inputFileNames.begin();
@@ -182,8 +192,6 @@ void ResultsWindow::setupSimulationResultsTree(void)
}
}
-
- resultsTree->addTopLevelItem(inputFilesItem);
}
// Results
@@ -194,11 +202,11 @@ void ResultsWindow::setupSimulationResultsTree(void)
// don't create if no children
if (resultsSummary == NULL && trajectoryNames.size()==0) return;
- QTreeWidgetItem *resultsItem = new QTreeWidgetItem(resultsTree);
+ QTreeWidgetItem *resultsItem = new QTreeWidgetItem(rootNode);
resultsItem->setIcon(0, resultsIcon);
resultsItem->setText(0, tr("Results"));
resultsItem->setFlags(Qt::ItemIsEnabled);
- resultsTree->addTopLevelItem(resultsItem);
+ resultsItem->setExpanded(true);
// Results -> Summary
DataWindowTreeItem* resultsSummaryItem = NULL;
@@ -214,6 +222,7 @@ void ResultsWindow::setupSimulationResultsTree(void)
trajectoryItem->setIcon(0, resultsTrajectoriesIcon);
trajectoryItem->setText(0, tr("Trajectories"));
trajectoryItem->setFlags(Qt::ItemIsEnabled);
+ trajectoryItem->setExpanded(true);
vector<string>::const_iterator trajectoryNameIter;
for (trajectoryNameIter = trajectoryNames.begin();
@@ -330,12 +339,12 @@ void ResultsWindow::setupSingleStructureTree(void)
QFileInfo fileInfo(fileFullPath);
QString const fileName = fileInfo.fileName();
QTreeWidgetItem *fileItem = new QTreeWidgetItem(resultsTree);
- fileItem->setIcon(0, mmpFileIcon);
+ fileItem->setIcon(0, inputFileIcon);
fileItem->setText(0, fileName);
fileItem->setFlags(Qt::ItemIsEnabled);
resultsTree->addTopLevelItem(fileItem);
- QString const fileSuffix = fileInfo.suffix();
- resultsTree->setHeaderLabel(fileSuffix.toUpper() + " file");
+ //QString const fileSuffix = fileInfo.suffix();
+ //resultsTree->setHeaderLabel(fileSuffix.toUpper() + " file");
if(isMMPFile(singleStructureFileName)) {
int frameSetID = dataStoreInfo->getSingleStructureId();
@@ -418,8 +427,8 @@ void DataWindowTreeItem::refresh() { }
/* CONSTRUCTOR */
InputParametersTreeItem::InputParametersTreeItem(ResultsWindow* resultsWindow,
- QTreeWidget* treeWidget)
- : DataWindowTreeItem(resultsWindow, treeWidget) {
+ QTreeWidgetItem* treeWidgetItem)
+ : DataWindowTreeItem(resultsWindow, treeWidgetItem) {
inputParametersWindow = NULL;
}
diff --git a/cad/plugins/NanoVision-1/src/ResultsWindow.h b/cad/plugins/NanoVision-1/src/ResultsWindow.h
index 7ac0295a9..b804954ae 100644
--- a/cad/plugins/NanoVision-1/src/ResultsWindow.h
+++ b/cad/plugins/NanoVision-1/src/ResultsWindow.h
@@ -54,6 +54,8 @@ class ResultsWindow : public QWidget, private Ui_ResultsWindow {
QString curFile;
QTreeWidget *resultsTree;
+ QIcon resultsTreeIcon;
+ QIcon nh5FileIcon;
QIcon mmpFileIcon;
QIcon atomIcon;
QIcon atomSetIcon;
@@ -105,7 +107,7 @@ class InputParametersTreeItem : public DataWindowTreeItem {
public:
InputParametersTreeItem(ResultsWindow* resultsWindow,
- QTreeWidget* treeWidget);
+ QTreeWidgetItem* treeWidgetItem);
~InputParametersTreeItem();
void showWindow();
diff --git a/cad/plugins/NanoVision-1/src/application.qrc b/cad/plugins/NanoVision-1/src/application.qrc
index b93f8e3eb..ba7e53d21 100644
--- a/cad/plugins/NanoVision-1/src/application.qrc
+++ b/cad/plugins/NanoVision-1/src/application.qrc
@@ -6,7 +6,8 @@
<file>Icons/splashscreen.png</file>
<file>Icons/eye-icon.png</file>
<file>Icons/home.png</file>
- <file>Icons/Model_Tree.png</file>
+ <file>Icons/results_tree.png</file>
+ <file>Icons/nh5_file.png</file>
<file>Icons/nanoENGINEER-1.ico</file>
<file>Icons/input_file.png</file>
<file>Icons/input_files.png</file>
diff --git a/cad/plugins/NanoVision-1/src/nv1.cpp b/cad/plugins/NanoVision-1/src/nv1.cpp
index edde95eb4..0ab72f493 100644
--- a/cad/plugins/NanoVision-1/src/nv1.cpp
+++ b/cad/plugins/NanoVision-1/src/nv1.cpp
@@ -363,10 +363,10 @@ void nv1::readSettings() {
QPoint pos =
UserSettings::Instance()->value("Layout/Position",
- QPoint(200, 200)).toPoint();
+ QPoint(100, 100)).toPoint();
QSize size =
UserSettings::Instance()->value("Layout/Size",
- QSize(400, 400)).toSize();
+ QSize(800, 600)).toSize();
resize(size);
move(pos);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-30 11:41:26 +0000