mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mfeemster/fractorium

Browse Source
This commit is contained in:
mfeemster 2015-07-29 17:35:38 -07:00
commit 51df7b3681
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Ember/Variations02.h
View File

@ -2726,7 +2726,7 @@ public:
string inside = "parVars[" + ToUpper(m_Params[i++].Name()) + index; string inside = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
ss << "\t{\n" ss << "\t{\n"
<< "\t\treal_t r, delta = pow(precalcAtanyx / M_PI + 1, " << a << ");\n" << "\t\treal_t r, delta = pow(precalcAtanyx / (real_t)M_PI + 1, " << a << ");\n"
<< "\n" << "\n"
<< "\t\tif (" << inside << " != 0)\n" << "\t\tif (" << inside << " != 0)\n"
<< "\t\t r = xform->m_VariationWeights[" << varIndex << "] * delta / (precalcSqrtSumSquares + delta);\n" << "\t\t r = xform->m_VariationWeights[" << varIndex << "] * delta / (precalcSqrtSumSquares + delta);\n"

4
Source/Fractorium/Fractorium.ui
View File

@ -6513,7 +6513,7 @@ SpinBox
<string>Copy selected xforms to the clipboard</string> <string>Copy selected xforms to the clipboard</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+Q</string> <string>Ctrl+D</string>
</property> </property>
</action> </action>
<action name="ActionPasteSelectedXforms"> <action name="ActionPasteSelectedXforms">
@ -6524,7 +6524,7 @@ SpinBox
<string>Paste copied xforms into the current flame</string> <string>Paste copied xforms into the current flame</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+W</string> <string>Ctrl+S</string>
</property> </property>
</action> </action>
<action name="ActionResetWorkspace"> <action name="ActionResetWorkspace">

17
Source/Fractorium/Main.cpp
View File

@ -44,9 +44,18 @@ int main(int argc, char *argv[])
"}" ); "}" );
#endif #endif
Fractorium w; int rv = -1;
w.show();
a.installEventFilter(&w); try
return a.exec(); {
Fractorium w;
w.show();
a.installEventFilter(&w);
rv = a.exec();
} catch (const char *e) {
QMessageBox::critical(0, "Fatal Error", e);
}
return rv;
} }