Skip to content

Commit

Permalink
Merge branch 'FFSApplication'
Browse files Browse the repository at this point in the history 
* FFSApplication:
  Copy simulator.config in Debug/Release/RelWithDebInfo bin subdirectory
  Tweak gui and default values
  Copy simulator.config to bin directory
  Add button to the GUI
  • Loading branch information
@finetjul
finetjul committed Feb 17, 2013
2 parents 3151526 + 624ef05 commit 7f46a3f
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 72 deletions.
9 changes: 8 additions & 1 deletion Applications/FFS/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,17 @@ target_link_libraries(msv${KIT}
msvVTKParallel
msvVTKWidgets
msvQtWidgets
msvIBTK
msvIBTK
msvIBAMR
)

add_custom_command(TARGET msv${KIT} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${CMAKE_CURRENT_SOURCE_DIR}/Resources/simulator.config"
"$<TARGET_FILE_DIR:msv${KIT}>/Resources/simulator.config")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/Resources/simulator.config"
DESTINATION "${MSVTK_INSTALL_BIN_DIR}/Resources/simulator.config")

install(TARGETS msv${KIT}
RUNTIME DESTINATION ${MSVTK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${MSVTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
Expand Down
148 changes: 121 additions & 27 deletions Applications/FFS/Resources/UI/msvQFFSMainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<x>0</x>
<y>0</y>
<width>698</width>
<height>20</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
Expand Down Expand Up @@ -73,43 +73,137 @@
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="showCartesianGrid">
<property name="text">
<string>Show Cartesian Grid</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showSurface">
<property name="text">
<string>Show Surface</string>
</property>
<property name="checked">
<bool>true</bool>
<widget class="QGroupBox" name="LoadingGroupBox">
<property name="title">
<string>Loading</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="maxLevelsLabel">
<property name="text">
<string>Max Levels:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="maxLevelsSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="dataLevelsLabel">
<property name="text">
<string>Data Levels:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="dataLevelsSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>4</number>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showBoundaryEdges">
<property name="text">
<string>Show boundary edges</string>
<widget class="QGroupBox" name="VisualisationGroupBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="checked">
<bool>true</bool>
<property name="title">
<string>Visualisation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="showCartesianGrid">
<property name="text">
<string>Show Cartesian Grid</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showSurface">
<property name="text">
<string>Show Surface</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showBoundaryEdges">
<property name="text">
<string>Show boundary edges</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showOutlineCorners">
<property name="text">
<string>Show outline corners</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showOutlineCorners">
<property name="text">
<string>Show outline corners</string>
<widget class="QGroupBox" name="SimulationGroupBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="checked">
<bool>true</bool>
<property name="title">
<string>Simulation</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="timeStepsLabel">
<property name="text">
<string>Time Steps:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="numberOfTimeSteps">
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QPushButton" name="runTimeSteps">
<property name="text">
<string>Run</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand Down
2 changes: 1 addition & 1 deletion Applications/FFS/msvFluidSimulator.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ msvFluidSimulator::msvFluidSimulator()
this->AMRDataset = vtkHierarchicalBoxDataSet::New();
this->CoarsestGridSpacing = 8;
this->MaxLevels = 5;
this->RefinamentRatio = 2;
this->RefinamentRatio = 4;
this->FinestGridSpacing = this->CoarsestGridSpacing << (this->MaxLevels-1);
this->DataLevel = this->MaxLevels-1;
this->FluidDensity = 1.0;
Expand Down
Loading

0 comments on commit 7f46a3f

Please sign in to comment.